Merge branch 'main' of https://github.com/microsoft/powerplatform-vscode

into users/shivikagupta/featurePreviewInVSCode
microsoft · Oct 4, 2023 · 4b8fd76 · 4b8fd76
2 parents 1cbd04b + 2e047ff
commit 4b8fd76
Show file tree

Hide file tree

Showing 36 changed files with 882 additions and 148 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,11 @@ Installing this extension will also make the latest Power Platform CLI (aka pac)
 [Power Platform CLI Exposed](https://www.youtube.com/playlist?list=PLlrxD0HtieHhEdLHxQOU96ySSZpMCyAxf)
 
 ## Release Notes
+
+2.0.10:
+  - pac CLI 1.27.5 (Auguest refresh, see release notes on [nuget.org](https://www.nuget.org/packages/Microsoft.PowerApps.CLI/))
+  - (Preview) Added 'Copilot in Power Pages' to Web Extension
+
 2.0.7:
   - QFE for styling files load for new data model schema
 

diff --git a/gulpfile.mjs b/gulpfile.mjs
@@ -368,7 +368,7 @@ async function snapshot() {
 }
 
 const feedName = 'CAP_ISVExp_Tools_Stable';
-const cliVersion = '1.26.6';
+const cliVersion = '1.27.5';
 
 const recompile = gulp.series(
     clean,

diff --git a/l10n/bundle.l10n.de.json b/l10n/bundle.l10n.de.json
@@ -63,6 +63,7 @@
   "Profile Kind: {0}/The {0} represents the profile type (Admin vs Dataverse)": "Profil-Variante: {0}",
   "Resource: {0}/The {0} represents profile's resource/environment URL": "Ressource: {0}",
   "Saving your file ...": "Datei wird gespeichert ...",
+  "Select Folder for new PCF Control/Do not translate 'PCF' as it is a product name.": "Ordner für neues PCF-Steuerelement auswählen",
   "Select Type": "Typ auswählen",
   "The Power Pages generator is ready for use in your VS Code extension!": "Der Power Pages-Generator ist in Ihrer VS Code-Erweiterung zur Verwendung bereit!",
   "The name you want to give to this authentication profile": "Der Name, den Sie diesem Authentifizierungsprofil geben möchten",

diff --git a/l10n/bundle.l10n.fr.json b/l10n/bundle.l10n.fr.json
@@ -63,6 +63,7 @@
   "Profile Kind: {0}/The {0} represents the profile type (Admin vs Dataverse)": "Type de profil : {0}",
   "Resource: {0}/The {0} represents profile's resource/environment URL": "Ressource : {0}",
   "Saving your file ...": "Enregistrement de votre fichier en cours...",
+  "Select Folder for new PCF Control/Do not translate 'PCF' as it is a product name.": "Sélectionner un dossier pour le nouveau contrôle PCF",
   "Select Type": "Sélectionner le type",
   "The Power Pages generator is ready for use in your VS Code extension!": "Le générateur Power Pages est prêt à être utilisé dans votre extension VS Code !",
   "The name you want to give to this authentication profile": "Nom que vous souhaitez attribuer à ce profil d’authentification",

diff --git a/l10n/bundle.l10n.it.json b/l10n/bundle.l10n.it.json
@@ -63,6 +63,7 @@
   "Profile Kind: {0}/The {0} represents the profile type (Admin vs Dataverse)": "Tipo di profilo: {0}",
   "Resource: {0}/The {0} represents profile's resource/environment URL": "Risorsa: {0}",
   "Saving your file ...": "Salvataggio del file in corso...",
+  "Select Folder for new PCF Control/Do not translate 'PCF' as it is a product name.": "Seleziona cartella per nuovo controllo PCF",
   "Select Type": "Seleziona tipo",
   "The Power Pages generator is ready for use in your VS Code extension!": "Il generatore Power Pages è pronto per l'utilizzo nell'estensione VS Code.",
   "The name you want to give to this authentication profile": "Il nome che vuoi assegnare a questo profilo di autenticazione",

diff --git a/l10n/bundle.l10n.json b/l10n/bundle.l10n.json
@@ -5,6 +5,9 @@
   "Edit the site": "Edit the site",
   "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.",
   "You are editing a live, public site ": "You are editing a live, public site ",
+  "Preview site": "Preview site",
+  "Open in Power Pages": "Open in Power Pages",
+  "Opening preview site...": "Opening preview site...",
   "Microsoft wants your feeback": "Microsoft wants your feeback",
   "Check the URL and verify the parameters are correct": "Check the URL and verify the parameters are correct",
   "Unable to complete the request": "Unable to complete the request",
@@ -33,8 +36,6 @@
       "Do not translate 'PCF' as it is a product name."
     ]
   },
-  "Get help writing code in HTML, CSS, and JS languages for Power Pages sites with Copilot.": "Get help writing code in HTML, CSS, and JS languages for Power Pages sites with Copilot.",
-  "Try Copilot for Power Pages": "Try Copilot for Power Pages",
   "Preparing pac CLI (v{0}).../{0} represents the version number": {
     "message": "Preparing pac CLI (v{0})...",
     "comment": [
@@ -66,6 +67,9 @@
       "{0} represents the name of the file"
     ]
   },
+  "Enter the name of the web template": "Enter the name of the web template",
+  "Please enter a name for the web template.": "Please enter a name for the web template.",
+  "A webtemplate with the same name already exists. Please enter a different name.": "A webtemplate with the same name already exists. Please enter a different name.",
   "No page templates found": "No page templates found",
   "No webpages found": "No webpages found",
   "New Webpage": "New Webpage",
@@ -78,9 +82,6 @@
   "File(s) already exist. No new files to add": "File(s) already exist. No new files to add",
   "Web files": "Web files",
   "Webfile(s) added successfully": "Webfile(s) added successfully",
-  "Enter the name of the web template": "Enter the name of the web template",
-  "Please enter a name for the web template.": "Please enter a name for the web template.",
-  "A webtemplate with the same name already exists. Please enter a different name.": "A webtemplate with the same name already exists. Please enter a different name.",
   "Page Template name cannot be empty.": "Page Template name cannot be empty.",
   "New Page Template": "New Page Template",
   "Choose web template": "Choose web template",

diff --git a/l10n/bundle.l10n.tr.json b/l10n/bundle.l10n.tr.json
@@ -63,6 +63,7 @@
   "Profile Kind: {0}/The {0} represents the profile type (Admin vs Dataverse)": "Profil Türü: {0}",
   "Resource: {0}/The {0} represents profile's resource/environment URL": "Kaynak: {0}",
   "Saving your file ...": "Dosyanız kaydediliyor...",
+  "Select Folder for new PCF Control/Do not translate 'PCF' as it is a product name.": "Yeni PCF Denetimi için Klasör Seçin",
   "Select Type": "Tür Seç",
   "The Power Pages generator is ready for use in your VS Code extension!": "Power Pages oluşturucusu, VS Code uzantınızda kullanıma hazır!",
   "The name you want to give to this authentication profile": "Bu kimlik doğrulama profiline vermek istediğiniz ad",

diff --git a/loc/translations-export/vscode-powerplatform.xlf b/loc/translations-export/vscode-powerplatform.xlf
@@ -121,9 +121,6 @@ The {3} represents Solution's Type (Managed or Unmanaged), but that test is loca
     <trans-unit id="++CODE++1b93e507157d91755f08e1abfe8a33d725b637a32ddadf149420b25907d440a0">
       <source xml:lang="en">File(s) already exist. No new files to add</source>
     </trans-unit>
-    <trans-unit id="++CODE++6658fe1c5f8e493175e012ea4a3f7e08df6207342fba111ccc67ba8d4d91977f">
-      <source xml:lang="en">Get help writing code in HTML, CSS, and JS languages for Power Pages sites with Copilot.</source>
-    </trans-unit>
     <trans-unit id="++CODE++25109e9c19daeeed3977b84ace83722ac8a4daafcfe4e3709082fcc5b228e7a8">
       <source xml:lang="en">Installing Power Pages generator(v{0})...</source>
       <note>{0} represents the version number</note>
@@ -182,6 +179,12 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++bda6bda1e902d120a7f4515ceac8546c3112e3cb9351df1d8b9713b8f86e0370">
       <source xml:lang="en">One or more attribute names have been changed or removed. Contact your admin.</source>
     </trans-unit>
+    <trans-unit id="++CODE++9c1a3ec7947746271d8596f2a428139e20ff14d48e87d4631a3fc17004c170f9">
+      <source xml:lang="en">Open in Power Pages</source>
+    </trans-unit>
+    <trans-unit id="++CODE++dac0ee62a5197a3722a9e7e9e851e80504cced8a13ce8b17842d78e8313578c2">
+      <source xml:lang="en">Opening preview site...</source>
+    </trans-unit>
     <trans-unit id="++CODE++d4dc9d620b68b70e7de4aeaa15e1d83dddb457c64a3cadb35cf1b55025ad194f">
       <source xml:lang="en">PAC Telemetry disabled</source>
     </trans-unit>
@@ -211,6 +214,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
       <source xml:lang="en">Preparing pac CLI (v{0})...</source>
       <note>{0} represents the version number</note>
     </trans-unit>
+    <trans-unit id="++CODE++f6412ced721a26ac3e3cb55d3ff713d8403c3dfc2efa0cff07b48478bdd57555">
+      <source xml:lang="en">Preview site</source>
+    </trans-unit>
     <trans-unit id="++CODE++7a6098eb5ff2c2401890216bb502ce6583ff7bddc99e62f8751551eab45ae1b4">
       <source xml:lang="en">Profile Kind: {0}</source>
       <note>The {0} represents the profile type (Admin vs Dataverse)</note>
@@ -247,9 +253,6 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++37ea190531b914739bf1ff100b3d44579b6d703de0b79b380094714aa3b3c259">
       <source xml:lang="en">There’s a problem on the back end</source>
     </trans-unit>
-    <trans-unit id="++CODE++8d6329ce370e7f2cf3a5b77a73e0100c08550628408f2763deafe57dce769719">
-      <source xml:lang="en">Try Copilot for Power Pages</source>
-    </trans-unit>
     <trans-unit id="++CODE++d8b8392e2c542950ca64867168e4ef87d4ad606882d5898f826b51c6d553988f">
       <source xml:lang="en">Try again</source>
     </trans-unit>
@@ -407,6 +410,9 @@ The second line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.
     <trans-unit id="microsoft-powerapps-portals.walkthrough.overview.title">
       <source xml:lang="en">Overview</source>
     </trans-unit>
+    <trans-unit id="microsoft-powerplatform-portals.navigation-loop.powerPagesFileExplorer.title">
+      <source xml:lang="en">POWER PAGES ACTIONS</source>
+    </trans-unit>
     <trans-unit id="power-platform-activitybar.title">
       <source xml:lang="en">Power Platform</source>
     </trans-unit>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -153,6 +153,16 @@
       }
     ],
     "commands": [
+      {
+        "command": "powerpages.powerPagesFileExplorer.powerPagesRuntimePreview",
+        "title": "Preview site",
+        "when": "never"
+      },
+      {
+        "command": "powerpages.powerPagesFileExplorer.backToStudio",
+        "title": "Open in Power Pages",
+        "when": "never"
+      },
       {
         "command": "extension.createChatView",
         "title": "Create Chat View"
@@ -326,6 +336,11 @@
         "category": "Copilot In Power Pages",
         "title": "Clear Conversation",
         "icon": "$(clear-all)"
+      },
+      {
+        "command": "powerpages.copilot.explain",
+        "category": "Copilot In Power Pages",
+        "title": "Explain"
       }
     ],
     "configuration": {
@@ -442,7 +457,7 @@
         "powerPlatform.experimental.enableCoPresenceFeature": {
           "type": "boolean",
           "markdownDescription": "Enable co-presence in Visual Studio Code (Web extension only)",
-          "default": true
+          "default": false
         }
       }
     },
