fix: update the UI of activity

nguyenngoclongdev · Oct 3, 2024 · a3a4372 · a3a4372
1 parent 218eec8
commit a3a4372
Show file tree

Hide file tree

Showing 20 changed files with 403 additions and 471 deletions.
diff --git a/.changeset/rare-vans-fail.md b/.changeset/rare-vans-fail.md
@@ -0,0 +1,5 @@
+---
+"terminal-keeper": patch
+---
+
+update the UI of activity
diff --git a/package.json b/package.json
@@ -83,23 +83,15 @@
         },
         "viewsWelcome": [
             {
-                "view": "terminalKeeperOverviewView",
+                "view": "terminalKeeperActivityView",
                 "contents": "Welcome to Terminal Keeper.\nLet's start by generating the configuration.\n[Generate Configuration](command:terminal-keeper.generate)\nTo learn more about how to manage the terminal session [read our docs!](https://github.com/nguyenngoclongdev/vs-terminal-keeper/)"
-            },
-            {
-                "view": "terminalKeeperSessionView",
-                "contents": "No sessions created yet."
             }
         ],
         "views": {
             "terminalKeeperActivitybar": [
                 {
-                    "id": "terminalKeeperOverviewView",
-                    "name": "Overview"
-                },
-                {
-                    "id": "terminalKeeperSessionView",
-                    "name": "Sessions"
+                    "id": "terminalKeeperActivityView",
+                    "name": ""
                 }
             ]
         },
@@ -138,14 +130,10 @@
                 "title": "Remove Terminal Session"
             },
             {
-                "command": "terminal-keeper.refresh",
-                "title": "Refresh",
+                "command": "terminal-keeper.refresh-activity",
+                "title": "Refresh Activity",
                 "icon": "$(refresh)"
             },
