Merge branch 'trunk' into ADD_PROTECT

Signed-off-by: David de Hilster <[email protected]>
hpcc-systems · Jan 25, 2024 · 0b98c93 · 0b98c93
2 parents d3de696 + 4ee1e25
commit 0b98c93
Show file tree

Hide file tree

Showing 8 changed files with 290 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.25.0](https://github.com/hpcc-systems/vscode-ecl/compare/v2.24.0...v2.25.0) (2023-12-19)
+
+
+### Features
+
+* Adding matching WU Context Menu functionality from the ECL IDE ([9da291a](https://github.com/hpcc-systems/vscode-ecl/commit/9da291a87431e1da5a736bc95209075ee057e29b))
+
+
+### Bug Fixes
+
+*  Workaround VSCode 1.85.x regression ([014ac55](https://github.com/hpcc-systems/vscode-ecl/commit/014ac55abe0a87aaffee9e05f65742d61cef3d7d))
+
 ## [2.24.0](https://github.com/hpcc-systems/vscode-ecl/compare/v2.23.7...v2.24.0) (2023-10-27)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ecl",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "publisher": "hpcc-systems",
   "displayName": "ECL Language",
   "description": "ECL (Enterprise Control Language) support for Visual Studio Code",
@@ -413,6 +413,66 @@
         "title": "%Unprotect Workunit%",
         "enablement": "viewItem =~ /ECLWUNodeComplete/"
       },
+      {
+        "command": "hpccPlatform.setStateCompiled",
+        "category": "ECL",
+        "title": "%Compiled%"
+      },
+      {
+        "command": "hpccPlatform.setStateRunning",
+        "category": "ECL",
+        "title": "%Running%"
+      },
+      {
+        "command": "hpccPlatform.setStateCompleted",
+        "category": "ECL",
+        "title": "%Completed%"
+      },
+      {
+        "command": "hpccPlatform.setStateFailed",
+        "category": "ECL",
+        "title": "%Failed%"
+      },
+      {
+        "command": "hpccPlatform.setStateArchived",
+        "category": "ECL",
+        "title": "%Archived%"
+      },
+      {
+        "command": "hpccPlatform.setStateAborting",
+        "category": "ECL",
+        "title": "%Aborting%"
+      },
+      {
+        "command": "hpccPlatform.setStateAborted",
+        "category": "ECL",
+        "title": "%Aborted%"
+      },
+      {
+        "command": "hpccPlatform.setStateBlocked",
+        "category": "ECL",
+        "title": "%Blocked%"
+      },
+      {
+        "command": "hpccPlatform.setStateSubmitted",
+        "category": "ECL",
+        "title": "%Submitted%"
+      },
+      {
+        "command": "hpccPlatform.setStateScheduled",
+        "category": "ECL",
+        "title": "%Scheduled%"
+      },
+      {
+        "command": "hpccPlatform.setStateCompiling",
+        "category": "ECL",
+        "title": "%Compiling%"
+      },
+      {
+        "command": "hpccPlatform.setStateWaiting",
+        "category": "ECL",
+        "title": "%Waiting%"
+      },
       {
         "command": "hpccPlatform.refresh",
         "category": "ECL",
@@ -664,7 +724,63 @@
         }
       }
     ],
+    "submenus": [
+      {
+        "id": "setState",
+        "label": "Set State"
+      }
+    ],
     "menus": {
+      "setState": [
+        {
+            "command": "hpccPlatform.setStateCompiled",
+            "group": "set@01"
+        },
+        {
+            "command": "hpccPlatform.setStateRunning",
+            "group": "set@02"
+        },
+        {
+            "command": "hpccPlatform.setStateCompleted",
+            "group": "set@03"
+        },
+        {
+            "command": "hpccPlatform.setStateFailed",
+            "group": "set@04"
+        },
+        {
+            "command": "hpccPlatform.setStateArchived",
+            "group": "set@05"
+        },
+        {
+            "command": "hpccPlatform.setStateAborting",
+            "group": "set@06"
+        },
+        {
+            "command": "hpccPlatform.setStateAborted",
+            "group": "set@07"
+        },
+        {
+            "command": "hpccPlatform.setStateBlocked",
+            "group": "set@08"
+        },
+        {
+            "command": "hpccPlatform.setStateSubmitted",
+            "group": "set@09"
+        },
+        {
+            "command": "hpccPlatform.setStateScheduled",
+            "group": "set@10"
+        },
+        {
+            "command": "hpccPlatform.setStateCompiling",
+            "group": "set@11"
+        },
+        {
+            "command": "hpccPlatform.setStateWaiting",
+            "group": "set@12"
+        }
+      ],
       "explorer/context": [
         {
           "when": "resourceLangId == ecl && resourceExtname == .ecl",
@@ -876,6 +992,10 @@
           "command": "hpccPlatform.unprotectWU",
           "group": "3action@940"
         },
+        {
+          "submenu": "setState",
+          "group": "3action@950"
+        },
         {
           "command": "hpccResources.bundles.homepage",
           "when": "view == hpccResources.bundles && viewItem =~ /^BundlesItem/",

diff --git a/package.nls.json b/package.nls.json
@@ -1,15 +1,19 @@
 {
     "A new configuration to submit ECL to localhost, hthor": "A new configuration to submit ECL to localhost, hthor",
+    "Aborted": "Aborted",
+    "Aborting": "Aborting",
     "Abort Workunit": "Abort Workunit",
     "Abort submit when errors are reported during archive generation": "Abort submit when errors are reported during archive generation",
     "Activate": "Activate",
     "Activate Client Tools": "Activate Client Tools",
     "Add '-legacy' argument to eclcc": "Add '-legacy' argument to eclcc",
     "Additional folders to use when resolving IMPORT statements": "Additional folders to use when resolving IMPORT statements",
     "All workunits": "All workunits",
+    "Archived": "Archived",
     "Auto Detect": "Auto Detect",
     "Auto Detect Client Tools": "Auto Detect Client Tools",
     "Automatically open Workunits on creation": "Automatically open Workunits on creation",
+    "Blocked": "Blocked",
     "Browse ECL Watch": "Browse ECL Watch",
     "Browse Metrics": "Browse Metrics",
     "Build flags, to be passed to the eclcc compiler": "Build flags, to be passed to the eclcc compiler",
@@ -19,7 +23,10 @@
     "Check syntax with KEL grammar (fast)": "Check syntax with KEL grammar (fast)",
     "Clear all previously reported ECL Syntax Check results": "Clear all previously reported ECL Syntax Check results",
     "Client Tools Homepage": "Client Tools Homepage",
+    "Completed": "Completed",
     "Compile": "Compile",
+    "Compiled": "Compiled",
+    "Compiling": "Compiling",
     "Compile ECL on the HPCC Platform": "Compile ECL on the HPCC Platform",
     "Copy WUID": "Copy WUID",
     "Copy as ECL ID": "Copy as ECL ID",
@@ -35,6 +42,7 @@
     "ECL Watch": "ECL Watch",
     "Edit Dashboard": "Edit Dashboard",
     "Export ECL Markdown to HTML": "Export ECL Markdown to HTML",
+    "Failed": "Failed",
     "For the currently selected text, search the online ECL language reference": "For the currently selected text, search the online ECL language reference",
     "Force global 'proxySupport' to 'fallback'": "Force global 'proxySupport' to 'fallback'",
     "Generate": "Generate",
@@ -81,12 +89,14 @@
     "Reveals Generated ECL in File Explorer": "Reveals Generated ECL in File Explorer",
     "Run 'eclcc -syntax' on load": "Run 'eclcc -syntax' on load",
     "Run 'eclcc -syntax' on save": "Run 'eclcc -syntax' on save",
+    "Running": "Running",
     "Save + check syntax of current file": "Save + check syntax of current file",
     "Save All + check syntax of all files": "Save All + check syntax of all files",
     "Save Data to File": "Save Data to File",
     "Save file prior to submission": "Save file prior to submission",
     "Save file prior to syntax check": "Save file prior to syntax check",
     "Save Result to File": "Save Result to File",
+    "Scheduled": "Scheduled",
     "Select Client Tools Version": "Select Client Tools Version",
     "Select Client Tools Version from available options": "Select Client Tools Version from available options",
     "Server IP/Domain address": "Server IP/Domain address",
@@ -98,6 +108,7 @@
     "Showing all workunits": "Showing all workunits",
     "Sign ECL": "Sign ECL",
     "Submit": "Submit",
+    "Submitted": "Submitted",
     "Submit (No Archive)": "Submit (No Archive)",
     "Submit ECL to HPCC Platform": "Submit ECL to HPCC Platform",
     "Submit Raw ECL to HPCC Platform": "Submit Raw ECL to HPCC Platform",
@@ -121,6 +132,7 @@
     "Verify ECL Signature": "Verify ECL Signature",
     "View Dashboard": "View Dashboard",
     "View ECL Markdown": "View ECL Markdown",
+    "Waiting": "Waiting",
     "Write eclcc log file to specified file": "Write eclcc log file to specified file",
     "eclcc syntax check arguments": "eclcc syntax check arguments"
 }