Fix markup check

plugins/card-resources/src/components/CardArrayEditor.svelte

@@ -24,7 +24,7 @@
   import CardsPopup from './CardsPopup.svelte'
 
   export let _class: Ref<Class<Card>> | undefined = undefined
-  export let value: Ref<Card>[] | undefined
+  export let value: Ref<Card>[] | Ref<Card> | undefined
   export let readonly: boolean = false
   export let label: IntlString | undefined
   export let onChange: ((value: any) => void) | undefined
@@ -60,13 +60,23 @@
 
     showPopup(
       CardsPopup,
-      { selectedObjects: value, _class, multiSelect: true },
+      { selectedObjects: toArray(value), _class, multiSelect: true },
       eventToHTMLElement(event),
       undefined,
       change
     )
   }
 
+  function toArray (value: Ref<Card>[] | Ref<Card> | undefined): Ref<Card>[] {
+    if (Array.isArray(value)) {
+      return value
+    }
+    if (value === undefined) {
+      return []
+    }
+    return [value]
+  }
+
   const change = (value: Ref<Card>[]): void => {
     onChange?.(value)
     dispatch('change', value)
@@ -75,7 +85,7 @@
   let docs: Card[] = []
 
   const query = createQuery()
-  $: query.query(card.class.Card, { _id: { $in: value ?? [] } }, (res) => {
+  $: query.query(card.class.Card, { _id: { $in: toArray(value) } }, (res) => {
     docs = res
   })
 

plugins/card-resources/src/components/MarkupProperties.svelte

@@ -66,7 +66,6 @@
   <div class="w-full mt-2">
     <span>
       <Label label={key.attr.label} />
-      {readonly}
     </span>
     <MarkupEditor
       value={getValue(doc, key.key)}

plugins/process-resources/src/utils.ts

@@ -822,10 +822,10 @@ export async function approveRequestRejected (
   return context.todo?.group === params._id && context.todo?.approved === false
 }
 
-function getMarkupParams (card: Card, params: Record<string, any>, client: Client): Record<string, any> {
+function getMarkupParams (process: Process, params: Record<string, any>, client: Client): Record<string, any> {
   const markup: Record<string, any> = {}
   for (const [key, value] of Object.entries(params)) {
-    const attr = client.getHierarchy().findAttribute(card._class, key)
+    const attr = client.getHierarchy().findAttribute(process.masterTag, key)
     if (attr?.type?._class === core.class.TypeMarkup) {
       markup[key] = value
     }
@@ -846,7 +846,7 @@ export function matchCardCheck (
   if (client.getHierarchy().isMixin(process.masterTag)) {
     doc = client.getHierarchy().as(doc, process.masterTag)
   }
-  const markup = getMarkupParams(doc, params, client)
+  const markup = getMarkupParams(process, params, client)
   for (const key of Object.keys(markup)) {
     if (isEmptyMarkup(doc[key])) return false
   }
@@ -861,12 +861,17 @@ export function fieldChangesCheck (
   params: Record<string, any>,
   context: Record<string, any>
 ): boolean {
-  const doc = context.card
+  let doc = context.card
   if (doc === undefined) return false
+  const process = client.getModel().findObject(execution.process)
+  if (process === undefined) return false
+  if (client.getHierarchy().isMixin(process.masterTag)) {
+    doc = client.getHierarchy().as(doc, process.masterTag)
+  }
   const operations = (context.operations ?? {}) as DocumentUpdate<Doc>
   const target = Object.keys(params)[0]
   if (!TxProcessor.hasUpdate(operations, target)) return false
-  const markup = getMarkupParams(doc, params, client)
+  const markup = getMarkupParams(process, params, client)
   for (const key of Object.keys(markup)) {
     if (isEmptyMarkup(doc[key])) return false
   }

server-plugins/process-resources/src/functions.ts

@@ -144,22 +144,27 @@ export function MatchCardCheck (
   params: Record<string, any>,
   context: Record<string, any>
 ): boolean {
-  if (context.card === undefined) return false
+  let card = context.card
+  if (card === undefined) return false
   const process = control.client.getModel().findObject(execution.process)
   if (process === undefined) return false
-  const markup = getMarkupParams(context.card, params, control)
+  const markup = getMarkupParams(process, params, control)
+  const h = control.client.getHierarchy()
+  if (h.isMixin(process.masterTag)) {
+    card = h.as(card, process.masterTag)
+  }
   for (const key of Object.keys(markup)) {
-    if (isEmptyMarkup(context.card[key])) return false
+    if (isEmptyMarkup(card[key])) return false
   }
 
-  const res = matchQuery([context.card], params, process.masterTag, control.client.getHierarchy(), true)
+  const res = matchQuery([card], params, process.masterTag, control.client.getHierarchy(), true)
   return res.length > 0
 }
 
-function getMarkupParams (card: Card, params: Record<string, any>, control: ProcessControl): Record<string, any> {
+function getMarkupParams (process: Process, params: Record<string, any>, control: ProcessControl): Record<string, any> {
   const markup: Record<string, any> = {}
   for (const [key, value] of Object.entries(params)) {
-    const attr = control.client.getHierarchy().findAttribute(card._class, key)
+    const attr = control.client.getHierarchy().findAttribute(process.masterTag, key)
     if (attr?.type?._class === core.class.TypeMarkup) {
       markup[key] = value
     }
@@ -190,12 +195,17 @@ export function FieldChangedCheck (
   const operations = context.operations as DocumentUpdate<Doc>
   const target = Object.keys(params)[0]
   if (!TxProcessor.hasUpdate(operations, target)) return false
-  const markup = getMarkupParams(context.card, params, control)
+  const markup = getMarkupParams(process, params, control)
+  const h = control.client.getHierarchy()
+  let card = context.card
+  if (h.isMixin(process.masterTag)) {
+    card = h.as(card, process.masterTag)
+  }
   for (const key of Object.keys(markup)) {
-    if (isEmptyMarkup(context.card[key])) return false
+    if (isEmptyMarkup(card[key])) return false
   }
 
-  const res = matchQuery([context.card], params, process.masterTag, control.client.getHierarchy(), true)
+  const res = matchQuery([card], params, process.masterTag, control.client.getHierarchy(), true)
   return res.length > 0
 }