Fix Build

dfpc-coe · Sep 21, 2024 · 1dc7480 · 1dc7480
1 parent 3a8733c
commit 1dc7480
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 28 deletions.
diff --git a/api/web/src/components/Admin/AdminOverlaysEdit.vue b/api/web/src/components/Admin/AdminOverlaysEdit.vue
@@ -10,7 +10,10 @@
             class='px-2'
         >
             <TablerLoading v-if='loading' />
-            <div v-else class='row'>
+            <div
+                v-else
+                class='row'
+            >
                 <div class='col-12'>
                     <TablerInput
                         v-model='overlay.name'
@@ -43,11 +46,11 @@
                     />
                 </div>
                 <div class='col-12 col-md-6'>
-                        <TablerEnum
-                            v-model='overlay.format'
-                            label='Overlay Format'
-                            :options='["png", "jpeg", "mvt"]'
-                        />
+                    <TablerEnum
+                        v-model='overlay.format'
+                        label='Overlay Format'
+                        :options='["png", "jpeg", "mvt"]'
+                    />
                 </div>
                 <div class='col-12'>
                     <TablerInput

diff --git a/api/web/src/components/CloudTAK/CoTView.vue b/api/web/src/components/CloudTAK/CoTView.vue
@@ -286,8 +286,8 @@
                 <CoTVideo
                     v-if='viewer'
                     class='my-2 mx-2'
-                    @close='viewer = false'
                     :video='feat.properties.video.url'
+                    @close='viewer = false'
                 />
 
                 <div class='table-responsive rounded mx-2 py-2 px-2'>

diff --git a/api/web/src/components/CloudTAK/Menu/OverlayExplorer.vue b/api/web/src/components/CloudTAK/Menu/OverlayExplorer.vue
@@ -25,8 +25,8 @@
                 <div
                     v-for='ov in list.items'
                     :key='ov.id'
-                    @click='createOverlay(ov)'
                     class='cursor-pointer col-12 py-2 px-3 hover-dark'
+                    @click='createOverlay(ov)'
                 >
                     <div class='col-12 py-2 px-2 d-flex align-items-center'>
                         <span
@@ -62,17 +62,6 @@ export default {
         TablerLoading,
         MenuTemplate
     },
-    mounted: async function() {
-        await this.fetchList();
-    },
-    watch: {
-        paging: {
-            deep: true,
-            handler: async function() {
-                await this.fetchList();
-            },
-        }
-    },
     data: function() {
         return {
             loading: false,
@@ -87,6 +76,17 @@ export default {
             }
         }
     },
+    watch: {
+        paging: {
+            deep: true,
+            handler: async function() {
+                await this.fetchList();
+            },
+        }
+    },
+    mounted: async function() {
+        await this.fetchList();
+    },
     methods: {
         createOverlay: async function(overlay) {
             this.loading = true;

diff --git a/api/web/src/components/CloudTAK/Menu/Overlays.vue b/api/web/src/components/CloudTAK/Menu/Overlays.vue
@@ -109,7 +109,7 @@
                                     <TablerDelete
                                         v-if='
                                             opened.includes(overlay.id)
-                                            && ["mission", "data", "profile", "overlay"].includes(overlay.mode)
+                                                && ["mission", "data", "profile", "overlay"].includes(overlay.mode)
                                         '
                                         :key='overlay.id'
                                         v-tooltip='"Delete Overlay"'

diff --git a/api/web/src/components/CloudTAK/util/Video.vue b/api/web/src/components/CloudTAK/util/Video.vue
@@ -2,10 +2,18 @@
     <div>
         <TablerLoading v-if='loading' />
         <template v-else-if='err'>
-            <TablerAlert title='Video Error' :err='err'/>
+            <TablerAlert
+                title='Video Error'
+                :err='err'
+            />
 
             <div class='d-flex justify-content-center'>
-                <button @click='$emit("close")' class='btn'>Close Player</button>
+                <button
+                    class='btn'
+                    @click='$emit("close")'
+                >
+                    Close Player
+                </button>
             </div>
         </template>
         <template v-else-if='!protocols || !protocols.hls'>
@@ -47,9 +55,6 @@ import {
 
 export default defineComponent({
     name: 'CoTVideo',
-    emits: [
-        'close'
-    ],
     components: {
         TablerNone,
         TablerAlert,
@@ -61,6 +66,9 @@ export default defineComponent({
             required: true
         }
     },
+    emits: [
+        'close'
+    ],
     data: function(): {
         loading: boolean,
         err?: Error,

diff --git a/api/web/src/stores/overlays/base.ts b/api/web/src/stores/overlays/base.ts
@@ -35,7 +35,7 @@ export default class Overlay {
     mode: string;
     mode_id: string | null;
     url?: string;
-    styles: Array<any>;
+    styles: Array<LayerSpecification>;
     token: string | null;
 
     static async create(
@@ -53,8 +53,9 @@ export default class Overlay {
 
         if (ov.styles && ov.styles.length) {
             for (const layer of ov.styles) {
-                const l = layer as any;
+                const l = layer as LayerSpecification;
                 l.id = `${ov.id}-${l.id}`;
+                // @ts-expect-error Special case Background Layer type
                 l.source = String(ov.id);
             }
         }
@@ -127,7 +128,7 @@ export default class Overlay {
         this.mode = overlay.mode;
         this.mode_id = overlay.mode_id;
         this.url = overlay.url;
-        this.styles = overlay.styles;
+        this.styles = overlay.styles as Array<LayerSpecification>;
         this.token = overlay.token;
 
         this.init(opts);