Make closeAllOtherTabs confirm and close tabs one-by-one

Author: kraenhansen

packages/compass-workspaces/src/stores/workspaces.spec.ts

@@ -527,13 +527,13 @@ describe('tabs behavior', function () {
   });
 
   describe('closeAllOtherTabs', function () {
-    it('should close all other tabs by index', function () {
+    it('should close all other tabs by index', async function () {
       const store = configureStore();
       openTabs(store);
       const stateBefore = store.getState();
       expect(stateBefore.tabs.length).to.be.greaterThan(1);
 
-      store.dispatch(closeAllOtherTabs(1));
+      await store.dispatch(closeAllOtherTabs(1));
       const state = store.getState();
       expect(state.tabs.length).to.equal(1);
       expect(state).to.have.property('activeTabId', stateBefore.tabs[1].id);

packages/compass-workspaces/src/stores/workspaces.ts

@@ -895,23 +895,32 @@ export const closeTab = (
   };
 };
 
-type CloseAllOtherTabsAction = {
-  type: WorkspacesActions.CloseAllOtherTabs;
-  atIndex: number;
-};
-
 export const closeAllOtherTabs = (
   atIndex: number
-): WorkspacesThunkAction<Promise<void>, CloseAllOtherTabsAction> => {
+): WorkspacesThunkAction<Promise<void>, CloseTabsAction | SelectTabAction> => {
   return async (dispatch, getState) => {
     const { tabs } = getState();
-    const otherTabs = tabs.filter((_, index) => index !== atIndex);
-    for (const tab of otherTabs) {
-      if (!canCloseTab(tab) && !(await confirmClosingTabs())) {
-        return; // Abort the action
-      }
-    }
-    dispatch({ type: WorkspacesActions.CloseAllOtherTabs, atIndex });
+    const tabsToClose = await tabs.reduce(
+      async (prev: Promise<WorkspaceTab[]>, tab, tabIndex) => {
+        const tabsToClose = await prev;
+        if (tabIndex === atIndex) {
+          return tabsToClose; // Skip the tab which is not being closed
+        }
+        if (!canCloseTab(tab)) {
+          // Select the closing tab - to show the confirmation dialog in context
+          dispatch({ type: WorkspacesActions.SelectTab, atIndex: tabIndex });
+          if (!(await confirmClosingTab())) {
+            return tabsToClose; // Skip this tab
+          }
+        }
+        return [...tabsToClose, tab];
+      },
+      Promise.resolve([])
+    );
+    dispatch({
+      type: WorkspacesActions.CloseTabs,
+      tabIds: tabsToClose.map((tab) => tab.id),
+    });
     cleanupRemovedTabs(tabs, getState().tabs);
   };
 };