From c50ca45b49dcda21a41c47ddfa52a75cd2ef6e76 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Thu, 17 Mar 2022 17:02:41 +0300
Subject: [PATCH] Selecting next or previous tab after closing selected one

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../dock/__test__/dock-store.test.ts          | 80 +++++++++++++++++++
 src/renderer/components/dock/dock/store.ts    |  3 +-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/renderer/components/dock/__test__/dock-store.test.ts

diff --git a/src/renderer/components/dock/__test__/dock-store.test.ts b/src/renderer/components/dock/__test__/dock-store.test.ts
new file mode 100644
index 0000000000..c18ebb5c14
--- /dev/null
+++ b/src/renderer/components/dock/__test__/dock-store.test.ts
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
+import { DockStore, DockTab, TabKind } from "../dock/store";
+import dockStoreInjectable from "../dock/store.injectable";
+import fse from "fs-extra";
+
+const initialTabs: DockTab[] = [
+  { id: "terminal", kind: TabKind.TERMINAL, title: "Terminal", pinned: false },
+  { id: "create", kind: TabKind.CREATE_RESOURCE, title: "Create resource", pinned: false },
+  { id: "edit", kind: TabKind.EDIT_RESOURCE, title: "Edit resource", pinned: false },
+  { id: "install", kind: TabKind.INSTALL_CHART, title: "Install chart", pinned: false },
+  { id: "logs", kind: TabKind.POD_LOGS, title: "Logs", pinned: false },
+];
+
+describe("DockStore", () => {
+  let dockStore: DockStore;
+
+  beforeEach(async () => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    di.override(
+      directoryForUserDataInjectable,
+      () => "some-test-suite-specific-directory-for-user-data",
+    );
+    await di.runSetups();
+
+    dockStore = di.inject(dockStoreInjectable);
+
+    await dockStore.whenReady;
+  });
+
+  afterEach(() => {
+    fse.remove("some-test-suite-specific-directory-for-user-data");
+    dockStore.closeAllTabs();
+  });
+
+  it("closes tab and selects one from right", () => {
+    dockStore.tabs = initialTabs;
+    dockStore.closeTab(dockStore.tabs[0].id);
+
+    expect(dockStore.selectedTabId).toBe("create");
+
+    dockStore.selectTab("edit");
+    dockStore.closeTab("edit");
+
+    expect(dockStore.selectedTabId).toBe("install");
+  });
+
+  it("closes last tab and selects one from right", () => {
+    dockStore.tabs = initialTabs;
+    dockStore.selectTab("logs");
+    dockStore.closeTab("logs");
+
+    expect(dockStore.selectedTabId).toBe("install");
+  });
+
+  it("closes tab and selects the last one", () => {
+    dockStore.tabs = [
+      { id: "terminal", kind: TabKind.TERMINAL, title: "Terminal", pinned: false },
+      { id: "create", kind: TabKind.CREATE_RESOURCE, title: "Create resource", pinned: false },
+    ];
+    dockStore.closeTab("terminal");
+
+    expect(dockStore.selectedTabId).toBe("create");
+  });
+
+  it("closes last tab and selects none", () => {
+    dockStore.tabs = [
+      { id: "create", kind: TabKind.CREATE_RESOURCE, title: "Create resource", pinned: false },
+    ];
+    dockStore.closeTab("create");
+
+    expect(dockStore.selectedTabId).toBeUndefined();
+  });
+});
diff --git a/src/renderer/components/dock/dock/store.ts b/src/renderer/components/dock/dock/store.ts
index 36c088a9d5..4e3252f99d 100644
--- a/src/renderer/components/dock/dock/store.ts
+++ b/src/renderer/components/dock/dock/store.ts
@@ -327,6 +327,7 @@ export class DockStore implements DockStorageState {
   @action
   closeTab(tabId: TabId) {
     const tab = this.getTabById(tabId);
+    const tabIndex = this.getTabIndex(tabId);
 
     if (!tab || tab.pinned) {
       return;
@@ -337,7 +338,7 @@ export class DockStore implements DockStorageState {
 
     if (this.selectedTabId === tab.id) {
       if (this.tabs.length) {
-        const newTab = this.tabs.slice(-1)[0]; // last
+        const newTab = tabIndex < this.tabsNumber ? this.tabs[tabIndex] : this.tabs[tabIndex - 1];
 
         this.selectTab(newTab.id);
       } else {