Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 68 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@
"view": "microsoft.powerplatform.pages.actionsHub",
"contents": "%microsoft.powerplatform.pages.actionsHub.login%",
"when": "!virtualWorkspace && pacCLI.authPanel.interactiveLoginSupported"
},
{
"view": "microsoft.powerplatform.pages.metadataDiff",
"contents": "%microsoft.powerplatform.pages.metadataDiff.login%",
"when": "!virtualWorkspace && pacCLI.authPanel.interactiveLoginSupported"
}
],
"commands": [
Expand Down Expand Up @@ -439,6 +444,36 @@
{
"command": "microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite",
"title": "%microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite.title%"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.triggerFlow",
"title": "Connect & Download",
"category": "Power Pages Metadata Diff",
"icon": "$(cloud-download)"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.generateReport",
"title": "Generate Report",
"category": "Power Pages Metadata Diff",
"icon": "$(markdown)"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.clearView",
"title": "Clear View",
"category": "Power Pages Metadata Diff",
"icon": "$(clear-all)"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.exportReport",
"title": "Export Report",
"category": "Power Pages Metadata Diff",
"icon": "$(save-as)"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.importReport",
"title": "Import Report",
"category": "Power Pages Metadata Diff",
"icon": "$(folder-opened)"
}
],
"configuration": {
Expand Down Expand Up @@ -950,6 +985,31 @@
"command": "powerpages.copilot.clearConversation",
"when": "view == powerpages.copilot",
"group": "navigation"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.generateReport",
"when": "view == microsoft.powerplatform.pages.metadataDiff",
"group": "navigation"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.triggerFlow",
"when": "view == microsoft.powerplatform.pages.metadataDiff",
"group": "navigation"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.clearView",
"when": "view == microsoft.powerplatform.pages.metadataDiff",
"group": "navigation"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.exportReport",
"when": "view == microsoft.powerplatform.pages.metadataDiff",
"group": "navigation"
},
{
"command": "microsoft.powerplatform.pages.metadataDiff.importReport",
"when": "view == microsoft.powerplatform.pages.metadataDiff",
"group": "navigation"
}
],
"view/item/context": [
Expand Down Expand Up @@ -1141,6 +1201,14 @@
"icon": "./src/client/assets/powerPages.svg",
"contextualTitle": "%microsoft.powerplatform.pages.actionsHub.title%",
"visibility": "visible"
},
{
"id": "microsoft.powerplatform.pages.metadataDiff",
"name": "%microsoft.powerplatform.pages.metadataDiff.title%",
"when": "microsoft.powerplatform.pages.metadataDiffEnabled",
"icon": "./src/client/assets/powerPages.svg",
"contextualTitle": "%microsoft.powerplatform.pages.metadataDiff.title%",
"visibility": "visible"
}
]
},
Expand Down
10 changes: 9 additions & 1 deletion package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,13 @@
"microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.mac.title": "Reveal in Finder",
"microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.linux.title": "Open Containing Folder",
"microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement.title": "Open site management",
"microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite.title": "Upload Site"
"microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite.title": "Upload Site",
"microsoft.powerplatform.pages.metadataDiff.title": "POWER PAGES METADATA COMPARATOR",
"microsoft.powerplatform.pages.metadataDiff.login":{
"message": "Compare your Power Pages website against a Power Pages environment to view any differences. [Learn more](https://go.microsoft.com/fwlink/?linkid=2305702).\n[Get Started](command:microsoft.powerplatform.pages.metadataDiff.triggerFlow)",
"comment": [
"This is a Markdown formatted string, and the formatting must persist across translations.",
"The second line should be '[TRANSLATION HERE](command:microsoft.powerplatform.pages.metadataDiff.triggerFlow).', keeping brackets and the text in the parentheses unmodified"
]
}
}
3 changes: 3 additions & 0 deletions src/client/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import { ActionsHub } from "./power-pages/actions-hub/ActionsHub";
import { extractAuthInfo, extractOrgInfo } from "./power-pages/commonUtility";
import PacContext from "./pac/PacContext";
import ArtemisContext from "./ArtemisContext";
import { MetadataDiffDesktop } from "./power-pages/metadata-diff/MetadataDiffDesktop";

let client: LanguageClient;
let _context: vscode.ExtensionContext;
Expand Down Expand Up @@ -260,6 +261,8 @@ export async function activate(
const workspaceFolderWatcher = vscode.workspace.onDidChangeWorkspaceFolders(handleWorkspaceFolderChange);
_context.subscriptions.push(workspaceFolderWatcher);

MetadataDiffDesktop.initialize(context, pacTerminal)

if (shouldEnableDebugger()) {
activateDebugger(context);
}
Expand Down
8 changes: 8 additions & 0 deletions src/client/pac/PacTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ export type OrgListOutput = {

export type PacOrgListOutput = PacOutputWithResultList<OrgListOutput>;

export type PagesList = {
FriendlyName: string,
WebsiteId: string,
ModelVersion: string
}

export type PacPagesListOutput = PacOutputWithResultList<PagesList>;

export type ActiveOrgOutput = {
OrgId: string,
UniqueName: string,
Expand Down
10 changes: 9 additions & 1 deletion src/client/pac/PacWrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import * as readline from "readline";
import * as fs from "fs-extra";
import { ChildProcessWithoutNullStreams, spawn } from "child_process";
import { BlockingQueue } from "../../common/utilities/BlockingQueue";
import { PacOutput, PacAdminListOutput, PacAuthListOutput, PacSolutionListOutput, PacOrgListOutput, PacOrgWhoOutput, PacAuthWhoOutput } from "./PacTypes";
import { PacOutput, PacAdminListOutput, PacAuthListOutput, PacSolutionListOutput, PacOrgListOutput, PacOrgWhoOutput, PacAuthWhoOutput, PacPagesListOutput} from "./PacTypes";
import { v4 } from "uuid";
import { oneDSLoggerWrapper } from "../../common/OneDSLoggerTelemetry/oneDSLoggerWrapper";

Expand Down Expand Up @@ -180,6 +180,14 @@ export class PacWrapper {
return this.executeCommandAndParseResults<PacOutput>(new PacArguments("telemetry", "disable"));
}

public async pagesDownload(path: string, websiteId: string, modelVersion: string): Promise<string> {
return this.pacInterop.executeCommand(new PacArguments("pages", "download", "--path", path, "--webSiteId", websiteId, "--modelVersion", modelVersion));
}

public async pagesList(): Promise<PacPagesListOutput> {
return this.executeCommandAndParseResults<PacPagesListOutput>(new PacArguments("pages", "list", "--verbose"));
}

public exit(): void {
this.pacInterop.exit();
}
Expand Down
Loading