Merge pull request #435 from dfpc-coe/ShareSearch

Migrate Share to TS
dfpc-coe · Dec 2, 2024 · adb694e · adb694e
2 parents 0d2a272 + b5c9385
commit adb694e
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 143 deletions.
diff --git a/.github/workflows/s3.yml b/.github/workflows/s3.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: NPM Build
         working-directory: ./api/web/
-        run: API_URL='${{ secrets[matrix.api_url] }}' npm run build
+        run: API_URL='${{ secrets[matrix.api_url] }}' npm run builds3
 
       - name: AWS S3 CP
         working-directory: ./api/web/
@@ -75,7 +75,7 @@ jobs:
 
       - name: NPM Build
         working-directory: ./api/web/
-        run: API_URL='${{ secrets[matrix.staging_api_url] }}' npm run build
+        run: API_URL='${{ secrets[matrix.staging_api_url] }}' npm run builds3
 
       - name: AWS S3 CP
         working-directory: ./api/web/

diff --git a/api/web/package.json b/api/web/package.json
@@ -8,6 +8,7 @@
         "typegen": "openapi-typescript http://localhost:5001/api/swagger --output src/derived-types.d.ts",
         "check": "vue-tsc",
         "build": "vite build",
+        "builds3": "VITE_MODE=s3 vite build",
         "lint": "eslint ./src/"
     },
     "dependencies": {

diff --git a/api/web/src/components/CloudTAK/Menu/Package.vue b/api/web/src/components/CloudTAK/Menu/Package.vue
@@ -22,7 +22,7 @@
                 v-else-if='error'
                 :err='error'
             />
-            <template v-else-if='mode === "share"'>
+            <template v-else-if='mode === "share" && shareFeat'>
                 <div class='overflow-auto'>
                     <Share
                         :feats='[shareFeat]'
@@ -99,7 +99,7 @@
 <script setup lang='ts'>
 import { ref, computed, watch, onMounted } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-import type { Server, Package, Import } from '../../../../src/types.ts';
+import type { Server, Package, Import, Feature } from '../../../../src/types.ts';
 import { std, stdurl } from '../../../../src/std.ts';
 import Share from '../util/Share.vue';
 import timeDiff from '../../../timediff.ts';
@@ -132,8 +132,8 @@ watch(route, async () => {
 
 const profile = profileStore.profile;
 
-const shareFeat = computed(() => {
-    if (!profile || !pkg.value || !server.value) return
+const shareFeat = computed<Feature | undefined>(() => {
+    if (!profile || !pkg.value || !server.value) return;
 
     return {
         type: 'Feature',
@@ -155,7 +155,7 @@ const shareFeat = computed(() => {
             type: 'Point',
             coordinates: [0, 0, 0]
         }
-    }
+    } as Feature;
 });
 
 

diff --git a/api/web/src/components/CloudTAK/util/SelectFeats.vue b/api/web/src/components/CloudTAK/util/SelectFeats.vue
@@ -32,7 +32,7 @@
                     v-for='select in selected.values()'
                     class='col-12'
                 >
-                    <Feature
+                    <DisplayFeature
                         :feature='select'
                         delete-action='emit'
                         @delete='selected.delete(select.properties.id)'
@@ -136,7 +136,8 @@
 
 <script setup lang='ts'>
 import { ref } from 'vue';
-import Feature from './Feature.vue';
+import DisplayFeature from './Feature.vue';
+import type { Feature } from '../../../../src/types.ts';
 import { useCOTStore } from '../../../../src/stores/cots.ts';
 import {
     IconPackageExport,
@@ -158,12 +159,9 @@ import ShareToPackage from './ShareToPackage.vue';
 
 const cotStore = useCOTStore();
 
-const props = defineProps({
-    selected: {
-        type: Object,
-        required: true
-    }
-});
+const props = defineProps<{
+    selected: Map<string, Feature>
+}>();
 
 enum ShareType {
     NONE = 'none',