Fix bug where type icon would fail in iconselect component

dfpc-coe · Sep 10, 2024 · a0f0dbc · a0f0dbc
1 parent 1447953
commit a0f0dbc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/api/web/src/components/CloudTAK/util/Icons.vue b/api/web/src/components/CloudTAK/util/Icons.vue
@@ -151,7 +151,10 @@ export default {
         }
     },
     mounted: async function() {
-        await this.fetchList();
+        // If the icon has a `:` it is part of an iconset, otherwise it is derived from the type
+        if (this.iconset.includes(':')) {
+            await this.fetchList();
+        }
     },
     methods: {
         iconurl: function(icon) {

diff --git a/api/web/src/components/util/IconSelect.vue b/api/web/src/components/util/IconSelect.vue
@@ -219,12 +219,16 @@ export default {
                 await this.Iconlists();
             },
         },
-        modelValue: function() {
-            if (this.modelValue) this.fetch();
+        modelValue: async function() {
+            if (this.modelValue && this.modelValue.includes(":")) {
+                await this.fetch();
+            }
         }
     },
     mounted: async function() {
-        if (this.modelValue) await this.fetch();
+        if (this.modelValue && this.modelValue.includes(":")) {
+            await this.fetch();
+        }
         await this.Iconlistsets();
         await this.Iconlists();
     },