@acorex/platform 20.6.0-next.16 → 20.6.0-next.18

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

@@ -1398,7 +1398,7 @@ class AXPEntityCreateViewSectionViewModel {
             const { interfaces, properties } = this.entity;
             const createProps = interfaces?.master?.create?.properties ?? [];
             const createPropNames = new Set(createProps.map(({ name }) => name));
-            const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id && !schema.hidden && createPropNames.has(name));
+            const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id && createPropNames.has(name));
             return filteredProperties.map((property) => {
                 const createProp = createProps.find(({ name }) => name === property.name);
                 return new AXPEntityCreateViewElementViewModel(this.entity, this, property, createProp);
@@ -1418,6 +1418,9 @@ class AXPEntityCreateViewElementViewModel {
         this.editable = computed(() => {
             return !(this.property.schema.readonly ?? false);
         }, ...(ngDevMode ? [{ debugName: "editable" }] : []));
+        this.isHidden = computed(() => {
+            return this.property.schema.hidden ?? false;
+        }, ...(ngDevMode ? [{ debugName: "isHidden" }] : []));
         this.isRequired = computed(() => {
             return this.property.validations?.some((c) => c.rule == 'required') || false;
         }, ...(ngDevMode ? [{ debugName: "isRequired" }] : []));
@@ -1463,7 +1466,7 @@ class AXPEntityMasterCreateViewModel {
         this.sections = computed(() => {
             const { interfaces, properties } = this.entityDef;
             const createProps = interfaces?.master?.create?.properties?.map(({ name }) => name) ?? [];
-            const visibleProperties = properties.filter(({ groupId, schema, name }) => groupId && !schema.hidden && createProps.includes(name));
+            const visibleProperties = properties.filter(({ groupId, schema, name }) => groupId && createProps.includes(name));
             const sections = interfaces?.master?.create?.sections?.filter(({ id }) => visibleProperties.some(({ groupId }) => groupId === id)) ?? [];
             console.log({ sections, visibleProperties });
             return sections.map((section) => new AXPEntityCreateViewSectionViewModel(this.entityDef, section));
@@ -3248,6 +3251,8 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
         const factory = new AXPRelatedEntityConverterFactory();
         const tabDetailTabs = await this.buildTabDetails(factory, tabDetailEntities ?? [], context);
         const tabListTabs = await this.buildTabLists(factory, tabListEntities ?? [], context);
+        // Build actions from single interface
+        const actions = this.buildActions(entityDef, helpers.singleInterface);
         return {
             id: entityDef?.name ?? '',
             title: `${context.rootTitle}`,
@@ -3255,12 +3260,73 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
             icon: relatedEntity.icon || entityDef.icon,
             settings: this.createPageSettings(),
             load: this.createLoadFunction(entityDef, relatedEntity, evaluateExpressions),
-            execute: this.createExecuteFunction(entityDef),
+            execute: this.createExecuteFunction(entityDef, actions, evaluateExpressions, context),
+            actions: await this.buildEvaluatedActions(actions, evaluateExpressions),
             // tabs: [...tabDetailTabs, ...tabListTabs],
             content: [await this.createGridLayoutStructure(helpers.singleInterface, helpers, evaluateExpressions)],
         };
     }
     //#region ----   Utility Methods   ----
+    buildActions(entityDef, singleInterface) {
+        const actions = singleInterface?.actions ?? [];
+        return actions.map((action) => new AXPEntityCommandTriggerViewModel(entityDef, action));
+    }
+    async buildEvaluatedActions(actions, evaluateExpressions) {
+        const evaluatedActions = [];
+        for (const action of actions) {
+            // Evaluate disabled condition
+            let disabled = action.disabled;
+            if (disabled && typeof disabled === 'string' && evaluateExpressions) {
+                try {
+                    const result = await evaluateExpressions({ disabled: disabled });
+                    disabled = result.disabled;
+                }
+                catch {
+                    disabled = false;
+                }
+            }
+            // Evaluate hidden condition
+            let hidden = action.hidden;
+            if (hidden && typeof hidden === 'string' && evaluateExpressions) {
+                try {
+                    const result = await evaluateExpressions({ hidden: hidden });
+                    hidden = result.hidden;
+                }
+                catch {
+                    hidden = false;
+                }
+            }
+            // Skip if hidden
+            if (hidden)
+                continue;
+            // Evaluate options
+            let options = action.options;
+            if (options && evaluateExpressions) {
+                try {
+                    options = await evaluateExpressions(options);
+                }
+                catch {
+                    // Keep original options if evaluation fails
+                }
+            }
+            evaluatedActions.push({
+                name: action.name,
+                title: action.title,
+                icon: action.icon,
+                color: action.color,
+                disabled: disabled || false,
+                zone: 'header',
+                priority: action.priority,
+                scope: action.scope === AXPEntityCommandScope.Individual ? AXPEntityCommandScope.TypeLevel : action.scope,
+                command: {
+                    name: action.name,
+                    options: options,
+                    metadata: action.metadata,
+                },
+            });
+        }
+        return evaluatedActions;
+    }
     createPageSettings() {
         return {
             commands: {
@@ -3289,20 +3355,70 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
             return { success: true, data: result };
         };
     }
-    createExecuteFunction(entityDef) {
+    createExecuteFunction(entityDef, actions, evaluateExpressions, converterContext) {
         return async (e, context) => {
-            if (e.name === 'update-entity') {
-                const fn = entityDef?.commands?.update?.execute;
-                const result = await fn(context);
-                return { success: true, data: result };
+            try {
+                if (e.name === 'update-entity') {
+                    const fn = entityDef?.commands?.update?.execute;
+                    const result = await fn(context);
+                    return {
+                        success: true,
+                        data: result,
+                    };
+                }
+                else {
+                    // Find action in single interface actions
+                    const action = actions.find((a) => a.name === e.name);
+                    if (action && converterContext.workflowService) {
+                        // Evaluate action options with current context
+                        let evaluatedOptions = action.options;
+                        if (evaluateExpressions && action.options) {
+                            try {
+                                evaluatedOptions = await evaluateExpressions(action.options);
+                            }
+                            catch {
+                                // Keep original options if evaluation fails
+                            }
+                        }
+                        const commandName = e.name.split('&')[0];
+                        if (converterContext.workflowService.exists(commandName)) {
+                            await converterContext.workflowService.execute(commandName, {
+                                entity: getEntityInfo(entityDef).source,
+                                data: context,
+                                entityInfo: {
+                                    name: entityDef.name,
+                                    module: entityDef.module,
+                                    title: entityDef.title,
+                                    parentKey: entityDef.parentKey,
+                                    source: `${entityDef.module}.${entityDef.name}`,
+                                },
+                                options: evaluatedOptions,
+                                metadata: action.metadata,
+                            });
+                            return {
+                                success: true,
+                            };
+                        }
+                        if (converterContext.commandService?.exists(commandName)) {
+                            // check options for evaluation
+                            await converterContext.commandService.execute(commandName, e.options);
+                        }
+                    }
+                    return {
+                        success: false,
+                        message: {
+                            code: 'invalid_command',
+                            text: 'Invalid command',
+                        },
+                    };
+                }
             }
-            else {
+            catch (error) {
                 return {
                     success: false,
                     message: {
-                        code: 'invalid_command',
-                        text: 'Invalid command'
-                    }
+                        text: error,
+                    },
                 };
             }
         };
@@ -4169,7 +4285,7 @@ class AXPMainEntityContentBuilder {
                 disabled: disabled || false,
                 zone: 'header',
                 priority: action.priority,
-                scope: action.scope,
+                scope: action.scope === AXPEntityCommandScope.Individual ? AXPEntityCommandScope.TypeLevel : action.scope,
                 command: {
                     name: action.name,
                     options: options,
@@ -4362,7 +4478,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                 }]
         }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }, { type: i4$1.AXPFilterOperatorMiddlewareService }] });
 
-const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory)) => {
+const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), commandService = inject(AXPCommandService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory)) => {
     const moduleName = route.parent?.paramMap.get('module');
     const entityName = route.paramMap.get('entity');
     const id = route.paramMap.get('id');
@@ -4372,6 +4488,7 @@ const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver =
         session,
         formatService,
         workflowService,
+        commandService,
     };
     return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
 };
@@ -4467,12 +4584,12 @@ const DEFAULT_SECTION_ORDER = {
  */
 const DEFAULT_PROPERTY_ORDER = {
     // Basic Info section
-    'basic-info.code': 1,
-    'basic-info.title': 2,
-    'basic-info.name': 3,
-    'basic-info.description': 10,
-    'basic-info.note': 11,
-    'basic-info.notes': 12,
+    'basic-info.code': -10,
+    'basic-info.title': -9,
+    'basic-info.name': -8,
+    'basic-info.description': -7,
+    'basic-info.note': -6,
+    'basic-info.notes': -5,
     // Classification section
     'classification.categoryIds': 1,
     'classification.tags': 2,