Add actions to show and hide secrets

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

src/views/settings/setting.ts

@@ -1,5 +1,5 @@
 import { ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, WorkspaceFolder } from "vscode";
-import { Setting } from "../../settingsManager";
+import { Setting, Visibility } from "../../settingsManager";
 import { StorageKey } from "../../storageManager";
 import { GithubLocalActionsTreeItem } from "../githubLocalActionsTreeItem";
 
@@ -7,30 +7,63 @@ export default class SettingTreeItem extends TreeItem implements GithubLocalActi
     setting: Setting;
     storageKey: StorageKey;
 
-    constructor(public workspaceFolder: WorkspaceFolder, setting: Setting, storageKey: StorageKey, treeItem: { description: string, contextValue: string, iconPath: ThemeIcon }) {
+    constructor(public workspaceFolder: WorkspaceFolder, setting: Setting, storageKey: StorageKey, treeItem: { contextValue: string, iconPath: ThemeIcon }) {
         super(setting.key, TreeItemCollapsibleState.None);
         this.setting = setting;
         this.storageKey = storageKey;
-        this.description = treeItem.description;
-        this.contextValue = treeItem.contextValue;
+        if (setting.password) {
+            this.description = (setting.visible === Visibility.hide && setting.value) ? '••••••••' : setting.value;
+        } else {
+            this.description = setting.value;
+        }
+        this.contextValue = `${treeItem.contextValue}_${setting.password ? setting.visible : ''}`;
         this.iconPath = treeItem.iconPath;
         this.checkboxState = setting.selected ? TreeItemCheckboxState.Checked : TreeItemCheckboxState.Unchecked;
     }
 
     static getSecretTreeItem(workspaceFolder: WorkspaceFolder, secret: Setting): SettingTreeItem {
-        return new SettingTreeItem(workspaceFolder, secret, StorageKey.Secrets, { description: secret.value ? '••••••••' : '', contextValue: 'githubLocalActions.secret', iconPath: new ThemeIcon('key') });
+        return new SettingTreeItem(
+            workspaceFolder,
+            secret,
+            StorageKey.Secrets,
+            {
+                contextValue: 'githubLocalActions.secret',
+                iconPath: new ThemeIcon('key')
+            }
+        );
     }
 
     static getVariableTreeItem(workspaceFolder: WorkspaceFolder, variable: Setting): SettingTreeItem {
-        return new SettingTreeItem(workspaceFolder, variable, StorageKey.Variables, { description: variable.value, contextValue: 'githubLocalActions.variable', iconPath: new ThemeIcon('symbol-variable') });
+        return new SettingTreeItem(
+            workspaceFolder,
+            variable, StorageKey.Variables,
+            {
+                contextValue: 'githubLocalActions.variable',
+                iconPath: new ThemeIcon('symbol-variable')
+            }
+        );
     }
 
     static getInputTreeItem(workspaceFolder: WorkspaceFolder, input: Setting): SettingTreeItem {
-        return new SettingTreeItem(workspaceFolder, input, StorageKey.Inputs, { description: input.value, contextValue: 'githubLocalActions.input', iconPath: new ThemeIcon('symbol-parameter') });
+        return new SettingTreeItem(
+            workspaceFolder,
+            input, StorageKey.Inputs,
+            {
+                contextValue: 'githubLocalActions.input',
+                iconPath: new ThemeIcon('symbol-parameter')
+            }
+        );
     }
 
     static getRunnerTreeItem(workspaceFolder: WorkspaceFolder, runner: Setting): SettingTreeItem {
-        return new SettingTreeItem(workspaceFolder, runner, StorageKey.Runners, { description: runner.value, contextValue: 'githubLocalActions.runner', iconPath: new ThemeIcon('vm-connect') });
+        return new SettingTreeItem(
+            workspaceFolder,
+            runner, StorageKey.Runners,
+            {
+                contextValue: 'githubLocalActions.runner',
+                iconPath: new ThemeIcon('vm-connect')
+            }
+        );
     }
 
     async getChildren(): Promise<GithubLocalActionsTreeItem[]> {

src/views/settings/settingsTreeDataProvider.ts

@@ -1,5 +1,6 @@
 import { CancellationToken, commands, EventEmitter, ExtensionContext, TreeCheckboxChangeEvent, TreeDataProvider, TreeItem, TreeItemCheckboxState, window, workspace } from "vscode";
 import { act } from "../../extension";
+import { Visibility } from "../../settingsManager";
 import { GithubLocalActionsTreeItem } from "../githubLocalActionsTreeItem";
 import SettingTreeItem from "./setting";
 import WorkspaceFolderSettingsTreeItem from "./workspaceFolderSettings";
@@ -14,16 +15,30 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
             commands.registerCommand('githubLocalActions.refreshSettings', async () => {
                 this.refresh();
             }),
+            commands.registerCommand('githubLocalActions.show', async (settingTreeItem: SettingTreeItem) => {
+                const newSetting = settingTreeItem.setting;
+                newSetting.visible = Visibility.show;
+                await act.settingsManager.editSetting(settingTreeItem.workspaceFolder, newSetting, settingTreeItem.storageKey);
+                this.refresh();
+            }),
+            commands.registerCommand('githubLocalActions.hide', async (settingTreeItem: SettingTreeItem) => {
+                const newSetting = settingTreeItem.setting;
+                newSetting.visible = Visibility.hide;
+                await act.settingsManager.editSetting(settingTreeItem.workspaceFolder, newSetting, settingTreeItem.storageKey);
+                this.refresh();
+            }),
             commands.registerCommand('githubLocalActions.editSetting', async (settingTreeItem: SettingTreeItem) => {
                 const newValue = await window.showInputBox({
                     prompt: `Enter the value for ${settingTreeItem.setting.value}`,
                     placeHolder: `Setting value`,
-                    value: settingTreeItem.setting.value,
-                    password: settingTreeItem.setting.password
+                    value: settingTreeItem.setting.visible === Visibility.hide && settingTreeItem.setting.password ? '' : settingTreeItem.setting.value,
+                    password: settingTreeItem.setting.visible === Visibility.hide && settingTreeItem.setting.password
                 });
 
                 if (newValue !== undefined) {
-                    await act.settingsManager.editSetting(settingTreeItem.workspaceFolder, { key: settingTreeItem.setting.key, value: newValue, selected: settingTreeItem.setting.selected, password: settingTreeItem.setting.password }, settingTreeItem.storageKey);
+                    const newSetting = settingTreeItem.setting;
+                    newSetting.value = newValue;
+                    await act.settingsManager.editSetting(settingTreeItem.workspaceFolder, newSetting, settingTreeItem.storageKey);
                     this.refresh();
                 }
             })
@@ -48,7 +63,9 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
 
     async onDidChangeCheckboxState(event: TreeCheckboxChangeEvent<SettingTreeItem>) {
         for await (const [treeItem, state] of event.items) {
-            await act.settingsManager.editSetting(treeItem.workspaceFolder, { key: treeItem.setting.key, value: treeItem.setting.value, selected: state === TreeItemCheckboxState.Checked, password: treeItem.setting.password }, treeItem.storageKey);
+            const newSetting = treeItem.setting;
+            newSetting.selected = (state === TreeItemCheckboxState.Checked);
+            await act.settingsManager.editSetting(treeItem.workspaceFolder, newSetting, treeItem.storageKey);
         }
         this.refresh();
     }