From 72335e3d7a821cc94240fc34f9450a29c380399d Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Mon, 22 Sep 2025 20:39:08 +0200 Subject: [PATCH] 5.1.1 --- .../{test-api.yml.disabled => test-api.yml} | 3 +-- www/controllers/Layout/Tab/Settings.php | 2 +- www/controllers/Layout/Tab/Status.php | 2 +- www/controllers/Service/Unit/Statistic.php | 1 + www/models/Repo/Listing.php | 4 ++-- .../js/events/settings/debug-mode.js | 4 +++- www/version | 2 +- .../containers/header/debug-mode.inc.php | 5 +---- .../containers/settings/debug-mode.inc.php | 18 +++++++++++++++++ .../containers/settings/right-section.inc.php | 6 ++++++ .../containers/settings/status.inc.php | 6 ++++++ .../containers/settings/users.inc.php | 20 ++----------------- .../includes/containers/status/health.inc.php | 2 +- .../{overview.inc.php => monitoring.inc.php} | 2 +- .../containers/status/service.inc.php | 2 +- 15 files changed, 46 insertions(+), 33 deletions(-) rename .github/workflows/{test-api.yml.disabled => test-api.yml} (99%) create mode 100644 www/views/includes/containers/settings/debug-mode.inc.php create mode 100644 www/views/includes/containers/settings/right-section.inc.php create mode 100644 www/views/includes/containers/settings/status.inc.php rename www/views/includes/containers/status/{overview.inc.php => monitoring.inc.php} (93%) diff --git a/.github/workflows/test-api.yml.disabled b/.github/workflows/test-api.yml similarity index 99% rename from .github/workflows/test-api.yml.disabled rename to .github/workflows/test-api.yml index 22ce87d6a..eb86af04d 100644 --- a/.github/workflows/test-api.yml.disabled +++ b/.github/workflows/test-api.yml @@ -45,10 +45,9 @@ jobs: # - name: Download test packages run: | - wget -O ${HOSTNAME}_nginx-1.26.0-1.el7.ngx.x86_64.rpm https://packages.repomanager.net/repo/rpm/ci-test/7/prod/packages/x86_64/nginx-1.26.0-1.el7.ngx.x86_64.rpm + wget -O ${HOSTNAME}_nginx-1.26.0-1.el7.ngx.x86_64.rpm https://packages.repomanager.net/repo/rpm/ci-test/8/prod/packages/x86_64/nginx-1.26.0-1.el7.ngx.x86_64.rpm wget -O ${HOSTNAME}_nginx_1.26.0-1~bookworm_amd64.deb https://packages.repomanager.net/repo/deb/ci-test/bookworm/main/prod/pool/main/nginx_1.26.0-1~bookworm_amd64.deb - # # Run tests as admin user # diff --git a/www/controllers/Layout/Tab/Settings.php b/www/controllers/Layout/Tab/Settings.php index 61615921c..ecd0612e6 100644 --- a/www/controllers/Layout/Tab/Settings.php +++ b/www/controllers/Layout/Tab/Settings.php @@ -15,6 +15,6 @@ public static function render() } \Controllers\Layout\Container\Render::render('settings/settings'); - \Controllers\Layout\Container\Render::render('settings/users'); + \Controllers\Layout\Container\Render::render('settings/right-section'); } } diff --git a/www/controllers/Layout/Tab/Status.php b/www/controllers/Layout/Tab/Status.php index c341b7797..396ed8d9e 100644 --- a/www/controllers/Layout/Tab/Status.php +++ b/www/controllers/Layout/Tab/Status.php @@ -14,6 +14,6 @@ public static function render() \Controllers\Layout\Container\Render::render('status/health'); \Controllers\Layout\Container\Render::render('status/service'); - \Controllers\Layout\Container\Render::render('status/overview'); + \Controllers\Layout\Container\Render::render('status/monitoring'); } } diff --git a/www/controllers/Service/Unit/Statistic.php b/www/controllers/Service/Unit/Statistic.php index def7b464b..2ff217eaa 100644 --- a/www/controllers/Service/Unit/Statistic.php +++ b/www/controllers/Service/Unit/Statistic.php @@ -3,6 +3,7 @@ namespace Controllers\Service\Unit; use Exception; +use DateTime; class Statistic extends \Controllers\Service\Service { diff --git a/www/models/Repo/Listing.php b/www/models/Repo/Listing.php index 6c1eade7d..a13f28b0f 100644 --- a/www/models/Repo/Listing.php +++ b/www/models/Repo/Listing.php @@ -91,7 +91,7 @@ public function listByGroup(string $groupName) : array LEFT JOIN repos_env ON repos_env.Id_snap = repos_snap.Id WHERE repos_snap.Status = 'active' AND repos.Id NOT IN (SELECT Id_repo FROM group_members) - ORDER BY repos.Name ASC, repos.Releasever ASC, repos.Dist ASC, repos.Section ASC, repos_snap.Date DESC"); + ORDER BY repos.Name ASC, repos.Releasever ASC, repos.Dist ASC, repos.Section ASC, repos_snap.Date DESC, repos_env.Env ASC"); } else { $stmt = $this->db->prepare("SELECT DISTINCT repos.Id AS repoId, @@ -124,7 +124,7 @@ public function listByGroup(string $groupName) : array ON groups.Id = group_members.Id_group WHERE groups.Name = :groupname AND repos_snap.Status = 'active' - ORDER BY repos.Name ASC, repos.Releasever ASC, repos.Dist ASC, repos.Section ASC, repos_snap.Date DESC"); + ORDER BY repos.Name ASC, repos.Releasever ASC, repos.Dist ASC, repos.Section ASC, repos_snap.Date DESC, repos_env.Env ASC"); $stmt->bindValue(':groupname', $groupName); $result = $stmt->execute(); } diff --git a/www/public/resources/js/events/settings/debug-mode.js b/www/public/resources/js/events/settings/debug-mode.js index 7fbbe5975..fd879670f 100644 --- a/www/public/resources/js/events/settings/debug-mode.js +++ b/www/public/resources/js/events/settings/debug-mode.js @@ -21,5 +21,7 @@ $(document).on('click','#debug-mode-btn',function () { true, // Print error alert: true - ); + ).then(function () { + mycontainer.reload('header/debug-mode'); + }); }); diff --git a/www/version b/www/version index acf69b48b..3bff05917 100644 --- a/www/version +++ b/www/version @@ -1 +1 @@ -5.1.0 \ No newline at end of file +5.1.1 \ No newline at end of file diff --git a/www/views/includes/containers/header/debug-mode.inc.php b/www/views/includes/containers/header/debug-mode.inc.php index e40a94f4c..0b35ef8f3 100644 --- a/www/views/includes/containers/header/debug-mode.inc.php +++ b/www/views/includes/containers/header/debug-mode.inc.php @@ -1,8 +1,5 @@
@@ -13,7 +10,7 @@ POST data:'; + echo '
POST data
'; echo '
';
                     print_r($_POST);
                     echo '
