@acorex/modules 21.0.0-next.37 → 21.0.0-next.40

package/fesm2022/acorex-modules-data-management.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { computed, effect, HostBinding, ChangeDetectionStrategy, Component, EventEmitter, signal, Output, Input, inject, ElementRef, DestroyRef, PLATFORM_ID, input, output, untracked, afterNextRender, InjectionToken, Injectable, Injector, NgModule, viewChild, model, ViewEncapsulation } from '@angular/core';
-import { AXPDataSourceDefinitionProviderService, applyFilterArray, applySortArray, AXPSystemActionType, AXPContextStore, isEffectivelyEmptyLocalizedValue, AXPDataGenerator, AXPMultiLanguageStringResolverService, compareMultiLanguageStrings, AXPTagProvider, AXP_TAG_PROVIDER, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, provideLazyProvider } from '@acorex/platform/core';
+import { AXPDataSourceDefinitionProviderService, applyFilterArray, applySortArray, AXPSystemActionType, AXPContextStore, AXPDataGenerator, compareMultiLanguageStrings, AXPTagProvider, AXP_TAG_PROVIDER, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, provideLazyProvider } from '@acorex/platform/core';
 import { AXPStateMessageComponent, AXPStandardSectionItemsBuilderComponent, AXPDataSelectorService, AXPWidgetPropertyViewerService, AXPItemConfiguratorComponent, AXP_PAGE_COMPONENT_PROVIDER } from '@acorex/platform/layout/components';
 import { AXPEntityDefinitionRegistryService, AXPEntityService, AXMEntityCrudServiceImpl, entityMasterCrudActions, entityMasterRecordActions, entityMasterDeleteAction, resolveEntityPluginDetailPageOrder, actionExists, AXP_ENTITY_ACTION_PLUGIN, ensureListActions, cloneLayoutArrays, ensureLayoutSection, ensureLayoutPropertyView, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import * as i4 from '@acorex/platform/layout/widget-core';
@@ -20,7 +20,7 @@ import { AXTabsModule } from '@acorex/components/tabs';
 import * as i5$1 from '@acorex/components/label';
 import { AXLabelModule } from '@acorex/components/label';
 import * as i7 from '@acorex/core/translation';
-import { AXTranslationModule, AXTranslationService } from '@acorex/core/translation';
+import { AXTranslationModule, AXTranslationService, isEffectivelyEmptyLocalizedValue } from '@acorex/core/translation';
 import * as i6 from '@angular/common';
 import { CommonModule, isPlatformBrowser } from '@angular/common';
 import * as i2$1 from '@acorex/components/button';
@@ -9127,9 +9127,7 @@ class AXPMetaDataBuilderGroupsComponent {
                 ? result.values.name.trim()
                 : String(item['name'] ?? '');
             const labelAfter = result.values?.options?.label;
-            const overriddenTitle = labelAfter !== undefined &&
-                labelAfter !== null &&
-                !isEffectivelyEmptyLocalizedValue(labelAfter)
+            const overriddenTitle = labelAfter !== undefined && labelAfter !== null && !isEffectivelyEmptyLocalizedValue(labelAfter)
                 ? labelAfter
                 : (item['title'] ?? '');
             return {
@@ -9973,6 +9971,41 @@ function normalizeDisplayConfig(display, defaultTitle) {
             return { section: { enabled: true } };
     }
 }
+/**
+ * Builds an expression that is true when `metadata.fromCategory` / `metadata.fromEntity` returns at least one non-empty field.
+ * Matches {@link AXPMetaDataFormWidgetEditComponent} `hasDefinitions` semantics.
+ */
+function buildHasMetadataFieldsVisibilityExpression(kind, moduleDotEntity, pathField, targetEntity) {
+    const pathAccessor = `context.eval('${pathField}')`;
+    const awaited = kind === 'category'
+        ? `(await metadata.fromCategory("${moduleDotEntity}", ${pathAccessor}))`
+        : `(await metadata.fromEntity("${targetEntity}", ${pathAccessor}))`;
+    return `{{ ${awaited}.some((g) => (g.fields || []).some((f) => f != null)) }}`;
+}
+/**
+ * Merges `layout.visible` onto an existing master section or creates the section so entity → layout builders
+ * (e.g. `AXPEntityFormBuilderService` fieldsets) can hide whole groups.
+ */
+function upsertMasterSectionLayoutVisible(sections, sectionId, sectionTitle, sectionOrder, schemaVisibleExpr) {
+    const idx = sections.findIndex((s) => s.id === sectionId);
+    const layoutPatch = schemaVisibleExpr ? { visible: schemaVisibleExpr } : {};
+    if (idx === -1) {
+        sections.push({
+            id: sectionId,
+            title: sectionTitle,
+            order: sectionOrder,
+            ...(Object.keys(layoutPatch).length > 0 ? { layout: layoutPatch } : {}),
+        });
+        return;
+    }
+    if (schemaVisibleExpr) {
+        const cur = sections[idx];
+        sections[idx] = {
+            ...cur,
+            layout: { ...(cur.layout ?? {}), ...layoutPatch },
+        };
+    }
+}
 /**
  * meta-data-form plugin
  * Notes:
@@ -9984,6 +10017,7 @@ function normalizeDisplayConfig(display, defaultTitle) {
  * - Auto-detects category lookup vs relationship lookup based on field definition
  * - field defaults to 'metaDataForm', title defaults to 'Meta Data Form'
  * - Silently ignores if path field is not properly configured
+ * - hideSectionWhenEmpty defaults to true (opt out with hideSectionWhenEmpty: false)
  */
 const metaDataFormPlugin = {
     name: 'meta-data-form',
@@ -10021,14 +10055,22 @@ const metaDataFormPlugin = {
             return; // Ignore - path field doesn't have valid entity option
         }
         let metadataExpression;
+        const moduleDotEntity = `${ctx.entity.module}.${ctx.entity.name}`;
         if (targetEntity.endsWith('Category')) {
             // Scenario 1: Category lookup - use fromCategory
-            metadataExpression = `{{ metadata.fromCategory("${ctx.entity.module}.${ctx.entity.name}", context.eval('${options.path}')) }}`;
+            metadataExpression = `{{ metadata.fromCategory("${moduleDotEntity}", context.eval('${options.path}')) }}`;
         }
         else {
             // Scenario 2: Relationship lookup - use fromEntity
             metadataExpression = `{{ metadata.fromEntity("${targetEntity}", context.eval('${options.path}')) }}`;
         }
+        const customSectionVisible = sectionConfig.visible?.trim();
+        const autoHideWhenEmpty = options.hideSectionWhenEmpty !== false;
+        const schemaVisibleExpr = customSectionVisible && customSectionVisible.length > 0
+            ? customSectionVisible
+            : autoHideWhenEmpty
+                ? buildHasMetadataFieldsVisibilityExpression(targetEntity.endsWith('Category') ? 'category' : 'entity', moduleDotEntity, options.path, targetEntity)
+                : undefined;
         // Ensure group and section ids (unique per field)
         const sectionId = `meta-data-form-${field}`;
         const groupIdForProperty = `meta-data-form-${field}`;
@@ -10044,6 +10086,7 @@ const metaDataFormPlugin = {
                 groupId: groupIdForProperty,
                 schema: {
                     dataType: 'string',
+                    ...(schemaVisibleExpr ? { visible: schemaVisibleExpr } : {}),
                     interface: {
                         type: 'meta-data-form-editor',
                         options: {
@@ -10053,6 +10096,13 @@ const metaDataFormPlugin = {
                 },
             });
         }
+        // Apply visibility even when the property was added earlier (e.g. another plugin defined metaDataForm first).
+        if (schemaVisibleExpr) {
+            const fieldProp = ctx.properties.list().find((p) => p.name === field);
+            if (fieldProp?.schema) {
+                fieldProp.schema = { ...fieldProp.schema, visible: schemaVisibleExpr };
+            }
+        }
         // Ensure column exists
         // const cols = ctx.columns.list() ?? [];
         // if (!cols?.some((c: any) => c.name === field)) {
@@ -10066,13 +10116,7 @@ const metaDataFormPlugin = {
             ctx.interfaces.master.single.update((single) => {
                 const next = single ?? { title: ctx.entity.title, sections: [], properties: [] };
                 next.sections = next.sections ?? [];
-                if (!next.sections.some((s) => s.id === sectionId)) {
-                    next.sections.push({
-                        id: sectionId,
-                        title: sectionTitle,
-                        order: sectionConfig.order ?? 200,
-                    });
-                }
+                upsertMasterSectionLayoutVisible(next.sections, sectionId, sectionTitle, sectionConfig.order ?? 200, schemaVisibleExpr);
                 next.properties = next.properties ?? [];
                 if (!next.properties.some((p) => p.name === field)) {
                     next.properties.push({
@@ -10089,13 +10133,7 @@ const metaDataFormPlugin = {
             ctx.interfaces.master.create.update((create) => {
                 const next = create ?? { sections: [], properties: [] };
                 next.sections = next.sections ?? [];
-                if (!next.sections.some((s) => s.id === sectionId)) {
-                    next.sections.push({
-                        id: sectionId,
-                        title: sectionTitle,
-                        order: sectionConfig.order,
-                    });
-                }
+                upsertMasterSectionLayoutVisible(next.sections, sectionId, sectionTitle, sectionConfig.order, schemaVisibleExpr);
                 next.properties = next.properties ?? [];
                 if (!next.properties.some((p) => p.name === field)) {
                     next.properties.push({
@@ -10112,13 +10150,7 @@ const metaDataFormPlugin = {
             ctx.interfaces.master.modify.update((modify) => {
                 const next = modify ?? { sections: [], properties: [] };
                 next.sections = next.sections ?? [];
-                if (!next.sections.some((s) => s.id === sectionId)) {
-                    next.sections.push({
-                        id: sectionId,
-                        title: sectionTitle,
-                        order: sectionConfig.order,
-                    });
-                }
+                upsertMasterSectionLayoutVisible(next.sections, sectionId, sectionTitle, sectionConfig.order, schemaVisibleExpr);
                 next.properties = next.properties ?? [];
                 if (!next.properties.some((p) => p.name === field)) {
                     next.properties.push({
@@ -10297,10 +10329,9 @@ class AXMetaDataConfiguratorComponent {
         //#region ----   Services   ----
         this.metaDataDefinitionService = inject(AXMMetaDataDefinitionService);
         this.translation = inject(AXTranslationService);
-        this.mlResolver = inject(AXPMultiLanguageStringResolverService);
         this.widgetRegistry = inject(AXPWidgetRegistryService);
         /** Recomputes list labels when the active locale changes. */
-        this.activeLocale = toSignal(this.mlResolver.currentLocale$, {
+        this.activeLocale = toSignal(this.translation.currentLocale$, {
             initialValue: this.translation.getActiveLang(),
         });
         //#endregion
@@ -10324,18 +10355,15 @@ class AXMetaDataConfiguratorComponent {
                 if (!id) {
                     continue;
                 }
-                let label = this.mlResolver.resolve(d.title);
+                let label = this.translation.resolve(d.title);
                 if (!label.trim()) {
-                    label =
-                        typeof d.name === 'string'
-                            ? d.name
-                            : this.mlResolver.resolve(d.name);
+                    label = typeof d.name === 'string' ? d.name : this.translation.resolve(d.name);
                 }
                 label = label.trim() || id;
                 const descRaw = d.description;
                 let description;
                 if (descRaw != null && descRaw !== '') {
-                    const text = this.mlResolver.resolve(descRaw).trim();
+                    const text = this.translation.resolve(descRaw).trim();
                     if (text) {
                         description = text;
                     }