Merge pull request #4070 from rtibbles/where_is_my_mind

Localize change sync operations

Author: bjester

contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/actions.js

@@ -41,16 +41,20 @@ export function addAssessmentItem(context, assessmentItem) {
     hints: JSON.stringify(assessmentItem.hints || []),
   };
 
-  return db.transaction('rw', [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.ASSESSMENTITEM], () => {
-    return AssessmentItem.put(stringifiedAssessmentItem).then(([contentnode, assessment_id]) => {
-      context.commit('UPDATE_ASSESSMENTITEM', {
-        ...assessmentItem,
-        contentnode,
-        assessment_id,
+  return db.transaction(
+    'rw',
+    [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.ASSESSMENTITEM, TABLE_NAMES.CHANGES_TABLE],
+    () => {
+      return AssessmentItem.add(stringifiedAssessmentItem).then(([contentnode, assessment_id]) => {
+        context.commit('UPDATE_ASSESSMENTITEM', {
+          ...assessmentItem,
+          contentnode,
+          assessment_id,
+        });
+        return updateNodeComplete(contentnode, context);
       });
-      return updateNodeComplete(contentnode, context);
-    });
-  });
+    }
+  );
 }
 export function updateAssessmentItem(context, assessmentItem) {
   return updateAssessmentItems(context, [assessmentItem]);
@@ -65,38 +69,46 @@ export function updateAssessmentItems(context, assessmentItems) {
     context.commit('UPDATE_ASSESSMENTITEM', assessmentItem);
   });
 
-  return db.transaction('rw', [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.ASSESSMENTITEM], () => {
-    return Promise.all(
-      assessmentItems.map(assessmentItem => {
-        // API accepts answers and hints as strings
-        const stringifiedAssessmentItem = {
-          ...assessmentItem,
-        };
-        if (assessmentItem.answers) {
-          stringifiedAssessmentItem.answers = JSON.stringify(assessmentItem.answers);
-        }
-        if (assessmentItem.hints) {
-          stringifiedAssessmentItem.hints = JSON.stringify(assessmentItem.hints);
-        }
-        return AssessmentItem.update(
-          [assessmentItem.contentnode, assessmentItem.assessment_id],
-          stringifiedAssessmentItem
-        ).then(() => {
-          updateNodeComplete(assessmentItem.contentnode, context);
-        });
-      })
-    );
-  });
+  return db.transaction(
+    'rw',
+    [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.ASSESSMENTITEM, TABLE_NAMES.CHANGES_TABLE],
+    () => {
+      return Promise.all(
+        assessmentItems.map(assessmentItem => {
+          // API accepts answers and hints as strings
+          const stringifiedAssessmentItem = {
+            ...assessmentItem,
+          };
+          if (assessmentItem.answers) {
+            stringifiedAssessmentItem.answers = JSON.stringify(assessmentItem.answers);
+          }
+          if (assessmentItem.hints) {
+            stringifiedAssessmentItem.hints = JSON.stringify(assessmentItem.hints);
+          }
+          return AssessmentItem.update(
+            [assessmentItem.contentnode, assessmentItem.assessment_id],
+            stringifiedAssessmentItem
+          ).then(() => {
+            updateNodeComplete(assessmentItem.contentnode, context);
+          });
+        })
+      );
+    }
+  );
 }
 
 export function deleteAssessmentItem(context, assessmentItem) {
-  return db.transaction('rw', [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.ASSESSMENTITEM], () => {
-    return AssessmentItem.delete([assessmentItem.contentnode, assessmentItem.assessment_id]).then(
-      () => {
-        context.commit('DELETE_ASSESSMENTITEM', assessmentItem);
-        const contentnode = assessmentItem.contentnode;
-        return updateNodeComplete(contentnode, context);
-      }
-    );
-  });
+  return db.transaction(
+    'rw',
+    [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.ASSESSMENTITEM, TABLE_NAMES.CHANGES_TABLE],
+    () => {
+      return AssessmentItem.delete([assessmentItem.contentnode, assessmentItem.assessment_id]).then(
+        () => {
+          context.commit('DELETE_ASSESSMENTITEM', assessmentItem);
+          const contentnode = assessmentItem.contentnode;
+          return updateNodeComplete(contentnode, context);
+        }
+      );
+    }
+  );
 }

contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js

@@ -4,6 +4,7 @@ import assessmentItem from '../../assessmentItem/index';
 import file from 'shared/vuex/file';
 import { ContentNode } from 'shared/data/resources';
 import storeFactory from 'shared/vuex/baseStore';
+import { mockChannelScope, resetMockChannelScope } from 'shared/utils/testing';
 
 jest.mock('../../currentChannel/index');
 
