Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Prevent base profile name collisions by default on new configuration files #3020

Merged
merged 6 commits into from
Jul 26, 2024
Merged

feat: Prevent base profile name collisions by default on new configuration files #3020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e25f025
Fixes profile creation error with new base profile naming changes
awharn Jul 18, 2024
96333d7
Merge remote-tracking branch 'origin/next' into awharn/support-update…
awharn Jul 25, 2024
8f1e384
Merge remote-tracking branch 'origin/ext-not' into awharn/support-upd…
awharn Jul 25, 2024
2bc4a77
Update changelog
awharn Jul 25, 2024
0b63010
Move workspace folder mock to the test it is needed
awharn Jul 25, 2024
7cbcf89
Collision to Conflict
awharn Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/zowe-explorer/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
- **Breaking:** Zowe Explorer no longer uses a temporary directory for storing Data Sets and USS files. All settings related to the temporary downloads folder have been removed. In order to access resources stored by Zowe Explorer v3, refer to the [FileSystemProvider documentation](https://github.com/zowe/zowe-explorer-vscode/wiki/FileSystemProvider) for information on how to build and access resource URIs. Extenders can detect changes to resources using the `onResourceChanged` function in the `ZoweExplorerApiRegister` class. [#2951](https://github.com/zowe/zowe-explorer-vscode/issues/2951)
- Implemented the `onVaultUpdate` VSCode events to notify extenders when credentials are updated on the OS vault by other applications. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
- Implemented the `onCredMgrsUpdate` VSCode events to notify extenders when the local PC's credential manager has been updated by other applications. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
- Changed default base profile naming scheme in newly generated configuration files to prevent name and property conflicts between Global and Project profiles [#2682](https://github.com/zowe/zowe-explorer-vscode/issues/2682)

### Bug fixes

Expand Down
4 changes: 2 additions & 2 deletions packages/zowe-explorer/__tests__/__mocks__/@zowe/imperative.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ export class ConfigBuilder {
},
secure: [],
},
base: {
global_base: {
type: "base",
properties: {
host: "sample.com",
Expand All @@ -379,7 +379,7 @@ export class ConfigBuilder {
},
defaults: {
zosmf: "zosmf",
base: "base",
base: "global_base",
},
autoStore: true,
};
Expand Down
Loading
Loading