@acorex-platform/module-workflow-management-client 0.0.57 → 0.0.58

package/fesm2022/{acorex-platform-module-workflow-management-client-acorex-platform-module-workflow-management-client-Ce2bU1tZ.mjs → acorex-platform-module-workflow-management-client-acorex-platform-module-workflow-management-client-DwHNK7p5.mjs}

@@ -17,7 +17,7 @@ import { ROUTES } from '@angular/router';
 import { AXDialogService } from '@acorex/components/dialog';
 import { AXTranslationService } from '@acorex/core/translation';
 import { AXPopupService } from '@acorex/components/popup';
-import { AXPDialogRendererComponent, AXPLayoutBuilderService, resolveLayoutBuilderDialogResult } from '@acorex-platform/framework-client/layout/builder';
+import { AXPDialogOpener, AXPDialogRendererComponent, AXPLayoutBuilderService, resolveLayoutBuilderDialogResult } from '@acorex-platform/framework-client/layout/builder';
 import { cloneDeep, isString, trim, isEmpty, defaultTo, merge, get } from 'lodash';
 import { AXToastService } from '@acorex/components/toast';
 import { AXPWidgetsList, runtimeCommandPayloadData, AXPSystemActionType, AXPStatusProvider, AXPSystemStatusType, systemStatusToDefinition, AXPRegionalSetting, AXPSystemStatuses, AXPWidgetsCatalog } from '@acorex-platform/framework-shared/core';
@@ -163,6 +163,7 @@ class ShowLayoutPopupActivity {
     constructor() {
         //#region ----   Services & Dependencies   ----
         this.popupService = inject(AXPopupService);
+        this.dialogOpener = inject(AXPDialogOpener);
     }
     //#endregion
     //#region ----   AXPCommand Implementation   ----
@@ -217,27 +218,47 @@ class ShowLayoutPopupActivity {
                 },
             };
             // Show dialog using AXPDialogRendererComponent. Close dialog before resolving so UI is updated before workflow continues.
