@acorex/platform 19.2.6 → 19.2.8

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -2,13 +2,13 @@ import * as i2$1 from '@acorex/components/common';
 import { AXDataSource, AXCommonModule } from '@acorex/components/common';
 import { AXFormatService } from '@acorex/core/format';
 import * as i1$3 from '@acorex/platform/common';
-import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingScope, AXPSettingService, AXPExpressionEvaluatorService, AXPRefreshEvent, AXPWorkflowNavigateAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPToastAction } from '@acorex/platform/common';
 import * as i2$3 from '@acorex/platform/workflow';
 import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, computed, signal, Injector, effect, Component, ChangeDetectionStrategy, HostBinding, DestroyRef, ViewChild, NgModule } from '@angular/core';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
-import { cloneDeep, set, merge, isNil, get, sortBy } from 'lodash-es';
+import { cloneDeep, set, merge, get, isNil, sortBy } from 'lodash-es';
 import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
 import * as i7 from '@acorex/platform/layout/builder';
 import { AXPWidgetRegistryService, AXPWidgetComponent, AXPLayoutBuilderModule, AXPColumnWidgetComponent, AXP_WIDGETS_EDITOR_GROUP, AXPWidgetsCatalog } from '@acorex/platform/layout/builder';
@@ -77,7 +77,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.3", ngImpor
 
 class AXPEntityCommandTriggerViewModel {
     constructor(entity, action) {
-        this.name = typeof action.command === 'string' ? action.command : action.command.name;
+        this.name = `${typeof action.command === 'string' ? action.command : action.command.name}&${action.name}`;
         this.options = typeof action.command === 'object' ? action.command.options : undefined;
         const resolvedLook = resolveActionLook(action);
         this.priority = action.priority;
@@ -85,6 +85,8 @@ class AXPEntityCommandTriggerViewModel {
         this.separated = action.separated ?? false;
         this.color = action.color ?? resolvedLook.color;
         this.icon = action.icon ?? resolvedLook.icon;
+        this.hidden = action.hidden ?? false;
+        this.disabled = action.disabled ?? false;
         this.scope = action.scope;
     }
 }
@@ -138,7 +140,9 @@ class AXPEntityDetailListViewModel {
         });
         //****************** Title ******************//
         this.title = computed(() => {
-            return this.detailEntityConfig.title ?? this.detailEntity()?.interfaces?.detail?.list?.title ?? this.detailEntity()?.formats.plural;
+            return (this.detailEntityConfig.title ??
+                this.detailEntity()?.interfaces?.detail?.list?.title ??
+                this.detailEntity()?.formats.plural);
         });
         //****************** Inline filter ******************//
         this.inlineFiltersPlaceholders = computed(() => {
@@ -157,10 +161,14 @@ class AXPEntityDetailListViewModel {
             return this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Selected).length;
         });
         this.primaryActions = computed(() => {
-            return this.allActions().filter((a) => a.priority == 'primary' && ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) || (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())));
+            return this.allActions().filter((a) => a.priority == 'primary' &&
+                ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
+                    (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())));
         });
         this.secondaryActions = computed(() => {
-            return this.allActions().filter((a) => a.priority == 'secondary' && ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) || (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())));
+            return this.allActions().filter((a) => a.priority == 'secondary' &&
+                ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
+                    (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())));
         });
         this.primaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'primary'));
         this.secondaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'secondary'));
