Fix vue set+del when imported explicitly.

dannon · Oct 23, 2023 · a5be29e · a5be29e
1 parent 4010617
commit a5be29e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/client/src/components/Form/FormInputs.vue b/client/src/components/Form/FormInputs.vue
@@ -65,8 +65,6 @@
 </template>
 
 <script>
-import { set } from "vue";
-
 import { matchCase } from "@/components/Form/utilities";
 
 import FormCard from "./FormCard.vue";
@@ -147,7 +145,7 @@ export default {
         repeatInsert(input) {
             const newInputs = structuredClone(input.inputs);
 
-            set(input, "cache", input.cache ?? []);
+            input.cache = input.cache ?? [];
             input.cache.push(newInputs);
 
             this.onChangeForm();

diff --git a/client/src/stores/collectionAttributesStore.ts b/client/src/stores/collectionAttributesStore.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { computed, del, ref, set } from "vue";
+import { computed, ref } from "vue";
 
 import { DatasetCollectionAttributes } from "./services";
 import { fetchCollectionAttributes } from "./services/datasetCollection.service";
@@ -11,7 +11,7 @@ export const useCollectionAttributesStore = defineStore("collectionAttributesSto
     const getAttributes = computed(() => {
         return (hdcaId: string) => {
             if (!storedAttributes.value[hdcaId]) {
-                set(storedAttributes.value, hdcaId, {});
+                storedAttributes.value[hdcaId] = {};
                 fetchAttributes({ hdcaId });
             }
             return storedAttributes.value[hdcaId];
@@ -25,13 +25,13 @@ export const useCollectionAttributesStore = defineStore("collectionAttributesSto
     });
 
     async function fetchAttributes(params: { hdcaId: string }) {
-        set(loadingAttributes.value, params.hdcaId, true);
+        loadingAttributes.value[params.hdcaId] = true;
         try {
             const attributes = await fetchCollectionAttributes(params);
-            set(storedAttributes.value, params.hdcaId, attributes);
+            storedAttributes.value[params.hdcaId] = attributes;
             return attributes;
         } finally {
-            del(loadingAttributes.value, params.hdcaId);
+            delete loadingAttributes.value[params.hdcaId];
         }
     }
 

diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { computed, del, ref, set } from "vue";
+import { computed, ref } from "vue";
 
 import { CollectionEntry, DCESummary, HDCASummary, HistoryContentItemBase, isHDCA } from "./services";
 import { fetchCollectionDetails, fetchElementsFromCollection } from "./services/datasetCollection.service";
@@ -79,7 +79,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
             // Adjust the offset to the first missing element
             params.offset += firstMissingIndexInRange;
 
-            set(loadingCollectionElements.value, collectionKey, true);
+            loadingCollectionElements.value[collectionKey] = true;
             // Mark all elements in the range as fetching
             params.storedElements
                 .slice(params.offset, params.offset + params.limit)
@@ -91,23 +91,23 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
             });
             // Update only the elements that were fetched
             params.storedElements.splice(params.offset, fetchedElements.length, ...fetchedElements);
-            set(storedCollectionElements.value, collectionKey, params.storedElements);
+            storedCollectionElements.value[collectionKey] = params.storedElements;
         } finally {
-            del(loadingCollectionElements.value, collectionKey);
+            delete loadingCollectionElements.value[collectionKey];
         }
     }
 
     async function loadCollectionElements(collection: CollectionEntry) {
         const elements = await fetchElementsFromCollection({ entry: collection });
-        set(storedCollectionElements.value, getCollectionKey(collection), elements);
+        storedCollectionElements.value[getCollectionKey(collection)] = elements;
     }
 
     function saveCollections(historyContentsPayload: HistoryContentItemBase[]) {
         const collectionsInHistory = historyContentsPayload.filter(
             (entry) => entry.history_content_type === "dataset_collection"
         ) as HDCASummary[];
         for (const collection of collectionsInHistory) {
-            set<HDCASummary>(storedCollections.value, collection.id, collection);
+            storedCollections.value[collection.id] = collection;
         }
     }
 
@@ -120,13 +120,13 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
     }
 
     async function fetchCollection(params: { id: string }) {
-        set(loadingCollectionElements.value, params.id, true);
+        loadingCollectionElements.value[params.id] = true;
         try {
             const collection = await fetchCollectionDetails({ hdcaId: params.id });
-            set(storedCollections.value, collection.id, collection);
+            storedCollections.value[collection.id] = collection;
             return collection;
         } finally {
-            del(loadingCollectionElements.value, params.id);
+            delete loadingCollectionElements.value[params.id];
         }
     }
 

diff --git a/client/src/stores/workflowStore.ts b/client/src/stores/workflowStore.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { defineStore } from "pinia";
-import { computed, ref, set } from "vue";
+import { computed, ref } from "vue";
 
 import { getAppRoot } from "@/onload/loadConfig";
 import type { Steps } from "@/stores/workflowStepStore";
@@ -58,7 +58,7 @@ export const useWorkflowStore = defineStore("workflowStore", () => {
 
             const { data } = await promise;
 
-            set(workflowsByInstanceId.value, workflowId, data as Workflow);
+            workflowsByInstanceId.value[workflowId] = data as Workflow;
         }
 
         workflowDetailPromises.delete(workflowId);