-            const dialogResult = await new Promise((resolve) => {
-                this.popupService.open(AXPDialogRendererComponent, {
-                    title: dialogConfig.title,
-                    size: input.size || 'md',
-                    closeButton: input.closeButton !== undefined ? input.closeButton : true,
-                    closeOnBackdropClick: false,
-                    draggable: true,
-                    data: {
-                        config: dialogConfig,
-                        callBack: (result) => {
-                            if (typeof result?.close === 'function') {
-                                result.close();
-                            }
-                            resolve({
-                                context: result?.context?.() ?? dialogConfig.context,
-                                action: result?.action ? result.action() : 'cancel',
-                            });
+            const outcome = await this.dialogOpener.run({
+                load: () => Promise.resolve(AXPDialogRendererComponent),
+                data: { title: dialogConfig.title, size: input.size || 'md' },
+                present: (notifyShown, component) => new Promise((resolve) => {
+                    let settled = false;
+                    const finish = (value) => {
+                        if (settled) {
+                            return;
+                        }
+                        settled = true;
+                        resolve(value);
+                    };
+                    const opened = this.popupService.open(component, {
+                        title: dialogConfig.title,
+                        size: input.size || 'md',
+                        closeButton: input.closeButton !== undefined ? input.closeButton : true,
+                        closeOnBackdropClick: false,
+                        draggable: true,
+                        data: {
+                            config: dialogConfig,
+                            callBack: (result) => {
+                                if (typeof result?.close === 'function') {
+                                    result.close();
+                                }
+                                finish({
+                                    context: result?.context?.() ?? dialogConfig.context,
+                                    action: result?.action ? result.action() : 'cancel',
+                                });
+                            },
                         },
-                    },
-                });
+                    });
+                    notifyShown();
+                    void opened.finally(() => {
+                        finish({ context: dialogConfig.context, action: 'cancel' });
+                    });
+                }),
             });
+            if (outcome.duplicate) {
+                return { success: false };
+            }
+            const dialogResult = outcome.result;
             // Extract result data and action
             const result = dialogResult?.context || {};
             let actionName = 'cancel'; // Default action
@@ -2721,43 +2742,15 @@ class AXPWorkflowTaskContinuationService {
     }
     //#endregion
     //#region ----   Hook   ----
-    async offerBeforeInteractiveFlow(context) {
-        try {
-            // Resume from task board already means the user chose to act on this step.
-            if (context.completedActivityId) {
-                return 'not-offered';
-            }
-            const nextTask = context.pendingNextTask;
-            if (!nextTask || !axpIsWorkflowInlineFrontendTask(nextTask)) {
-                return 'not-offered';
-            }
-            const instance = await this.bookmarkAccess.loadInstanceForContinuation(context.instanceId);
-            if (!instance) {
-                return 'not-offered';
-            }
-            const bookmarks = this.bookmarkAccess.getActiveBookmarks(instance);
-            const activeActivityIds = bookmarks.map((b) => b.activityId);
-            if (!shouldOfferWorkflowContinuationAfterStep(context, activeActivityIds)) {
-                return 'not-offered';
-            }
-            const humanTaskAssigneeId = resolveWorkflowHumanTaskAssigneeId(instance, context.completedActivityId);
-            if (shouldSkipContinuationBeforeInteractive(context, nextTask, this.sessionService, instance, bookmarks, humanTaskAssigneeId)) {
-                return 'not-offered';
-            }
-            if (!shouldOfferWorkflowInteractiveStepContinuation(instance, this.sessionService, humanTaskAssigneeId)) {
-                return 'not-offered';
-            }
-            const takeOver = needsTakeOverForWorkflowInteractiveContinuation(instance, this.sessionService, humanTaskAssigneeId);
-            const confirmed = await this.confirmContinueToNextStep(takeOver);
-            return confirmed ? 'confirmed' : 'declined';
-        }
-        catch (error) {
-            console.warn('[AXPWorkflowTaskContinuationService] offerBeforeInteractiveFlow failed', error);
-            return 'not-offered';
-        }
+    async offerBeforeInteractiveFlow(_context) {
+        // The opening dialog is the step the user just started. Do not load the instance to ask.
+        return 'not-offered';
     }
     async offerAfterWorkflowStep(context) {
         try {
+            if (this.isAssignedToSomeoneElse(context.pendingNextTask)) {
+                return 'not-offered';
+            }
             const expectedActivityId = context.pendingNextTask?.activityId;
             const instance = await this.bookmarkAccess.loadInstanceForContinuation(context.instanceId, expectedActivityId);
             if (!instance) {
@@ -2830,6 +2823,9 @@ class AXPWorkflowTaskContinuationService {
     }
     async confirmAndAdvance(instanceId, continuationCtx, nextActivityId, nextBookmarkId) {
         const takeOver = needsTakeOverForWorkflowTaskContinuation(continuationCtx);
+        if (takeOver) {
+            return 'not-offered';
+        }
         const confirmed = await this.confirmContinueToNextStep(takeOver);
         if (!confirmed) {
             return 'declined';
@@ -2892,6 +2888,26 @@ class AXPWorkflowTaskContinuationService {
             context: input['context'],
         };
     }
+    /** Next human task belongs to another user. Do not ask the starter to take it over. */
+    isAssignedToSomeoneElse(task) {
+        if (!task || !axpIsWorkflowTaskBoardActivityType(task.activityType)) {
+            return false;
+        }
+        const currentUserId = this.sessionService.user?.id;
+        if (currentUserId == null) {
+            return false;
+        }
+        const assigned = task.input?.['assignedUserIds'];
+        const ids = Array.isArray(assigned)
+            ? assigned.map((id) => String(id).trim()).filter((id) => id.length > 0)
+            : assigned != null && String(assigned).trim().length > 0
+                ? [String(assigned).trim()]
+                : [];
+        if (ids.length === 0) {
+            return false;
+        }
+        return !ids.includes(String(currentUserId));
+    }
     async confirmContinueToNextStep(requiresTakeOver) {
         const title = await this.translationService.translateAsync('@workflow-management:tasks.dialogs.continue-next-step.title');
         const messageKey = requiresTakeOver
@@ -3062,7 +3078,7 @@ class AXMWorkflowManagementModule {
                 },
                 {
                     key: 'WorkflowManagement.WorkflowDefinition:Execute',
-                    command: () => import('./acorex-platform-module-workflow-management-client-execute-workflow.command-Cd1vcrzK.mjs').then((c) => c.ExecuteWorkflowCommand),
+                    command: () => import('./acorex-platform-module-workflow-management-client-execute-workflow.command-D1AQsYgn.mjs').then((c) => c.ExecuteWorkflowCommand),
                 },
                 {
                     key: 'WorkflowManagement.WorkflowDefinition:Activities:Save',
@@ -3106,23 +3122,23 @@ class AXMWorkflowManagementModule {
                 },
                 {
                     key: 'WorkflowManagement.WorkflowRun:Continue',
-                    command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.ContinueWorkflowRunCommand),
+                    command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.ContinueWorkflowRunCommand),
                 },
                 {
                     key: 'WorkflowManagement.WorkflowRun:CancelRun',
-                    command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.CancelWorkflowRunCommand),
+                    command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.CancelWorkflowRunCommand),
                 },
                 {
                     key: 'WorkflowManagement.WorkflowRun:TakeOver',
-                    command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.TakeOverWorkflowRunCommand),
+                    command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.TakeOverWorkflowRunCommand),
                 },
                 {
                     key: 'WorkflowManagement.WorkflowRun:ShowHistory',
-                    command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
+                    command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
                 },
                 {
                     key: 'WorkflowManagement.WorkflowRun:ShowHistory',
-                    command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
+                    command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
                 },
             ]),
             // provideEntity([RootConfig.entities.activityDefinition.fullName]),
@@ -3236,7 +3252,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
                             },
                             {
                                 key: 'WorkflowManagement.WorkflowDefinition:Execute',
-                                command: () => import('./acorex-platform-module-workflow-management-client-execute-workflow.command-Cd1vcrzK.mjs').then((c) => c.ExecuteWorkflowCommand),
+                                command: () => import('./acorex-platform-module-workflow-management-client-execute-workflow.command-D1AQsYgn.mjs').then((c) => c.ExecuteWorkflowCommand),
                             },
                             {
                                 key: 'WorkflowManagement.WorkflowDefinition:Activities:Save',
@@ -3280,23 +3296,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
                             },
                             {
                                 key: 'WorkflowManagement.WorkflowRun:Continue',
-                                command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.ContinueWorkflowRunCommand),
+                                command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.ContinueWorkflowRunCommand),
                             },
                             {
                                 key: 'WorkflowManagement.WorkflowRun:CancelRun',
-                                command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.CancelWorkflowRunCommand),
+                                command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.CancelWorkflowRunCommand),
                             },
                             {
                                 key: 'WorkflowManagement.WorkflowRun:TakeOver',
-                                command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.TakeOverWorkflowRunCommand),
+                                command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.TakeOverWorkflowRunCommand),
                             },
                             {
                                 key: 'WorkflowManagement.WorkflowRun:ShowHistory',
-                                command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
+                                command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
                             },
                             {
                                 key: 'WorkflowManagement.WorkflowRun:ShowHistory',
-                                command: () => import('./acorex-platform-module-workflow-management-client-index-DjvJZef8.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
+                                command: () => import('./acorex-platform-module-workflow-management-client-index-nljwSnXl.mjs').then((c) => c.ShowWorkflowRunHistoryCommand),
                             },
                         ]),
                         // provideEntity([RootConfig.entities.activityDefinition.fullName]),
