@acorex/modules 20.7.9 → 20.7.11

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

@@ -306,8 +306,10 @@ class AXMLocationManagementFeatureDefinitionProvider {
 class AXMGeographicRegionDataSourceDefinition {
     constructor() {
         this.entityService = inject(AXPEntityService);
-        this.geographicRegionService = this.entityService.withEntity(RootConfig.module.name, RootConfig.entities.geographicRegion.name).data();
-        //#region Country
+        this.geographicRegionService = this.entityService
+            .withEntity(RootConfig.module.name, RootConfig.entities.geographicRegion.name)
+            .data();
+        //#region ---- Country ----
         this.countries = {
             name: 'countries',
             title: 'Countries',
@@ -344,9 +346,143 @@ class AXMGeographicRegionDataSourceDefinition {
                     load: async (e) => {
                         const result = await this.geographicRegionService.query({
                             ...e,
-                            filter: { field: 'type', operator: { type: 'equal' }, value: 'country' },
+                            filter: { field: 'type.code', operator: { type: 'equal' }, value: 'country' },
+                            sort: [{ field: 'title', dir: 'asc' }],
+                        });
+                        return {
+                            items: result.items,
+                            total: result.total,
+                        };
+                    },
+                    byKey: async (key) => {
+                        const item = await this.geographicRegionService.byKey(key);
+                        return item;
+                    },
+                });
+            },
+        };
+        //#endregion
+        //#region ---- Provinces (States) ----
+        this.provinces = {
+            name: 'provinces',
+            title: 'Provinces',
+            columns: [
+                {
+                    name: 'code',
+                    title: 'Code',
+                    type: 'string',
+                    datatype: 'string',
+                },
+                {
+                    name: 'title',
+                    title: 'Title',
+                    type: 'string',
+                    datatype: 'string',
+                },
+            ],
+            filters: [
+                {
+                    field: 'parentId',
+                    title: 'Country',
+                    operator: { type: 'equal' },
+                    widget: {
+                        type: AXPWidgetsCatalog.selectFilter,
+                        options: {
+                            dataSource: 'countries',
+                            valueField: 'id',
+                            textField: 'title',
+                        },
+                    },
+                    filterType: { advance: true, inline: true },
+                },
+            ],
+            textField: { name: 'title', title: 'Title' },
+            valueField: { name: 'id', title: 'Id' },
+            source: () => {
+                return new AXDataSource({
+                    pageSize: 50,
+                    key: 'id',
+                    load: async (e) => {
+                        console.log('[provinces datasource] load query:', { filter: e?.filter, take: e?.take, skip: e?.skip });
+                        const typeFilter = { field: 'type.code', operator: { type: 'equal' }, value: 'state' };
+                        const extraFilters = e?.filter?.filters ?? (e?.filter ? [e.filter] : []);
+                        const filter = extraFilters.length > 0
+                            ? { logic: 'and', filters: [typeFilter, ...extraFilters] }
+                            : typeFilter;
+                        console.log('[provinces datasource] extraFilters:', extraFilters, 'final filter:', filter);
+                        const result = await this.geographicRegionService.query({
+                            ...e,
+                            filter,
                             sort: [{ field: 'title', dir: 'asc' }],
                         });
+                        console.log('[provinces datasource] result:', result.items?.length, result.total);
+                        return {
+                            items: result.items,
+                            total: result.total,
+                        };
+                    },
+                    byKey: async (key) => {
+                        const item = await this.geographicRegionService.byKey(key);
+                        return item;
+                    },
+                });
+            },
+        };
+        //#endregion
+        //#region ---- Cities ----
+        this.cities = {
+            name: 'cities',
+            title: 'Cities',
+            columns: [
+                {
+                    name: 'code',
+                    title: 'Code',
+                    type: 'string',
+                    datatype: 'string',
+                },
+                {
+                    name: 'title',
+                    title: 'Title',
+                    type: 'string',
+                    datatype: 'string',
+                },
+            ],
+            filters: [
+                {
+                    field: 'parentId',
+                    title: 'Province',
+                    operator: { type: 'equal' },
+                    widget: {
+                        type: AXPWidgetsCatalog.selectFilter,
+                        options: {
+                            dataSource: 'provinces',
+                            valueField: 'id',
+                            textField: 'title',
+                        },
+                    },
+                    filterType: { advance: true, inline: true },
+                },
+            ],
+            textField: { name: 'title', title: 'Title' },
+            valueField: { name: 'id', title: 'Id' },
+            source: () => {
+                return new AXDataSource({
+                    pageSize: 50,
+                    key: 'id',
+                    load: async (e) => {
+                        console.log('[cities datasource] load query:', { filter: e?.filter, take: e?.take, skip: e?.skip });
+                        const typeFilter = { field: 'type.code', operator: { type: 'equal' }, value: 'city' };
+                        const extraFilters = e?.filter?.filters ?? (e?.filter ? [e.filter] : []);
+                        const filter = extraFilters.length > 0
+                            ? { logic: 'and', filters: [typeFilter, ...extraFilters] }
+                            : typeFilter;
+                        console.log('[cities datasource] extraFilters:', extraFilters, 'final filter:', filter);
+                        const result = await this.geographicRegionService.query({
+                            ...e,
+                            filter,
+                            sort: [{ field: 'title', dir: 'asc' }],
+                        });
+                        console.log('[cities datasource] result:', result.items?.length, result.total);
                         return {
                             items: result.items,
                             total: result.total,
@@ -362,9 +498,7 @@ class AXMGeographicRegionDataSourceDefinition {
     }
     //#endregion
     async items() {
-        return [
-            this.countries,
-        ];
+        return [this.countries, this.provinces, this.cities];
     }
 }