Merge pull request #1420 from RunOnFlux/development

v5.33.0
RunOnFlux · Nov 5, 2024 · 710594d · 710594d
2 parents b673389 + d7a6944
commit 710594d
Show file tree

Hide file tree

Showing 20 changed files with 1,083 additions and 306 deletions.
diff --git a/HomeUI/dist/css/9367.css → HomeUI/dist/css/4593.css b/HomeUI/dist/css/9367.css → HomeUI/dist/css/4593.css
diff --git a/HomeUI/dist/css/7415.css → HomeUI/dist/css/5486.css b/HomeUI/dist/css/7415.css → HomeUI/dist/css/5486.css
diff --git a/HomeUI/dist/css/5713.css b/HomeUI/dist/css/5713.css
diff --git a/HomeUI/dist/css/6289.css b/HomeUI/dist/css/6289.css
diff --git a/HomeUI/dist/css/2532.css → HomeUI/dist/css/6407.css b/HomeUI/dist/css/2532.css → HomeUI/dist/css/6407.css
diff --git a/HomeUI/dist/css/8307.css b/HomeUI/dist/css/8307.css
diff --git a/HomeUI/dist/js/2532.js b/HomeUI/dist/js/2532.js
diff --git a/HomeUI/dist/js/4593.js b/HomeUI/dist/js/4593.js
diff --git a/HomeUI/dist/js/7415.js → HomeUI/dist/js/5486.js b/HomeUI/dist/js/7415.js → HomeUI/dist/js/5486.js
diff --git a/HomeUI/dist/js/5713.js b/HomeUI/dist/js/5713.js
diff --git a/HomeUI/dist/js/6289.js b/HomeUI/dist/js/6289.js
diff --git a/HomeUI/dist/js/6407.js b/HomeUI/dist/js/6407.js
diff --git a/HomeUI/dist/js/8307.js b/HomeUI/dist/js/8307.js
diff --git a/HomeUI/dist/js/9367.js b/HomeUI/dist/js/9367.js
diff --git a/HomeUI/dist/js/index.js b/HomeUI/dist/js/index.js
diff --git a/HomeUI/src/layouts/components/Navbar.vue b/HomeUI/src/layouts/components/Navbar.vue
@@ -113,6 +113,13 @@ export default {
     ]),
   },
   mounted() {
+    const storedZelidauth = localStorage.getItem('zelidauth');
+    if (storedZelidauth) {
+      const authData = qs.parse(storedZelidauth);
+      if (authData.zelid) {
+        this.$store.commit('flux/setZelid', authData.zelid);
+      }
+    }
     const { protocol, hostname, port } = window.location;
     let mybackend = '';
     mybackend += protocol;

diff --git a/HomeUI/src/views/apps/LocalApps.vue b/HomeUI/src/views/apps/LocalApps.vue
@@ -675,7 +675,7 @@
                     :per-page="tableconfig.globalAvailable.perPage"
                     :current-page="tableconfig.globalAvailable.currentPage"
                     :items="tableconfig.globalAvailable.apps"
-                    :fields="isLoggedIn() ? tableconfig.globalAvailable.loggedInFields : tableconfig.globalAvailable.fields"
+                    :fields="isFluxAdminLoggedIn() ? tableconfig.globalAvailable.loggedInFields : tableconfig.globalAvailable.fields"
                     :filter="tableconfig.globalAvailable.filter"
                     show-empty
                     sort-icon-left
@@ -2623,6 +2623,9 @@ export default {
     isLoggedIn() {
       return (this.privilege === 'fluxteam' || this.privilege === 'admin');
     },
+    isFluxAdminLoggedIn() {
+      return (this.privilege === 'fluxteam');
+    },
     showLocations(row, items) {
       if (row.detailsShowing) {
         row.toggleDetails();