@acorex/modules 20.4.1 → 20.4.2

package/data-management/index.d.ts

@@ -44,7 +44,6 @@ declare const RootConfig: {
     };
     module: {
         route: string;
-        module: string;
         name: string;
         title: string;
         icon: string;

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

@@ -41,7 +41,6 @@ const RootConfig = {
     config,
     module: {
         route: 'data-management',
-        module: 'dataManagement',
         name: 'DataManagement',
         title: `t('module-name', {scope:"${config.i18n}"})`,
         icon: 'fa-regular fa-database',
@@ -3867,6 +3866,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
         //#region ----   Services & Dependencies   ----
         this.dataSelectorService = inject(AXPDataSelectorService);
         this.metaDataService = inject(AXMMetaDataDefinitionService);
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         //#endregion
         //#region ----   Computed Properties   ----
         /**
@@ -3893,21 +3893,21 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                 },
                 status: item.status || 'active',
                 order: item.order ?? index,
-                ...item
+                ...item,
             }));
         }, ...(ngDevMode ? [{ debugName: "metaItems" }] : []));
         //#endregion
         //#region ----   Event Handlers   ----
         /**
          * Effect to handle status changes
-        */
+         */
         this.#statusChanged = effect(() => {
             if (this.layoutService.status() === AXPPageStatus.Submitting) {
                 const currentValue = this.getValue();
                 if (Array.isArray(currentValue)) {
                     const cleanedValue = currentValue
-                        .filter(item => item.status !== 'deleted')
-                        .map(item => {
+                        .filter((item) => item.status !== 'deleted')
+                        .map((item) => {
                         const { isNewlyAdded, ...rest } = item;
                         return rest;
                     });
@@ -3920,7 +3920,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
     //#region ----   Event Handlers   ----
     /**
      * Effect to handle status changes
-    */
+     */
     #statusChanged;
     /**
      * Handle adding a new metadata item
@@ -3934,9 +3934,9 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                     const metaDataItems = await this.metaDataService.query(e);
                     return {
                         items: metaDataItems.items,
-                        total: metaDataItems.total
+                        total: metaDataItems.total,
                     };
-                }
+                },
             });
             // Create category tree data source for filtering
             const categoryTreeDataSource = {
@@ -3948,8 +3948,8 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                         filter: {
                             field: 'parentId',
                             operator: { type: 'isEmpty' },
-                            value: true
-                        }
+                            value: true,
+                        },
                     });
                     // Convert to tree nodes format (childCount is now calculated by the service)
                     return result.items.map((item) => ({
@@ -3957,7 +3957,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                         title: item.title || item.name,
                         description: item.description || '',
                         parentId: item.parentId,
-                        childCount: item.childCount || 0
+                        childCount: item.childCount || 0,
                     }));
                 },
                 loadChildNodes: async (parentId) => {
@@ -3968,8 +3968,8 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                         filter: {
                             field: 'parentId',
                             operator: { type: 'equal' },
-                            value: parentId
-                        }
+                            value: parentId,
+                        },
                     });
                     // Convert to tree nodes format (childCount is now calculated by the service)
                     return result.items.map((item) => ({
@@ -3977,7 +3977,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                         title: item.title || item.name,
                         description: item.description || '',
                         parentId: item.parentId,
-                        childCount: item.childCount || 0
+                        childCount: item.childCount || 0,
                     }));
                 },
                 searchNodes: async (searchValue) => {
@@ -3990,16 +3990,16 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                                 {
                                     field: 'title',
                                     operator: { type: 'contains' },
-                                    value: searchValue
+                                    value: searchValue,
                                 },
                                 {
                                     field: 'name',
                                     operator: { type: 'contains' },
-                                    value: searchValue
-                                }
+                                    value: searchValue,
+                                },
                             ],
-                            logic: 'or'
-                        }
+                            logic: 'or',
+                        },
                     });
                     // Convert to tree nodes format (childCount is now calculated by the service)
                     return result.items.map((item) => ({
@@ -4007,37 +4007,57 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                         title: item.title || item.name,
                         description: item.description || '',
                         parentId: item.parentId,
-                        childCount: item.childCount || 0
+                        childCount: item.childCount || 0,
                     }));
-                }
+                },
             };
+            const entity = await this.entityResolver.resolve(RootConfig.module.name, RootConfig.entities.metaDataDefinition.name);
+            if (!entity) {
+                throw new Error('Entity not found with name: ' + RootConfig.entities.metaDataDefinition.name);
+            }
+            const columns = entity.columns
+                ?.filter((column) => entity.properties.some((property) => property.name === column.name))
+                .map((column) => {
+                const property = entity.properties.find((prop) => prop.name === column.name);
+                return {
+                    name: column.name,
+                    title: property?.title ?? '',
+                    visible: column.options?.visible !== false,
+                    widget: {
+                        type: column.showAs?.type ?? property?.schema?.interface?.type ?? 'text-editor',
+                        options: column.showAs?.options ?? property?.schema?.interface?.options ?? {},
+                    },
+                };
+            }) || [];
+            debugger;
             // Open data selector with category filter
             const result = await this.dataSelectorService.openWithCategoryFilter({
                 title: '@data-management:meta-data-selector.select-items',
                 dataSource: dataSource,
-                columns: [
-                    {
-                        name: 'title',
-                        title: '@general:terms.common.title',
-                        visible: true,
-                        widget: {
-                            type: 'text-editor',
-                            options: {}
-                        }
-                    },
-                    {
-                        name: 'description',
-                        title: '@general:terms.common.description',
-                        visible: true,
-                        widget: {
-                            type: 'text-editor',
-                            options: {}
-                        }
-                    },
-                ],
+                // columns: [
+                //   {
+                //     name: 'title',
+                //     title: '@general:terms.common.title',
+                //     visible: true,
+                //     widget: {
+                //       type: 'text-editor',
+                //       options: {}
+                //     }
+                //   },
+                //   {
+                //     name: 'description',
+                //     title: '@general:terms.common.description',
+                //     visible: true,
+                //     widget: {
+                //       type: 'text-editor',
+                //       options: {}
+                //     }
+                //   },
+                // ],
+                columns: columns,
                 selectionMode: 'multiple',
                 searchFields: ['title', 'description'],
-                allowCreate: false
+                allowCreate: false,
             }, {
                 title: '@data-management:meta-data-selector.categories',
                 dataSource: categoryTreeDataSource,
@@ -4056,7 +4076,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
                     interface: item.interface,
                     configuration: {
                         isRequired: false,
-                        placeholder: ''
+                        placeholder: '',
                     },
                     order: currentValue.length + index,
                     isNewlyAdded: true, // Mark as newly added
@@ -4097,7 +4117,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
         // Update order property
         const updatedItems = currentValue.map((item, index) => ({
             ...item,
-            order: index
+            order: index,
         }));
         this.setValue(updatedItems);
     }
@@ -4131,7 +4151,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
      */
     updateMetaItem(item) {
         const currentValue = this.getValue() || [];
-        const updatedValue = currentValue.map((meta) => meta.id === item.id ? { ...meta, ...item } : meta);
+        const updatedValue = currentValue.map((meta) => (meta.id === item.id ? { ...meta, ...item } : meta));
         this.setValue(updatedValue);
     }
     //#endregion
@@ -4381,6 +4401,14 @@ class AXPMetaDataFormWidgetEditComponent extends AXPValueWidgetComponent {
          * Array of metadata definitions to render as form fields
          */
         this.definitions = computed(() => this.options()['definitions'] ?? [], ...(ngDevMode ? [{ debugName: "definitions" }] : []));
+        /**
+         * Text field to use for the meta data form, default is 'title'
+         */
+        this.textField = computed(() => this.options()['textField'] ?? 'title', ...(ngDevMode ? [{ debugName: "textField" }] : []));
+        /**
+         * Value field to use for the meta data form, default is 'name'
+         */
+        this.valueField = computed(() => this.options()['valueField'] ?? 'name', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
         this.#effect = effect(() => {
             this.initializeFormDefinition();
         }, ...(ngDevMode ? [{ debugName: "#effect" }] : []));
@@ -4538,13 +4566,14 @@ class AXPMetaDataFormWidgetEditComponent extends AXPValueWidgetComponent {
             };
         }
         const interfaceConfig = this.parseInterfaceConfig(metadata.interface);
+        debugger;
         return {
-            path: metadata.name || 'unnamed',
-            title: metadata.title || 'Untitled Field',
+            path: metadata[this.valueField()] || 'unnamed',
+            title: metadata[this.textField()] || 'Untitled Field',
             description: undefined, // metadata.description not available in current interface
             widget: {
                 type: interfaceConfig.type || 'text-editor',
-                path: metadata.name || 'unnamed',
+                path: metadata[this.valueField()] || 'unnamed',
                 options: {
                     ...interfaceConfig.options,
                     defaultValue: metadata.defaultValue,
@@ -4726,6 +4755,8 @@ const metaDataFormPlugin = {
                         type: 'meta-data-form-editor',
                         options: {
                             definitions: metadataExpression,
+                            textField: options.textField,
+                            valueField: options.valueField,
                         },
                     },
                 },