chore = content reviews cleanup

Author: nathanwoulfe

src/lang/en-us.ts

@@ -378,7 +378,7 @@ and new lines
     saveReviewConfigMessage: `This might take a while - saving generates the review due date for all reviewable content, which might be a lot of nodes. This does not modify node-level review configuration.`,
     staleContent: `Stale content`,
     unableToSeedReviewDate: `Unable to update review date for node`,
-    generateRelativeTo: `Generate review dates relative to`,
+    generateRelativeTo: `Generate relative to`,
     saveAndRegenerate: `Save and regenerate`,
     externalReviewers: `External reviewers`,
     externalReviewersDescription: `Semi-colon-delimited list of email addresses. These should not be associated with CMS users.`,

src/section/content-reviews/components/config-list/content-reviews-config-list.element.ts

@@ -29,7 +29,6 @@ const elementName = "workflow-content-reviews-config-list";
 export class WorkflowContentReviewsConfigListElement extends UmbElementMixin(
   LitElement
 ) {
-  #modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE;
   #contentReviewsWorkspaceContext?: typeof WORKFLOW_CONTENTREVIEWS_WORKSPACE_CONTEXT.TYPE;
   #documentRepository = new UmbDocumentItemRepository(this);
 
@@ -57,11 +56,6 @@ export class WorkflowContentReviewsConfigListElement extends UmbElementMixin(
   constructor() {
     super();
 
-    this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
-      if (!instance) return;
-      this.#modalManagerContext = instance;
-    });
-
     this.consumeContext(
       WORKFLOW_CONTENTREVIEWS_WORKSPACE_CONTEXT,
       (instance) => {
@@ -86,37 +80,31 @@ export class WorkflowContentReviewsConfigListElement extends UmbElementMixin(
   }
 
   async #openPicker() {
-    if (!this.#modalManagerContext) return;
-
     const data = {
       hideTreeRoot: true,
       multiple: false,
     };
 
+    const modalContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+
     let modalHandler;
     if (this.type === "document") {
-      modalHandler = this.#modalManagerContext.open(
-        this,
-        UMB_DOCUMENT_PICKER_MODAL,
-        {
-          data,
-        }
-      );
+      modalHandler = modalContext.open(this, UMB_DOCUMENT_PICKER_MODAL, {
+        data,
+      });
     } else {
-      modalHandler = this.#modalManagerContext.open(
-        this,
-        UMB_DOCUMENT_TYPE_PICKER_MODAL,
-        { data }
-      );
+      modalHandler = modalContext.open(this, UMB_DOCUMENT_TYPE_PICKER_MODAL, {
+        data,
+      });
     }
 
-    const { selection } = await modalHandler.onSubmit();
+    const result = await modalHandler.onSubmit().catch(() => undefined);
 
-    if (!selection?.length) return;
+    if (!result?.selection?.length) return;
 
     const itemToConfigure: ContentReviewItem = {
-      documentKey: this.type === "document" ? selection[0]! : undefined,
-      documentTypeKey: this.type === "documentType" ? selection[0]! : undefined,
+      documentKey: this.type === "document" ? result.selection[0]! : undefined,
+      documentTypeKey: this.type === "documentType" ? result.selection[0]! : undefined,
       type: this.type!,
       configItems: [],
     };
@@ -126,7 +114,8 @@ export class WorkflowContentReviewsConfigListElement extends UmbElementMixin(
   }
 
   async #editReview(itemToConfigure: ContentReviewItem, isAdd = false) {
-    const modalHandler = this.#modalManagerContext?.open(
+    const modalContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+    const modalHandler = modalContext.open(
       this,
       WORKFLOW_CONTENTREVIEWS_CONFIG_MODAL,
       {
@@ -139,8 +128,10 @@ export class WorkflowContentReviewsConfigListElement extends UmbElementMixin(
       }
     );
 
-    const { configItems } = await modalHandler!.onSubmit();
-    const newItem = { ...itemToConfigure, ...{ configItems } };
+    const result = await modalHandler.onSubmit().catch(() => undefined);
+    if (!result?.configItems) return;
+
+    const newItem = { ...itemToConfigure, ...{ configItems: result?.configItems } };
 
     if (isAdd) {
       this.#setValue([...this.value, newItem]);

src/section/content-reviews/modal/element/content-reviews-config-modal.element.ts

@@ -24,8 +24,6 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
   WorkflowContentReviewsConfigModalData,
   WorkflowContentReviewsConfigModalResult
 > {
-  #modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE;
-
   @state()
   current?: ContentReviewConfigItem;
 
@@ -35,18 +33,6 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
   @state()
   headline = "";
 
-  get currentVariant() {
-    return this.current?.variant;
-  }
-
-  constructor() {
-    super();
-
-    this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
-      this.#modalManagerContext = instance;
-    });
-  }
-
   connectedCallback() {
     super.connectedCallback();
 
@@ -70,10 +56,14 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
     }
   }
 
-  #handleSubmit() {
-    const idx = this.configItems.findIndex(
-      (x) => x.variant === this.currentVariant
+  #getExistingIndex() {
+    return this.configItems.findIndex(
+      (x) => x.variant === this.current?.variant
     );
+  }
+
+  #handleSubmit() {
+    const idx = this.#getExistingIndex();
 
     if (idx > -1) {
       this.configItems[idx] = this.current!;
@@ -89,9 +79,8 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
     this.modalContext?.reject();
   }
 
-  #setValue(value: any, propertyAlias: string) {
-    this.current![propertyAlias] = value;
-    this.requestUpdate();
+  #setValue(value: unknown, propertyAlias: string) {
+    this.current = { ...this.current, ...{ [propertyAlias]: value } };
   }
 
   #removeGroup(idx: number) {
@@ -101,27 +90,21 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
   }
 
   async #openGroupPicker() {
