Skip to content

Commit

Permalink
Merge pull request #3057 from zowe/3.0.0-pre-release.20240821
Browse files Browse the repository at this point in the history
3.0.0 Pre-release Aug 2024
  • Loading branch information
traeok authored Aug 30, 2024
2 parents c72d346 + aff8da8 commit 7f36ebe
Show file tree
Hide file tree
Showing 11 changed files with 440 additions and 289 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.0.0-next-SNAPSHOT",
"version": "3.0.0-next.202408210815",
"command": {
"version": {
"forcePublish": true,
Expand Down
4 changes: 0 additions & 4 deletions packages/eslint-plugin-zowe-explorer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen

## TBD Release

### New features and enhancements

### Bug fixes

## `3.0.0-next.202309121526`

### New features and enhancements
Expand Down
5 changes: 3 additions & 2 deletions packages/zowe-explorer-api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
- `ZoweVsCodeExtension.showVsCodeMessage` - use `Gui.showMessage` instead.
- `ZoweVsCodeExtension.inputBox` - use `Gui.showInputBox` instead.
- `ZoweVsCodeExtension.promptCredentials` - use `ZoweVsCodeExtension.updateCredentials` instead.
- **Breaking:** Removed unused property `profileManagerByType` which used the V1-profile class `CLIProfileManager`. [#3057](https://github.com/zowe/zowe-explorer-vscode/issues/3057)
- **Breaking:** Added return type of `Promise<void>` to the following `IZoweTree` methods: [#2238](https://github.com/zowe/zowe-explorer-vscode/issues/2238)
- addFavorite
- removeFavorite
Expand Down Expand Up @@ -115,8 +116,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
- Removed `handlebars` dependency in favor of `mustache` for technical currency purposes. [#2975](https://github.com/zowe/zowe-explorer-vscode/pull/2975)
- Fixed an issue where the `ZoweVsCodeExtension.updateCredentials` method could remove credentials from session when input prompt was cancelled. [#3009](https://github.com/zowe/zowe-explorer-vscode/pull/3009)
- Fixed an issue where the loaded configuration could be overridden when extenders retrieved the Zowe home directory. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
- Update Zowe SDKs to `8.0.0-next.202407232256` for technical currency. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
- Fixed an issue where remote lookup functionality caused the local side of a conflict to be overwritten with the remote contents.
- Fixed an issue where remote lookup functionality caused the local side of a conflict to be overwritten with the remote contents. [#3085](https://github.com/zowe/zowe-explorer-vscode/pull/3085)
- Update Zowe SDKs to `8.0.0-next.202408291544` for technical currency. [#3057](https://github.com/zowe/zowe-explorer-vscode/pull/3057)

## `3.0.0-next.202404242037`

Expand Down
18 changes: 9 additions & 9 deletions packages/zowe-explorer-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
},
"dependencies": {
"@types/vscode": "^1.53.2",
"@zowe/core-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/imperative": "8.0.0-next.202407232256",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/core-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/imperative": "8.0.0-next.202408291544",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202408291544",
"deep-object-diff": "^1.1.9",
"mustache": "^4.2.0",
"semver": "^7.6.0"
Expand Down
1 change: 0 additions & 1 deletion packages/zowe-explorer-api/src/profiles/ProfilesCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export class ProfilesCache {
protected allExternalTypes = new Set<string>();
protected profilesByType = new Map<string, imperative.IProfileLoaded[]>();
protected defaultProfileByType = new Map<string, imperative.IProfileLoaded>();
protected profileManagerByType = new Map<string, imperative.CliProfileManager>();

public constructor(protected log: imperative.Logger, protected cwd?: string) {
this.cwd = cwd != null ? FileManagement.getFullPath(cwd) : undefined;
Expand Down
2 changes: 1 addition & 1 deletion packages/zowe-explorer-ftp-extension/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
- Changed the hashing algorithm for e-tag generation from `sha1` to `sha256` to avoid collisions. [#2890](https://github.com/zowe/zowe-explorer-vscode/pull/2890)
- Updated the FTP plugin dependency to `3.0.0-next.202403191358` for technical currency [#2783](https://github.com/zowe/vscode-extension-for-zowe/pull/2783).
- Renamed extension to `IBM z/OS FTP for Zowe Explorer`. [#2990](https://github.com/zowe/zowe-explorer-vscode/issues/2990)
- Update Zowe SDKs to `8.0.0-next.202407232256` for technical currency. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
- Update Zowe SDKs to `8.0.0-next.202408291544` for technical currency. [#3057](https://github.com/zowe/zowe-explorer-vscode/pull/3057)

## `3.0.0-next.202404242037`

Expand Down
4 changes: 2 additions & 2 deletions packages/zowe-explorer-ftp-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"vscode": "^1.79.0"
},
"dependencies": {
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-ftp-for-zowe-cli": "3.0.0-next.202403191358",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
"tmp": "0.2.3"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/zowe-explorer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
- Added a "Copy Relative Path" context option for USS files and directories in the tree view. [#2908](https://github.com/zowe/zowe-explorer-vscode/pull/2908)
- Added a "Copy Name" context option for data sets, jobs and spool files in the tree view. [#2908](https://github.com/zowe/zowe-explorer-vscode/pull/2908)
- Added integration and end-to-end test framework to verify extension behavior and catch issues during Zowe Explorer development. [#2322](https://github.com/zowe/zowe-explorer-vscode/issues/2322)
- Removed deprecated methods: [#2238](https://github.com/zowe/zowe-explorer-vscode/issues/2238)
- **Breaking:** Removed deprecated methods: [#2238](https://github.com/zowe/zowe-explorer-vscode/issues/2238)
- `DatasetActions.copyDataSet` - use `DatasetActions.copyDataSets` instead
- `USSActions.pasteUssFile` - use `DatasetActions.pasteUss` instead
- `ZoweUSSNode.refreshAndReopen` - use `ZoweUSSNode.reopen` instead
Expand Down Expand Up @@ -70,12 +70,12 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
- Fixed issue where multiple extensions that contribute profiles to a tree view using the Zowe Explorer API may fail to load. [#2888](https://github.com/zowe/zowe-explorer-vscode/issues/2888)
- Fixed regression where `getProviderForNode` returned the wrong tree provider after performing an action on a Zowe tree node, causing some commands to fail silently. [#2967](https://github.com/zowe/zowe-explorer-vscode/issues/2967)
- Fixed issue where creating a new team configuration file could cause Zowe Explorer to crash, resulting in all sessions disappearing from trees. [#2906](https://github.com/zowe/zowe-explorer-vscode/issues/2906)
- Update Zowe SDKs to `8.0.0-next.202407232256` for technical currency. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
- Addressed breaking changes from the Zowe Explorer API package.[#2952](https://github.com/zowe/zowe-explorer-vscode/issues/2952)
- Fixed data set not opening when the token has expired. [#3001](https://github.com/zowe/zowe-explorer-vscode/issues/3001)
- Fixed an issue where upgrading from Zowe Explorer v1 and selecting "Reload Extensions" causes Zowe Explorer v3 to fail during initialization. [#3051](https://github.com/zowe/zowe-explorer-vscode/pull/3051)
- Fixed an issue where remote lookup functionality caused the local side of a conflict to be overwritten with the remote contents.
- Fixed an issue where the remote conflict icons showed when using the "Compare with Selected" feature.
- Fixed an issue where remote lookup functionality caused the local side of a conflict to be overwritten with the remote contents. [#3085](https://github.com/zowe/zowe-explorer-vscode/pull/3085)
- Fixed an issue where the remote conflict icons showed when using the "Compare with Selected" feature. [#3085](https://github.com/zowe/zowe-explorer-vscode/pull/3085)
- Update Zowe SDKs to `8.0.0-next.202408291544` for technical currency. [#3057](https://github.com/zowe/zowe-explorer-vscode/pull/3057)

## `3.0.0-next.202404242037`

Expand Down
10 changes: 5 additions & 5 deletions packages/zowe-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1835,11 +1835,11 @@
"webdriverio": "^8.36.1"
},
"dependencies": {
"@zowe/core-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202407232256",
"@zowe/core-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/secrets-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202408291544",
"@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
"dayjs": "^1.11.10",
"fs-extra": "8.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class ZoweDatasetNode extends ZoweTreeNode implements IZoweDatasetTreeNod
this.iconPath = icon.path;
}

if (this.getParent() == null) {
if (this.getParent() == null || this.getParent().label === vscode.l10n.t("Favorites")) {
// set default sort options for session nodes
this.sort = {
method: Sorting.DatasetSortOpts.Name,
Expand Down
Loading

0 comments on commit 7f36ebe

Please sign in to comment.