fixed collection creation

Pictalk-speech-made-easy · Jun 13, 2024 · 7bd28ba · 7bd28ba
1 parent fe66cef
commit 7bd28ba
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/pages/pictalk/index.vue b/pages/pictalk/index.vue
@@ -195,7 +195,6 @@ export default {
       this.sidebarPictos = await this.loadedSidebarPictos();
     }
 
-    console.log("sidebarPictos", this.sidebarPictos);
     const user = this.$store.getters.getUser;
     if (!user.username) {
       try {

diff --git a/store/index.js b/store/index.js
@@ -136,13 +136,30 @@ export const actions = {
       newCollections = new Array(newCollections);
     }
     const db = await getDexieDB();
-    // Dexie transition
-    await db.collection.bulkPut(newCollections);
-
+    let collection;
+    let toModify = [];
+    // Merge with the newCollections array
+    toModify = toModify.concat(newCollections);
+    for (let newCollection of newCollections) {
+      if (newCollection.fatherCollectionId) {
+        collection = await db.collection.get(newCollection.fatherCollectionId);
+        if (collection) {
+          const collectionIndex = collection.collections.findIndex(
+            col => col.id === newCollection.id
+          );
+          if (collection && collectionIndex == -1) {
+            collection.collections.push({ id: newCollection.id });
+            toModify.push(collection);
+          }
+        }
+      }
+    }
+    await db.collection.bulkPut(toModify);
+    return;
   },
   async dbRemoveCollection(state, removedCollection) {
     const db = await getDexieDB();
-    await db.collection.delete(removedCollection.id);
+    return db.collection.delete(removedCollection.id);
   },
   async dbEditCollection(state, editedCollections) {
     if (!Array.isArray(editedCollections)) {
@@ -180,7 +197,7 @@ export const actions = {
       }
     }
     // Dexie transition
-    await db.pictogram.bulkPut(pictos);
+    return db.pictogram.bulkPut(pictos);
   },
   async dbEditPicto(state, editedPictos) {
     if (!Array.isArray(editedPictos)) {
@@ -192,15 +209,15 @@ export const actions = {
       Object.assign(pct, picto);
       return pct;
     }));
-    await db.pictogram.bulkPut(editedPictos);
+    return db.pictogram.bulkPut(editedPictos);
   },
   async dbResetCollections(state) {
     const db = await getDexieDB();
-    await db.collection.clear();
+    return db.collection.clear();
   },
   async dbSetCollections(state, collections) {
     const db = await getDexieDB();
-    await db.collection.bulkPut(collections);
+    return db.collection.bulkPut(collections);
   },
 
   async fetchCollection(vuexContext, collectionId) {
@@ -404,6 +421,7 @@ export const actions = {
           "Content-Type": "multipart/form-data"
         }
       })).data;
+    console.log("Collection call done");
     const editedNewCollection = {
       speech: collection.speech,
       meaning: collection.meaning,
@@ -423,6 +441,7 @@ export const actions = {
       ...(collection.pictohubId && { pictohubId: Number(collection.pictohubId) }),
     };
     await vuexContext.dispatch("dbAddCollection", editedNewCollection);
+    console.log("Collection added to db");
     return editedNewCollection;
   },
   async editCollection(vuexContext, collection) {