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.

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

[cherry-pick] Add base profile when creating team config #2959

Merged
merged 6 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
- `Zowe Explorer: Stop Polling`
- Ported the following fixes from v2:
- Moved schema warnings into the log file (rather than a UI message) to minimize end-user disruption. [#2860](https://github.com/zowe/zowe-explorer-vscode/pull/2860)
- Fix issue with base profile not being included in fresh team configuration file. [#2887](https://github.com/zowe/zowe-explorer-vscode/issues/2887)
- Fixed an issue where the `onProfilesUpdate` event did not fire after secure credentials were updated. [#2822](https://github.com/zowe/zowe-explorer-vscode/issues/2822)

## `3.0.0-next.202404242037`
Expand Down
4 changes: 3 additions & 1 deletion packages/zowe-explorer/l10n/bundle.l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
},
"initializeUSSFavorites.error.buttonRemove": "initializeUSSFavorites.error.buttonRemove",
"File does not exist. It may have been deleted.": "File does not exist. It may have been deleted.",
"$(sync~spin) Pulling from Mainframe...": "$(sync~spin) Pulling from Mainframe...",
"{0} location/Node type": {
"message": "{0} location",
"comment": [
Expand All @@ -266,6 +267,8 @@
},
"Name of file or directory": "Name of file or directory",
"Unable to create node:": "Unable to create node:",
"Uploading file to USS tree": "Uploading file to USS tree",
"Upload action was cancelled.": "Upload action was cancelled.",
"Uploading USS file": "Uploading USS file",
"Delete": "Delete",
"Are you sure you want to delete the following item?\nThis will permanently remove the following file or folder from your system.\n\n{0}/File names": {
Expand Down Expand Up @@ -652,7 +655,6 @@
]
},
"Uploading to data set": "Uploading to data set",
"Upload action was cancelled.": "Upload action was cancelled.",
"No data sets selected for deletion, cancelling...": "No data sets selected for deletion, cancelling...",
"Deleting data set(s): {0}/Data Sets to delete": {
"message": "Deleting data set(s): {0}",
Expand Down
3 changes: 2 additions & 1 deletion packages/zowe-explorer/l10n/poeditor.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"Upload Files...": ""
},
"uss.uploadDialogBinary": {
"Upload Files... (Binary)": ""
"Upload Files (Binary)...": ""
},
"uss.text": {
"Toggle Text": ""
Expand Down Expand Up @@ -507,6 +507,7 @@
"Error: You have Zowe USS favorites that refer to a non-existent CLI profile named: {0}.\n To resolve this, you can remove {0} from the Favorites section of Zowe Explorer's USS view.\n Would you like to do this now? {1}": "",
"initializeUSSFavorites.error.buttonRemove": "",
"File does not exist. It may have been deleted.": "",
"$(sync~spin) Pulling from Mainframe...": "",
"{0} location": "",
"Choose a location to create the {0}": "",
"Name of file or directory": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/zowe-explorer/src/configuration/Profiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ export class Profiles extends ProfilesCache {

// Build new config and merge with existing layer
const impConfig: Partial<imperative.IImperativeConfig> = {
profiles: this.getCoreProfileTypes(),
profiles: [...this.getCoreProfileTypes(), ProfileConstants.BaseProfile],
baseProfile: ProfileConstants.BaseProfile,
};
const newConfig: imperative.IConfig = await imperative.ConfigBuilder.build(impConfig, opts);
Expand Down
Loading