@@ -559,6 +574,19 @@
       }
     ],
     "menus": {
+      "editor/context": [
+        {
+          "submenu": "microsoft-powerapps-portals.powerpages-copilot",
+          "group": "0_powerpages-copilot",
+          "when": "never"
+        }
+      ],
+      "microsoft-powerapps-portals.powerpages-copilot": [
+        {
+          "command": "powerpages.copilot.explain",
+          "group": "0_powerpages-copilot@1"
+        }
+      ],
       "explorer/context": [
         {
           "submenu": "microsoft-powerapps-portals.powerpages",
@@ -713,6 +741,10 @@
           "command": "powerpages.copilot.clearConversation",
           "when": "never"
         },
+        {
+          "command": "powerpages.copilot.explain",
+          "when": "never"
+        },
         {
           "command": "microsoft-powerapps-portals.webpage",
           "when": "config.powerPlatform.generatorInstalled"
@@ -826,6 +858,10 @@
       {
         "id": "microsoft-powerapps-portals.powerpages",
         "label": "Power Pages"
+      },
+      {
+        "id": "microsoft-powerapps-portals.powerpages-copilot",
+        "label": "Copilot In Power Pages"
       }
     ],
     "viewsContainers": {
@@ -857,6 +893,16 @@
           "visibility": "visible",
           "when": "(!virtualWorkspace && powerpages.websiteYmlExists && config.powerPlatform.experimental.copilotEnabled) || (isWeb && config.powerPlatform.experimental.enableWebCopilot)"
         }
+      ],
+      "explorer": [
+        {
+          "id": "powerpages.powerPagesFileExplorer",
+          "name": "%microsoft-powerplatform-portals.navigation-loop.powerPagesFileExplorer.title%",
+          "when": "isWeb && virtualWorkspace",
+          "icon": "./src/web/client/assets/powerPages.svg",
+          "contextualTitle": "%microsoft-powerplatform-portals.navigation-loop.powerPagesFileExplorer.title%",
+          "visibility": "visible"
+        }
       ]
     },
     "walkthroughs": [
@@ -949,6 +995,7 @@
     "eslint-plugin-header": "^3.1.1",
     "fancy-log": "^1.3.3",
     "fs-extra": "^9.0.1",
+    "get-func-name": "^2.0.2",
     "gulp": "^4.0.2",
     "gulp-eslint": "^6.0.0",
     "gulp-filter": "^7.0.0",
@@ -960,6 +1007,7 @@
     "jwt-decode": "2.2.0",
     "mocha": "^9.2.2",
     "moment": "^2.29.4",
+    "nanoid": "^3.1.31",
     "node-fetch": "^2.6.7",
     "nyc": "^15.1.0",
     "os-browserify": "^0.3.0",

diff --git a/package.nls.json b/package.nls.json
@@ -13,10 +13,10 @@
 
   "pacCLI.authPanel.title": "Auth Profiles",
   "pacCLI.authPanel.welcome.whenInteractiveSupported": {
-     "message": "No auth profiles found on this computer.\n[Add Auth Profile](command:pacCLI.authPanel.newAuthProfile)",
-     "comment": [
-       "This is a Markdown formatted string, and the formatting must persist across translations.",
-       "The second line should be '[TRANSLATION HERE](command:pacCLI.authPanel.newAuthProfile)', keeping brackets and the text in the parentheses unmodified"
+    "message": "No auth profiles found on this computer.\n[Add Auth Profile](command:pacCLI.authPanel.newAuthProfile)",
+    "comment": [
+      "This is a Markdown formatted string, and the formatting must persist across translations.",
+      "The second line should be '[TRANSLATION HERE](command:pacCLI.authPanel.newAuthProfile)', keeping brackets and the text in the parentheses unmodified"
     ]
   },
   "pacCLI.authPanel.welcome.whenInteractiveNotSupported": {
@@ -25,8 +25,7 @@
       "This is a Markdown formatted string, and the formatting must persist across translations.",
       "The second line should not translate the argument `--deviceCode`",
       "The third line should be '[TRANSLATION HERE](command:pacCLI.pacAuthHelp)', keeping brackets and the text in the parentheses unmodified"
-
-   ]
+    ]
   },
   "pacCLI.authPanel.clearAuthProfile.title": "Clear Auth Profiles",
   "pacCLI.authPanel.refresh.title": "Refresh",
