Skip to content

Fixing orgLocation in all the records #891

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

Open
BidishaMS wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Fixing orgLocation in all the records #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
25074d4
Adding OrgGeo at parent level
BidishaMS Mar 22, 2024
78a8eed
conflict resolution
BidishaMS Mar 22, 2024
9eef891
conflict resolution
BidishaMS Mar 22, 2024
e7abb6c
changes
BidishaMS Mar 26, 2024
20b6878
changes
BidishaMS Mar 26, 2024
ef93691
changes
BidishaMS Mar 26, 2024
cd2c610
added machineId
BidishaMS May 14, 2024
c404c14
create tree
Mansi-Singh-MS Jun 20, 2024
a68f6eb
Merge branch 'main' into users/mansisingh/dataMapper
Mansi-Singh-MS Jun 20, 2024
93a0879
Merge branch 'main' of https://github.com/microsoft/powerplatform-vscode
BidishaMS Jun 24, 2024
2006874
Merge branch 'users/mansisingh/dataMapper' of https://github.com/micr…
BidishaMS Jun 24, 2024
dd839db
Merge branch 'main' of https://github.com/microsoft/powerplatform-vscode
BidishaMS Jul 3, 2024
d61825f
Fixed location
BidishaMS Jan 22, 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
5 changes: 4 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 22 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@
"onStartupFinished",
"workspaceContains:**/**.portalconfig",
"onDebug",
"onFileSystem:powerplatform-vfs"
"onFileSystem:powerplatform-vfs",
"onCommand:extension.openWebpage",
"onCommand:extension.openFile"
],
"capabilities": {
"untrustedWorkspaces": {
Expand Down Expand Up @@ -167,6 +169,18 @@
"dark": "src/web/client/assets/microsoftTeamsIcon/dark/microsoftTeams.svg"
}
},
{
"command": "extension.openWebpage",
"title": "Open Webpage"
},
{
"command": "extension.openFile",
"title": "Open File"
},
{
"command": "extension.activateDirectory",
"title": "Activate Directory"
},
{
"command": "powerpages.collaboration.openMail",
"title": "Open Mail",
Expand Down Expand Up @@ -944,6 +958,10 @@
}
],
"explorer": [
{
"id": "exampleView",
"name": "Example View"
},
{
"id": "powerpages.powerPagesFileExplorer",
"name": "%microsoft-powerplatform-portals.navigation-loop.powerPagesFileExplorer.title%",
Expand Down Expand Up @@ -1053,7 +1071,7 @@
"eslint": "^8.11.0",
"eslint-plugin-header": "^3.1.1",
"fancy-log": "^1.3.3",
"fs-extra": "^9.0.1",
"fs-extra": "^9.1.0",
"get-func-name": "^2.0.2",
"gulp": "^4.0.2",
"gulp-eslint": "^6.0.0",
Expand Down Expand Up @@ -1088,6 +1106,7 @@
"@fluidframework/azure-client": "^1.2.0",
"@microsoft/1ds-core-js": "4.0.5",
"@microsoft/1ds-post-js": "4.0.5",
"@maker-studio/powerportals-preview-engine": "^3.7.24",
"@microsoft/generator-powerpages": "1.21.19",
"@types/jwt-decode": "2.2.0",
"@types/node-fetch": "^2.6.2",
Expand All @@ -1100,6 +1119,7 @@
"glob": "^7.1.7",
"gpt-tokenizer": "^2.1.1",
"https-browserify": "^1.0.0",
"js-yaml": "^4.1.0",
"liquidjs": "^10.2.0",
"n-readlines": "^1.0.1",
"puppeteer-core": "^14.4.1",
Expand Down
2 changes: 1 addition & 1 deletion src/client/PortalWebView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export class PortalWebView {
return html;
}

private static getPortalRootFolder(): vscode.Uri | null {
public static getPortalRootFolder(): vscode.Uri | null {
const fileBeingEdited = vscode.window.activeTextEditor as vscode.TextEditor;
if (fileBeingEdited) {
for (let i = 0; !!(vscode.workspace.workspaceFolders) && (i < vscode.workspace.workspaceFolders?.length); i++) {
Expand Down
47 changes: 46 additions & 1 deletion src/client/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import { ActiveOrgOutput } from "./pac/PacTypes";
import { telemetryEventNames } from "./telemetry/TelemetryEventNames";
import { IArtemisAPIOrgResponse } from "../common/services/Interfaces";
import { ArtemisService } from "../common/services/ArtemisService";
import { treeView } from "../common/DataMapper";

let client: LanguageClient;
let _context: vscode.ExtensionContext;
Expand Down Expand Up @@ -69,7 +70,7 @@ export async function activate(
context.subscriptions.push(_telemetry);
// Logging telemetry in US cluster for unauthenticated scenario
oneDSLoggerWrapper.instantiate("us");

await treeView();
_telemetry.sendTelemetryEvent("Start", {
"pac.userId": readUserSettings().uniqueId,
});
Expand Down Expand Up @@ -484,3 +485,47 @@ class CliAcquisitionContext implements ICliAcquisitionContext {
});
}
}







// class TreeDataProvider implements vscode.TreeDataProvider<TreeItem> {
// onDidChangeTreeData?: vscode.Event<TreeItem|null|undefined>|undefined;

// data: TreeItem[];

// constructor() {
// this.data = [new TreeItem('cars', [
// new TreeItem(
// 'Ford', [new TreeItem('Fiesta'), new TreeItem('Focus'), new TreeItem('Mustang')]),
// new TreeItem(
// 'BMW', [new TreeItem('320'), new TreeItem('X3'), new TreeItem('X5')])
// ])];
// }

// getTreeItem(element: TreeItem): vscode.TreeItem|Thenable<vscode.TreeItem> {
// return element;
// }

// getChildren(element?: TreeItem|undefined): vscode.ProviderResult<TreeItem[]> {
// if (element === undefined) {
// return this.data;
// }
// return element.children;
// }
// }

// class TreeItem extends vscode.TreeItem {
// children: TreeItem[]|undefined;

// constructor(label: string, children?: TreeItem[]) {
// super(
// label,
// children === undefined ? vscode.TreeItemCollapsibleState.None :
// vscode.TreeItemCollapsibleState.Expanded);
// this.children = children;
// }
// }
13 changes: 13 additions & 0 deletions src/client/power-pages/commonUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,16 @@ export function getRegExPattern(fileNameArray: string[]): RegExp[] {

return patterns;
}

export const findObjectIndexByProperty = (array: any, key: string, value: any): number => {
for (let i=0; i<array.length; i++) {
if (array[i][key] === value) {
return i;
}
}
return -1;
}

export const removeExtension = (fileName: string, extn: string): string => {
return fileName.slice(0, -extn.length);
}
Loading
Loading