Skip to content

[MDiff] Add compare with local action in Power Pages Actions #1363

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.

Sign up for GitHub

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

Merged
priyanshu92 merged 7 commits into from
Dec 15, 2025
Merged

[MDiff] Add compare with local action in Power Pages Actions #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a984d5
Initial commit
priyanshu92 Dec 9, 2025
c0a069a
Show diff
priyanshu92 Dec 9, 2025
2ae8d06
Implement feature
priyanshu92 Dec 9, 2025
4b8e3b4
Add tests
priyanshu92 Dec 9, 2025
eb96685
Merge branch 'main' of https://github.com/microsoft/powerplatform-vsc…
priyanshu92 Dec 9, 2025
4ac609a
Merge branch 'main' of https://github.com/microsoft/powerplatform-vsc…
priyanshu92 Dec 10, 2025
d0c8038
Merge branch 'main' of https://github.com/microsoft/powerplatform-vsc…
priyanshu92 Dec 11, 2025
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
101 changes: 58 additions & 43 deletions l10n/bundle.l10n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@
"The SARIF Viewer extension is recommended for viewing CodeQL results. Would you like to install it now?": "The SARIF Viewer extension is recommended for viewing CodeQL results. Would you like to install it now?",
"Failed to install SARIF viewer extension. Opening results as text file.": "Failed to install SARIF viewer extension. Opening results as text file.",
"Open as Text": "Open as Text",
"CodeQL Analysis": "CodeQL Analysis",
"Starting CodeQL analysis for: {0}": "Starting CodeQL analysis for: {0}",
"Database location: {0}": "Database location: {0}",
"Creating CodeQL database...": "Creating CodeQL database...",
Expand Down Expand Up @@ -334,6 +333,60 @@
"Error creating config file: {0}": "Error creating config file: {0}",
"PowerPages config file updated successfully: {0}": "PowerPages config file updated successfully: {0}",
"Error updating config file: {0}": "Error updating config file: {0}",
"No workspace folder is open. Please open a folder containing your Power Pages site.": "No workspace folder is open. Please open a folder containing your Power Pages site.",
"Website ID not found. Please ensure you have a valid Power Pages site open.": "Website ID not found. Please ensure you have a valid Power Pages site open.",
"Downloading site for comparison...": "Downloading site for comparison...",
"Site download failed. Please try again later.": "Site download failed. Please try again later.",
"No differences found between the remote site and your local workspace.": "No differences found between the remote site and your local workspace.",
"Comparing files...": "Comparing files...",
"Metadata Comparison": "Metadata Comparison",
"Modified": "Modified",
"Added locally": "Added locally",
"Deleted locally": "Deleted locally",
"{0} ({1} change(s))": "{0} ({1} change(s))",
"Show Diff": "Show Diff",
"Friendly name: {0}/{0} is the website name": {
"message": "Friendly name: {0}",
"comment": [
"{0} is the website name"
]
},
"Website Id: {0}/{0} is the website ID": {
"message": "Website Id: {0}",
"comment": [
"{0} is the website ID"
]
},
"Data model version: {0}/{0} is the data model version": {
"message": "Data model version: {0}",
"comment": [
"{0} is the data model version"
]
},
"Website Url: {0}/{0} is the website Url": {
"message": "Website Url: {0}",
"comment": [
"{0} is the website Url"
]
},
"Site visibility: {0}/{0} is the site visibility": {
"message": "Site visibility: {0}",
"comment": [
"{0} is the site visibility"
]
},
"Creator: {0}/{0} is the creator": {
"message": "Creator: {0}",
"comment": [
"{0} is the creator"
]
},
"Created on: {0}/{0} is the created date": {
"message": "Created on: {0}",
"comment": [
"{0} is the created date"
]
},
"Timestamp: {0}/{0} is the timestamp": {
"message": "Timestamp: {0}",
"comment": [
Expand Down Expand Up @@ -400,48 +453,10 @@
"{0} is the cluster geo name"
]
},
"Friendly name: {0}/{0} is the website name": {
"message": "Friendly name: {0}",
"comment": [
"{0} is the website name"
]
},
"Website Id: {0}/{0} is the website ID": {
"message": "Website Id: {0}",
"comment": [
"{0} is the website ID"
]
},
"Data model version: {0}/{0} is the data model version": {
"message": "Data model version: {0}",
"comment": [
"{0} is the data model version"
]
},
"Website Url: {0}/{0} is the website Url": {
"message": "Website Url: {0}",
"comment": [
"{0} is the website Url"
]
},
"Site visibility: {0}/{0} is the site visibility": {
"message": "Site visibility: {0}",
"comment": [
"{0} is the site visibility"
]
},
"Creator: {0}/{0} is the creator": {
"message": "Creator: {0}",
"comment": [
"{0} is the creator"
]
},
"Created on: {0}/{0} is the created date": {
"message": "Created on: {0}",
"comment": [
"{0} is the created date"
]
},
"{0}: {1} (Remote ↔ Local)": "{0}: {1} (Remote ↔ Local)",
"Compare: {0} (Remote ↔ Local)": "Compare: {0} (Remote ↔ Local)",
"Power Platform Tools: PAC CLI": "Power Platform Tools: PAC CLI",
"Command completed successfully.": "Command completed successfully.",
"PAC Telemetry enabled": "PAC Telemetry enabled",
"Failed to enable PAC telemetry.": "Failed to enable PAC telemetry.",
"PAC Telemetry disabled": "PAC Telemetry disabled",
Expand Down
63 changes: 60 additions & 3 deletions loc/translations-export/vscode-powerplatform.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
<trans-unit id="++CODE++0e24df55d08fd98cf5664002561cf1ab063231df2ec58e3a4ae50c063ba66828">
<source xml:lang="en">Added default query suite to config: {0}</source>
</trans-unit>
<trans-unit id="++CODE++466ad00fc6eece4d1ca46baf1d8a6faf8dffc1745c77094b4eb8fd3697fb9a28">
<source xml:lang="en">Added locally</source>
</trans-unit>
<trans-unit id="++CODE++e7027d80d4c05ae510621f20062db71d499cbd4f8760e3076a3530220fbf0a18">
<source xml:lang="en">Adding {0} web file(s). Existing files will be skipped</source>
<note>{0} represents the number of web files</note>
Expand Down Expand Up @@ -162,9 +165,6 @@ The second line should be '[TRANSLATION HERE](https://aka.ms/pages-clear-cache).
<trans-unit id="++CODE++51e495f295ba55f724b77298746e3284ff9fc8e1e582828a9a3f4051fc577cb0">
<source xml:lang="en">Code Block </source>
</trans-unit>
<trans-unit id="++CODE++876831b143507fffa7cbdec8d0d72b9dc328976180b4206c83331911a27d6740">
<source xml:lang="en">CodeQL Analysis</source>
</trans-unit>
<trans-unit id="++CODE++67fe2c02a3f3e19ede0f449f4e42c477c8b6a55baee7edb23a1928df18403c07">
<source xml:lang="en">CodeQL CLI is not installed or not in PATH. Please install the CodeQL extension or add CodeQL CLI to your PATH.</source>
</trans-unit>
Expand Down Expand Up @@ -209,12 +209,21 @@ Check the CodeQL extension panel for available queries.</source>
<trans-unit id="++CODE++1fb4405a792e9eb077d2bd96517eca8d81fc43bc251d5589e9d959fd07c8f31d">
<source xml:lang="en">Command completed successfully (exit code: {0})</source>
</trans-unit>
<trans-unit id="++CODE++bf281cb4dcfdee3bea566c086c3d77aa9234f6854dfbcbcb25f2bcf19828e9b5">
<source xml:lang="en">Command completed successfully.</source>
</trans-unit>
<trans-unit id="++CODE++ff61c2f710070e267638038dfbd105cfffe4de4d37580f566f4537b304b6ca84">
<source xml:lang="en">Command failed with exit code {0}: {1}</source>
</trans-unit>
<trans-unit id="++CODE++67a58f1682f864bfa789f056e50bab25181dfcddf455fadaad856c826f852d6a">
<source xml:lang="en">Command failed with exit code: {0}</source>
</trans-unit>
<trans-unit id="++CODE++a5dd75e4f009266d387357e7177d51d70227a2d6e58e40bfa19c487a86119b18">
<source xml:lang="en">Compare: {0} (Remote ↔ Local)</source>
</trans-unit>
<trans-unit id="++CODE++cf8510772ff5dbeb2edc5e7209cc8f47e6c7c79810155260b41c6aec64a9f277">
<source xml:lang="en">Comparing files...</source>
</trans-unit>
<trans-unit id="++CODE++eebdd24a77d9ad32222660c07777163bf5f6732df2b172351f3f8d5783e4f529">
<source xml:lang="en">Confirm</source>
</trans-unit>
Expand Down Expand Up @@ -277,6 +286,9 @@ Check the CodeQL extension panel for available queries.</source>
<source xml:lang="en">Default Environment: {0}</source>
<note>The {0} represents profile's resource/environment URL</note>
</trans-unit>
<trans-unit id="++CODE++9a983b9151d6fc6165f094e95ba9ba8cb588b59345cf8956f8fb77ee7ce36be2">
<source xml:lang="en">Deleted locally</source>
</trans-unit>
<trans-unit id="++CODE++21c02244893ddc07c4494a2ac7eb69a143e75d7b49d04f10234a1865c2111310">
<source xml:lang="en">Dislike something? Tell us more.</source>
</trans-unit>
Expand All @@ -303,6 +315,9 @@ The {3} represents Solution's Type (Managed or Unmanaged), but that test is loca
<trans-unit id="++CODE++7f3601875ec37c14ea70acbdfab60e330eec2f6b65ccad92bee9823a2eb326de">
<source xml:lang="en">Download failed: {0}</source>
</trans-unit>
<trans-unit id="++CODE++fc712246d708b7d31470c5c0886c05f99b5b51bdbeae94d82320f2b1d1cf04d3">
<source xml:lang="en">Downloading site for comparison...</source>
</trans-unit>
<trans-unit id="++CODE++ac72407b10d30bf47faf11da09b605a85fc649bd3f2e33acb281655cb9021d9d">
<source xml:lang="en">Edit the site</source>
</trans-unit>
Expand Down Expand Up @@ -559,12 +574,18 @@ Return to this chat and @powerpages can help you write and edit your website cod
<trans-unit id="++CODE++8a194d5287e3da019883144787cd5f282753f5ce892d933be0833b3818c25503">
<source xml:lang="en">Maximum 30 characters allowed</source>
</trans-unit>
<trans-unit id="++CODE++860f6f3c2e1d6181dc472b69025ea24381c462c5f48319a7cf667de1a78c714b">
<source xml:lang="en">Metadata Comparison</source>
</trans-unit>
<trans-unit id="++CODE++b1c8258fb401975727a82d9ce473af0a600f076cc7b73dbd16524e815cf4153d">
<source xml:lang="en">Microsoft wants your feedback</source>
</trans-unit>
<trans-unit id="++CODE++5813bc61a859f78f4474b9c45e545b7da14fe71acdbb5b7c4cb7010628780513">
<source xml:lang="en">Missing required site information for reactivation.</source>
</trans-unit>
<trans-unit id="++CODE++e8ce5dcaf408935ff76747226d2e8bee4319a2f593c1d7a838115e56183d1f37">
<source xml:lang="en">Modified</source>
</trans-unit>
<trans-unit id="++CODE++a253ff09c5a8678e1fd1962b2c329245e139e45f9cc6ced4e5d7ad42c4108fc0">
<source xml:lang="en">NEW</source>
</trans-unit>
Expand Down Expand Up @@ -604,6 +625,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
<trans-unit id="++CODE++1b03558147265e7c9bd70e6a4abe031ef65dbca05e01d94953e58b86ec82c859">
<source xml:lang="en">No analysis results found.</source>
</trans-unit>
<trans-unit id="++CODE++fe9da58a68fc4d4ac79a76febed4ff3a3ebc116954b5b383578fd1803f2f7268">
<source xml:lang="en">No differences found between the remote site and your local workspace.</source>
</trans-unit>
<trans-unit id="++CODE++80266a1ea7e6671d65c98a0624c254f5b9acfacddd05d69524b7f034eeba3268">
<source xml:lang="en">No environments found</source>
</trans-unit>
Expand All @@ -628,6 +652,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
<trans-unit id="++CODE++6da29e062697a9f26659ef14ebda075afe939756af5d8e1d3451eb7d6d6e1a8a">
<source xml:lang="en">No workspace folder found</source>
</trans-unit>
<trans-unit id="++CODE++9214ba9d7c0e1e98dc8919cffaa47b39e1444bcb5925a6c7818d11fa11363eb1">
<source xml:lang="en">No workspace folder is open. Please open a folder containing your Power Pages site.</source>
</trans-unit>
<trans-unit id="++CODE++6c0242ffba2aababcb4e45831de1492e8bccae2cb0f3387dfe9c16620f6928ef">
<source xml:lang="en">No workspace folder opened. Please open a site folder to preview.</source>
</trans-unit>
Expand Down Expand Up @@ -733,6 +760,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
<trans-unit id="++CODE++cce89cd3a0f118dafd3173f6444abdcd2b9782153af1b6bfa8f63ef3d4b68268">
<source xml:lang="en">Power Pages studio URL is not available</source>
</trans-unit>
<trans-unit id="++CODE++92c355db79b65ac0ec6050657f427d46214ff364079cc646f7d255dec23586f8">
<source xml:lang="en">Power Platform Tools: PAC CLI</source>
</trans-unit>
<trans-unit id="++CODE++bf67e1194aabff2106dde73ed7318caf658a4cebe27dbd2d03239a141e16a211">
<source xml:lang="en">PowerPages config file created successfully: {0}</source>
</trans-unit>
Expand Down Expand Up @@ -824,6 +854,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
<source xml:lang="en">Session ID: {0}</source>
<note>{0} is the Session ID</note>
</trans-unit>
<trans-unit id="++CODE++b874846bfcc51aecfc0366c676894ca6aa980e7f8de9a6632bb6ade00b49bc47">
<source xml:lang="en">Show Diff</source>
</trans-unit>
<trans-unit id="++CODE++899fb203e6c2faac8093e21a2fa8db0d4b13d16ea5492461d8b72dbcee3ecf2a">
<source xml:lang="en">Show Output Panel</source>
</trans-unit>
Expand All @@ -842,6 +875,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
<trans-unit id="++CODE++c0917a71517a4a08ef56adaaec8f79404a4d5cc14afc8d141e9aa6181bee8622">
<source xml:lang="en">Site download cancelled. No folder selected.</source>
</trans-unit>
<trans-unit id="++CODE++e14f56f166e3f1c738244eb549eed009edbcede757905ce707cc30dbffd60c8b">
<source xml:lang="en">Site download failed. Please try again later.</source>
</trans-unit>
<trans-unit id="++CODE++a72357d268bce5e1643bfd74563495784179f75ace0d652db8f808f293586b63">
<source xml:lang="en">Site management URL not found for the selected site. Please try again after refreshing the environment.</source>
</trans-unit>
Expand Down Expand Up @@ -1010,6 +1046,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
<trans-unit id="++CODE++6a9f7c7cbfe7d5ae5e596c92dc8f1e73e79add5f6c7359c5fd0d61a23a66b668">
<source xml:lang="en">Website ID is required</source>
</trans-unit>
<trans-unit id="++CODE++a70c63db9e2d7ceb9f17f00065db00262718561d9330fbef203aba4acbf57d7b">
<source xml:lang="en">Website ID not found. Please ensure you have a valid Power Pages site open.</source>
</trans-unit>
<trans-unit id="++CODE++d3eaa7bf5377b15781ad4c0f43e4da94b9a2bd485ddbbbe62a2c3d53c5c7fe4a">
<source xml:lang="en">Website Id: {0}</source>
<note>{0} is the website ID</note>
Expand Down Expand Up @@ -1064,10 +1103,16 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
<trans-unit id="++CODE++21c9bbf3ca8756722337933b27566345c8aa2794231295a3ede6204329456931">
<source xml:lang="en">pac pcf init</source>
</trans-unit>
<trans-unit id="++CODE++8d3cb42e3e3212d1301b30e2de80763361a074237ba5c603bad0bedf69f0d120">
<source xml:lang="en">{0} ({1} change(s))</source>
</trans-unit>
<trans-unit id="++CODE++48c4c42c9b70ac4687a121f91d8cb9a9063a3b51fbc5eeb68e5edc961ee18482">
<source xml:lang="en">{0} created!</source>
<note>{0} will be replaced by the entity type.</note>
</trans-unit>
<trans-unit id="++CODE++21c6e9daa33e4efc327932fdbfaa13720e2536c8345dcc464d3022c4ef216731">
<source xml:lang="en">{0}: {1} (Remote ↔ Local)</source>
</trans-unit>
</body></file>
<file original="package" source-language="en" datatype="plaintext"><body>
<trans-unit id="microsoft.powerplatform.pages.actionsHub.login.title">
Expand All @@ -1092,9 +1137,15 @@ The fifth line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.s
<trans-unit id="pacCLI.authPanel.clearAuthProfile.title">
<source xml:lang="en">Clear Auth Profiles</source>
</trans-unit>
<trans-unit id="microsoft.powerplatform.pages.actionsHub.metadataDiff.clear.title">
<source xml:lang="en">Clear Comparison</source>
</trans-unit>
<trans-unit id="powerpages.copilotPanel.clearConversation.title">
<source xml:lang="en">Clear Conversation</source>
</trans-unit>
<trans-unit id="microsoft.powerplatform.pages.actionsHub.activeSite.compareWithLocal.title">
<source xml:lang="en">Compare with Local</source>
</trans-unit>
<trans-unit id="powerpages.copilotPanel.title">
<source xml:lang="en">Copilot In Power Pages</source>
</trans-unit>
Expand Down Expand Up @@ -1200,6 +1251,9 @@ The second line should be '[TRANSLATION HERE](command:pacCLI.authPanel.newAuthPr
<note>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</note>
</trans-unit>
<trans-unit id="microsoft.powerplatform.pages.actionsHub.metadataDiff.openAll.title">
<source xml:lang="en">Open All Diffs</source>
</trans-unit>
<trans-unit id="microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.linux.title">
<source xml:lang="en">Open Containing Folder</source>
</trans-unit>
Expand Down Expand Up @@ -1270,6 +1324,9 @@ The second line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.
<trans-unit id="pacCLI.envAndSolutionsPanel.selectEnvironment.title">
<source xml:lang="en">Select Environment</source>
</trans-unit>
<trans-unit id="microsoft.powerplatform.pages.actionsHub.metadataDiff.openFile.title">
<source xml:lang="en">Show Diff</source>
</trans-unit>
<trans-unit id="microsoft.powerplatform.pages.actionsHub.showEnvironmentDetails.title">
<source xml:lang="en">Show Environment Details</source>
</trans-unit>
Expand Down
41 changes: 41 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,28 @@
"category": "Power Pages",
"title": "%microsoft.powerplatform.pages.actionsHub.currentActiveSite.runCodeQLScreening.title%",
"when": "microsoft.powerplatform.pages.codeQlScanEnabled"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.activeSite.compareWithLocal",
"title": "%microsoft.powerplatform.pages.actionsHub.activeSite.compareWithLocal.title%",
"when": "microsoft.powerplatform.pages.metadataDiffEnabled"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.metadataDiff.openFile",
"title": "%microsoft.powerplatform.pages.actionsHub.metadataDiff.openFile.title%",
"when": "microsoft.powerplatform.pages.metadataDiffEnabled"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.metadataDiff.openAll",
"title": "%microsoft.powerplatform.pages.actionsHub.metadataDiff.openAll.title%",
"icon": "$(diff-multiple)",
"when": "microsoft.powerplatform.pages.metadataDiffEnabled"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.metadataDiff.clear",
"title": "%microsoft.powerplatform.pages.actionsHub.metadataDiff.clear.title%",
"icon": "$(clear-all)",
"when": "microsoft.powerplatform.pages.metadataDiffEnabled"
}
],
"configuration": {
Expand Down Expand Up @@ -1000,6 +1022,10 @@
{
"command": "microsoft.powerplatform.pages.actionsHub.inactiveSite.reactivateSite",
"when": "never"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.activeSite.compareWithLocal",
"when": "never"
}
],
"view/title": [
Expand Down Expand Up @@ -1177,6 +1203,21 @@
"command": "microsoft.powerplatform.pages.actionsHub.currentActiveSite.runCodeQLScreening",
"when": "view == microsoft.powerplatform.pages.actionsHub && viewItem == currentActiveSite && microsoft.powerplatform.pages.codeQlScanEnabled",
"group": "siteAction@7"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.activeSite.compareWithLocal",
"when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == nonCurrentActiveSite || viewItem == inactiveSite) &&microsoft.powerplatform.pages.metadataDiffEnabled",
"group": "siteAction@8"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.metadataDiff.openAll",
"when": "view == microsoft.powerplatform.pages.actionsHub && viewItem == metadataDiffGroup && microsoft.powerplatform.pages.metadataDiffEnabled",
"group": "inline@1"
},
{
"command": "microsoft.powerplatform.pages.actionsHub.metadataDiff.clear",
"when": "view == microsoft.powerplatform.pages.actionsHub && viewItem == metadataDiffGroup && microsoft.powerplatform.pages.metadataDiffEnabled",
"group": "inline@2"
}
]
},
Expand Down
Loading