@@ -256,7 +264,11 @@ class AXPEntityDetailListViewModel {
     }
     //******************  Commands ******************//
     async executeCommand(commandName, data = null) {
-        const action = this.allActions().find((c) => c.name == commandName && ((this.selectedItems().length ? c.scope == AXPEntityCommandScope.Selected : c.scope == AXPEntityCommandScope.Individual) || c.scope == AXPEntityCommandScope.TypeLevel));
+        const action = this.allActions().find((c) => c.name == commandName &&
+            ((this.selectedItems().length
+                ? c.scope == AXPEntityCommandScope.Selected
+                : c.scope == AXPEntityCommandScope.Individual) ||
+                c.scope == AXPEntityCommandScope.TypeLevel));
         if (action?.scope == AXPEntityCommandScope.TypeLevel) {
             if (data == null) {
                 data = {};
@@ -272,7 +284,8 @@ class AXPEntityDetailListViewModel {
             }
         }
         console.log({ action, detailEntity: this.detailEntity });
-        await this.workflow.execute(commandName, {
+        const command = commandName.split('&')[0];
+        await this.workflow.execute(command, {
             entity: getEntityInfo(this.detailEntity()).source,
             data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
             entityInfo: {
@@ -580,6 +593,7 @@ class AXPEntityMasterListViewModel {
         this.workflow = this.injector.get(AXPWorkflowService);
         this.settings = this.injector.get(AXPSettingService);
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
+        this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.settingListViewKey = '';
         this.settingSelectedViewKey = '';
@@ -667,7 +681,6 @@ class AXPEntityMasterListViewModel {
             return this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Selected).length;
         });
         this.primaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'primary'));
-        this.secondaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'secondary'));
         //****************** Filter ******************//
         this.simpleFilters = signal({
             field: null,
@@ -730,7 +743,6 @@ class AXPEntityMasterListViewModel {
             .pipe(ofType(AXPRefreshEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
-            debugger;
             if (event.payload.entity == getEntityInfo(this.entityDef).source) {
                 this.selectedItems.set([]);
                 this.events$.next({ action: 'refresh', meta: event.payload.meta });
@@ -752,6 +764,30 @@ class AXPEntityMasterListViewModel {
     clearSelection() {
         this.selectedItems.set([]);
     }
+    // public secondaryRowActions = computed<AXPEntityCommandTriggerViewModel[]>(() =>
+    //   this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'secondary')
+    // );
+    async secondaryRowActions(rowData) {
+        const scope = {
+            context: {
+                eval: (path) => get(rowData, path),
+            },
+        };
+        const actions = await Promise.all(this.allActions()
+            .filter((a) => a.scope === AXPEntityCommandScope.Individual && a.priority === 'secondary')
+            .map(async (a) => {
+            const isHidden = typeof a.hidden === 'string' && a.hidden.includes('{{')
+                ? await this.expressionEvaluator.evaluateExpression(rowData, a.hidden, scope)
+                : a.hidden;
+            if (isHidden)
+                return null;
+            const disabled = typeof a.disabled === 'string' && a.disabled.includes('{{')
+                ? await this.expressionEvaluator.evaluateExpression(rowData, a.disabled, scope)
+                : a.disabled;
+            return { ...a, disabled };
+        }));
+        return actions.filter(Boolean);
+    }
     get filtersDef() {
         const props = this.entityDef.properties.filter((c) => c.options?.filter?.advance?.enabled);
         return props.map((e) => {
@@ -920,12 +956,15 @@ class AXPEntityMasterListViewModel {
     }
     //******************  Commands ******************//
     async executeCommand(commandName, data = null) {
-        const action = this.allActions().find((c) => c.name == commandName &&
-            ((this.selectedItems().length
-                ? c.scope == AXPEntityCommandScope.Selected
-                : c.scope == AXPEntityCommandScope.Individual) ||
-                c.scope == AXPEntityCommandScope.TypeLevel));
-        await this.workflow.execute(commandName, {
+        const action = this.allActions().find((c) => {
+            return (c.name == commandName &&
+                ((this.selectedItems().length
+                    ? c.scope == AXPEntityCommandScope.Selected
+                    : c.scope == AXPEntityCommandScope.Individual) ||
+                    c.scope == AXPEntityCommandScope.TypeLevel));
+        });
+        const command = commandName.split('&')[0];
+        await this.workflow.execute(command, {
             entity: getEntityInfo(this.entityDef).source,
             entityInfo: {
                 name: this.entityDef.name,
@@ -989,7 +1028,6 @@ class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
         const showResult = process?.showResult ?? true;
         const ids = Array.isArray(data) ? data.map((c) => c.id) : [data.id];
         const entity = await this.entityRegistery.resolve(moduleName, entityName);
-        debugger;
         if (entity.parentKey && data[entity.parentKey]) {
             context.setVariable('meta', { ...meta, refreshTargetId: data[entity.parentKey] });
         }
@@ -2539,7 +2577,6 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
             const prevData = context.getVariable('data');
             const prevMeta = context.getVariable('meta');
             context.setVariable('data', { ...prevData, ...result.data.item });
-            debugger;
             if (entityRef.parentKey && result.data.item[entityRef.parentKey]) {
                 context.setVariable('meta', { ...prevMeta, refreshTargetId: result.data.item[entityRef.parentKey] });
             }
@@ -2614,7 +2651,6 @@ class AXPQuickEntityModifyPopupAction extends AXPWorkflowAction {
         this.factory = inject(AXPEntityMasterUpdateViewModelFactory);
     }
     async execute(context) {
-        debugger;
         const [moduleName, entityName] = context.getVariable('entity').split('.');
         const data = context.getVariable('data');
         const entityRef = await this.entityRegistery.resolve(moduleName, entityName);