@acorex/platform 18.2.0 → 18.2.1

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

@@ -5,7 +5,7 @@ import { InjectionToken, inject, Injectable, computed, signal, Injector, Compone
 import * as i1$3 from '@acorex/platform/workflow';
 import { createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowService, ofType, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
-import { resolveActionLook, AXPLayoutService, AXPEntityCommandScope, AXPWorkflowNavigateAction } from '@acorex/platform/common';
+import { resolveActionLook, AXPLayoutService, AXPEntityCommandScope, getEntityInfo, AXPWorkflowNavigateAction } from '@acorex/platform/common';
 import { AXDialogService } from '@acorex/components/dialog';
 import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import * as i8 from '@acorex/core/translation';
@@ -45,14 +45,14 @@ import { AXP_DISABLED_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DATA_PROPERTY_GROUP,
 import { AXPWidgetPropertyViewerComponent } from '@acorex/platform/layout/designer';
 
 const AXP_ENTITY_CONFIG_TOKEN = new InjectionToken('AXP_ENTITY_CONFIG_TOKEN');
-const AXP_ENTITY_DEFINITION_LOADER = new InjectionToken('AXP_ENTITY_DEFINITION_LOADER');
+const AXP_ENTITY_DEFINITION_LOADER = new InjectionToken('AXP_ENTITY_DEFINITION_PROVIDER');
 class AXPEntityResolver {
     constructor() {
-        this.loader = inject(AXP_ENTITY_DEFINITION_LOADER);
+        this.providers = inject(AXP_ENTITY_DEFINITION_LOADER);
     }
     async get(moduleName, entityName) {
-        if (Array.isArray(this.loader)) {
-            for (const loader of this.loader) {
+        if (Array.isArray(this.providers)) {
+            for (const loader of this.providers) {
                 const entity = await loader.get(moduleName, entityName);
                 if (entity) {
                     return entity;
@@ -60,7 +60,7 @@ class AXPEntityResolver {
             }
         }
         else {
-            return await this.loader.get(moduleName, entityName);
+            return await this.providers.get(moduleName, entityName);
         }
         return null;
     }
@@ -406,7 +406,7 @@ class AXPEntityModifySectionPopupAction extends AXPWorkflowAction {
         const vm = await this.factory.create(moduleName, entityName, id, properties);
         const com = await this.config.viewers.master.modify();
         const popup = await this.popupService.open(com, {
-            title: title ?? `${this.translateService.translateSync('entity.modify')} ${entityRef.formats.individual}`,
+            title: title ?? `${this.translateService.translateSync('entity.modify')} ${this.translateService.translateSync(entityRef.formats.individual)}`,
             size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : 'md',
             data: {
                 vm,
@@ -639,9 +639,8 @@ class AXPEntityDetailListViewModel {
                 data[relatedColumn] = this.parent.data['id'];
             }
         }
-        debugger;
         await this.workflow.execute(commandName, {
-            entity: this.detailEntity()?.source,
+            entity: getEntityInfo(this.detailEntity()).source,
             data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
         });
     }
@@ -778,10 +777,10 @@ class AXPEntityMasterSingleViewModel {
             .pipe(ofType(AXPEntityDeletedEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
-            if (event.payload.entity == this.entityDef.source &&
+            if (event.payload.entity == getEntityInfo(this.entityDef).source &&
                 event.payload.ids.includes(this.context().id)) {
                 this.workflow.execute('show-list-view', {
-                    entity: this.entityDef.source
+                    entity: getEntityInfo(this.entityDef).source
                 });
             }
         });
@@ -789,7 +788,7 @@ class AXPEntityMasterSingleViewModel {
             .pipe(ofType(AXPEntityModifyEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe(async (event) => {
-            if (event.payload.entity == this.entityDef.source &&
+            if (event.payload.entity == getEntityInfo(this.entityDef).source &&
                 event.payload.values.id === this.context().id) {
                 this.context.set(event.payload.values);
             }
@@ -800,7 +799,7 @@ class AXPEntityMasterSingleViewModel {
         switch (commandName) {
             case 'modify-entity-section': {
                 this.workflow.execute('modify-entity-section', {
-                    entity: this.entityDef.source,
+                    entity: getEntityInfo(this.entityDef).source,
                     data: {
                         id: this.context().id,
                         properties: data.editableProps().map(m => m.name()),
@@ -812,7 +811,7 @@ class AXPEntityMasterSingleViewModel {
                 {
                     const action = this.actions().find(c => c.name == commandName);
                     this.workflow.execute(commandName, {
-                        entity: this.entityDef.source,
+                        entity: getEntityInfo(this.entityDef).source,
                         data: action?.scope == AXPEntityCommandScope.Individual ? this.context() : null
                     });
                 }
@@ -970,7 +969,7 @@ class AXPEntityMasterCreateViewModel {
     }
     async createNewOne() {
         await this.workflow.execute('create-entity', {
-            entity: this.entityDef.source
+            entity: getEntityInfo(this.entityDef).source
         });
     }
 }
@@ -1122,7 +1121,7 @@ class AXPEntityMasterListViewModel {
             return props.map((e) => {
                 return {
                     name: e.name,
-                    title: e.title ?? cloneDeep.name,
+                    title: this.translateService.translateSync(e.title) ?? cloneDeep.name,
                     dir: 'asc',
                 };
             });
@@ -1151,7 +1150,7 @@ class AXPEntityMasterListViewModel {
             .pipe(ofType(AXPEntityDeletedEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
-            if (event.payload.entity == this.entityDef.source) {
+            if (event.payload.entity == getEntityInfo(this.entityDef).source) {
                 this.selectedItems.set([]);
                 this.events$.next({ action: 'refresh' });
             }
@@ -1264,7 +1263,7 @@ class AXPEntityMasterListViewModel {
                 : c.scope == AXPEntityCommandScope.Individual) ||
                 c.scope == AXPEntityCommandScope.TypeLevel));
         await this.workflow.execute(commandName, {
-            entity: this.entityDef.source,
+            entity: getEntityInfo(this.entityDef).source,
             data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
         });
     }
@@ -1294,7 +1293,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
             args: [{ providedIn: 'root' }]
         }] });
 const AXPEntityListViewModelResolver = (route, state, service = inject(AXPEntityListViewModelFactory)) => {
-    const appName = route.parent?.paramMap.get('app');
     const moduleName = route.parent?.paramMap.get('module');
     const entityName = route.paramMap.get('entity');
     //
@@ -1572,55 +1570,56 @@ class AXPLookupWidgetSelectorViewModel {
                 return func(e);
             },
             pageSize: 10,
-            key: 'id'
+            key: 'id',
         });
         this.canCreate = computed(() => {
             return this.entityDef.commands?.create?.execute != null;
         });
         this.inlineFiltersPlaceholders = computed(() => {
-            return this.entityDef.properties.filter(p => p.options?.filter?.inline?.enabled).map(c => c.title ?? c.name);
+            console.log(this.entityDef);
+            return (this.entityDef?.properties.filter((p) => p.options?.filter?.inline?.enabled).map((c) => c.title ?? c.name) ?? []);
         });
         this.hasInlineFilters = computed(() => {
             return this.inlineFiltersPlaceholders().length > 0;
         });
         this.columns = () => {
             const listColumns = this.entityDef.columns ?? [];
-            const columns = listColumns?.map(c => c.name) ?? [];
-            const props = this.entityDef.properties.filter(p => p.schema.hidden != true);
-            const displayColumns = props.filter(p => columns.some(c => c == p.name));
-            return displayColumns.map(p => {
-                return new AXPEntityListViewColumnViewModel(p, listColumns?.find(c => c.name == p.name));
+            const columns = listColumns?.map((c) => c.name) ?? [];
+            const props = this.entityDef.properties.filter((p) => p.schema.hidden != true);
+            const displayColumns = props.filter((p) => columns.some((c) => c == p.name));
+            return displayColumns.map((p) => {
+                return new AXPEntityListViewColumnViewModel(p, listColumns?.find((c) => c.name == p.name));
             });
         };
         this.inlineFilters = {
             field: null,
             logic: 'or',
             operator: null,
-            filters: []
+            filters: [],
         };
         this.advanceFilters = {
             field: null,
             logic: 'and',
             operator: null,
-            filters: []
+            filters: [],
         };
     }
     async create() {
         await this.workflow.execute('create-entity', {
-            entity: this.entityDef.source,
+            entity: getEntityInfo(this.entityDef).source,
         });
     }
     applyInlineFilter(value, refresh = true) {
-        const props = this.entityDef.properties.filter(c => c.options?.filter?.inline?.enabled);
+        const props = this.entityDef.properties.filter((c) => c.options?.filter?.inline?.enabled);
         this.inlineFilters.filters = [];
         if (value) {
-            props.forEach(p => {
+            props.forEach((p) => {
                 this.inlineFilters.filters?.push({
                     field: p.name,
                     operator: {
-                        type: 'contains'
+                        type: 'contains',
                     },
-                    value
+                    value,
                 });
             });
         }
@@ -1648,7 +1647,7 @@ class AXPLookupWidgetSelectorViewModel {
             field: null,
             logic: 'and',
             operator: null,
-            filters: filters
+            filters: filters,
         });
         // Refresh the dataSource
         this.dataSource.refresh();
@@ -1656,7 +1655,7 @@ class AXPLookupWidgetSelectorViewModel {
     async find(value) {
         this.applyInlineFilter(value.trim(), false);
         const func = this.entityDef.queries.list?.execute;
-        return await func({ filter: this.inlineFilters, take: 10 }) ?? [];
+        return (await func({ filter: this.inlineFilters, take: 10 })) ?? [];
     }
 }
 
@@ -2436,9 +2435,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImpor
                 }]
         }] });
 
+class AXPEntityService {
+    constructor() {
+        this.sessionService = inject(AXPSessionService);
+    }
+    createPath(module, entity, path = 'list') {
+        return `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${path}`;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: AXPEntityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: AXPEntityService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.0", ngImport: i0, type: AXPEntityService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDefinitionRegistryService, AXPEntityDetailListViewModel, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityModule, AXPEntityResolver, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER };
+export { AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDefinitionRegistryService, AXPEntityDetailListViewModel, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityModule, AXPEntityResolver, AXPEntityService, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map