Skip to content

Commit 22948b7

Browse files
amitjoshi438Amit Joshi
andauthored
Revert 'Remove redundant parameters when initializing for VS Code Web (#1325)' - This reverts commit 5ede327 due to regression (#1345)
Co-authored-by: Amit Joshi <amitjoshi@microsoft.com>
1 parent 5725a4e commit 22948b7

27 files changed

+823
-628
lines changed

l10n/bundle.l10n.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
"Edit the site": "Edit the site",
66
"Be careful making changes. Anyone can see the changes you make immediately. Choose Edit the site to make edits, or close the editor tab to cancel without editing.": "Be careful making changes. Anyone can see the changes you make immediately. Choose Edit the site to make edits, or close the editor tab to cancel without editing.",
77
"You are editing a live, public site ": "You are editing a live, public site ",
8-
"Fetching environment information ...": "Fetching environment information ...",
9-
"Unable to fetch environment information": "Unable to fetch environment information",
10-
"Fetching website details ...": "Fetching website details ...",
11-
"Unable to fetch website details": "Unable to fetch website details",
128
"Microsoft wants your feedback": "Microsoft wants your feedback",
139
"Preview site": "Preview site",
1410
"Open in Power Pages studio": "Open in Power Pages studio",
@@ -24,6 +20,7 @@
2420
"Update Extension": "Update Extension",
2521
"Failed to generate VS Code Desktop URL: {0}": "Failed to generate VS Code Desktop URL: {0}",
2622
"Failed to open in VS Code Desktop: {0}": "Failed to open in VS Code Desktop: {0}",
23+
"Check the URL and verify the parameters are correct": "Check the URL and verify the parameters are correct",
2724
"Unable to complete the request": "Unable to complete the request",
2825
"One or more attribute names have been changed or removed. Contact your admin.": "One or more attribute names have been changed or removed. Contact your admin.",
2926
"Authorization Failed. Please run again to authorize it": "Authorization Failed. Please run again to authorize it",
@@ -35,7 +32,6 @@
3532
"Failed to fetch some files.": "Failed to fetch some files.",
3633
"Failed to get file ready for edit: {0}": "Failed to get file ready for edit: {0}",
3734
"Saving your file ...": "Saving your file ...",
38-
"Check the URL and verify the parameters are correct": "Check the URL and verify the parameters are correct",
3935
"Enter Organization ID": "Enter Organization ID",
4036
"Power Pages Copilot is now connected to the environment: {0} : {1}/{0} represents the environment name": {
4137
"message": "Power Pages Copilot is now connected to the environment: {0} : {1}",

loc/translations-export/vscode-powerplatform.xlf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,6 @@ The {3} represents Solution's Type (Managed or Unmanaged), but that test is loca
422422
<trans-unit id="++CODE++aac77df347205252b074d45aff7891debdba0ff1466cc0c351416d1662bb71ab">
423423
<source xml:lang="en">Feedback</source>
424424
</trans-unit>
425-
<trans-unit id="++CODE++6625a35e6dacf5200897a3c37d9d601d529b759031fa6c2684a9e7491afaf82c">
426-
<source xml:lang="en">Fetching environment information ...</source>
427-
</trans-unit>
428-
<trans-unit id="++CODE++558c0e8512ccb47e170851ab1dc541283c7e53179581db1e69ece6c9b5fb8719">
429-
<source xml:lang="en">Fetching website details ...</source>
430-
</trans-unit>
431425
<trans-unit id="++CODE++2a8ddde521f14ecd4a8717f2bcf9a2b021fa38a578518066d2ae32271aa95237">
432426
<source xml:lang="en">Fetching your file ...</source>
433427
</trans-unit>
@@ -942,12 +936,6 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
942936
<trans-unit id="++CODE++bd7b156375b48ce5797a3421150e6f5c3b71d3a30f823e957241589aea6236ca">
943937
<source xml:lang="en">Unable to complete the request</source>
944938
</trans-unit>
945-
<trans-unit id="++CODE++825428f802dce30a8443dd17ada4d08aff818700cba857285da17a926c96c8b9">
946-
<source xml:lang="en">Unable to fetch environment information</source>
947-
</trans-unit>
948-
<trans-unit id="++CODE++9083a7e873ce09c78f134fb812ce04c4fcb02ace2682c620211eca599cfa78c3">
949-
<source xml:lang="en">Unable to fetch website details</source>
950-
</trans-unit>
951939
<trans-unit id="++CODE++bab36b47fe2dd4f2f7e8eb486f2e3546e27dc047e69f5b24307bc71e5be2a7cf">
952940
<source xml:lang="en">Unable to find that app</source>
953941
</trans-unit>

src/common/OneDSLoggerTelemetry/web/client/webExtensionTelemetryEvents.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,18 @@ export enum webExtensionTelemetryEventNames {
7171
WEB_EXTENSION_FETCH_DATAVERSE_AND_CREATE_FILES_SYSTEM_ERROR = 'webExtensionFetchDataverseCreateFilesSystemError',
7272
WEB_EXTENSION_SAVE_DATA_TO_DATAVERSE_API_ERROR = 'webExtensionSaveDataToDataverseAPIError',
7373
WEB_EXTENSION_GET_SAVE_PARAMETERS_ERROR = 'webExtensionGetSaveParametersError',
74+
WEB_EXTENSION_MULTI_FILE_FEATURE_FLAG_ENABLED = "WebExtensionMultiFileFeatureFlagEnabled",
75+
WEB_EXTENSION_MULTI_FILE_FEATURE_FLAG_DISABLED = "WebExtensionMultiFileFeatureFlagDisabled",
76+
WEB_EXTENSION_MULTI_FILE_MANDATORY_PARAMETERS_MISSING = "WebExtensionMultiFileMandatoryParametersMissing",
7477
WEB_EXTENSION_WEBSITE_PREVIEW_URL_VALIDATION_SITE_DETAILS_FETCH_FAILED = "WebExtensionWebsitePreviewUrlValidationSiteDetailsFetchFailed",
7578
WEB_EXTENSION_WEBSITE_PREVIEW_URL_VALIDATION_INSUFFICIENT_PARAMETERS = "WebExtensionWebsitePreviewUrlValidationInsufficientParameters",
7679
WEB_EXTENSION_MULTI_FILE_INVALID_DATAVERSE_URL = "WebExtensionMultiFileInvalidDataverseUrl",
80+
WEB_EXTENSION_MULTI_FILE_INVALID_WEBSITE_PREVIEW_URL = "WebExtensionMultiFileInvalidWebsitePreviewUrl",
7781
WEB_EXTENSION_CO_PRESENCE_FEATURE_FLAG_DISABLED = "WebExtensionCoPresenceFeatureFlagDisabled",
7882
WEB_EXTENSION_CO_PRESENCE_FEATURE_FLAG_ENABLED = "WebExtensionCoPresenceFeatureFlagEnabled",
7983
WEB_EXTENSION_FILES_LOAD_SUCCESS = "WebExtensionFilesLoadSuccess",
8084
WEB_EXTENSION_PREPARE_WORKSPACE_SUCCESS = "webExtensionPrepareWorkspaceSuccess",
85+
WEB_EXTENSION_MULTI_FILE_FEATURE_AVAILABILITY = "WebExtensionMultiFileFeatureAvailability",
8186
WEB_EXTENSION_APP_NAME_NOT_FOUND = "WebExtensionAppNameNotFound",
8287
WEB_EXTENSION_SET_VSCODE_WORKSPACE_STATE_FAILED = "WebExtensionSetVscodeWorkspaceStateFailed",
8388
WEB_EXTENSION_SET_VSCODE_WORKSPACE_STATE_SUCCESS = "WebExtensionGetVscodeWorkspaceStateSuccess",

src/common/ecs-features/ecsFeatureGates.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
import { COPILOT_GOVERNANCE_SETTING_NAME, PowerPagesClientName } from './constants';
77
import { getFeatureConfigs } from './ecsFeatureUtil';
88

9+
export const {
10+
feature: EnableMultifileVscodeWeb
11+
} = getFeatureConfigs({
12+
teamName: PowerPagesClientName,
13+
description: 'Enable multiple file view in Visual Studio Code Web',
14+
fallback: {
15+
enableMultifileVscodeWeb: false,
16+
},
17+
});
18+
919
export const {
1020
feature: CopilotDisableList
1121
} = getFeatureConfigs({

src/common/services/BAPService.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class BAPService {
1515
try {
1616
const accessToken = await bapServiceAuthentication(true);
1717

18-
const response = await fetch(BAPService.getBAPCopilotCrossGeoFlagEndpoint(serviceEndpointStamp, environmentId), {
18+
const response = await fetch(await BAPService.getBAPCopilotCrossGeoFlagEndpoint(serviceEndpointStamp, environmentId), {
1919
method: 'GET',
2020
headers: getCommonHeaders(accessToken)
2121
});
@@ -33,12 +33,13 @@ export class BAPService {
3333
return false;
3434
}
3535

36-
static getBAPCopilotCrossGeoFlagEndpoint(serviceEndpointStamp: ServiceEndpointCategory, environmentId: string): string {
36+
static async getBAPCopilotCrossGeoFlagEndpoint(serviceEndpointStamp: ServiceEndpointCategory, environmentId: string): Promise<string> {
3737

38-
const bapEndpoint = getBAPEndpoint(serviceEndpointStamp);
38+
const bapEndpoint = await getBAPEndpoint(serviceEndpointStamp);
3939

4040
return BAP_SERVICE_ENDPOINT.replace('{rootURL}', bapEndpoint) +
4141
BAP_SERVICE_COPILOT_CROSS_GEO_FLAG_RELATIVE_URL.replace('{environmentID}', environmentId).replace('{apiVersion}', BAP_API_VERSION);
4242
}
4343

4444
}
45+

0 commit comments

Comments
 (0)