fix: concurrency control in persistence layer

Composer/cypress/integration/NotificationPage.spec.ts

@@ -67,7 +67,8 @@ context('Notification Page', () => {
         .should('contain.text', 'expression');
       cy.get('#root\\.condition')
         .click()
-        .type('()');
+        .type('()')
+        .wait(1000);
     });
 
     cy.get('[data-testid="notifications-info-button"]').click();

Composer/packages/client/__tests__/store/persistence/filePersistence.test.ts

@@ -10,83 +10,44 @@ jest.mock('axios', () => {
   return {
     create: jest.fn(() => {
       return {
-        put: jest.fn(() => Promise.resolve({ data: {} })),
-        post: jest.fn((url, data) => Promise.resolve({ data })),
-        delete: jest.fn(() => Promise.resolve({ data: {} })),
+        put: new Promise(resolve => setTimeout(() => resolve({ data: {} }), 10)),
+        post: new Promise(resolve => setTimeout(() => resolve({ data: {} }), 10)),
+        delete: new Promise(resolve => setTimeout(() => resolve({ data: {} }), 10)),
       };
     }),
   };
 });
 
-const files = [
-  {
-    name: 'a.dialog',
-    content: '',
-    lastModified: 'Tue Mar 31 2020 23:08:15 GMT+0800 (GMT+08:00)',
-    path: 'C:/a.dialog',
-    relativePath: 'a.dialog',
-  },
-  {
-    name: 'a.en-us.lg',
-    content: '',
-    lastModified: 'Tue Mar 31 2020 23:08:15 GMT+0800 (GMT+08:00)',
-    path: 'C:/a.dialog',
-    relativePath: 'a.en-us.lg',
-  },
-  {
-    name: 'a.en-us.lu',
-    content: '',
-    lastModified: 'Tue Mar 31 2020 23:08:15 GMT+0800 (GMT+08:00)',
-    path: 'C:/a.en-us.lu',
-    relativePath: 'a.en-us.lu',
-  },
-];
-
 describe('test persistence layer', () => {
-  it('test attach file', () => {
-    expect(Object.keys(filePersistence.files).length).toBe(0);
+  it('test init persistence', () => {
     expect(filePersistence.projectId).toBe('');
-    filePersistence.projectId = 'projectId';
-    files.forEach(file => filePersistence.attach(file.name, file));
-    expect(Object.keys(filePersistence.files).length).toBe(3);
+    filePersistence.notify({} as State, {} as State, {
+      type: ActionTypes.GET_PROJECT_SUCCESS,
+      payload: { response: { data: { id: 'a' } } },
+    });
+    expect(filePersistence.projectId).toBe('a');
   });
 
   it('test notify update', async () => {
     const state1 = {
-      dialogs: [{ id: 'a', content: {} }] as DialogInfo[],
+      dialogs: [{ id: 'a', content: { a: 'a' } }] as DialogInfo[],
       lgFiles: [{ id: 'a.en-us', content: '' }] as LgFile[],
       luFiles: [{ id: 'a.en-us', content: '' }] as LuFile[],
     } as State;
 
     const state2 = {
       dialogs: [{ id: 'a', content: { a: 'a' } }] as DialogInfo[],
-      lgFiles: [{ id: 'a.en-us', content: 'a' }] as LgFile[],
-      luFiles: [{ id: 'a.en-us', content: 'a' }] as LuFile[],
+      lgFiles: [{ id: 'a.en-us', content: 'a.lg' }] as LgFile[],
+      luFiles: [{ id: 'a.en-us', content: 'a.lu' }] as LuFile[],
     } as State;
 
     await filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_DIALOG, payload: { id: 'a' } });
-    await filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_LG, payload: { id: 'a.en-us' } });
-    await filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_LU, payload: { id: 'a.en-us' } });
-    await new Promise(res =>
-      setTimeout(() => {
-        const dialog = filePersistence.files['a.dialog'].file;
-        const lg = filePersistence.files['a.en-us.lg'].file;
-        const lu = filePersistence.files['a.en-us.lu'].file;
-        expect(dialog).toBeDefined();
-        if (dialog) {
-          expect(JSON.parse(dialog.content).a).toBe('a');
-        }
-        expect(lg).toBeDefined();
-        if (lg) {
-          expect(lg.content).toBe('a');
-        }
-        expect(lu).toBeDefined();
-        if (lu) {
-          expect(lu.content).toBe('a');
-        }
-        res();
-      }, 601)
-    );
+    filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_DIALOG, payload: { id: 'a' } });
+    expect(JSON.parse(filePersistence.taskQueue['a.dialog'][0].change).a).toBe('a');
+    filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_LG, payload: { id: 'a.en-us' } });
+    expect(filePersistence.taskQueue['a.en-us.lg'][0].change).toBe('a.lg');
+    filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_LU, payload: { id: 'a.en-us' } });
+    expect(filePersistence.taskQueue['a.en-us.lu'][0].change).toBe('a.lu');
   });
 
   it('test notify create', async () => {
@@ -103,45 +64,34 @@ describe('test persistence layer', () => {
       ] as DialogInfo[],
       lgFiles: [
         { id: 'a.en-us', content: 'a' },
-        { id: 'b.en-us', content: 'b' },
+        { id: 'b.en-us', content: 'b.lg' },
       ] as LgFile[],
       luFiles: [
         { id: 'a.en-us', content: 'a' },
-        { id: 'b.en-us', content: 'b' },
+        { id: 'b.en-us', content: 'b.lu' },
       ] as LuFile[],
     } as State;
 
-    await filePersistence.notify(state1, state2, { type: ActionTypes.CREATE_DIALOG, payload: { id: 'b' } });
-    const dialog = filePersistence.files['b.dialog'].file;
-    const lg = filePersistence.files['b.en-us.lg'].file;
-    const lu = filePersistence.files['b.en-us.lu'].file;
-    expect(dialog).toBeDefined();
-    if (dialog) {
-      expect(JSON.parse(dialog.content).b).toBe('b');
-    }
-    expect(lg).toBeDefined();
-    if (lg) {
-      expect(lg.content).toBe('b');
-    }
-    expect(lu).toBeDefined();
-    if (lu) {
-      expect(lu.content).toBe('b');
-    }
+    await filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_DIALOG, payload: { id: 'a' } });
+    filePersistence.notify(state1, state2, { type: ActionTypes.CREATE_DIALOG, payload: { id: 'b' } });
+    expect(JSON.parse(filePersistence.taskQueue['b.dialog'][0].change).b).toBe('b');
+    expect(filePersistence.taskQueue['b.en-us.lg'][0].change).toBe('b.lg');
+    expect(filePersistence.taskQueue['b.en-us.lu'][0].change).toBe('b.lu');
   });
 
   it('test notify remove', async () => {
     const state1 = {
       dialogs: [
         { id: 'a', content: { a: 'a' } },
-        { id: 'b', content: { b: 'b' } },
+        { id: 'b', content: { b: 'b.pre' } },
       ] as DialogInfo[],
       lgFiles: [
         { id: 'a.en-us', content: 'a' },
-        { id: 'b.en-us', content: 'b' },
+        { id: 'b.en-us', content: 'b.pre.lg' },
       ] as LgFile[],
       luFiles: [
         { id: 'a.en-us', content: 'a' },
-        { id: 'b.en-us', content: 'b' },
+        { id: 'b.en-us', content: 'b.pre.lu' },
       ] as LuFile[],
     } as State;
 
@@ -150,21 +100,10 @@ describe('test persistence layer', () => {
       lgFiles: [{ id: 'a.en-us', content: 'a' }] as LgFile[],
       luFiles: [{ id: 'a.en-us', content: 'a' }] as LuFile[],
     } as State;
-
-    await filePersistence.notify(state1, state2, { type: ActionTypes.REMOVE_DIALOG, payload: { id: 'b' } });
-    const dialog = filePersistence.files['b.dialog'];
-    const lg = filePersistence.files['b.en-us.lg'];
-    const lu = filePersistence.files['b.en-us.lu'];
-    expect(dialog).toBeUndefined();
-    expect(lg).toBeUndefined();
-    expect(lu).toBeUndefined();
-  });
-  it('test detach', async () => {
-    filePersistence.detach('a.dialog');
-    expect(filePersistence.files['a.dialog']).toBeUndefined();
-  });
-  it('test clear', async () => {
-    filePersistence.clear();
-    expect(Object.keys(filePersistence.files).length).toBe(0);
+    await filePersistence.notify(state1, state2, { type: ActionTypes.UPDATE_DIALOG, payload: { id: 'a' } });
+    filePersistence.notify(state1, state2, { type: ActionTypes.REMOVE_DIALOG, payload: { id: 'b' } });
+    expect(JSON.parse(filePersistence.taskQueue['b.dialog'][1].change).b).toBe('b.pre');
+    expect(filePersistence.taskQueue['b.en-us.lg'][1].change).toBe('b.pre.lg');
+    expect(filePersistence.taskQueue['b.en-us.lu'][1].change).toBe('b.pre.lu');
   });
 });