@masterteam/work-center 0.0.34 → 0.0.35

package/assets/i18n/ar.json

@@ -79,6 +79,7 @@
       "name": "\u0627\u0644\u0627\u0633\u0645",
       "status": "\u0627\u0644\u062d\u0627\u0644\u0629",
       "user": "\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645",
+      "userOrGroup": "\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 / \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629",
       "initiationDate": "\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0628\u062f\u0621",
       "actionDate": "\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0625\u062c\u0631\u0627\u0621",
       "start": "\u0628\u062f\u0627\u064a\u0629",
@@ -125,6 +126,7 @@
       "name": "الاسم",
       "status": "الحالة",
       "user": "المستخدم",
+      "userOrGroup": "المستخدم / المجموعة",
       "initiationDate": "تاريخ البدء",
       "actionDate": "تاريخ الإجراء",
       "start": "بداية",

package/assets/i18n/en.json

@@ -79,6 +79,7 @@
       "name": "Name",
       "status": "Status",
       "user": "User",
+      "userOrGroup": "User / Group",
       "initiationDate": "Initiation Date",
       "actionDate": "Action Date",
       "start": "Start",
@@ -125,6 +126,7 @@
       "name": "Name",
       "status": "Status",
       "user": "User",
+      "userOrGroup": "User / Group",
       "initiationDate": "Initiation Date",
       "actionDate": "Action Date",
       "start": "Start",

package/fesm2022/masterteam-work-center.mjs

@@ -1735,10 +1735,11 @@ class WorkCenterProcessPreview {
         {
             key: 'status',
             label: this.transloco.translate('workCenter.preview.status'),
+            type: 'entity',
         },
         {
             key: 'user',
-            label: this.transloco.translate('workCenter.preview.user'),
+            label: this.transloco.translate('workCenter.preview.userOrGroup'),
             type: 'entity',
         },
         {
@@ -1756,18 +1757,50 @@ class WorkCenterProcessPreview {
     error = signal(null, ...(ngDevMode ? [{ debugName: "error" }] : /* istanbul ignore next */ []));
     preview = signal(null, ...(ngDevMode ? [{ debugName: "preview" }] : /* istanbul ignore next */ []));
     canRenderPreview = computed(() => (this.requestId() ?? 0) > 0, ...(ngDevMode ? [{ debugName: "canRenderPreview" }] : /* istanbul ignore next */ []));
-    approvalRows = computed(() => (this.preview()?.steps ?? []).map((step) => ({
-        stepName: this.resolveDisplayName(step.stepName) || String(step.stepId ?? '--'),
-        status: this.resolveDisplayName(step.status) || '--',
-        user: buildEntity('User', 'User', (step.actionUserInfo ?? step.targetUser ?? null)),
-        createdAt: buildEntity('Initiation Date', 'DateTime', step.createdAt ?? ''),
-        actionDate: buildEntity('Action Date', 'DateTime', step.actionDate ?? ''),
-    })), ...(ngDevMode ? [{ debugName: "approvalRows" }] : /* istanbul ignore next */ []));
+    approvalRows = computed(() => {
+        const steps = this.preview()?.steps ?? [];
+        const rows = [];
+        const seenGroupKeys = new Set();
+        for (const step of steps) {
+            const groupName = this.resolveGroupName(step.target);
+            if (groupName) {
+                const dedupKey = `${step.stepSchemaId ?? ''}|${step.target?.groupKey ?? ''}`;
+                if (seenGroupKeys.has(dedupKey))
+                    continue;
+                seenGroupKeys.add(dedupKey);
+                // Prefer a sibling that has been actioned so we can surface real
+                // action date/status; otherwise fall back to the current step.
+                const siblings = steps.filter((s) => (s.stepSchemaId ?? '') === (step.stepSchemaId ?? '') &&
+                    (s.target?.groupKey ?? '') === (step.target?.groupKey ?? ''));
+                const repr = siblings.find((s) => s.actionUserInfo) ?? step;
+                rows.push({
+                    stepName: this.resolveDisplayName(repr.stepName) ||
+                        String(repr.stepId ?? '--'),
+                    status: buildEntity('Status', 'Status', repr.status),
+                    user: buildEntity('User', 'Text', groupName),
+                    createdAt: buildEntity('Initiation Date', 'DateTime', repr.createdAt ?? ''),
+                    actionDate: buildEntity('Action Date', 'DateTime', repr.actionDate ?? ''),
+                });
+            }
+            else {
+                rows.push({
+                    stepName: this.resolveDisplayName(step.stepName) ||
+                        String(step.stepId ?? '--'),
+                    status: buildEntity('Status', 'Status', step.status),
+                    user: buildEntity('User', 'User', (step.actionUserInfo ?? step.targetUser ?? null)),
+                    createdAt: buildEntity('Initiation Date', 'DateTime', step.createdAt ?? ''),
+                    actionDate: buildEntity('Action Date', 'DateTime', step.actionDate ?? ''),
+                });
+            }
+        }
+        return rows;
+    }, ...(ngDevMode ? [{ debugName: "approvalRows" }] : /* istanbul ignore next */ []));
     hasApprovals = computed(() => this.approvalRows().length > 0, ...(ngDevMode ? [{ debugName: "hasApprovals" }] : /* istanbul ignore next */ []));
     schemaNodes = computed(() => {
         const steps = this.preview()?.schema?.stepsSchema ?? [];
         const connections = this.preview()?.schema?.connections ?? [];
         const sourceIds = new Set(connections.map((c) => String(c.source)));
+        const currentStepIds = new Set((this.preview()?.currentStepSchemaIds ?? []).map(String));
         return steps.map((step) => {
             const isAppAction = step.type === 'AppAction';
             const isApprovalCommit = step.type === 'ApprovalCommit' || step.systemKind === 'ApprovalCommit';
@@ -1817,6 +1850,7 @@ class WorkCenterProcessPreview {
                             : null,
                 status: step.status ?? null,
                 style: isAppAction || isApprovalCommit ? 'icon' : 'detail',
+                current: currentStepIds.has(String(step.id)),
             };
         });
     }, ...(ngDevMode ? [{ debugName: "schemaNodes" }] : /* istanbul ignore next */ []));
@@ -1836,6 +1870,7 @@ class WorkCenterProcessPreview {
         badge: 'badge',
         status: 'status',
         style: 'style',
+        current: 'current',
     };
     constructor() {
         effect(() => {
@@ -1853,6 +1888,13 @@ class WorkCenterProcessPreview {
     ngOnDestroy() {
         this.loadSub?.unsubscribe();
     }
+    resolveGroupName(target) {
+        if (!target || target.type !== 'Group' || !target.group) {
+            return '';
+        }
+        return (this.resolveDisplayName(target.displayName) ||
+            this.resolveDisplayName(target.group.name));
+    }
     resolveDisplayName(name) {
         if (typeof name === 'string') {
             return name;