@@ -5015,7 +5031,7 @@ class AXPGenericWorkflowTaskProvider extends AXPWorkflowTaskProvider {
     //#endregion
     //#region ----   Component   ----
     getComponent() {
-        return () => import('./acorex-platform-module-workflow-management-client-workflow-task-popover.component-Dmr9oHBd.mjs').then((m) => m.AXMWorkflowTaskPopoverComponent);
+        return () => import('./acorex-platform-module-workflow-management-client-workflow-task-popover.component-Cmcd551i.mjs').then((m) => m.AXMWorkflowTaskPopoverComponent);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXPGenericWorkflowTaskProvider, deps: [{ token: AXP_GENERIC_WORKFLOW_TASK_PROVIDER_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXPGenericWorkflowTaskProvider }); }
@@ -5038,4 +5054,4 @@ var genericWorkflowTask_provider = /*#__PURE__*/Object.freeze({
  */
 
 export { AXPWorkflowInstanceHumanTaskService as A, needsTakeOverForWorkflowInteractiveContinuation as B, CartableTaskActivity as C, needsTakeOverForWorkflowTaskContinuation as D, parseWorkflowTaskContinuationPayload as E, resolveWorkflowHumanTaskAssigneeId as F, resolveWorkflowInitiatorUserIdFromVariables as G, HumanTaskActivity as H, resolveWorkflowTaskContinuationAssigneeId as I, shouldOfferWorkflowContinuationAfterStep as J, shouldOfferWorkflowInteractiveStepContinuation as K, shouldOfferWorkflowTaskContinuation as L, shouldSkipContinuationBeforeInteractive as M, wasWorkflowTaskBoardActivity as N, RejectionReasonActivity as R, ShowConfirmPopupActivity as S, AXMWorkflowManagementCommandKeys as a, buildWorkflowTaskDisplayParamsFromWorkflowState as b, createWorkflowInstanceBookmarkAccess as c, buildWorkflowTaskDisplayParams as d, AXCCategoryProvider as e, AXMMenuProvider as f, AXMWorkflowActivitiesDefinitionProvider as g, AXMWorkflowManagementModule as h, isWorkflowPooledClaimablePayload as i, AXPCreateEntityActivity as j, AXPGenericWorkflowTaskProvider as k, AXPWorkflowTaskContinuationService as l, AXPWorkflowTaskInstanceQueryService as m, normalizeWorkflowTaskUserIds as n, AXP_GENERIC_WORKFLOW_TASK_PROVIDER_CONFIG as o, CreateEntityFormActivity as p, ShowLayoutPopupActivity as q, rehydrateWorkflowStateInputTitles as r, ShowToastActivity as s, SignOffActivity as t, discoverWorkflowTaskProviders as u, findActiveHumanTaskAssigneeId as v, findHumanTaskAssigneeIdForActivity as w, getWorkflowInstanceInitiatorUserId as x, isWorkflowReassignableHumanTaskPayload as y, isWorkflowTaskBoardBookmarkPayload as z };
-//# sourceMappingURL=acorex-platform-module-workflow-management-client-acorex-platform-module-workflow-management-client-Ce2bU1tZ.mjs.map
+//# sourceMappingURL=acorex-platform-module-workflow-management-client-acorex-platform-module-workflow-management-client-DwHNK7p5.mjs.map