Add actions to remove and delete setting files

Signed-off-by: Sanjula Ganepola <sanjulagane@gmail.com>

package.json

@@ -288,6 +288,12 @@
         "title": "Remove",
         "icon": "$(close)"
       },
+      {
+        "category": "GitHub Local Actions",
+        "command": "githubLocalActions.deleteSettingFile",
+        "title": "Delete",
+        "icon": "$(trash)"
+      },
       {
         "category": "GitHub Local Actions",
         "command": "githubLocalActions.editSetting",
@@ -414,6 +420,10 @@
           "command": "githubLocalActions.removeSettingFile",
           "when": "never"
         },
+        {
+          "command": "githubLocalActions.deleteSettingFile",
+          "when": "never"
+        },
         {
           "command": "githubLocalActions.editSetting",
           "when": "never"
@@ -585,6 +595,11 @@
           "when": "view == settings && viewItem =~ /^githubLocalActions.(secret|variable|input)File.*/",
           "group": "inline@1"
         },
+        {
+          "command": "githubLocalActions.deleteSettingFile",
+          "when": "view == settings && viewItem =~ /^githubLocalActions.(secret|variable|input)File.*/",
+          "group": "inline@2"
+        },
         {
           "command": "githubLocalActions.editSetting",
           "when": "view == settings && viewItem =~ /^githubLocalActions.(secret|variable|input|runner)(?!(File|s)).*/",

src/act.ts

@@ -298,7 +298,7 @@ export class Act {
 
         try {
             await workspace.fs.createDirectory(this.context.globalStorageUri);
-        } catch (error) { }
+        } catch (error: any) { }
 
         // Build command with settings
         const settings = await this.settingsManager.getSettings(workspaceFolder, true);

src/githubManager.ts

@@ -147,7 +147,7 @@ export class GitHubManager {
     private async getSession(): Promise<AuthenticationSession | undefined> {
         try {
             return await authentication.getSession('github', ['repo'], { createIfNone: true });
-        } catch (error) {
+        } catch (error: any) {
             window.showErrorMessage(`Failed to authenticate to GitHub. Error ${error}`);
             return;
         }

src/historyManager.ts

@@ -48,7 +48,7 @@ export class HistoryManager {
         for (const history of existingHistory) {
             try {
                 await workspace.fs.delete(Uri.file(history.logPath));
-            } catch (error) { }
+            } catch (error: any) { }
         }
 
         this.workspaceHistory[workspaceFolder.uri.fsPath] = [];
@@ -60,7 +60,7 @@ export class HistoryManager {
         try {
             const document = await workspace.openTextDocument(history.logPath);
             await window.showTextDocument(document);
-        } catch (error) {
+        } catch (error: any) {
             window.showErrorMessage(`${history.name} #${history.count} log file not found`);
         }
     }
@@ -75,11 +75,13 @@ export class HistoryManager {
 
     async remove(history: History) {
         const historyIndex = this.workspaceHistory[history.commandArgs.path].findIndex(workspaceHistory => workspaceHistory.index === history.index);
+        if (historyIndex > -1) {
             this.workspaceHistory[history.commandArgs.path].splice(historyIndex, 1);
             this.storageManager.update(StorageKey.WorkspaceHistory, this.workspaceHistory);
 
             try {
                 await workspace.fs.delete(Uri.file(history.logPath));
-        } catch (error) { }
+            } catch (error: any) { }
+        }
     }
 }

src/settingsManager.ts

@@ -1,4 +1,4 @@
-import { WorkspaceFolder } from "vscode";
+import { Uri, window, workspace, WorkspaceFolder } from "vscode";
 import { act } from "./extension";
 import { GitHubManager } from "./githubManager";
 import { SecretManager } from "./secretManager";
@@ -169,6 +169,27 @@ export class SettingsManager {
         await this.storageManager.update(storageKey, existingSettingFiles);
     }
 
+    async removeSettingFile(workspaceFolder: WorkspaceFolder, settingFile: SettingFile, storageKey: StorageKey) {
+        const existingSettingFiles = this.storageManager.get<{ [path: string]: SettingFile[] }>(storageKey) || {};
+        if (existingSettingFiles[workspaceFolder.uri.fsPath]) {
+            const settingFileIndex = existingSettingFiles[workspaceFolder.uri.fsPath].findIndex(settingFile => settingFile.path === settingFile.path);
+            if (settingFileIndex > -1) {
+                existingSettingFiles[workspaceFolder.uri.fsPath].splice(settingFileIndex, 1);
+            }
+        }
+
+        await this.storageManager.update(storageKey, existingSettingFiles);
+    }
+
+    async deleteSettingFile(workspaceFolder: WorkspaceFolder, settingFile: SettingFile, storageKey: StorageKey) {
+        try {
+            await workspace.fs.delete(Uri.file(settingFile.path));
+            await this.removeSettingFile(workspaceFolder, settingFile, storageKey);
+        } catch (error: any) {
+            window.showErrorMessage(`Failed to delete file. Error ${error}`)
+        }
+    }
+
     async editSetting(workspaceFolder: WorkspaceFolder, newSetting: Setting, storageKey: StorageKey) {
         const value = newSetting.value;
         if (storageKey === StorageKey.Secrets) {

src/views/settings/inputs.ts

@@ -1,6 +1,6 @@
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState, WorkspaceFolder } from "vscode";
 import { act } from "../../extension";
-import { Setting } from "../../settingsManager";
+import { Setting, SettingFile } from "../../settingsManager";
 import { StorageKey } from "../../storageManager";
 import { GithubLocalActionsTreeItem } from "../githubLocalActionsTreeItem";
 import SettingTreeItem from "./setting";
@@ -10,9 +10,10 @@ export default class InputsTreeItem extends TreeItem implements GithubLocalActio
     static contextValue = 'githubLocalActions.inputs';
     storageKey = StorageKey.InputFiles;
 
-    constructor(public workspaceFolder: WorkspaceFolder, inputs: Setting[]) {
+    constructor(public workspaceFolder: WorkspaceFolder, inputs: Setting[], inputFiles: SettingFile[]) {
         super('Inputs', TreeItemCollapsibleState.Collapsed);
-        this.description = `${inputs.filter(input => input.selected).length}/${inputs.length}`;
+        this.description = `${inputs.filter(input => input.selected).length}/${inputs.length}` +
+            (inputFiles.length > 0 ? ` + ${inputFiles.length} input file(s)` : ``);
         this.contextValue = InputsTreeItem.contextValue;
         this.iconPath = new ThemeIcon('record-keys');
     }

src/views/settings/secrets.ts

@@ -1,6 +1,6 @@
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState, WorkspaceFolder } from "vscode";
 import { act } from "../../extension";
-import { Setting } from "../../settingsManager";
+import { Setting, SettingFile } from "../../settingsManager";
 import { StorageKey } from "../../storageManager";
 import { GithubLocalActionsTreeItem } from "../githubLocalActionsTreeItem";
 import SettingTreeItem from "./setting";
@@ -10,9 +10,10 @@ export default class SecretsTreeItem extends TreeItem implements GithubLocalActi
     static contextValue = 'githubLocalActions.secrets';
     storageKey = StorageKey.SecretFiles;
 
-    constructor(public workspaceFolder: WorkspaceFolder, secrets: Setting[]) {
+    constructor(public workspaceFolder: WorkspaceFolder, secrets: Setting[], secretFiles: SettingFile[]) {
         super('Secrets', TreeItemCollapsibleState.Collapsed);
-        this.description = `${secrets.filter(secret => secret.selected).length}/${secrets.length}`;
+        this.description = `${secrets.filter(secret => secret.selected).length}/${secrets.length}` +
+            (secretFiles.length > 0 ? ` + ${secretFiles.length} secret file(s)` : ``);
         this.contextValue = SecretsTreeItem.contextValue;
         this.iconPath = new ThemeIcon('lock');
     }

src/views/settings/settingsTreeDataProvider.ts

@@ -69,7 +69,12 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
                 await window.showTextDocument(document);
             }),
             commands.registerCommand('githubLocalActions.removeSettingFile', async (settingFileTreeItem: SettingFileTreeItem) => {
-
+                await act.settingsManager.removeSettingFile(settingFileTreeItem.workspaceFolder, settingFileTreeItem.settingFile, settingFileTreeItem.storageKey);
+                this.refresh();
+            }),
+            commands.registerCommand('githubLocalActions.deleteSettingFile', async (settingFileTreeItem: SettingFileTreeItem) => {
+                await act.settingsManager.deleteSettingFile(settingFileTreeItem.workspaceFolder, settingFileTreeItem.settingFile, settingFileTreeItem.storageKey);
+                this.refresh();
             }),
             commands.registerCommand('githubLocalActions.show', async (settingTreeItem: SettingTreeItem) => {
                 const newSetting = settingTreeItem.setting;

src/views/settings/variables.ts

@@ -1,6 +1,6 @@
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState, WorkspaceFolder } from "vscode";
 import { act } from "../../extension";
-import { Setting } from "../../settingsManager";
+import { Setting, SettingFile } from "../../settingsManager";
 import { StorageKey } from "../../storageManager";
 import { GithubLocalActionsTreeItem } from "../githubLocalActionsTreeItem";
 import SettingTreeItem from "./setting";
@@ -10,9 +10,10 @@ export default class VariablesTreeItem extends TreeItem implements GithubLocalAc
     static contextValue = 'githubLocalActions.variables';
     storageKey = StorageKey.VariableFiles;
 
-    constructor(public workspaceFolder: WorkspaceFolder, variables: Setting[]) {
+    constructor(public workspaceFolder: WorkspaceFolder, variables: Setting[], variableFiles: SettingFile[]) {
         super('Variables', TreeItemCollapsibleState.Collapsed);
-        this.description = `${variables.filter(variable => variable.selected).length}/${variables.length}`;
+        this.description = `${variables.filter(variable => variable.selected).length}/${variables.length}` +
+            (variableFiles.length > 0 ? ` + ${variableFiles.length} variable file(s)` : ``);
         this.contextValue = VariablesTreeItem.contextValue;
         this.iconPath = new ThemeIcon('symbol-key');
     }

src/views/settings/workspaceFolderSettings.ts

@@ -20,9 +20,9 @@ export default class WorkspaceFolderSettingsTreeItem extends TreeItem implements
 
         const settings = await act.settingsManager.getSettings(this.workspaceFolder, false);
         items.push(...[
-            new SecretsTreeItem(this.workspaceFolder, settings.secrets),
+            new SecretsTreeItem(this.workspaceFolder, settings.secrets, settings.secretFiles),
-            new VariablesTreeItem(this.workspaceFolder, settings.variables),
+            new VariablesTreeItem(this.workspaceFolder, settings.variables, settings.variableFiles),
-            new InputsTreeItem(this.workspaceFolder, settings.inputs),
+            new InputsTreeItem(this.workspaceFolder, settings.inputs, settings.inputFiles),
             new RunnersTreeItem(this.workspaceFolder, settings.runners)
         ]);
 

src/workflowsManager.ts

@@ -34,7 +34,7 @@ export class WorkflowsManager {
           fileContent: fileContent,
           yaml: yaml.parse(fileContent)
         });
-      } catch (error) {
+      } catch (error: any) {
         workflows.push({
           name: (yamlContent ? yamlContent.name : undefined) || path.parse(workflowFileUri.fsPath).name,
           uri: workflowFileUri,