removed bug of no show command found

microsoft · Dec 9, 2024 · 5b8eefd · 5b8eefd
1 parent 52048a9
commit 5b8eefd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 36 deletions.
diff --git a/l10n/bundle.l10n.json b/l10n/bundle.l10n.json
@@ -33,6 +33,7 @@
   },
   "Enter the environment URL": "Enter the environment URL",
   "Active auth profile is not found or has expired. To create a new auth profile, enter the environment URL.": "Active auth profile is not found or has expired. To create a new auth profile, enter the environment URL.",
+  "Website not found in the environment. Please check the credentials and root folder path.": "Website not found in the environment. Please check the credentials and root folder path.",
   "Selection is empty.": "Selection is empty.",
   "PREVIEW": "PREVIEW",
   "Explain the following code snippet:": "Explain the following code snippet:",

diff --git a/loc/translations-export/vscode-powerplatform.xlf b/loc/translations-export/vscode-powerplatform.xlf
@@ -461,6 +461,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++00dc171124ab430bbbaae51ec39dda1c5e7d045f382f56b1767d9e733292731c">
       <source xml:lang="en">Webpage names should contain only letters, numbers, hyphens, or underscores.</source>
     </trans-unit>
+    <trans-unit id="++CODE++4ed689987736ce09e17c67eb32f441ca7d0f7ed013a282aafd1ebcf302e6386b">
+      <source xml:lang="en">Website not found in the environment. Please check the credentials and root folder path.</source>
+    </trans-unit>
     <trans-unit id="++CODE++e4bb03b399c07eeda658d87305435a58818cb5e0c3b76ae054d99564cf14ef6b">
       <source xml:lang="en">What do you need help with?</source>
     </trans-unit>

diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -239,7 +239,6 @@ export async function activate(
             if(artemisResponse !== null && PreviewSite.isSiteRuntimePreviewEnabled()) {
                 websiteURL = await PreviewSite.getWebSiteURL(workspaceFolders, artemisResponse?.stamp, orgDetails.EnvironmentId, _telemetry);
             }
-            await registerPreviewShowCommand();
 
         })
     );
@@ -261,43 +260,35 @@ export async function activate(
         vscode.commands.executeCommand('setContext', 'powerpages.websiteYmlExists', false);
     }
 
-    const registerPreviewShowCommand = async () => {
-        const isEnabled = PreviewSite.isSiteRuntimePreviewEnabled();
+    const isEnabled = PreviewSite.isSiteRuntimePreviewEnabled();
 
-        _telemetry.sendTelemetryEvent("EnableSiteRuntimePreview", {
-            isEnabled: isEnabled.toString(),
-            websiteURL: websiteURL
-        });
-        oneDSLoggerWrapper.getLogger().traceInfo("EnableSiteRuntimePreview", {
-            isEnabled: isEnabled.toString(),
-            websiteURL: websiteURL
-        });
+    _telemetry.sendTelemetryEvent("EnableSiteRuntimePreview", {
+        isEnabled: isEnabled.toString(),
+        websiteURL: websiteURL
+    });
+    oneDSLoggerWrapper.getLogger().traceInfo("EnableSiteRuntimePreview", {
+        isEnabled: isEnabled.toString(),
+        websiteURL: websiteURL
+    });
 
-        if (!isEnabled || websiteURL === "") {
-            // portal web view panel
-            _context.subscriptions.push(
-                vscode.commands.registerCommand(
-                    "microsoft-powerapps-portals.preview-show",
-                    () => {
-                        _telemetry.sendTelemetryEvent("StartCommand", {
-                            commandId: "microsoft-powerapps-portals.preview-show",
-                        });
-                        oneDSLoggerWrapper.getLogger().traceInfo("StartCommand", {
-                            commandId: "microsoft-powerapps-portals.preview-show"
-                        });
-                        PortalWebView.createOrShow();
-                    }
-                )
-            );
-        } else {
-            _context.subscriptions.push(
-                vscode.commands.registerCommand(
-                    "microsoft-powerapps-portals.preview-show",
-                    () => PreviewSite.launchBrowserAndDevToolsWithinVsCode(websiteURL)
-                )
-            );
-        }
-    };
+    _context.subscriptions.push(
+        vscode.commands.registerCommand(
+            "microsoft-powerapps-portals.preview-show",
+            () => {
+                if (!isEnabled) {
+                    _telemetry.sendTelemetryEvent("StartCommand", {
+                        commandId: "microsoft-powerapps-portals.preview-show",
+                    });
+                    oneDSLoggerWrapper.getLogger().traceInfo("StartCommand", {
+                        commandId: "microsoft-powerapps-portals.preview-show"
+                    });
+                    PortalWebView.createOrShow();
+                } else {
+                    PreviewSite.launchBrowserAndDevToolsWithinVsCode(websiteURL);
+                }
+            }
+        )
+    );
 
     const workspaceFolderWatcher = vscode.workspace.onDidChangeWorkspaceFolders(handleWorkspaceFolderChange);
     _context.subscriptions.push(workspaceFolderWatcher);

diff --git a/src/common/services/PPAPIService.ts b/src/common/services/PPAPIService.ts
@@ -3,6 +3,7 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
 
+import * as vscode from 'vscode';
 import { ITelemetry } from "../OneDSLoggerTelemetry/telemetry/ITelemetry";
 import { getCommonHeaders, powerPlatformAPIAuthentication } from "./AuthenticationProvider";
 import { VSCODE_EXTENSION_SERVICE_STAMP_NOT_FOUND, VSCODE_EXTENSION_GET_CROSS_GEO_DATA_MOVEMENT_ENABLED_FLAG_FAILED, VSCODE_EXTENSION_GET_PPAPI_WEBSITES_ENDPOINT_UNSUPPORTED_REGION,
@@ -48,6 +49,13 @@ export class PPAPIService {
         if (websiteDetails) {
             sendTelemetryEvent(telemetry, { eventName: VSCODE_EXTENSION_PPAPI_GET_WEBSITE_BY_RECORD_ID_COMPLETED, orgUrl: websiteDetails.dataverseInstanceUrl });
             return websiteDetails;
+        } else {
+            // Showing a warning message when the website is not found in the environment
+            vscode.window.showWarningMessage(
+                vscode.l10n.t(
+                    `Website not found in the environment. Please check the credentials and root folder path.`
+                )
+            );
         }
         return null;
     }