Retain TASK_ID and COPYING_FLAG when fetching from the server

learningequality · Dec 1, 2022 · a4bfdba · a4bfdba
1 parent d065c4e
commit a4bfdba
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 56 deletions.
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -264,65 +264,82 @@ class IndexedDBResource {
       CHANGES_TABLE,
       () => {
         // Get any relevant changes that would be overwritten by this bulkPut
-        return db[CHANGES_TABLE].where('[table+key]')
+        const changesPromise = db[CHANGES_TABLE].where('[table+key]')
           .anyOf(itemData.map(datum => [this.tableName, this.getIdValue(datum)]))
-          .sortBy('rev', changes => {
-            changes = mergeAllChanges(changes, true);
-            const collectedChanges = collectChanges(changes)[this.tableName] || {};
-            for (let changeType of Object.keys(collectedChanges)) {
-              const map = {};
-              for (let change of collectedChanges[changeType]) {
-                map[change.key] = change;
-              }
-              collectedChanges[changeType] = map;
+          .sortBy('rev');
+        const currentPromise = this.table
+          .where(this.idField)
+          .anyOf(itemData.map(datum => this.getIdValue(datum)))
+          .toArray();
+
+        return Promise.all([changesPromise, currentPromise]).then(([changes, currents]) => {
+          changes = mergeAllChanges(changes, true);
+          const collectedChanges = collectChanges(changes)[this.tableName] || {};
+          for (let changeType of Object.keys(collectedChanges)) {
+            const map = {};
+            for (let change of collectedChanges[changeType]) {
+              map[change.key] = change;
             }
-            const data = itemData
-              .map(datum => {
-                datum[LAST_FETCHED] = now;
-                const id = this.getIdValue(datum);
-                // If we have an updated change, apply the modifications here
-                if (
-                  collectedChanges[CHANGE_TYPES.UPDATED] &&
-                  collectedChanges[CHANGE_TYPES.UPDATED][id]
-                ) {
-                  applyMods(datum, collectedChanges[CHANGE_TYPES.UPDATED][id].mods);
+            collectedChanges[changeType] = map;
+          }
+          const currentMap = {};
+          for (let currentObj of currents) {
+            currentMap[this.getIdValue(currentObj)] = currentObj;
+          }
+          const data = itemData
+            .map(datum => {
+              const id = this.getIdValue(datum);
+              datum[LAST_FETCHED] = now;
+              // Persist TASK_ID and COPYING_FLAG attributes when directly fetching from the server
+              if (currentMap[id] && currentMap[id][TASK_ID]) {
+                datum[TASK_ID] = currentMap[id][TASK_ID];
+              }
+              if (currentMap[id] && currentMap[id][COPYING_FLAG]) {
+                datum[COPYING_FLAG] = currentMap[id][COPYING_FLAG];
+              }
+              // If we have an updated change, apply the modifications here
+              if (
+                collectedChanges[CHANGE_TYPES.UPDATED] &&
+                collectedChanges[CHANGE_TYPES.UPDATED][id]
+              ) {
+                applyMods(datum, collectedChanges[CHANGE_TYPES.UPDATED][id].mods);
+              }
+              return datum;
+              // If we have a deleted change, just filter out this object so we don't reput it
+            })
+            .filter(
+              datum =>
+                !collectedChanges[CHANGE_TYPES.DELETED] ||
+                !collectedChanges[CHANGE_TYPES.DELETED][this.getIdValue(datum)]
+            );
+          return this.table.bulkPut(data).then(() => {
+            // Move changes need to be reapplied on top of fetched data in case anything
+            // has happened on the backend.
+            return applyChanges(Object.values(collectedChanges[CHANGE_TYPES.MOVED] || {})).then(
+              results => {
+                if (!results || !results.length) {
+                  return data;
                 }
-                return datum;
-                // If we have a deleted change, just filter out this object so we don't reput it
-              })
-              .filter(
-                datum =>
-                  !collectedChanges[CHANGE_TYPES.DELETED] ||
-                  !collectedChanges[CHANGE_TYPES.DELETED][this.getIdValue(datum)]
-              );
-            return this.table.bulkPut(data).then(() => {
-              // Move changes need to be reapplied on top of fetched data in case anything
-              // has happened on the backend.
-              return applyChanges(Object.values(collectedChanges[CHANGE_TYPES.MOVED] || {})).then(
-                results => {
-                  if (!results || !results.length) {
-                    return data;
-                  }
-                  const resultsMap = {};
-                  for (let result of results) {
-                    const id = this.getIdValue(result);
-                    resultsMap[id] = result;
-                  }
-                  return data
-                    .map(datum => {
-                      const id = this.getIdValue(datum);
-                      if (resultsMap[id]) {
-                        applyMods(datum, resultsMap[id]);
-                      }
-                      return datum;
-                      // Concatenate any unsynced created objects onto
-                      // the end of the returned objects
-                    })
-                    .concat(Object.values(collectedChanges[CHANGE_TYPES.CREATED]).map(c => c.obj));
+                const resultsMap = {};
+                for (let result of results) {
+                  const id = this.getIdValue(result);
+                  resultsMap[id] = result;
                 }
-              );
-            });
+                return data
+                  .map(datum => {
+                    const id = this.getIdValue(datum);
+                    if (resultsMap[id]) {
+                      applyMods(datum, resultsMap[id]);
+                    }
+                    return datum;
+                    // Concatenate any unsynced created objects onto
+                    // the end of the returned objects
+                  })
+                  .concat(Object.values(collectedChanges[CHANGE_TYPES.CREATED]).map(c => c.obj));
+              }
+            );
           });
+        });
       }
     );
   }

diff --git a/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js b/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
@@ -114,11 +114,15 @@ export default function IndexedDBPlugin(db, listeners = []) {
       if (change.type === CHANGE_TYPES.UPDATED) {
         obj = change.mods;
       }
+      // omit the last fetched attribute used only in resource layer
+      const mods = omit(obj, [LAST_FETCHED]);
+      if (Object.keys(mods).length === 0) {
+        return;
+      }
       events.emit(getEventName(change.table, change.type), {
         // we ensure we invoke the listeners with an object that has the PK
         [db[change.table].schema.primKey.keyPath]: change.key,
-        // spread the object, omitting the last fetched attribute used only in resource layer
-        ...omit(obj, [LAST_FETCHED]),
+        ...mods,
       });
     });
   });