sort urlactions by name closes amidaware/tacticalrmm#1795

amidaware · Jul 26, 2024 · 1f5af9b · 1f5af9b
1 parent 45e2690
commit 1f5af9b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/components/agents/AgentActionMenu.vue b/src/components/agents/AgentActionMenu.vue
@@ -302,18 +302,21 @@ export default {
     async function getURLActions() {
       menuLoading.value = true;
       try {
-        urlActions.value = (await fetchURLActions()).filter(
-          (action) => action.action_type === "web",
-        );
+        urlActions.value = (await fetchURLActions())
+          .filter((action) => action.action_type === "web")
+          .sort((a, b) => a.name.localeCompare(b.name));
 
         if (urlActions.value.length === 0) {
           notifyWarning(
             "No URL Actions configured. Go to Settings > Global Settings > URL Actions",
           );
           return;
         }
-      } catch (e) {}
-      menuLoading.value = true;
+      } catch (e) {
+        console.error(e);
+      } finally {
+        menuLoading.value = false;
+      }
     }
 
     function showSendCommand(agent) {

diff --git a/src/components/modals/coresettings/UserPreferences.vue b/src/components/modals/coresettings/UserPreferences.vue
@@ -313,18 +313,19 @@ export default {
     },
     getURLActions() {
       this.$axios.get("/core/urlaction/").then((r) => {
-        if (r.data.length === 0) {
-          this.notifyWarning(
-            "No URL Actions configured. Go to Settings > Global Settings > URL Actions",
-          );
-          return;
-        }
         this.urlActions = r.data
           .filter((action) => action.action_type === "web")
+          .sort((a, b) => a.name.localeCompare(b.name))
           .map((action) => ({
             label: action.name,
             value: action.id,
           }));
+
+        if (this.urlActions.length === 0) {
+          this.notifyWarning(
+            "No URL Actions configured. Go to Settings > Global Settings > URL Actions",
+          );
+        }
       });
     },
     getUserPrefs() {

diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue
@@ -818,15 +818,14 @@ export default {
     },
     getURLActions() {
       this.$axios.get("/core/urlaction/").then((r) => {
-        if (r.data.length === 0) {
+        this.urlActions = r.data
+          .filter((action) => action.action_type === "web")
+          .sort((a, b) => a.name.localeCompare(b.name));
+        if (this.urlActions.length === 0) {
           this.notifyWarning(
             "No URL Actions configured. Go to Settings > Global Settings > URL Actions",
           );
-          return;
         }
-        this.urlActions = r.data.filter(
-          (action) => action.action_type === "web",
-        );
       });
     },
     runURLAction(id, action, model) {