fix samples (#588)

microsoft · Mar 7, 2024 · a31bfae · a31bfae
1 parent b0f028c
commit a31bfae
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 42 deletions.
diff --git a/samples/creation.ts b/samples/creation.ts
@@ -58,7 +58,7 @@ export async function run() {
         /********** Dashboard **********/
         printSectionStart("Dashboard");
         const dashboardApi = await vstsCollectionLevel.getDashboardApi();
-        const widgetTypes: WidgetTypesResponse = await dashboardApi.getWidgetTypes(WidgetScope.Collection_User);
+        const widgetTypes: WidgetTypesResponse = await dashboardApi.getWidgetTypes(WidgetScope.Collection_User, common.getProject());
 
         if (widgetTypes) {
             console.log(`found ${widgetTypes.widgetTypes.length} widget types`);

diff --git a/samples/dashboard.ts b/samples/dashboard.ts
@@ -57,7 +57,7 @@ export async function run(projectId: string) {
                                               typeId: null,
                                               url: null
                                               };
-    const widgetMetadata: DashboardInterfaces.WidgetMetadataResponse = await dashboardApiObject.getWidgetMetadata('ms.vss-dashboards-web.Microsoft.VisualStudioOnline.Dashboards.OtherLinksWidget');
+    const widgetMetadata: DashboardInterfaces.WidgetMetadataResponse = await dashboardApiObject.getWidgetMetadata('ms.vss-dashboards-web.Microsoft.VisualStudioOnline.Dashboards.OtherLinksWidget', projectId);
     console.log('Creating widget with metadata:', widgetMetadata);
     widget = await dashboardApiObject.createWidget(widget, teamContext, dashboard.id);
     //Ensure its been created and we can get it.
@@ -72,7 +72,7 @@ export async function run(projectId: string) {
     console.log('Widget name updated to', widget.name);
 
     common.heading('Get Widget data');
-    const widgetTypes: DashboardInterfaces.WidgetTypesResponse = await dashboardApiObject.getWidgetTypes(DashboardInterfaces.WidgetScope.Project_Team);
+    const widgetTypes: DashboardInterfaces.WidgetTypesResponse = await dashboardApiObject.getWidgetTypes(DashboardInterfaces.WidgetScope.Project_Team, projectId);
     console.log('First widget type:', widgetTypes.widgetTypes[0]);
 
     common.heading('Delete a widget');

diff --git a/samples/package-lock.json b/samples/package-lock.json
diff --git a/samples/run.ts b/samples/run.ts
@@ -12,7 +12,7 @@ let samples: string[] = require("./samples.json");
 let coreApi: cApi.ICoreApi;
 const maxLoops: number = 500;
 
-let selection: string = process.argv[2];
+const selection: string = process.argv[2];
 if (selection) {
     if (samples.indexOf(selection) == -1) {
         console.error("Not a valid sample.  See list of samples");
@@ -41,7 +41,19 @@ async function createProject(projectId: string): Promise<boolean> {
                                                          revision: null,
                                                          state: null,
                                                          url: null};
-    await coreApi.queueCreateProject(projectToCreate);
+    let num = 0;
+    while (num < maxLoops) {
+        try {
+            await coreApi.queueCreateProject(projectToCreate);
+            break;
+        } catch (err) {
+            const errTypeKey = err.result.typeKey.toString();
+            if (!(errTypeKey == 'ProjectWorkPendingException' || errTypeKey == 'ProjectAlreadyExistsException')) {
+                throw err;
+            }
+            num++;
+        }
+    }
 
     //Poll until project exists
     let project: coreInterfaces.TeamProject = null;
@@ -114,11 +126,4 @@ async function runSamples(selected?: string) {
     }
 }
 
-function run() {
-    runSamples();
-}
-
-runSamples(process.argv[2]);
-
-
-
+runSamples(selection);