@@ -15,8 +16,9 @@ describe('contentNode actions', () => {
   let store;
   let id;
   const contentNodeDatum = { title: 'test', parent: parentId, lft: 1, tags: {} };
-  beforeEach(() => {
-    return ContentNode._put(contentNodeDatum).then(newId => {
+  beforeEach(async () => {
+    await mockChannelScope('test-123');
+    return ContentNode._add(contentNodeDatum).then(newId => {
       id = newId;
       contentNodeDatum.id = newId;
       jest
@@ -25,7 +27,7 @@ describe('contentNode actions', () => {
       jest
         .spyOn(ContentNode, 'fetchModel')
         .mockImplementation(() => Promise.resolve(contentNodeDatum));
-      return ContentNode._put({ title: 'notatest', parent: newId, lft: 2 }).then(() => {
+      return ContentNode._add({ title: 'notatest', parent: newId, lft: 2 }).then(() => {
         store = storeFactory({
           modules: {
             assessmentItem,
@@ -38,7 +40,8 @@ describe('contentNode actions', () => {
       });
     });
   });
-  afterEach(() => {
+  afterEach(async () => {
+    await resetMockChannelScope();
     jest.restoreAllMocks();
     return ContentNode.table.toCollection().delete();
   });

contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

@@ -191,7 +191,7 @@ export function createContentNode(context, { parent, kind, ...payload }) {
     assessmentItems: [],
     files: [],
   });
-  return ContentNode.put(contentNodeData).then(id => {
+  return ContentNode.add(contentNodeData).then(id => {
     context.commit('ADD_CONTENTNODE', {
       id,
       ...contentNodeData,

contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js

@@ -38,7 +38,7 @@ export function createSearch({ commit, rootState }, params) {
     saved_by: rootState.session.currentUser.id,
     created: new Date(),
   };
-  return SavedSearch.put(data).then(id => {
+  return SavedSearch.add(data).then(id => {
     commit('UPDATE_SAVEDSEARCH', {
       id,
       ...data,

contentcuration/contentcuration/frontend/channelList/vuex/channelList/__tests__/module.spec.js

@@ -3,7 +3,6 @@ import channelList from '../index';
 import { Channel, Invitation } from 'shared/data/resources';
 import storeFactory from 'shared/vuex/baseStore';
 
-jest.mock('shared/client');
 jest.mock('shared/vuex/connectionPlugin');
 
 const channel_id = '11111111111111111111111111111111';
@@ -18,7 +17,7 @@ describe('invitation actions', () => {
   let store;
   let id;
   beforeEach(() => {
-    return Invitation.put(invitation).then(newId => {
+    return Invitation.add(invitation).then(newId => {
       id = newId;
       store = storeFactory({
         modules: {
@@ -59,7 +58,7 @@ describe('invitation actions', () => {
   //   const channel = { id: channel_id, name: 'test', deleted: false, edit: true };
   //   beforeEach(() => {
   //     store.commit('channelList/SET_INVITATION_LIST', [{ id, ...invitation }]);
-  //     return Channel.put(channel);
+  //     return Channel.add(channel);
   //   });
   //   afterEach(() => {
   //     return Channel.table.toCollection().delete();

contentcuration/contentcuration/frontend/channelList/vuex/channelSet/__tests__/module.spec.js

@@ -1,5 +1,5 @@
 import channelSet from '../index';
-import { ChannelSet } from 'shared/data/resources';
+import { ChannelSet, injectVuexStore } from 'shared/data/resources';
 import storeFactory from 'shared/vuex/baseStore';
 
 jest.mock('shared/vuex/connectionPlugin');
@@ -14,17 +14,19 @@ describe('channelSet actions', () => {
     edit: true,
   };
   beforeEach(() => {
-    return ChannelSet.put(channelSetDatum).then(newId => {
+    store = storeFactory({
+      modules: {
+        channelSet,
+      },
+    });
+    store.state.session.currentUser.id = userId;
+    injectVuexStore(store);
+    return ChannelSet.add(channelSetDatum).then(newId => {
       id = newId;
-      store = storeFactory({
-        modules: {
-          channelSet,
-        },
-      });
-      store.state.session.currentUser.id = userId;
     });
   });
   afterEach(() => {
+    injectVuexStore();
     return ChannelSet.table.toCollection().delete();
   });
   describe('loadChannelSetList action', () => {

contentcuration/contentcuration/frontend/shared/__tests__/app.spec.js

@@ -45,7 +45,7 @@ describe('startApp', () => {
 
     describe('if there is a current user saved in a session', () => {
       beforeEach(async () => {
-        await Session.put({ ...USER_1, CURRENT_USER });
+        await Session.table.put({ ...USER_1, CURRENT_USER });
 
         const sessionTable = await Session.table.toArray();
         expect(sessionTable).toEqual([{ ...USER_1, CURRENT_USER }]);
@@ -77,7 +77,7 @@ describe('startApp', () => {
 
     describe('if there is the same current user saved in a session', () => {
       beforeEach(async () => {
-        await Session.put({ ...USER_1, CURRENT_USER });
+        await Session.table.put({ ...USER_1, CURRENT_USER });
 
         const sessionTable = await Session.table.toArray();
         expect(sessionTable).toEqual([{ ...USER_1, CURRENT_USER }]);
@@ -91,7 +91,7 @@ describe('startApp', () => {
 
     describe('if there is a different current user saved in a session', () => {
       beforeEach(async () => {
-        await Session.put({ ...USER_2, CURRENT_USER });
+        await Session.table.put({ ...USER_2, CURRENT_USER });
 
         const sessionTable = await Session.table.toArray();
         expect(sessionTable).toEqual([{ ...USER_2, CURRENT_USER }]);

contentcuration/contentcuration/frontend/shared/app.js

@@ -256,7 +256,7 @@ Vue.component('Menu', Menu);
 function initiateServiceWorker() {
   // Second conditional must be removed if you are doing dev work on the service
   // worker.
-  if ('serviceWorker' in navigator && process.env.NODE_ENV === 'production') {
+  if ('serviceWorker' in navigator) {
     const wb = new Workbox(window.Urls.service_worker());
     let registration;