diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index a4a50ef69c..d635d1e313 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -2,7 +2,7 @@ name: Update gh-pages on: push: - branches: [main, trunk-future] + branches: [main, main-future] workflow_dispatch: diff --git a/packages/comms/index.html b/packages/comms/index.html index 7adc4d0125..61dcd028de 100644 --- a/packages/comms/index.html +++ b/packages/comms/index.html @@ -43,11 +43,17 @@

ESM Quick Test

testWUDetailsMeta("wuPlaceholder"); -
+
+ + +
diff --git a/packages/comms/src/ecl/workunit.ts b/packages/comms/src/ecl/workunit.ts index 89c9e99fde..48cf69de19 100644 --- a/packages/comms/src/ecl/workunit.ts +++ b/packages/comms/src/ecl/workunit.ts @@ -685,7 +685,7 @@ export class Workunit extends StateObject implem const scope = scopes[i]; const props: { [key: string]: any } = {}; const formattedProps: { [key: string]: any } = {}; - if (scope.Id && scope.Properties?.Property) { + if (scope.Properties?.Property) { for (const scopeProperty of scope.Properties.Property) { const measure = scopeProperty.Measure; const name = scopeProperty.Name; diff --git a/packages/comms/tests/index.ts b/packages/comms/tests/index.ts index 2dfb3286ac..d69c42c22c 100644 --- a/packages/comms/tests/index.ts +++ b/packages/comms/tests/index.ts @@ -1,4 +1,4 @@ -import { SMCService, WorkunitsService } from "../src/index.browser.ts"; +import { SMCService, Workunit, WorkunitsService } from "../src/index.browser.ts"; export function testWUDetailsMeta(placeholder: string) { const wuService = new WorkunitsService({ baseUrl: "http://localhost:8010" }); @@ -30,6 +30,44 @@ export function testWUDetailsMeta(placeholder: string) { } +export async function testWUDetails(placeholder: string) { + const wu = Workunit.attach({ baseUrl: "http://localhost:8010" }, "W20260219-100208-3"); + const wuPlaceholder = document.getElementById(placeholder); + const response = await wu.fetchDetailsNormalized({ + ScopeFilter: { + ScopeTypes: ["all"], + }, + NestedFilter: { + + }, + PropertiesToReturn: { + AllScopes: true, + AllAttributes: true, + AllProperties: true, + AllNotes: true, + AllStatistics: true, + AllHints: true + }, + ScopeOptions: { + IncludeId: true, + IncludeScope: true, + IncludeScopeType: true, + IncludeMatchedScopesInResults: true + }, + PropertyOptions: { + IncludeName: true, + IncludeRawValue: true, + IncludeFormatted: true, + IncludeMeasure: true, + IncludeCreator: false, + IncludeCreatorType: false + } + }); + if (wuPlaceholder) { + wuPlaceholder.textContent = JSON.stringify(response.data, null, 2); + } +} + export function testSMCGlobalMetrics(placeholder: string) { const service = new SMCService({ baseUrl: "http://localhost:8010" }); const placeholderElement = document.getElementById(placeholder); diff --git a/packages/eclwatch/tests/test1.ts b/packages/eclwatch/tests/test1.ts index c16e54e8b2..5d8fb61294 100644 --- a/packages/eclwatch/tests/test1.ts +++ b/packages/eclwatch/tests/test1.ts @@ -53,7 +53,7 @@ export class WUTimelineNoFetch extends WUTimelinePatched { const wu = Workunit.attach({ baseUrl: "http://localhost:8010" }, "W20260219-100208-3"); const response = await wu.fetchDetailsNormalized({ ScopeFilter: { - ScopeTypes: ["operation", "workflow", "graph", "subgraph", "activity", "edge"], + ScopeTypes: ["all"], }, NestedFilter: {