@acorex/modules 20.7.17 → 20.7.19

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

@@ -6,6 +6,7 @@ import { AXPSearchCommandProvider, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PRO
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
 import { CommonModule } from '@angular/common';
 import { AXTranslationService } from '@acorex/core/translation';
+import { AXPCommonMenuKeys } from '@acorex/modules/common';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/widget-core';
 
@@ -141,6 +142,7 @@ const AXPLocationManagementMenuKeys = {
     GeographicRegions: 'location-management:menu:geographic-regions',
 };
 
+//#region ----   Imports   ----
 //#endregion
 //#region ----   Menu Provider   ----
 class AXMLocationManagementMenuProvider {
@@ -149,39 +151,25 @@ class AXMLocationManagementMenuProvider {
     }
     async provide(context) {
         const module = RootConfig.module;
-        context.addItems([
+        // Add LocationTypes and GeographicRegions under Configuration/Locations
+        // Locations entity is hidden from menu (used as detail of other entities)
+        context.find(AXPCommonMenuKeys.Configuration).addItems([
             {
                 name: AXPLocationManagementMenuKeys.Root,
-                priority: 9003,
-                text: '@location-management:module.menus.root.title',
+                priority: 8550,
+                text: '@location-management:module.menus.configuration.title',
                 icon: module.icon,
                 policy: {
                     features: [module.name],
                     permissions: [AXMLocationManagementPermissionsKeys.LocationManagement.Management],
                 },
                 children: [
-                    {
-                        name: AXPLocationManagementMenuKeys.Locations,
-                        text: '@location-management:locations.menus.locations.title',
-                        path: this.entityService.createPath(module.name, RootConfig.entities.location.name),
-                        icon: RootConfig.entities.location.icon,
-                        priority: 1,
-                        policy: {
-                            permissions: [AXMLocationManagementPermissionsKeys.LocationManagement.Locations.View],
-                        },
-                    },
-                    {
-                        name: AXPLocationManagementMenuKeys.Divider1,
-                        text: '',
-                        type: 'break',
-                        priority: 5,
-                    },
                     {
                         name: AXPLocationManagementMenuKeys.LocationTypes,
                         text: '@location-management:location-types.menus.location-types.title',
                         path: this.entityService.createPath(module.name, RootConfig.entities.locationType.name),
                         icon: RootConfig.entities.locationType.icon,
-                        priority: 6,
+                        priority: 1,
                         policy: {
                             permissions: [AXMLocationManagementPermissionsKeys.LocationManagement.LocationTypes.View],
                         },
@@ -191,7 +179,7 @@ class AXMLocationManagementMenuProvider {
                         text: '@location-management:geographic-regions.menus.geographic-regions.title',
                         path: this.entityService.createPath(module.name, RootConfig.entities.geographicRegion.name),
                         icon: RootConfig.entities.geographicRegion.icon,
-                        priority: 7,
+                        priority: 2,
                         policy: {
                             permissions: [AXMLocationManagementPermissionsKeys.LocationManagement.GeographicRegions.View],
                         },
@@ -634,16 +622,12 @@ async function locationFactory(injector) {
             },
             {
                 id: 'geographic',
-                title: '@location-management:locations.entities.location.groups.geographic-details',
+                title: '@general:terms.interface.geographic-details',
             },
             {
                 id: 'additional',
                 title: '@general:terms.interface.additional-info',
             },
-            {
-                id: 'validity',
-                title: '@general:terms.validation.validity',
-            },
         ],
         properties: [
             {
@@ -742,48 +726,6 @@ async function locationFactory(injector) {
                     },
                 ],
             },
-            {
-                name: 'validFrom',
-                title: '@location-management:locations.entities.location.fields.valid-from',
-                groupId: 'validity',
-                options: {
-                    filter: {
-                        advance: {
-                            enabled: true,
-                        },
-                    },
-                },
-                schema: {
-                    dataType: 'date',
-                    interface: {
-                        type: AXPWidgetsCatalog.dateTime,
-                        options: {
-                            showTime: false,
-                        },
-                    },
-                },
-            },
-            {
-                name: 'validTo',
-                title: '@location-management:locations.entities.location.fields.valid-to',
-                groupId: 'validity',
-                options: {
-                    filter: {
-                        advance: {
-                            enabled: true,
-                        },
-                    },
-                },
-                schema: {
-                    dataType: 'date',
-                    interface: {
-                        type: AXPWidgetsCatalog.dateTime,
-                        options: {
-                            showTime: false,
-                        },
-                    },
-                },
-            },
             {
                 name: 'street1',
                 title: '@location-management:locations.entities.location.fields.street1',
@@ -1043,53 +985,53 @@ async function locationFactory(injector) {
                 },
             },
             {
-                name: 'parentLocationId',
-                title: '@location-management:locations.entities.location.fields.parent-location',
-                groupId: 'basic-info',
+                name: 'timezone',
+                title: '@location-management:locations.entities.location.fields.timezone',
+                groupId: 'geographic',
                 options: {
                     filter: {
                         advance: {
                             enabled: true,
                         },
-                        inline: {
-                            enabled: true,
-                        },
                     },
                 },
                 schema: {
-                    dataType: 'object',
+                    dataType: 'string',
                     interface: {
-                        type: AXPWidgetsCatalog.lookup,
+                        type: AXPWidgetsCatalog.select,
                         options: {
-                            entity: `${RootConfig.module.name}.${RootConfig.entities.location.name}`,
-                            expose: [
-                                { source: 'id', target: 'parentLocation.id' },
-                                { source: 'title', target: 'parentLocation.title' },
-                            ],
+                            allowSearch: true,
+                            valueField: 'code',
+                            placeholder: 'e.g., America/New_York',
+                            dataSource: 'timezones',
                         },
                     },
                 },
             },
             {
-                name: 'timezone',
-                title: '@location-management:locations.entities.location.fields.timezone',
-                groupId: 'additional',
+                name: 'parentLocationId',
+                title: '@location-management:locations.entities.location.fields.parent-location',
+                groupId: 'basic-info',
                 options: {
                     filter: {
                         advance: {
                             enabled: true,
                         },
+                        inline: {
+                            enabled: true,
+                        },
                     },
                 },
                 schema: {
-                    dataType: 'string',
+                    dataType: 'object',
                     interface: {
-                        type: AXPWidgetsCatalog.select,
+                        type: AXPWidgetsCatalog.lookup,
                         options: {
-                            allowSearch: true,
-                            valueField: 'code',
-                            placeholder: 'e.g., America/New_York',
-                            dataSource: 'timezones',
+                            entity: `${RootConfig.module.name}.${RootConfig.entities.location.name}`,
+                            expose: [
+                                { source: 'id', target: 'parentLocation.id' },
+                                { source: 'title', target: 'parentLocation.title' },
+                            ],
                         },
                     },
                 },
@@ -1125,8 +1067,6 @@ async function locationFactory(injector) {
             { name: 'cityId', options: { dataPath: 'city.title' } },
             { name: 'stateId', options: { dataPath: 'state.title' } },
             { name: 'countryId', options: { dataPath: 'country.title' } },
-            { name: 'validFrom' },
-            { name: 'validTo' },
         ],
         interfaces: {
             master: {
@@ -1138,9 +1078,6 @@ async function locationFactory(injector) {
                         {
                             id: 'address',
                         },
-                        {
-                            id: 'validity',
-                        },
                         {
                             id: 'geographic',
                         },
@@ -1255,7 +1192,7 @@ async function locationFactory(injector) {
                                         colSpan: 12,
                                     },
                                     md: {
-                                        colSpan: 6,
+                                        colSpan: 4,
                                     },
                                 },
                             },
@@ -1283,19 +1220,6 @@ async function locationFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            name: 'parentLocationId',
-                            layout: {
-                                positions: {
-                                    sm: {
-                                        colSpan: 12,
-                                    },
-                                    md: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
                         {
                             name: 'timezone',
                             layout: {
@@ -1304,23 +1228,13 @@ async function locationFactory(injector) {
                                         colSpan: 12,
                                     },
                                     md: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'description',
-                            layout: {
-                                positions: {
-                                    sm: {
-                                        colSpan: 12,
+                                        colSpan: 4,
                                     },
                                 },
                             },
                         },
                         {
-                            name: 'validFrom',
+                            name: 'parentLocationId',
                             layout: {
                                 positions: {
                                     sm: {
@@ -1333,15 +1247,12 @@ async function locationFactory(injector) {
                             },
                         },
                         {
-                            name: 'validTo',
+                            name: 'description',
                             layout: {
                                 positions: {
                                     sm: {
                                         colSpan: 12,
                                     },
-                                    md: {
-                                        colSpan: 6,
-                                    },
                                 },
                             },
                         },
@@ -1356,7 +1267,7 @@ async function locationFactory(injector) {
                             id: 'address',
                         },
                         {
-                            id: 'validity',
+                            id: 'geographic',
                         },
                         {
                             id: 'additional',
@@ -1498,7 +1409,7 @@ async function locationFactory(injector) {
                                         colSpan: 12,
                                     },
                                     md: {
-                                        colSpan: 6,
+                                        colSpan: 4,
                                     },
                                 },
                             },
@@ -1534,7 +1445,7 @@ async function locationFactory(injector) {
                                         colSpan: 12,
                                     },
                                     md: {
-                                        colSpan: 6,
+                                        colSpan: 4,
                                     },
                                 },
                             },
@@ -1574,16 +1485,6 @@ async function locationFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            id: 'validity',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                    },
-                                },
-                            },
-                        },
                         {
                             id: 'additional',
                             layout: {
@@ -1711,7 +1612,7 @@ async function locationFactory(injector) {
                             layout: {
                                 positions: {
                                     lg: {
-                                        colSpan: 6,
+                                        colSpan: 4,
                                         order: 9,
                                     },
                                 },
@@ -1728,35 +1629,13 @@ async function locationFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            name: 'validFrom',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                        order: 13,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'validTo',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                        order: 14,
-                                    },
-                                },
-                            },
-                        },
                         {
                             name: 'timezone',
                             layout: {
                                 positions: {
                                     lg: {
-                                        colSpan: 6,
-                                        order: 17,
+                                        colSpan: 4,
+                                        order: 11,
                                     },
                                 },
                             },
@@ -2044,13 +1923,9 @@ async function geographicRegionFactory(injector) {
                 id: 'basic-info',
                 title: '@general:terms.interface.basic-info',
             },
-            {
-                id: 'hierarchy',
-                title: '@location-management:geographic-regions.entities.geographic-region.groups.hierarchy',
-            },
             {
                 id: 'geographic-data',
-                title: '@location-management:geographic-regions.entities.geographic-region.groups.geographic-data',
+                title: '@general:terms.interface.geographic-details',
             },
             {
                 id: 'additional-info',
@@ -2151,6 +2026,7 @@ async function geographicRegionFactory(injector) {
                                 { code: 'city', title: 'City' },
                                 { code: 'district', title: 'District' },
                                 { code: 'subdistrict', title: 'Subdistrict' },
+                                { code: 'territory', title: 'Territory' },
                             ],
                         },
                     },
@@ -2164,7 +2040,7 @@ async function geographicRegionFactory(injector) {
             {
                 name: 'parentId',
                 title: '@location-management:geographic-regions.entities.geographic-region.fields.parent-region',
-                groupId: 'hierarchy',
+                groupId: 'basic-info',
                 options: {
                     filter: {
                         advance: {
@@ -2318,9 +2194,6 @@ async function geographicRegionFactory(injector) {
                         {
                             id: 'basic-info',
                         },
-                        {
-                            id: 'hierarchy',
-                        },
                         {
                             id: 'geographic-data',
                         },
@@ -2378,6 +2251,9 @@ async function geographicRegionFactory(injector) {
                                     sm: {
                                         colSpan: 12,
                                     },
+                                    md: {
+                                        colSpan: 6,
+                                    },
                                 },
                             },
                         },
@@ -2399,7 +2275,7 @@ async function geographicRegionFactory(injector) {
                                         colSpan: 12,
                                     },
                                     md: {
-                                        colSpan: 12,
+                                        colSpan: 4,
                                     },
                                 },
                             },
@@ -2450,9 +2326,6 @@ async function geographicRegionFactory(injector) {
                         {
                             id: 'basic-info',
                         },
-                        {
-                            id: 'hierarchy',
-                        },
                         {
                             id: 'geographic-data',
                         },
@@ -2510,6 +2383,9 @@ async function geographicRegionFactory(injector) {
                                     sm: {
                                         colSpan: 12,
                                     },
+                                    md: {
+                                        colSpan: 6,
+                                    },
                                 },
                             },
                         },
@@ -2531,7 +2407,7 @@ async function geographicRegionFactory(injector) {
                                         colSpan: 12,
                                     },
                                     md: {
-                                        colSpan: 12,
+                                        colSpan: 4,
                                     },
                                 },
                             },
@@ -2590,16 +2466,6 @@ async function geographicRegionFactory(injector) {
                                 },
                             },
                         },
-                        {
-                            id: 'hierarchy',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                    },
-                                },
-                            },
-                        },
                         {
                             id: 'geographic-data',
                             layout: {
@@ -2637,7 +2503,7 @@ async function geographicRegionFactory(injector) {
                             layout: {
                                 positions: {
                                     lg: {
-                                        colSpan: 4,
+                                        colSpan: 6,
                                         order: 1,
                                     },
                                 },
@@ -2648,7 +2514,7 @@ async function geographicRegionFactory(injector) {
                             layout: {
                                 positions: {
                                     lg: {
-                                        colSpan: 4,
+                                        colSpan: 6,
                                         order: 2,
                                     },
                                 },
@@ -2659,7 +2525,7 @@ async function geographicRegionFactory(injector) {
                             layout: {
                                 positions: {
                                     lg: {
-                                        colSpan: 4,
+                                        colSpan: 6,
                                         order: 3,
                                     },
                                 },
@@ -2670,8 +2536,8 @@ async function geographicRegionFactory(injector) {
                             layout: {
                                 positions: {
                                     lg: {
-                                        colSpan: 12,
-                                        order: 5,
+                                        colSpan: 6,
+                                        order: 4,
                                     },
                                 },
                             },
@@ -2682,7 +2548,7 @@ async function geographicRegionFactory(injector) {
                                 positions: {
                                     lg: {
                                         colSpan: 12,
-                                        order: 6,
+                                        order: 5,
                                     },
                                 },
                             },
@@ -2692,8 +2558,8 @@ async function geographicRegionFactory(injector) {
                             layout: {
                                 positions: {
                                     lg: {
-                                        colSpan: 12,
-                                        order: 7,
+                                        colSpan: 4,
+                                        order: 6,
                                     },
                                 },
                             },
@@ -2704,7 +2570,7 @@ async function geographicRegionFactory(injector) {
                                 positions: {
                                     lg: {
                                         colSpan: 4,
-                                        order: 8,
+                                        order: 7,
                                     },
                                 },
                             },
@@ -2715,7 +2581,7 @@ async function geographicRegionFactory(injector) {
                                 positions: {
                                     lg: {
                                         colSpan: 4,
-                                        order: 9,
+                                        order: 8,
                                     },
                                 },
                             },
@@ -2726,7 +2592,7 @@ async function geographicRegionFactory(injector) {
                                 positions: {
                                     lg: {
                                         colSpan: 4,
-                                        order: 10,
+                                        order: 9,
                                     },
                                 },
                             },