-            {
-                "command": "terminal-keeper.refresh-command-activity",
-                "title": "Refresh Command"
-            },
             {
                 "command": "terminal-keeper.active-session-activity",
                 "title": "Active Session",
@@ -155,40 +143,55 @@
                 "command": "terminal-keeper.active-terminal-activity",
                 "title": "Active Terminal",
                 "icon": "$(run)"
+            },
+            {
+                "command": "terminal-keeper.copy-command-activity",
+                "title": "Copy Commands"
             }
         ],
         "menus": {
             "view/title": [
                 {
                     "command": "terminal-keeper.active",
-                    "when": "view == terminalKeeperOverviewView",
+                    "when": "view == terminalKeeperActivityView",
                     "group": "navigation@1"
                 },
+                {
+                    "command": "terminal-keeper.active",
+                    "when": "view == terminalKeeperActivityView"
+                },
                 {
                     "command": "terminal-keeper.open",
-                    "when": "view == terminalKeeperOverviewView",
-                    "group": "navigation@2"
+                    "when": "view == terminalKeeperActivityView"
                 },
                 {
-                    "command": "terminal-keeper.refresh",
-                    "when": "view == terminalKeeperOverviewView",
-                    "group": "navigation@3"
+                    "command": "terminal-keeper.refresh-activity",
+                    "when": "view == terminalKeeperActivityView"
+                },
+                {
+                    "command": "terminal-keeper.remove",
+                    "when": "view == terminalKeeperActivityView"
                 },
                 {
                     "command": "terminal-keeper.kill-all",
-                    "when": "view == terminalKeeperOverviewView"
+                    "when": "view == terminalKeeperActivityView"
                 }
             ],
             "view/item/context": [
                 {
                     "command": "terminal-keeper.active-session-activity",
-                    "when": "view == terminalKeeperSessionView && viewItem == session-context",
+                    "when": "viewItem == session-context",
                     "group": "inline@1"
                 },
                 {
                     "command": "terminal-keeper.active-terminal-activity",
-                    "when": "view == terminalKeeperSessionView && (viewItem == terminal-context || viewItem == terminal-array-context)",
+                    "when": "viewItem == terminal-array-context || viewItem == terminal-context",
                     "group": "inline@1"
+                },
+                {
+                    "command": "terminal-keeper.copy-command-activity",
+                    "when": "viewItem == terminal-context",
+                    "group": "terminal@1"
                 }
             ],
             "explorer/context": [

diff --git a/src/commands/activeAsync.ts b/src/commands/activeAsync.ts
@@ -1,22 +1,26 @@
+import { TerminalApi, ThemeService } from '@vscode-utility/terminal-browserify';
 import { ProgressLocation, QuickPickItem, window } from 'vscode';
 import { Configuration } from '../configuration/configuration';
 import { constants } from '../utils/constants';
 import { updateStatusBar } from '../utils/show-status-bar';
-import { TerminalApi, ThemeService } from '@vscode-utility/terminal-browserify';
-import { getSessionQuickPickItems, showErrorMessageWithDetail, showGenerateConfiguration } from '../utils/utils';
+import {
+    getSessionQuickPickItems,
+    killAllTerminal,
+    showErrorMessageWithDetail,
+    showGenerateConfiguration
+} from '../utils/utils';
 
 export const activeAsync = async (workspacePath: string | undefined): Promise<void> => {
     try {
         // Read the config
-        const configInstance = Configuration.instance();
-        const isDefinedSessionFile = await configInstance.isDefinedSessionFile();
+        const isDefinedSessionFile = await Configuration.isDefinedSessionFile();
         if (!isDefinedSessionFile) {
             await showGenerateConfiguration();
             return;
         }
 
         // Check the size of sessions
-        const config = await configInstance.load();
+        const config = await Configuration.load();
         const { keepExistingTerminals = false, sessions, theme = 'default', noClear = false, active = '' } = config;
         if (!sessions) {
             window.showWarningMessage(constants.notExistAnySessions);
@@ -58,7 +62,7 @@ export const activeAsync = async (workspacePath: string | undefined): Promise<vo
         }
 
         // Kill previous terminal and create new terminal from session
-        const { createTerminal, focusTerminal, getCwdPath, killAllTerminalAsync } = TerminalApi.instance();
+        const { createTerminal, focusTerminal, getCwdPath } = TerminalApi.instance();
         window.withProgress(
             {
                 location: ProgressLocation.Window,
@@ -71,8 +75,7 @@ export const activeAsync = async (workspacePath: string | undefined): Promise<vo
                     progress.report({ message: 'Killing previous terminals...' });
 
                     // Kill all existing terminal in parallel
-                    const isKillProcess = configInstance.getExperimentalConfig<boolean>('killProcess');
-                    await killAllTerminalAsync(isKillProcess);
+                    await killAllTerminal();
                 }
 
                 // Validate data need use async function
@@ -123,7 +126,7 @@ export const activeAsync = async (workspacePath: string | undefined): Promise<vo
 
                 // Save active terminal to configuration
                 progress.report({ message: 'Waiting for the terminal session to render completely...' });
-                await configInstance.save({ active: selectedSessionKey });
+                await Configuration.save({ active: selectedSessionKey });
 
                 // Return a value when the task completes
                 return 'Initialization of the terminal session completed!';

diff --git a/src/commands/activeBySessionAsync.ts b/src/commands/activeBySessionAsync.ts
@@ -1,25 +1,24 @@
+import { TerminalApi, ThemeService } from '@vscode-utility/terminal-browserify';
 import { ProgressLocation, window } from 'vscode';
 import { Configuration } from '../configuration/configuration';
 import { constants } from '../utils/constants';
 import { updateStatusBar } from '../utils/show-status-bar';
-import { TerminalApi, ThemeService } from '@vscode-utility/terminal-browserify';
-import { showErrorMessageWithDetail, showGenerateConfiguration } from '../utils/utils';
+import { killAllTerminal, showErrorMessageWithDetail, showGenerateConfiguration } from '../utils/utils';
 
 export const activeBySessionAsync = async (
     activeSession: string | undefined,
     isSaveActiveSession?: boolean
 ): Promise<void> => {
     try {
         // Read the config
-        const configInstance = Configuration.instance();
-        const isDefinedSessionFile = await configInstance.isDefinedSessionFile();
+        const isDefinedSessionFile = await Configuration.isDefinedSessionFile();
         if (!isDefinedSessionFile) {
             await showGenerateConfiguration();
             return;
         }
 
         // Check the size of sessions
-        const config = await configInstance.load();
+        const config = await Configuration.load();
         const { keepExistingTerminals = false, sessions, theme = 'default', noClear = false } = config;
         if (!sessions) {
             window.showWarningMessage(constants.notExistAnySessions);
@@ -40,7 +39,7 @@ export const activeBySessionAsync = async (
         }
 
         // Kill previous terminal and create new terminal from session
-        const { createTerminal, focusTerminal, getCwdPath, killAllTerminalAsync } = TerminalApi.instance();
+        const { createTerminal, focusTerminal, getCwdPath } = TerminalApi.instance();
         await window.withProgress(
             {
                 location: ProgressLocation.Window,
@@ -53,8 +52,7 @@ export const activeBySessionAsync = async (
                     progress.report({ message: 'Killing previous terminals...' });
 
                     // Kill all existing terminal in parallel
-                    const isKillProcess = configInstance.getExperimentalConfig<boolean>('killProcess');
-                    await killAllTerminalAsync(isKillProcess);
+                    await killAllTerminal();
                 }
 
                 // Validate data need use async function
@@ -103,7 +101,7 @@ export const activeBySessionAsync = async (
                 // Save active terminal to configuration
                 progress.report({ message: 'Waiting for the terminal session to render completely...' });
                 if (isSaveActiveSession) {
-                    await configInstance.save({ active: activeSession });
+                    await Configuration.save({ active: activeSession });
                 }
 
                 // Return a value when the task completes

diff --git a/src/commands/activeByTerminalAsync.ts b/src/commands/activeByTerminalAsync.ts
@@ -19,8 +19,7 @@ export const activeByTerminalAsync = async (
 
         // Read the config
         const { createTerminal, getCwdPath } = TerminalApi.instance();
-        const configInstance = Configuration.instance();
-        const config = await configInstance.load();
+        const config = await Configuration.load();
         const { theme = 'default', noClear = false } = config;
         const themeService = new ThemeService(theme);
 

diff --git a/src/commands/generateAsync.ts b/src/commands/generateAsync.ts
@@ -26,28 +26,27 @@ export const generateAsync = async (): Promise<void> => {
         }
 
         // Write configuration file
-        const configInstance = Configuration.instance();
-        const isDefinedSessionFile = await configInstance.isDefinedSessionFile();
+        const isDefinedSessionFile = await Configuration.isDefinedSessionFile();
         if (isDefinedSessionFile) {
             window.showWarningMessage(constants.configurationFileAlreadyExist);
             return;
         }
 
         // Generate configuration file
-        await configInstance.save(configurationTemplate);
+        await Configuration.save(configurationTemplate);
 
         // Show message
         window
             .showInformationMessage(constants.generateConfigurationSuccess, constants.viewConfigurationButton)
             .then((selection) => {
                 if (selection === constants.viewConfigurationButton) {
                     // Open the terminal session configuration
-                    showTextDocument(configInstance.sessionFilePath);
+                    showTextDocument(Configuration.sessionFilePath);
                 }
             });
 
         // Open the terminal session configuration
-        showTextDocument(configInstance.sessionFilePath);
+        showTextDocument(Configuration.sessionFilePath);
     } catch (error) {
         showErrorMessageWithDetail(constants.generateConfigurationFailed, error);
     }

diff --git a/src/commands/killAllAsync.ts b/src/commands/killAllAsync.ts
@@ -1,12 +1,10 @@
 import { ProgressLocation, window } from 'vscode';
 import { constants } from '../utils/constants';
-import { TerminalApi } from '@vscode-utility/terminal-browserify';
-import { showErrorMessageWithDetail } from '../utils/utils';
+import { killAllTerminal, showErrorMessageWithDetail } from '../utils/utils';
 
 export const killAllAsync = async (): Promise<void> => {
     try {
         // Kill previous terminal and create new terminal from session
-        const { killAllTerminalAsync } = TerminalApi.instance();
         window.withProgress(
             {
                 location: ProgressLocation.Window,
@@ -18,7 +16,7 @@ export const killAllAsync = async (): Promise<void> => {
                 progress.report({ message: 'Kill all terminals...' });
 
                 // Kill all existing terminal in parallel
-                await killAllTerminalAsync(true);
+                await killAllTerminal();
 
                 // Return a value when the task completes
                 return 'Kill all of the terminal completed!';

diff --git a/src/commands/migrateAsync.ts b/src/commands/migrateAsync.ts
@@ -7,14 +7,13 @@ import { showErrorMessageWithDetail } from '../utils/utils';
 export const migrateAsync = async (): Promise<void> => {
     try {
         // Write configuration file
-        const configInstance = Configuration.instance();
-        const isDefinedSessionFile = await configInstance.isDefinedSessionFile();
+        const isDefinedSessionFile = await Configuration.isDefinedSessionFile();
         if (!isDefinedSessionFile) {
             return;
         }
 
         // Get content file
-        const currentConfiguration = await configInstance.load();
+        const currentConfiguration = await Configuration.load();
         if (!currentConfiguration) {
             return;
         }
@@ -59,7 +58,7 @@ export const migrateAsync = async (): Promise<void> => {
         migrateConfiguration.$schema = latestSchema;
 
         // Write new session configuration to file
-        await configInstance.save(migrateConfiguration);
+        await Configuration.save(migrateConfiguration);
     } catch (error) {
         showErrorMessageWithDetail(constants.migrateConfigurationFailed, error);
     }

diff --git a/src/commands/openAsync.ts b/src/commands/openAsync.ts
@@ -9,15 +9,14 @@ import {
 export const openAsync = async (): Promise<void> => {
     try {
         // Write configuration file
-        const configInstance = Configuration.instance();
-        const isDefinedSessionFile = await configInstance.isDefinedSessionFile();
+        const isDefinedSessionFile = await Configuration.isDefinedSessionFile();
         if (!isDefinedSessionFile) {
             await showGenerateConfiguration();
             return;
         }
 
         // Open the terminal session configuration
-        showTextDocument(configInstance.sessionFilePath);
+        showTextDocument(Configuration.sessionFilePath);
     } catch (error) {
         showErrorMessageWithDetail(constants.openConfigurationFailed, error);
     }

diff --git a/src/commands/removeAsync.ts b/src/commands/removeAsync.ts
@@ -7,14 +7,13 @@ import { getSessionQuickPickItems, showErrorMessageWithDetail, showTextDocument
 
 export const removeAsync = async (): Promise<void> => {
     try {
-        const configInstance = Configuration.instance();
-        const isDefinedSessionFile = await configInstance.isDefinedSessionFile();
+        const isDefinedSessionFile = await Configuration.isDefinedSessionFile();
         if (!isDefinedSessionFile) {
             window.showWarningMessage(constants.notExistConfiguration);
             return;
         }
 
-        const config = await configInstance.load();
+        const config = await Configuration.load();
         if (!config) {
             window.showWarningMessage(constants.notExistConfiguration);
             return;
@@ -65,15 +64,15 @@ export const removeAsync = async (): Promise<void> => {
         }
 
         // Write new session configuration to file
-        await configInstance.save(newestConfiguration);
+        await Configuration.save(newestConfiguration);
 
         // Show message
         window
             .showInformationMessage(constants.removeSessionSuccess, constants.viewConfigurationButton)
             .then((selection) => {
                 if (selection === constants.viewConfigurationButton) {
                     // Open the terminal session configuration
-                    showTextDocument(configInstance.sessionFilePath);
+                    showTextDocument(Configuration.sessionFilePath);
                 }
             });
     } catch (error) {