rc1 client fixes

Author: nathanwoulfe

src/components/charts/content-reviews-chart.element.ts

@@ -9,7 +9,7 @@ import type { ChartHeaderCard } from "./chart-base.element.js";
 import { ChartBase } from "./chart-base.element.js";
 import { ChartBaseStyles } from "./chart-style.styles.js";
 import {
-  ChartResource,
+  ChartService,
   WorkflowStatusModel,
   type ChartResponseModel,
 } from "@umbraco-workflow/generated";
@@ -37,15 +37,17 @@ export class ContentReviewsChartElement extends ChartBase {
         status: k.value,
         label: k.key,
         value: this.numberFormat(
-          (chartData?.additionalData ?? {})[`${lower}Count`] ?? 0,
+          <number>(chartData?.additionalData ?? {})[`${lower}Count`] ?? 0,
           chartData?.currentUserLocale
         ),
       });
     });
 
     this.series = chartData?.series ?? [];
     this.drawChart(
-      chartData?.additionalData?.expiringCount > 100 ? "logarithmic" : "linear"
+      <number>chartData?.additionalData?.expiringCount > 100
+        ? "logarithmic"
+        : "linear"
     );
   }
 
@@ -56,7 +58,7 @@ export class ContentReviewsChartElement extends ChartBase {
 
     const { data, error } = await tryExecuteAndNotify(
       this,
-      ChartResource.getChartContentReviewChart({
+      ChartService.getChartContentReviewChart({
         range: this.range,
       })
     );

src/components/charts/workflow-activity-chart.element.ts

@@ -11,7 +11,7 @@ import { ChartBase } from "./chart-base.element.js";
 import type { ChartHeaderCard } from "./chart-base.element.js";
 import {
   type ChartResponseModel,
-  ChartResource,
+  ChartService,
   WorkflowStatusModel,
 } from "@umbraco-workflow/generated";
 import { WorkflowStatus } from "@umbraco-workflow/enums";
@@ -42,7 +42,6 @@ export class WorkflowActivityChartElement extends ChartBase {
 
   // TODO => humanize
   humanize = (x: number) => x;
-  //moment.duration(x, 'seconds').humanize();
 
   buildChartSeries(chartData?: ChartResponseModel) {
     this.headerCards = [];
@@ -56,7 +55,7 @@ export class WorkflowActivityChartElement extends ChartBase {
         action: () => this.getActivity(s.key),
         label: s.key,
         value: this.numberFormat(
-          (chartData?.additionalData ?? {})[`${lower}Count`] ?? 0,
+          <number>(chartData?.additionalData ?? {})[`${lower}Count`] ?? 0,
           chartData?.currentUserLocale
         ),
       });
@@ -65,10 +64,10 @@ export class WorkflowActivityChartElement extends ChartBase {
     this.showStatsBox = chartData?.additionalData?.averageSeconds !== 0 || true;
 
     if (this.showStatsBox) {
-      this.minSeconds = this.humanize(chartData?.additionalData?.minSeconds);
-      this.maxSeconds = this.humanize(chartData?.additionalData?.maxSeconds);
+      this.minSeconds = this.humanize(<number>chartData?.additionalData?.minSeconds ?? 0);
+      this.maxSeconds = this.humanize(<number>chartData?.additionalData?.maxSeconds ?? 0);
       this.averageSeconds = this.humanize(
-        chartData?.additionalData?.averageSeconds
+        <number>chartData?.additionalData?.averageSeconds ?? 0
       );
     }
 
@@ -83,7 +82,7 @@ export class WorkflowActivityChartElement extends ChartBase {
 
     const { data, error } = await tryExecuteAndNotify(
       this,
-      ChartResource.getChartWorkflowChart({
+      ChartService.getChartWorkflowChart({
         range: this.range,
         groupId: this.groupId,
       })

src/components/daterange/daterange.element.ts

@@ -7,13 +7,14 @@ import {
   property,
   state,
 } from "@umbraco-cms/backoffice/external/lit";
-import { FormControlMixin } from "@umbraco-cms/backoffice/external/uui";
+import { UUIFormControlMixin } from "@umbraco-cms/backoffice/external/uui";
 
 const elementName = "workflow-daterange";
 
 @customElement(elementName)
-export class WorkflowDateRangeElement extends FormControlMixin(
-  UmbElementMixin(LitElement)
+export class WorkflowDateRangeElement extends UUIFormControlMixin(
+  UmbElementMixin(LitElement),
+  undefined
 ) {
   getFormElement() {
     return undefined;
@@ -40,8 +41,12 @@ export class WorkflowDateRangeElement extends FormControlMixin(
     this.maxDateFrom = new Date().toString();
     this.minDateTo = new Date().toString();
 
-    this.labelFrom = this.localize.term(this.labelKeys[0]).replace(/\b\w/g, s => s.toUpperCase());
-    this.labelTo = this.localize.term(this.labelKeys[1]).replace(/\b\w/g, s => s.toUpperCase());
+    this.labelFrom = this.localize
+      .term(this.labelKeys[0])
+      .replace(/\b\w/g, (s) => s.toUpperCase());
+    this.labelTo = this.localize
+      .term(this.labelKeys[1])
+      .replace(/\b\w/g, (s) => s.toUpperCase());
 
     this.addValidator(
       "badInput",
@@ -105,7 +110,7 @@ export class WorkflowDateRangeElement extends FormControlMixin(
       }
 
       umb-property-layout {
-        padding:0;
+        padding: 0;
       }
     `,
   ];

src/components/filter-picker/elements/document-filter.element.ts

@@ -11,7 +11,7 @@ export class WorkflowDocumentFilterElement extends WorkflowBaseFilterElement<str
 
   #onSelectionChange(event: CustomEvent) {
     this.setValue(
-      (event.target as UmbInputDocumentElement).selectedIds.join(",")
+      (event.target as UmbInputDocumentElement).selection.join(",")
     );
   }
 

src/components/filter-picker/elements/user-filter.element.ts

@@ -7,7 +7,7 @@ const elementName = "workflow-user-filter";
 @customElement(elementName)
 export class WorkflowUserFilterElement extends WorkflowBaseFilterElement<string> {
   #onSelectionChange(event: CustomEvent) {
-    this.setValue((event.target as UmbInputDocumentElement).selectedIds.join(","));
+    this.setValue((event.target as UmbInputDocumentElement).selection.join(","));
   }
 
   render() {

src/components/history-cleanup/history-cleanup.element.ts

@@ -7,18 +7,16 @@ import {
   property,
 } from "@umbraco-cms/backoffice/external/lit";
 import { UMB_MODAL_MANAGER_CONTEXT } from "@umbraco-cms/backoffice/modal";
-import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from "@umbraco-cms/backoffice/document";
 import { tryExecuteAndNotify } from "@umbraco-cms/backoffice/resources";
 import { UMB_NOTIFICATION_CONTEXT } from "@umbraco-cms/backoffice/notification";
-import { HistoryCleanupResource } from "@umbraco-workflow/generated";
+import { HistoryCleanupService } from "@umbraco-workflow/generated";
 import { WORKFLOW_HISTORY_CLEANUP_MODAL } from "@umbraco-workflow/modal";
 
 const elementName = "workflow-history-cleanup";
 
 @customElement(elementName)
 export class WorkflowHistoryCleanupElement extends UmbElementMixin(LitElement) {
   #modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE;
-  #workspaceContext?: typeof UMB_DOCUMENT_WORKSPACE_CONTEXT.TYPE;
   #notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE;
 
   @property()
@@ -32,11 +30,6 @@ export class WorkflowHistoryCleanupElement extends UmbElementMixin(LitElement) {
       this.#modalManagerContext = instance;
     });
 
-    this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, (instance) => {
-      if (!instance) return;
-      this.#workspaceContext = instance;
-    });
-
     this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
       if (!instance) return;
       this.#notificationContext = instance;
@@ -58,7 +51,7 @@ export class WorkflowHistoryCleanupElement extends UmbElementMixin(LitElement) {
 
     const { error } = await tryExecuteAndNotify(
       this,
-      HistoryCleanupResource.putHistoryCleanup({
+      HistoryCleanupService.putHistoryCleanup({
         requestBody: Object.assign({}, result.nodeRules, result.docTypeRules),
       })
     );

src/context/workflow-action.repository.ts

@@ -11,7 +11,7 @@ import {
 } from "@umbraco-cms/backoffice/class-api";
 import { UmbContextConsumerController } from "@umbraco-cms/backoffice/context-api";
 import {
-  ActionResource,
+  ActionService,
   WorkflowTypeModel,
 } from "@umbraco-workflow/generated";
 import type {
@@ -62,7 +62,7 @@ export class WorkflowActionRepository extends UmbControllerBase {
     // attachmentId should be a guid
     const { data, error } = await tryExecuteAndNotify(
       this.#host,
-      ActionResource.postActionInitiate({
+      ActionService.postActionInitiate({
         requestBody: {
           entityId: nodeUnique,          
           comment,
@@ -144,13 +144,13 @@ export class WorkflowActionRepository extends UmbControllerBase {
     | undefined {
     switch (action) {
       case ValidActionDescriptor.APPROVE:
-        return ActionResource.postActionApprove;
+        return ActionService.postActionApprove;
       case ValidActionDescriptor.CANCEL:
-        return ActionResource.postActionCancel;
+        return ActionService.postActionCancel;
       case ValidActionDescriptor.REJECT:
-        return ActionResource.postActionReject;
+        return ActionService.postActionReject;
       case ValidActionDescriptor.RESUBMIT:
-        return ActionResource.postActionResubmit;
+        return ActionService.postActionResubmit;
     }
   }
 }

src/context/workflow-context.ts

@@ -15,9 +15,9 @@ import type {
   WorkflowScaffoldResponseModel,
 } from "@umbraco-workflow/generated";
 import {
-  GlobalVariablesResource,
-  LicenseResource,
-  ScaffoldResource,
+  GlobalVariablesService,
+  LicenseService,
+  ScaffoldService,
 } from "@umbraco-workflow/generated";
 
 /** TODO => how do we handle new nodes? Currently creating a node won't trigger the change detection
@@ -97,7 +97,7 @@ export class WorkflowContext extends UmbControllerBase {
   async scaffoldNode(nodeKey = this.#currentDocument) {
     const { data } = await tryExecuteAndNotify(
       this,
-      ScaffoldResource.getScaffold({
+      ScaffoldService.getScaffold({
         nodeKey,
       })
     );
@@ -109,7 +109,7 @@ export class WorkflowContext extends UmbControllerBase {
   async #getLicense() {
     const { data } = await tryExecuteAndNotify(
       this,
-      LicenseResource.getLicense()
+      LicenseService.getLicense()
     );
 
     this.#license.setValue(data);
@@ -118,7 +118,7 @@ export class WorkflowContext extends UmbControllerBase {
   async #getGlobals() {
     const { data } = await tryExecuteAndNotify(
       this,
-      GlobalVariablesResource.getGlobal()
+      GlobalVariablesService.getGlobal()
     );
 
     this.#globalVariables.setValue(data);

src/dashboards/advanced-search/advanced-search.dashboard.element.ts

@@ -27,7 +27,7 @@ import type {
   SelectableNameKeyPairModel,
 } from "@umbraco-workflow/generated";
 import {
-  AdvancedSearchResource,
+  AdvancedSearchService,
   AdvancedSearchTypeModel,
   WorkflowStatusModel,
 } from "@umbraco-workflow/generated";
@@ -71,7 +71,7 @@ export class AdvancedSearchDashboardElement extends UmbElementMixin(
 
   @state()
   searchModel: TableQueryModel = {
-    handler: AdvancedSearchResource.postAdvancedSearchSearch,
+    handler: AdvancedSearchService.postAdvancedSearchSearch,
     meta: {
       fuzzy: false,
     },
@@ -170,7 +170,7 @@ export class AdvancedSearchDashboardElement extends UmbElementMixin(
   async #getData() {
     const { data } = await tryExecuteAndNotify(
       this,
-      AdvancedSearchResource.getAdvancedSearchContentTypes()
+      AdvancedSearchService.getAdvancedSearchContentTypes()
     );
 
     data?.contentTypes!.forEach((x) => (x.selected = true));
@@ -399,7 +399,7 @@ export class AdvancedSearchDashboardElement extends UmbElementMixin(
     status: Record<string, any>
   ) {
     status.selected = !status.selected;
-    const value = !property.value?.length ? [] : property.value.split(",");
+    const value = !(<any>property.value)?.length ? [] : (<string>property.value).split(",");
 
     if (status.selected) {
       value.push(status.value);
@@ -824,7 +824,7 @@ export class AdvancedSearchDashboardElement extends UmbElementMixin(
                           ${when(
                             prop.propertyEditorUiAlias === "checkboxlist",
                             () =>
-                              html` ${prop.config?.items.map(
+                              html` ${(<any>prop.config)?.items.map(
                                 (status) => html`
                                   <uui-checkbox
                                     style="margin-right:var(--uui-size-5)"
@@ -845,7 +845,7 @@ export class AdvancedSearchDashboardElement extends UmbElementMixin(
                               html`${when(
                                 prop.value,
                                 () => html`<uui-ref-list>
-                                  <uui-ref-node-user .name=${prop.value?.name}
+                                  <uui-ref-node-user .name=${(<any>prop.value)?.name}
                                     ><uui-action-bar slot="actions">
                                       <uui-button
                                         label="Remove"

src/dashboards/advanced-search/basefield-query-generator.function.ts

@@ -9,7 +9,7 @@ export function BaseFieldQueryGenerator(props: Array<Partial<PropertyDetailModel
         const v = ValueMap(x);
 
         if (x.propertyEditorUiAlias === "userpicker" && x.value) {
-          v[1] = x.value.id;
+          v[1] = (<any>x.value).id;
         }
 
         return v;