5.1.1

.github/workflows/test-api.yml.disabled → .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
       #

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');
     }
 }

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');
     }
 }

www/controllers/Service/Unit/Statistic.php

@@ -3,6 +3,7 @@
 namespace Controllers\Service\Unit;
 
 use Exception;
+use DateTime;
 
 class Statistic extends \Controllers\Service\Service
 {

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();
             }

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');
+    });
 });

www/version

@@ -1 +1 @@
-5.1.0
+5.1.1

www/views/includes/containers/header/debug-mode.inc.php

@@ -1,8 +1,5 @@
 <article class="reloadable-container" container="header/debug-mode">
     <?php
-    /**
-     *  Debug mode
-     */
     if (DEBUG_MODE) : ?>
         <section class="section-main">
             <div class="div-generic-blue">
@@ -13,7 +10,7 @@
 
                 <?php
                 if (!empty($_POST)) {
-                    echo '<br>POST data:</h6>';
+                    echo '<h6>POST data</h6>';
                     echo '<pre class="codeblock copy">';
                     print_r($_POST);
                     echo '</pre>';

www/views/includes/containers/settings/debug-mode.inc.php

@@ -0,0 +1,18 @@
+<div class="reloadable-container" container="settings/debug-mode">
+    <?php
+    if (IS_ADMIN) : ?>
+        <div>
+            <h3>DEBUG MODE</h3>
+            <div class="div-generic-blue">
+                <h6 class="margin-top-0">ENABLE DEBUG MODE</h6>
+                <p class="note">Debug mode will display additional information on the interface.</p>
+
+                <label class="onoff-switch-label">
+                    <input id="debug-mode-btn" class="onoff-switch-input" type="checkbox" value="true" <?php echo DEBUG_MODE === true ? 'checked' : ''; ?>>
+                    <span class="onoff-switch-slider"></span>
+                </label>
+            </div>
+        </div>
+        <?php
+    endif ?>
+</div>

www/views/includes/containers/settings/right-section.inc.php

@@ -0,0 +1,6 @@
+<section class="section-right reloadable-container" container="settings/right-section">
+    <?php
+    \Controllers\Layout\Container\Render::render('settings/users');
+    \Controllers\Layout\Container\Render::render('settings/debug-mode');
+    \Controllers\Layout\Container\Render::render('settings/status'); ?>
+</section>

www/views/includes/containers/settings/status.inc.php

@@ -0,0 +1,6 @@
+<div class="reloadable-container" container="settings/status">
+    <div>
+        <h3 class="margin-bottom-10">STATUS & MONITORING</h3>
+        <a href="/status"><img src="/assets/icons/external-link.svg" class="icon icon-medium mediumopacity" title="Access status page" /></a>
+    </div>
+</div>

www/views/includes/containers/settings/users.inc.php

@@ -1,8 +1,5 @@
-<section class="section-right reloadable-container" container="settings/health">
+<div class="reloadable-container" container="settings/users">
     <?php
-    /**
-     *  Those sections are only accessible to super-administrator user
-     */
     if (IS_ADMIN) : ?>
         <h3>USERS</h3>
 
@@ -90,19 +87,6 @@
                 <?php
             endif ?>
         </div>
-
-        <div>
-            <h3>DEBUG MODE</h3>
-            <div class="div-generic-blue">
-                <h6 class="margin-top-0">ENABLE DEBUG MODE</h6>
-                <p class="note">Debug mode will display additional information on the interface.</p>
-
-                <label class="onoff-switch-label">
-                    <input id="debug-mode-btn" class="onoff-switch-input" type="checkbox" value="true" <?php echo DEBUG_MODE === true ? 'checked' : ''; ?>>
-                    <span class="onoff-switch-slider"></span>
-                </label>
-            </div>
-        </div>
         <?php
     endif ?>
-</section>
+</div>

www/views/includes/containers/status/health.inc.php

@@ -1,4 +1,4 @@
-<section class="section-main">
+<section id="health" class="section-main reloadable-container" container="settings/health">
     <h3>DATABASES HEALTH</h3>
 
     <div class="div-generic-blue">

www/views/includes/containers/status/overview.inc.php → www/views/includes/containers/status/monitoring.inc.php

@@ -1,4 +1,4 @@
-<section id="system-monitoring" class="section-main">
+<section id="system-monitoring" class="section-main reloadable-container" container="status/monitoring">
     <h3 class="margin-bottom-5">SYSTEM MONITORING</h3>
     <p class="note margin-bottom-15">Overview of system resource usage (last hour).</p>
 

www/views/includes/containers/status/service.inc.php

@@ -1,4 +1,4 @@
-<section class="section-main">
+<section id="service-units" class="section-main reloadable-container" container="status/service">
     <h3>SERVICE UNITS</h3>
 
     <div class="div-generic-blue grid grid-rfr-1-4 row-gap-30 column-gap-20">