Skip to content

Commit

Permalink
Merge branch 'main' into features/PowerPagesAgent
Browse files Browse the repository at this point in the history
  • Loading branch information
tyaginidhi committed May 21, 2024
2 parents 2f8af77 + 3d74f36 commit b1b1145
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"email": "[email protected]"
},
"engines": {
"vscode": "^1.73.0",
"vscode": "^1.89.0",
"npm": ">=8.3.0"
},
"extensionKind": [
Expand Down Expand Up @@ -1051,7 +1051,7 @@
"@types/sinon": "^10.0.12",
"@types/unzip-stream": "^0.3.0",
"@types/uuid": "^8.3.0",
"@types/vscode": "^1.73.0",
"@types/vscode": "^1.89.0",
"@types/vscode-webview": "^1.57.1",
"@types/webpack": "^5.28.0",
"@types/webpack-env": "^1.17.0",
Expand Down
6 changes: 3 additions & 3 deletions src/common/copilot/PowerPagesCopilot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ export class PowerPagesCopilot implements vscode.WebviewViewProvider {
orgChangeEvent((orgDetails: ActiveOrgOutput) => this.handleOrgChangeSuccess(orgDetails))
);

this._disposables.push(
orgChangeErrorEvent(async () => await createAuthProfileExp(this._pacWrapper))
);
if(this._view?.visible) {
this._disposables.push(orgChangeErrorEvent(async () => await createAuthProfileExp(this._pacWrapper)));
}

if (orgInfo) {
orgID = orgInfo.orgId;
Expand Down
3 changes: 2 additions & 1 deletion src/common/utilities/Utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ export function showConnectedOrgMessage(environmentName: string, orgUrl: string)
export async function showInputBoxAndGetOrgUrl() {
return vscode.window.showInputBox({
placeHolder: vscode.l10n.t("Enter the environment URL"),
prompt: vscode.l10n.t("Active auth profile is not found or has expired. To create a new auth profile, enter the environment URL.")
prompt: vscode.l10n.t("Active auth profile is not found or has expired. To create a new auth profile, enter the environment URL."),
ignoreFocusOut: true
});
}

Expand Down
1 change: 0 additions & 1 deletion src/web/client/webViews/QuickPickProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { getFileEntityId, getFileEntityName, getFileRootWebPageId } from "../uti
interface IQuickPickItem extends vscode.QuickPickItem {
label: string;
id?: string;
iconPath?: string | vscode.Uri | { light: string | vscode.Uri; dark: string | vscode.Uri } | vscode.ThemeIcon;
}

export class QuickPickProvider {
Expand Down

0 comments on commit b1b1145

Please sign in to comment.