This should help with merge conflicts between next and `update-next…

…-2.14`

Signed-off-by: zFernand0 <[email protected]>

.github/workflows/audit.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js LTS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: lts/*
 

.github/workflows/auto-comment.yml

@@ -9,10 +9,10 @@ jobs:
     name: Process Label Action
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Process Label Action
-        uses: hramos/respond-to-issue-based-on-label@v2
+        uses: dessant/label-actions@v4
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: '.github/label-actions.yml'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          config-path: '.github/label-actions.yml'

.github/workflows/changelog.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/deployment.yml

@@ -24,16 +24,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
           ref: ${{ github.ref }}
 
       - name: Use Node.js LTS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: '18.x'
 
       - name: Install pnpm and Lerna
         run: npm install -g pnpm lerna@6

.github/workflows/lint.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js LTS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
 

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           any-of-issue-labels: "needs more info, pending closure"
           close-issue-message: >

.github/workflows/zowe-explorer-ci.yml

@@ -32,10 +32,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -50,32 +50,33 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=4096
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
+        uses: actions/upload-artifact@v4
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
         with:
           name: zowe-explorer-results
           path: packages/zowe-explorer/results/
 
       - name: Upload API test results
-        uses: actions/upload-artifact@v3
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
+        uses: actions/upload-artifact@v4
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
         with:
           name: zowe-explorer-api-results
           path: packages/zowe-explorer-api/results/
 
       - name: Upload Results to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           env_vars: OS,NODE
+          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Package VSIX
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
         run: pnpm package
         working-directory: packages/zowe-explorer
 
       - name: Archive VSIX artifact
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
-        uses: actions/upload-artifact@v3
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
+        uses: actions/upload-artifact@v4
         with:
           name: zowe-explorer-vsix
           path: dist/*.vsix

.github/workflows/zowe-explorer-ftp-ci.yml

@@ -32,10 +32,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -50,27 +50,27 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=4096
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
+        uses: actions/upload-artifact@v4
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
         with:
           name: zowe-explorer-ftp-extension-results
           path: packages/zowe-explorer-ftp-extension/results/
 
       # Run codecov upload for only one run
       # - name: Upload Results to Codecov
-      #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
+      #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
       #   uses: codecov/codecov-action@v3
       #   with:
       #     env_vars: OS,NODE
 
       - name: Package VSIX
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
         run: pnpm package
         working-directory: packages/zowe-explorer-ftp-extension
 
       - name: Archive VSIX artifact
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
-        uses: actions/upload-artifact@v3
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
+        uses: actions/upload-artifact@v4
         with:
           name: zowe-explorer-ftp-extension-vsix
           path: dist/*.vsix

.github/workflows/zowe-explorer-samples.yml

@@ -31,10 +31,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 

docs/early-access/v3/Extenders.md

@@ -17,6 +17,50 @@
 - `ZoweVsCodeExtension.promptCredentials` removed in favor of `ZoweVsCodeExtension.updateCredentials`.
 - Changed ZoweExplorerExtender.initForZowe `profileTypeConfigurations: imperative.ICommandProfileTypeConfiguration[]` to a required argument
 - Changed IApiExplorerExtenders.initForZowe `profileTypeConfigurations: imperative.ICommandProfileTypeConfiguration[]` to a required argument
+- Changed `ICommon`, `IMvs`, `IUss`, `IJes` interfaces to be grouped in `MainframeInteraction` namespace.
+- Renamed `WebviewOptions` interface to `GuiWebviewOptions` and moved to `GuiOptions` namespace.
+- Moved `GuiMessageOptions` interface to `GuiOptions` namespace.
+- Moved all types to the `Types` interface, these types include:
+  - IZoweNodeType
+  - IZoweUSSNodeType
+  - `NodeInteraction` renamed to `ZoweNodeInteraction`
+  - IApiRegisterClient
+  - WebviewUris
+  - FileAttributes
+  - PollRequest
+  - DatasetStats
+  - KeytarModule
+  - DataSetAllocTemplate
+  - Appender
+  - LogJsConfig
+- Moved `MessageSeverity` enum to it's own class.
+- Moved `IUrlValidator`, `IProfileValidation`, `IValidationSetting`, `ValidProfileEnum` and `EvenTypes` to `Validation` namespace.
+- Moved `getZoweDir` and `getFullPath` to `FileManagement` class.
+- Renamed `IUrlValidator` to `IValidationUrl`.
+- Renamed `IProfileValidation` to `IValidationProfile`.
+- Renamed `ValidProfileEnum` to `ValidationType`.
+- Wrapped `ZosmfApiCommon`, `ZosmfUssApi`, `ZosmfMvsApi`, `ZosmfJesApi` and `ZosmfCommandApi` inside `ZoweExplorerZosmf` namespace.
+- Renamed `ZosmfApiCommon` to `CommonApi`.
+- Renamed `ZosmfUssApi` to `UssApi`.
+- Renamed `ZosmfMvsApi` to `MvsApi`.
+- Renamed `ZosmfJesApi` to `JesApi`.
+- Renamed `ZosmfCommandApi` to `CommandApi`.
+- Renamed `ZoweExplorerTreeApi` to `IZoweExplorerTreeApi`.
+- Moved `NodeAction` enum to its own class `ZoweTreeNodeActions`.
+- Renamed `NodeAction` enum to `ZoweTreeNodeActions`.
+- Wrapped all content sorting related content to be contained in `Sorting` namespace, such as:
+  - DataSetSortOpts
+  - SortDirection
+  - DatasetFilterOpts
+  - DatasetFilter
+  - NodeSort
+  - JobSortOpts
+- Renamed `files` class to `FileManagement`.
+- Renamed `IPromptCredentials` into `PromptCredentials`.
+- Wrapped `IPromptCredentialsCommonOptions`, `IPromptCredentialsOptions` and `IPromptUserPassOptions` in `PromptCredentialsOptions` namespace.
+- Renamed `IPromptCredentialsCommonOptions` to `CommonOptions`.
+- Renamed `IPromptcredentialsOptions` to `ComplexOptions`.
+- Renamed `IPromptUserPassOptions` to `UserPassOptions`.
 
 ## New APIs Added
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.0.0-next.202401241448",
+  "version": "3.0.0-next.202402071248",
   "command": {
     "version": {
       "forcePublish": true,

package.json

@@ -50,7 +50,7 @@
     "ts-jest": "^29.0.3",
     "ts-loader": "^8.2.0",
     "ts-node": "^9.1.1",
-    "typescript": "^4.5.3",
+    "typescript": "^5.3.3",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"
   },

packages/eslint-plugin-zowe-explorer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zowe-explorer",
-  "version": "3.0.0-next.202401241448",
+  "version": "3.0.0-next.202402071248",
   "description": "Custom ESLint Rules for ZOWE Explorer",
   "keywords": [
     "eslint",

packages/zowe-explorer-api/CHANGELOG.md

@@ -12,6 +12,14 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
   - `IZoweUSSTreeNode.setBinary()` -> `IZoweUSSTreeNode.setEncoding()`
 - **Breaking:** Removed `ZoweTreeNode.binary`, `ZoweTreeNode.binaryFiles`, and `ZoweTreeNode.shortLabel`. These properties are not applicable for all tree nodes and should be defined in subclasses of `ZoweTreeNode` if necessary.
 
+## `3.0.0-next.202402071248`
+
+### New features and enhancements
+
+- Grouped common methods into singleton classes [#2109](https://github.com/zowe/vscode-extension-for-zowe/issues/2109)
+
+### Bug fixes
+
 ## `3.0.0-next.202401241448`
 
 ### New features and enhancements

packages/zowe-explorer-api/__tests__/__unit__/globals/Gui.unit.test.ts

@@ -12,7 +12,7 @@
 import { Gui, IZoweTree, IZoweTreeNode } from "../../../src/";
 
 import * as vscode from "vscode";
-import { DOUBLE_CLICK_SPEED_MS } from "../../../src/globals";
+import { Constants } from "../../../src/globals";
 jest.mock("vscode");
 
 function createGlobalMocks() {
@@ -198,10 +198,10 @@ describe("Gui.utils - unit tests", () => {
     };
 
     it("returns false when the second click event is after the DOUBLE_CLICK_SPEED_MS window", () => {
-        testDoubleClickEvent(DOUBLE_CLICK_SPEED_MS * 4, false);
+        testDoubleClickEvent(Constants.DOUBLE_CLICK_SPEED_MS * 4, false);
     });
 
     it("returns true when the second click event is within the DOUBLE_CLICK_SPEED_MS window", () => {
-        testDoubleClickEvent(DOUBLE_CLICK_SPEED_MS / 8, true);
+        testDoubleClickEvent(Constants.DOUBLE_CLICK_SPEED_MS / 8, true);
     });
 });

packages/zowe-explorer-api/__tests__/__unit__/logger/IZoweLogger.unit.test.ts

@@ -10,7 +10,7 @@
  */
 
 import { imperative } from "@zowe/cli";
-import { IZoweLogger, MessageSeverity } from "../../../src/logger/IZoweLogger";
+import { MessageSeverity, IZoweLogger } from "../../../src/logger";
 import * as loggerConfig from "../../../src/log4jsconfig.json";
 
 jest.mock("fs");