Merge branch '5276-2-update-stores-for-terminal-file-sync' into 'master'

[Part 2] 5276 Update existing stores for terminal file sync

Closes #5276

See merge request gitlab-org/gitlab-ee!14027

app/assets/javascripts/ide/components/repo_editor.vue

@@ -125,6 +125,7 @@ export default {
       'setFileEOL',
       'updateViewer',
       'removePendingTab',
+      'triggerFilesChange',
     ]),
     initEditor() {
       if (this.shouldHideEditor) return;
@@ -256,6 +257,7 @@ export default {
         'is-added': file.tempFile,
       }"
       class="multi-file-editor-holder"
+      @focusout="triggerFilesChange"
     ></div>
     <content-viewer
       v-if="showContentViewer"

app/assets/javascripts/ide/lib/keymap.json

@@ -7,5 +7,13 @@
       "name": "toggleFileFinder",
       "params": true
     }
+  },
+  {
+    "id": "save-files",
+    "label": "Save files",
+    "bindings": ["CtrlCmd+KEY_S"],
+    "action": {
+      "name": "triggerFilesChange"
+    }
   }
 ]

app/assets/javascripts/ide/stores/actions.js

@@ -99,6 +99,7 @@ export const createTempEntry = (
       commit(types.TOGGLE_FILE_OPEN, file.path);
       commit(types.ADD_FILE_TO_CHANGED, file.path);
       dispatch('setFileActive', file.path);
+      dispatch('triggerFilesChange');
     }
 
     if (parentPath && !state.entries[parentPath].opened) {
@@ -210,6 +211,8 @@ export const deleteEntry = ({ commit, dispatch, state }, path) => {
   if (entry.parentPath && state.entries[entry.parentPath].tree.length === 0) {
     dispatch('deleteEntry', entry.parentPath);
   }
+
+  dispatch('triggerFilesChange');
 };
 
 export const resetOpenFiles = ({ commit }) => commit(types.RESET_OPEN_FILES);
@@ -240,6 +243,8 @@ export const renameEntry = (
   if (!entryPath && !entry.tempFile) {
     dispatch('deleteEntry', path);
   }
+
+  dispatch('triggerFilesChange');
 };
 
 export const getBranchData = ({ commit, state }, { projectId, branchId, force = false } = {}) =>

app/assets/javascripts/ide/stores/actions/file.js

@@ -265,3 +265,8 @@ export const removePendingTab = ({ commit }, file) => {
 
   eventHub.$emit(`editor.update.model.dispose.${file.key}`);
 };
+
+export const triggerFilesChange = () => {
+  // Used in EE for file mirroring
+  eventHub.$emit('ide.files.change');
+};

ee/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js

@@ -18,6 +18,8 @@ export const receiveStartSessionSuccess = ({ commit, dispatch }, data) => {
     cancelPath: data.cancel_path,
     retryPath: data.retry_path,
     terminalPath: data.terminal_path,
+    proxyWebsocketPath: data.proxy_websocket_path,
+    services: data.services,
   });
 
   dispatch('pollSessionStatus');

ee/spec/javascripts/ide/stores/modules/terminal/actions/session_controls_spec.js

@@ -16,6 +16,8 @@ const TEST_SESSION = {
   cancel_path: 'path/cancel',
   retry_path: 'path/retry',
   terminal_path: 'path/terminal',
+  proxy_websocket_path: 'path/proxy',
+  services: ['test-service'],
 };
 
 describe('EE IDE store terminal session controls actions', () => {
@@ -73,6 +75,8 @@ describe('EE IDE store terminal session controls actions', () => {
               cancelPath: TEST_SESSION.cancel_path,
               retryPath: TEST_SESSION.retry_path,
               terminalPath: TEST_SESSION.terminal_path,
+              proxyWebsocketPath: TEST_SESSION.proxy_websocket_path,
+              services: TEST_SESSION.services,
             },
           },
         ],

spec/javascripts/ide/stores/actions/file_spec.js

@@ -719,4 +719,20 @@ describe('IDE store file actions', () => {
         .catch(done.fail);
     });
   });
+
+  describe('triggerFilesChange', () => {
+    beforeEach(() => {
+      spyOn(eventHub, '$emit');
+    });
+
+    it('emits event that files have changed', done => {
+      store
+        .dispatch('triggerFilesChange')
+        .then(() => {
+          expect(eventHub.$emit).toHaveBeenCalledWith('ide.files.change');
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
 });

spec/javascripts/ide/stores/actions_spec.js

@@ -488,7 +488,7 @@ describe('Multi-file store actions', () => {
         'path',
         store.state,
         [{ type: types.DELETE_ENTRY, payload: 'path' }],
-        [{ type: 'burstUnusedSeal' }],
+        [{ type: 'burstUnusedSeal' }, { type: 'triggerFilesChange' }],
         done,
       );
     });
@@ -510,7 +510,7 @@ describe('Multi-file store actions', () => {
             payload: { path: 'test', name: 'new-name', entryPath: null, parentPath: 'parent-path' },
           },
         ],
-        [{ type: 'deleteEntry', payload: 'test' }],
+        [{ type: 'deleteEntry', payload: 'test' }, { type: 'triggerFilesChange' }],
         done,
       );
     });
@@ -558,6 +558,7 @@ describe('Multi-file store actions', () => {
             },
           },
           { type: 'deleteEntry', payload: 'test' },
+          { type: 'triggerFilesChange' },
         ],
         done,
       );