'; diff --git a/www/views/includes/containers/settings/debug-mode.inc.php b/www/views/includes/containers/settings/debug-mode.inc.php new file mode 100644 index 000000000..f8aad397a --- /dev/null +++ b/www/views/includes/containers/settings/debug-mode.inc.php @@ -0,0 +1,18 @@ +
+ +
+

DEBUG MODE

+
+
ENABLE DEBUG MODE
+

Debug mode will display additional information on the interface.

+ + +
+
+ +
diff --git a/www/views/includes/containers/settings/right-section.inc.php b/www/views/includes/containers/settings/right-section.inc.php new file mode 100644 index 000000000..4e5a3e13c --- /dev/null +++ b/www/views/includes/containers/settings/right-section.inc.php @@ -0,0 +1,6 @@ +
+ +
\ No newline at end of file diff --git a/www/views/includes/containers/settings/status.inc.php b/www/views/includes/containers/settings/status.inc.php new file mode 100644 index 000000000..6baccfddb --- /dev/null +++ b/www/views/includes/containers/settings/status.inc.php @@ -0,0 +1,6 @@ +
+
+

STATUS & MONITORING

+ +
+
diff --git a/www/views/includes/containers/settings/users.inc.php b/www/views/includes/containers/settings/users.inc.php index 7d4ca3f4b..05314ee31 100644 --- a/www/views/includes/containers/settings/users.inc.php +++ b/www/views/includes/containers/settings/users.inc.php @@ -1,8 +1,5 @@ -
+

USERS

@@ -90,19 +87,6 @@
- -
-

DEBUG MODE

-
-
ENABLE DEBUG MODE
-

Debug mode will display additional information on the interface.

- - -
-
-
\ No newline at end of file +
\ No newline at end of file diff --git a/www/views/includes/containers/status/health.inc.php b/www/views/includes/containers/status/health.inc.php index 3cc6e90c7..aa080842d 100644 --- a/www/views/includes/containers/status/health.inc.php +++ b/www/views/includes/containers/status/health.inc.php @@ -1,4 +1,4 @@ -
+

DATABASES HEALTH

diff --git a/www/views/includes/containers/status/overview.inc.php b/www/views/includes/containers/status/monitoring.inc.php similarity index 93% rename from www/views/includes/containers/status/overview.inc.php rename to www/views/includes/containers/status/monitoring.inc.php index a5aebcd66..3150aa00e 100644 --- a/www/views/includes/containers/status/overview.inc.php +++ b/www/views/includes/containers/status/monitoring.inc.php @@ -1,4 +1,4 @@ -
+

SYSTEM MONITORING

Overview of system resource usage (last hour).

diff --git a/www/views/includes/containers/status/service.inc.php b/www/views/includes/containers/status/service.inc.php index 9eba19249..abb133a81 100644 --- a/www/views/includes/containers/status/service.inc.php +++ b/www/views/includes/containers/status/service.inc.php @@ -1,4 +1,4 @@ -
+

SERVICE UNITS