@@ -67,7 +66,7 @@
     "comment": [
       "This is a Markdown formatted string, and the formatting must persist across translations.",
       "The second line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.overview-learn-more)', keeping brackets and the text in the parentheses unmodified"
-   ]
+    ]
   },
   "microsoft-powerapps-portals.walkthrough.fileSystem.title": "File explorer",
   "microsoft-powerapps-portals.walkthrough.fileSystem.description": {
@@ -76,7 +75,7 @@
       "This is a Markdown formatted string, and the formatting must persist across translations.",
       "The seventh line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.fileSystem-documentation).', keeping brackets and the text in the parentheses unmodified",
       "The eighth line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.fileSystem-open-folder)', keeping brackets and the text in the parentheses unmodified"
-   ]
+    ]
   },
   "microsoft-powerapps-portals.walkthrough.advancedCapabilities.title": "Advanced capabilities",
   "microsoft-powerapps-portals.walkthrough.advancedCapabilities.description": {
@@ -85,14 +84,15 @@
       "This is a Markdown formatted string, and the formatting must persist across translations.",
       "The fifth line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.advancedCapabilities-learn-more) TRANSLATION', keeping brackets and the text in the parentheses unmodified",
       "The seventh line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.advancedCapabilities-start-coding)', keeping brackets and the text in the parentheses unmodified"
-   ]
+    ]
   },
   "microsoft-powerapps-portals.walkthrough.saveConflict.title": "Save conflict",
   "microsoft-powerapps-portals.walkthrough.saveConflict.description": {
     "message": "Avoid accidental overwrites when you try to save outdated code in VS Code for the Web. You can compare the changes side-by-side and decide to accept or revert the changes. \n \nTo learn more, visit [Prevent accidental overwrites](command:powerplatform-walkthrough.saveConflict-learn-more).",
     "comment": [
       "This is a Markdown formatted string, and the formatting must persist across translations.",
       "The fifth line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.saveConflict-learn-more).', keeping brackets and the text in the parentheses unmodified"
-   ]
-  }
+    ]
+  },
+  "microsoft-powerplatform-portals.navigation-loop.powerPagesFileExplorer.title": "POWER PAGES ACTIONS"
 }
diff --git a/public/images/codicon-arrow-rightarrow.svg b/public/images/codicon-arrow-rightarrow.svg