-    const modalHandler = this.#modalManagerContext?.open(this, 
-      WORKFLOW_GROUP_PICKER_MODAL,
-      {
-        data: {
-          selection: [
-            ...(this.current!.groups?.map((p) => p.key ?? null) ?? []),
-          ],
-        },
-      }
-    );
+    const modalContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+    const modalHandler = modalContext.open(this, WORKFLOW_GROUP_PICKER_MODAL, {
+      data: {
+        selection: [...(this.current!.groups?.map((p) => p.key ?? null) ?? [])],
+      },
+    });
 
     const { groups } = await modalHandler!.onSubmit();
     this.#setValue(groups, "groups");
   }
 
   #handleLanguageChange(e: UUIInputEvent) {
     const idx = this.configItems.findIndex((x) => x.variant === e.target.value);
+    const existingIndex = this.#getExistingIndex();
 
-    const existingIndex = this.configItems.findIndex(
-      (x) => x.variant === this.currentVariant
-    );
     this.configItems[existingIndex] = this.current!;
 
     if (idx !== -1) {
@@ -148,7 +131,7 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
         .options=${this.data?.languages.map((l) => ({
           name: l.name!,
           value: l.isoCode!,
-          selected: l.isoCode === this.currentVariant,
+          selected: l.isoCode === this.current?.variant,
         })) ?? []}
         @change=${this.#handleLanguageChange}
       ></uui-select>
@@ -157,7 +140,7 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
 
   #renderGeneralBox() {
     return html`<uui-box .headline=${this.localize.term("general_general")}>
-      <umb-property-layout .label=${"Exclude from review"}>
+      <umb-property-layout label="Exclude from review">
         <uui-toggle
           slot="editor"
           .checked=${this.current?.excluded ?? false}
@@ -166,11 +149,11 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
       </umb-property-layout>
       ${when(
         !this.current?.excluded,
-        () => html`<umb-property-layout .label=${"Review period (days)"}>
+        () => html`<umb-property-layout label="Review period (days)">
           <uui-input
             type="number"
             slot="editor"
-            .label=${"Review period (days)"}
+            label="Review period (days)"
             .value=${this.current?.period}
             @change=${(e) => this.#setValue(Number(e.target.value), "period")}
           ></uui-input>
@@ -195,7 +178,7 @@ export class WorkflowContentReviewsConfigModalElement extends UmbModalBaseElemen
       </uui-ref-list>
       <workflow-add-button
         @click=${this.#openGroupPicker}
-        .labelKey=${"workflow_addWorkflowGroups"}
+        labelKey="workflow_addWorkflowGroups"
       ></workflow-add-button>
     </uui-box>`;
   }

src/section/content-reviews/modal/element/content-reviews-regenerate-modal.element.ts

@@ -36,7 +36,7 @@ export class WorkflowContentReviewsRegenerateModalElement extends UmbModalBaseEl
     return html`<umb-body-layout>
       <div id="main">
         <p>${this.localize.term("contentReviews_saveReviewConfigMessage")}</p>
-        <umb-workspace-property-layout
+        <umb-property-layout
           .label=${this.localize.term("contentReviews_generateRelativeTo")}
         >
           <uui-radio-group
@@ -51,8 +51,8 @@ export class WorkflowContentReviewsRegenerateModalElement extends UmbModalBaseEl
             >
             </uui-radio>
           </uui-radio-group>
-        </umb-workspace-property-layout>
-        <umb-workspace-property-layout
+        </umb-property-layout>
+        <umb-property-layout
           .label=${this.localize.term("contentReviews_force")}
           .description=${this.localize.term("contentReviews_forceDescription")}
         >
@@ -62,7 +62,7 @@ export class WorkflowContentReviewsRegenerateModalElement extends UmbModalBaseEl
             @change=${() => (this.force = !this.force)}
           >
           </uui-toggle>
-        </umb-workspace-property-layout>
+        </umb-property-layout>
       </div>
       <div slot="actions">
         <uui-button

src/section/content-reviews/modal/token/content-reviews-regenerate-modal.token.ts

@@ -14,6 +14,6 @@ export const WORKFLOW_CONTENTREVIEWS_REGENERATE_MODAL = new UmbModalToken<
 >(WORKFLOW_CONTENTREVIEWS_REGENERATE_MODAL_ALIAS, {
   modal: {
     type: "dialog",
-    size: "medium",
+    size: "large",
   },
 });

src/section/content-reviews/workspace/actions/save-and-regenerate.action.ts

@@ -1,14 +1,13 @@
 import type { UmbControllerHost } from "@umbraco-cms/backoffice/controller-api";
 import { UMB_MODAL_MANAGER_CONTEXT } from "@umbraco-cms/backoffice/modal";
-import type { UmbWorkspaceActionArgs} from "@umbraco-cms/backoffice/workspace";
+import type { UmbWorkspaceActionArgs } from "@umbraco-cms/backoffice/workspace";
 import { UmbWorkspaceActionBase } from "@umbraco-cms/backoffice/workspace";
 import { WORKFLOW_CONTENTREVIEWS_WORKSPACE_CONTEXT } from "../content-reviews-workspace.context-token.js";
 import type { WorkflowContentReviewsRegenerateModalResult } from "../../modal/index.js";
 import { WORKFLOW_CONTENTREVIEWS_REGENERATE_MODAL } from "../../modal/index.js";
 import type { WorkflowContentReviewsWorkspaceContext } from "../content-reviews-workspace.context.js";
 
 export class WorkflowRegenerateContentReviewsWorkspaceAction extends UmbWorkspaceActionBase<WorkflowContentReviewsWorkspaceContext> {
-
   constructor(
     host: UmbControllerHost,
     args: UmbWorkspaceActionArgs<WorkflowContentReviewsWorkspaceContext>
@@ -17,7 +16,9 @@ export class WorkflowRegenerateContentReviewsWorkspaceAction extends UmbWorkspac
   }
 
   async execute() {
-    const workspaceContext = await this.getContext(WORKFLOW_CONTENTREVIEWS_WORKSPACE_CONTEXT);
+    const workspaceContext = await this.getContext(
+      WORKFLOW_CONTENTREVIEWS_WORKSPACE_CONTEXT
+    );
     const modalContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
 
     if (!workspaceContext || !modalContext) return;
@@ -27,8 +28,7 @@ export class WorkflowRegenerateContentReviewsWorkspaceAction extends UmbWorkspac
       WORKFLOW_CONTENTREVIEWS_REGENERATE_MODAL
     );
 
-    const { relativeTo, force } =
-      (await modalHandler.onSubmit()) as WorkflowContentReviewsRegenerateModalResult;
+    const { relativeTo, force } = await modalHandler.onSubmit();
 
     workspaceContext.saveAndRegenerate(force, relativeTo);
   }

src/section/content-reviews/workspace/content-reviews-workspace.context.ts

@@ -174,7 +174,8 @@ export class WorkflowContentReviewsWorkspaceContext
 
   deleteReview(item: ContentReviewItem) {
     item.configItems.forEach((c) => {
-      if (!c.id) throw new Error('id is missing');
+      // if no id, item has not been saved so no need to mark for deletion
+      if (!c.id) return;
       this.deletedReviews.push(c.id);
     });
   }