Merge pull request #1664 from codefori/feature/protectedActions

Add "Run on protected" option on Actions
codefori · Nov 21, 2023 · 9dbc63c · 9dbc63c
2 parents 923d1c8 + da1e2a4
commit 9dbc63c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -571,6 +571,10 @@
 									"filter",
 									"browser"
 								]								
+							},
+							"runOnProtected": {
+								"type": "boolean",
+								"description": "If enabled, this Action will be allowed to run on protected/read only targets."
 							}
 						}
 					},

diff --git a/src/api/CompileTools.ts b/src/api/CompileTools.ts
@@ -1,6 +1,6 @@
 
 import path from 'path';
-import vscode, { CustomExecution, EventEmitter, Pseudoterminal, TaskGroup, TaskRevealKind, WorkspaceFolder, commands, tasks, window } from 'vscode';
+import vscode, { CustomExecution, EventEmitter, Pseudoterminal, TaskGroup, TaskRevealKind, WorkspaceFolder, commands, tasks } from 'vscode';
 import { parseFSOptions } from '../filesystems/qsys/QSysFs';
 import { Action, BrowserItem, CommandResult, DeploymentMethod, RemoteCommand, StandardIO } from '../typings';
 import { GlobalConfiguration } from './Configuration';
@@ -86,17 +86,8 @@ export namespace CompileTools {
     const content = instance.getContent();
 
     const uriOptions = parseFSOptions(uri);
-
-    if (uriOptions.readonly) {
-      window.showWarningMessage(`Cannot run Actions against readonly objects.`);
-      return false;
-    }
-
-    if (config?.readOnlyMode) {
-      window.showWarningMessage(`Cannot run Actions while readonly mode is enabled in the connection settings.`);
-      return false;
-    }
-
+    const isProtected = uriOptions.readonly || config?.readOnlyMode;
+
     const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri);
 
     if (connection && config && content) {
@@ -123,7 +114,7 @@ export namespace CompileTools {
         });
 
         // Then we get all the available Actions for the current context
-        availableActions = allActions.filter(action => action.type === uri.scheme && (!action.extensions || action.extensions.includes(extension) || action.extensions.includes(fragment) || action.extensions.includes(`GLOBAL`)))
+        availableActions = allActions.filter(action => action.type === uri.scheme && (!action.extensions || action.extensions.includes(extension) || action.extensions.includes(fragment) || action.extensions.includes(`GLOBAL`)) && (!isProtected || action.runOnProtected))
           .sort((a, b) => (actionUsed.get(b.name) || 0) - (actionUsed.get(a.name) || 0))
           .map(action => ({
             label: action.name,

diff --git a/src/locale/ids/da.ts b/src/locale/ids/da.ts
@@ -236,7 +236,7 @@ export const da: Locale = {
   'actions.workAction.create.title': `Opret aktion`,
   'actions.workAction.edit.title': `Revider aktion "{0}"`,
   'actions.workAction.duplicate.title': `Kopier aktion "{0}"`,
-  'actions.workAction.name': `Action navn`,
+  'actions.workAction.name': `Aktionsnavn`,
   'actions.workAction.command': `Kommandoer`,
   'actions.workAction.command.description': `Nedenfor er de tilgængelige variable, baseret på objekt typen. Du kan angive forskellige kommandoer på hver linie. Hver kommando er "stateless" og afvikles i eget job.`,
   'actions.workAction.extensions': `Typer`,
@@ -264,10 +264,12 @@ export const da: Locale = {
   'actions.workAction.refresh.description':'Liste niveauet for opfriskning efter aktion er udført.',
   'actions.workAction.refresh.no':'Ingen',
   'actions.workAction.refresh.no.description':'Ingen opfriskning',
-  'actions.workAction.refresh.parent':'Comtainer',
+  'actions.workAction.refresh.parent':'Container',
   'actions.workAction.refresh.parent.description':'Den aktuelle container bliver opfrisket',
   'actions.workAction.refresh.filter':'Filter',
   'actions.workAction.refresh.filter.description':'Det aktuelle filter bliver opfrisket',
   'actions.workAction.refresh.browser':'Vindue',
-  'actions.workAction.refresh.browser.description':'Hele vinduet bliver opfrisket'
+  'actions.workAction.refresh.browser.description':'Hele vinduet bliver opfrisket',
+  'actions.workAction.runOnProtected':'Må afvikles på sikret/skrive-beskyttet',
+  'actions.workAction.runOnProtected.description':'Tillader afvikling af denne aktion på sikrede eller skrive-beskyttede mål'
 };
diff --git a/src/locale/ids/en.ts b/src/locale/ids/en.ts
@@ -269,5 +269,7 @@ export const en: Locale = {
   'actions.workAction.refresh.filter':'Filter',
   'actions.workAction.refresh.filter.description':'The parent filter is refreshed',
   'actions.workAction.refresh.browser':'Browser',
-  'actions.workAction.refresh.browser.description':'The entire browser is refreshed'
+  'actions.workAction.refresh.browser.description':'The entire browser is refreshed',
+  'actions.workAction.runOnProtected':'Run on protected/read only',
+  'actions.workAction.runOnProtected.description':'Allows the execution of this Action on protected or read only targets'
 };
diff --git a/src/locale/ids/fr.ts b/src/locale/ids/fr.ts
@@ -269,5 +269,7 @@ export const fr: Locale = {
   'actions.workAction.refresh.filter':'Filtre',
   'actions.workAction.refresh.filter.description':'Le filtre parent est rafraîchi',
   'actions.workAction.refresh.browser':'Navigateur',
-  'actions.workAction.refresh.browser.description':'Le navigateur est entièrement rafraîchi'
+  'actions.workAction.refresh.browser.description':'Le navigateur est entièrement rafraîchi',
+  'actions.workAction.runOnProtected':'Exécuter en mode protégé/lecture seule',
+  'actions.workAction.runOnProtected.description':`Autorise l'exécution de cette action sur des cibles protégés ou en lecture seule`
 };
diff --git a/src/typings.ts b/src/typings.ts
@@ -65,7 +65,8 @@ export interface Action {
   extensions?: string[];
   deployFirst?: boolean;
   postDownload?: string[];
-  refresh?: ActionRefresh
+  refresh?: ActionRefresh;
+  runOnProtected?:boolean;  
 }
 
 export interface ConnectionData {

diff --git a/src/webviews/actions/index.ts b/src/webviews/actions/index.ts
@@ -21,6 +21,7 @@ type ActionPage = {
   type: ActionType
   environment: ActionEnvironment
   refresh: ActionRefresh
+  runOnProtected: boolean
   buttons: "saveAction" | "deleteAction" | "cancelAction"
 }
 
@@ -237,7 +238,8 @@ export namespace ActionsUI {
             description: t('actions.workAction.refresh.browser'),
             text: t('actions.workAction.refresh.browser.description')
           }], t('actions.workAction.refresh.description')
-        )
+        )        
+        .addCheckbox("runOnProtected", t("actions.workAction.runOnProtected"), t("actions.workAction.runOnProtected.description"), currentAction.runOnProtected)
         .addHorizontalRule()
         .addButtons(
           { id: `saveAction`, label: t(`save`) },
@@ -274,7 +276,8 @@ export namespace ActionsUI {
                 environment: data.environment,
                 name: data.name,
                 command: data.command,
-                refresh: data.refresh
+                refresh: data.refresh,
+                runOnProtected: data.runOnProtected
               };
 
               if (id >= 0) {