@acorex/platform 19.2.3 → 19.2.4

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

@@ -312,7 +312,9 @@ class AXPEntityDefinitionRegistryService {
         this.entityResolver = inject(AXPEntityResolver); // Assuming AXPEntityLoader is the correct type
     }
     async preload() {
-        const providers = Array.isArray(this.providers) ? this.providers : [this.providers];
+        const providers = Array.isArray(this.providers)
+            ? this.providers
+            : [this.providers];
         const promises = [];
         providers.forEach((provider) => {
             const items = typeof provider.preload == 'function' ? provider.preload() : [];
@@ -321,7 +323,10 @@ class AXPEntityDefinitionRegistryService {
             });
         });
         const entities = await Promise.all(promises);
-        entities.forEach((entity) => this.register(this.middleware.process(entity)));
+        entities.forEach((entity) => {
+            if (entity != null)
+                this.register(this.middleware.process(entity));
+        });
     }
     /**
      * Registers a new entity configuration. Entities are identified uniquely by a combination
@@ -632,14 +637,7 @@ class AXPEntityMasterListViewModel {
                 },
                 {
                     title: this.title(),
-                    url: [
-                        `/${this.session.application?.name}`,
-                        'm',
-                        `${this.entityDef.module}`,
-                        'e',
-                        `${this.entityDef.name}`,
-                        'list',
-                    ],
+                    url: [`/${this.session.application?.name}`, 'm', `${this.entityDef.module}`, 'e', `${this.entityDef.name}`, 'list'],
                 },
             ];
         });
@@ -649,14 +647,10 @@ class AXPEntityMasterListViewModel {
             return list.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? [];
         });
         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.selectedScopeActionsCount = computed(() => {
             return this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Selected).length;
@@ -739,8 +733,7 @@ class AXPEntityMasterListViewModel {
             const columnVisibilityMap = new Map(listViewSetting.columns.map((col) => [col.name, col.visible]));
             this.columns.update((prev) => prev
                 .map((c) => ({ ...c, visible: columnVisibilityMap.get(c.name) ?? c.visible })) // Update visibility
-                .sort((a, b) => listViewSetting.columns.findIndex((col) => col.name === a.name) -
-                listViewSetting.columns.findIndex((col) => col.name === b.name)));
+                .sort((a, b) => listViewSetting.columns.findIndex((col) => col.name === a.name) - listViewSetting.columns.findIndex((col) => col.name === b.name)));
         }
     }
     clearSelection() {
@@ -750,9 +743,7 @@ class AXPEntityMasterListViewModel {
         const props = this.entityDef.properties.filter((c) => c.options?.filter?.advance?.enabled);
         return props.map((e) => {
             const widgetConfig = this.widgetResolver.resolve(e.schema.interface?.type);
-            const type = (e.options?.filter?.advance?.widgetType ||
-                widgetConfig?.defaultFilterWidgetName ||
-                e.schema.interface?.type);
+            const type = (e.options?.filter?.advance?.widgetType || widgetConfig?.defaultFilterWidgetName || e.schema.interface?.type);
             return {
                 title: e.title,
                 field: e.name,
@@ -825,10 +816,7 @@ class AXPEntityMasterListViewModel {
         this.dataSource.sort(...this.sortedFields()
             .filter((sf) => sf.dir)
             .map((s) => ({ dir: s.dir, field: s.name })));
-        const allFilters = [
-            this.inlineFilters.filters?.length && this.inlineFilters,
-            this.simpleFilters().filters?.length && this.simpleFilters(),
-        ].filter(Boolean);
+        const allFilters = [this.inlineFilters.filters?.length && this.inlineFilters, this.simpleFilters().filters?.length && this.simpleFilters()].filter(Boolean);
         const cleanedAllFilters = this.cleanNestedFilters(allFilters);
         this.lastFiltersApplied.set(this.simpleFilters());
         this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
@@ -846,6 +834,9 @@ class AXPEntityMasterListViewModel {
                 return undefined;
             if (filter.filters?.length) {
                 const cleanedNestedFilters = this.cleanNestedFilters(filter.filters);
+                if (!filter.field && !filter.operator && cleanedNestedFilters.length === 0) {
+                    return undefined;
+                }
                 return {
                     ...filter,
                     filters: cleanedNestedFilters.filter(Boolean),
@@ -911,11 +902,7 @@ 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));
+        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, {
             entity: getEntityInfo(this.entityDef).source,
             entityInfo: {
@@ -1509,7 +1496,7 @@ const AXPEntityDetailViewModelResolver = (route, state, service = inject(AXPEnti
 
 class AXPEntityCommandSearchDefinitionProvider {
     async provide(context) {
-        context.addDefinition('command', 'Commands', 'fa-solid fa-command', 1, {
+        context.addDefinition('command', 'Commands', 'command', 'fa-solid fa-command', 1, {
             format: {
                 id: '{{id}}',
             },
@@ -1529,33 +1516,21 @@ class AXPEntitySearchDefinitionProvider {
         this.entityRegister = inject(AXPEntityDefinitionRegistryService);
     }
     async provide(context) {
-        const moduleDefinitions = new Map();
+        console.log(this.entityRegister.getAll());
         this.entityRegister.getAll().forEach((entity) => {
-            if (!moduleDefinitions.has(entity.module)) {
-                moduleDefinitions.set(`Module.${entity.module}`, {
-                    name: `Module.${entity.module}`,
-                    title: entity.formats.searchResult?.description ?? entity.module,
-                    icon: 'fa-solid fa-objects-column',
-                    order: 4,
-                    actions: [
-                        {
-                            name: 'open-entity',
-                            type: 'view',
-                            priority: 'primary',
-                        },
-                    ],
-                    format: {
-                        title: entity.formats.searchResult?.title,
-                        description: (entity.formats.searchResult?.description ?? entity.module) + ' / ' + entity.title,
-                        id: '{{data.id}}',
+            context.addDefinition(`Module.${entity.module}.${entity.name}`, entity.formats.searchResult?.description ?? entity.module, `Module.${entity.module}`, 'fa-solid fa-objects-column', 4, {
+                actions: [
+                    {
+                        name: 'open-entity',
+                        type: 'view',
+                        priority: 'primary',
                     },
-                });
-            }
-        });
-        moduleDefinitions.forEach((definition) => {
-            context.addDefinition(definition.name, definition.title, definition.icon, definition.order, {
-                format: definition.format,
-                actions: definition.actions,
+                ],
+                format: {
+                    title: entity.formats.searchResult?.title,
+                    description: (entity.formats.searchResult?.description ?? entity.module) + ' / ' + entity.title,
+                    id: '{{data.id}}',
+                },
             });
         });
     }
@@ -2772,14 +2747,14 @@ function routesFacory() {
 class AXPEntityModule {
     constructor(appInitService, injector) {
         const service = injector.get(AXPEntityDefinitionRegistryService);
-        // appInitService.registerTask({
-        //   name: 'layout-theme',
-        //   statusText: 'Preload entities ...',
-        //   run: async () => {
-        //     // load in background
-        //     service.preload();
-        //   },
-        // });
+        appInitService.registerTask({
+            name: 'layout-theme',
+            statusText: 'Preload entities ...',
+            run: async () => {
+                // load in background
+                service.preload();
+            },
+        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModule, deps: [{ token: i1$3.AXPAppStartUpService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.0.3", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i2$3.AXPWorkflowModule, i7.AXPLayoutBuilderModule] }); }