@acorex/platform-generator 20.3.0-next.9 → 20.4.0

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@acorex/platform-generator",
-  "version": "20.3.0-next.9",
+  "version": "20.4.0",
   "peerDependencies": {
-    "@acorex/modules": ">=20.0.0"
+    "@acorex/modules": "20.4.0"
   },
   "type": "commonjs",
   "main": "./src/index.js",

package/src/generators/app-module/files/src/app/app.config.ts.template

@@ -1,5 +1,5 @@
 import { ApplicationConfig, importProvidersFrom } from '@angular/core';
-import { provideRouter, withEnabledBlockingInitialNavigation, withComponentInputBinding, withNavigationErrorHandler, NavigationError, withDebugTracing } from '@angular/router';
+import { provideRouter, withEnabledBlockingInitialNavigation, withComponentInputBinding } from '@angular/router';
 import { appRoutes } from './app.routes';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -11,19 +11,35 @@ import { AXFormatModule } from '@acorex/core/format';
 import { AXValidationModule } from '@acorex/core/validation';
 import { AXPTranslationRootModule } from './modules/common/translation-root.module';
 import { AXPLayoutRootModule } from './modules/layout/layout-root.module';
-import { AXMSettingsManagementModule } from '@acorex/modules/settings-management';
-import { <%= className %>AuthRootModule } from './modules/auth/auth-root.module';
-import { AXMPlatformManagementModule } from '@acorex/modules/platform-management';
+import { AXCMockModule, AXCUserPassStrategyMock } from '@acorex/connectivity/mock';
+import { AXPAuthModule } from '@acorex/platform/auth';
 import { AXMNotificationManagementModule } from '@acorex/modules/notification-management';
+import { AXMSettingsManagementModule } from '@acorex/modules/settings-management';
+import { AXMHelpDeskModule } from '@acorex/modules/help-desk';
+import { AXMDashboardManagementModule } from '@acorex/modules/dashboard-management';
+import { AXMHumanCapitalManagementModule } from '@acorex/modules/human-capital-management';
 import { AXMFormTemplateManagementModule } from '@acorex/modules/form-template-management';
-import { AXMTextTemplateManagementModule } from '@acorex/modules/text-template-management';
 import { AXMSecurityManagementModule } from '@acorex/modules/security-management';
 import { AXMOrganizationManagementModule } from '@acorex/modules/organization-management';
 import { AXMLogManagementModule } from '@acorex/modules/log-management';
 import { AXMDocumentManagementModule } from '@acorex/modules/document-management';
-import { AXCMockModule } from '@acorex/connectivity/mock';
-import { AXMSampleEntityModule } from './modules/<%= name %>/sample/sample.module';
-import { <%= upperCase(name) %>RootModule } from './modules/<%= name %>/<%= name %>-root.module';
+import { AXMProjectManagementModule } from '@acorex/modules/project-management';
+import { AXMTrainingManagementModule } from '@acorex/modules/training-management';
+import { AXMWorkflowManagementModule } from '@acorex/modules/workflow-management';
+import { AXMContentManagementModule } from '@acorex/modules/content-management';
+import { AXMConversationModule } from '@acorex/modules/conversation';
+import { AXMPlatformManagementModule } from '@acorex/modules/platform-management';
+import { AXMDataManagementModule } from '@acorex/modules/data-management';
+import { AXMReportManagementModule } from '@acorex/modules/report-management';
+import { AXMCalendarManagementModule } from '@acorex/modules/calendar-management';
+import { AXMLocationManagementModule } from '@acorex/modules/location-management';
+import { AXMPartyManagementModule } from '@acorex/modules/party-management';
+import { AXMContactManagementModule } from '@acorex/modules/contact-management';
+import { AXMLocaleManagementModule } from '@acorex/modules/locale-management';
+import { AXMMeetingManagementModule } from '@acorex/modules/meeting-management';
+import { AXMTaskManagementModule } from '@acorex/modules/task-management';
+import { AXMIdentifierManagementModule } from '@acorex/modules/identifier-management';
+import { AXMApplicationManagementModule } from '@acorex/modules/application-management';
 
 import {
     AXPHomePageModule,
@@ -37,12 +53,17 @@ import {
 import { AXPImageUrlLogoConfig } from '@acorex/platform/core';
 
 import { environment } from '../environments/environment';
-import { <%= className %>AppVersionProvider } from './app-version.provider';
-import { AXMCommonModule,AXPGlobalSearchModule } from '@acorex/modules/common';
+import { <%= className %>AppVersionProvider } from './modules/common/app-version.provider';
+import { AXMCommonModule } from '@acorex/modules/common';
+import { AXPGlobalSearchModule } from '@acorex/modules/common';
+import { APP_DEFAULT_SETTINGS_PROVIDERS } from './modules/common/default-settings.providers';
+import { <%= className %>AuthRootModule } from './modules/auth/auth-root.module';
+import { <%= upperCase(name) %>RootModule } from './modules/<%= name %>/<%= name %>-root.module';
 
 
 export const appConfig: ApplicationConfig = {
     providers: [
+        APP_DEFAULT_SETTINGS_PROVIDERS,
         provideHttpClient(withInterceptorsFromDi()),
         provideRouter(appRoutes, withEnabledBlockingInitialNavigation(), withComponentInputBinding()),
         //
@@ -71,7 +92,7 @@ export const appConfig: ApplicationConfig = {
                     light: new AXPImageUrlLogoConfig('assets/images/logos/full-light.svg', 160),
                 },
                 },
-                title: 'Demo',
+                title: '<%= title %>',
                 copyright: '© 2024',
             }),
             },
@@ -90,16 +111,45 @@ export const appConfig: ApplicationConfig = {
             AXValidationModule.forRoot(),
             //
             AXPGlobalSearchModule,
-            AXMSettingsManagementModule,
             //
             AXMCommonModule,
             AXPHomePageModule,
             //
             AXPTranslationRootModule,
             AXPLayoutRootModule,
+            // Management Modules (Mock)
+            AXMSettingsManagementModule,
+            AXMHelpDeskModule,
+            AXMDashboardManagementModule,
+            AXMNotificationManagementModule,
+            AXMFormTemplateManagementModule,
+            AXMSecurityManagementModule,
+            AXMOrganizationManagementModule,
+            AXMHumanCapitalManagementModule,
+            AXMLogManagementModule,
+            AXMDocumentManagementModule,
+            AXMProjectManagementModule,
+            AXMTrainingManagementModule,
+            AXMWorkflowManagementModule,
+            AXMContentManagementModule,
+            AXMConversationModule,
+            AXMPlatformManagementModule,
+            AXMDataManagementModule,
+            AXMReportManagementModule,
+            AXMCalendarManagementModule,
+            AXMLocationManagementModule,
+            AXMPartyManagementModule,
+            AXMContactManagementModule,
+            AXMLocaleManagementModule,
+            AXMMeetingManagementModule,
+            AXMTaskManagementModule,
+            AXMIdentifierManagementModule,
+            AXMApplicationManagementModule,
             //
-            AXMSampleEntityModule,
             AXCMockModule,
+            AXPAuthModule.forRoot({
+                strategies: [AXCUserPassStrategyMock],
+            }),
             //
             <%= upperCase(name) %>RootModule,
             <%= className %>AuthRootModule,

package/src/generators/app-module/files/src/app/basic-interceptor.interceptor.ts.template

@@ -11,21 +11,21 @@ export class BasicInterceptor implements HttpInterceptor {
   private isRefreshing = false;
 
   session = inject(AXPSessionService);
-  token = this.session.getToken();
   router = inject(Router);
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<any> {
+    const token = this.session.getToken();
     let modifiedReq = request.clone();
     if (!(request.body instanceof FormData) && !request.headers.has('Content-Type')) {
       modifiedReq = modifiedReq.clone({ setHeaders: { 'Content-Type': 'application/json' } });
     }
-    if (this.token) {
-      modifiedReq = modifiedReq.clone({ setHeaders: { Authorization: `Bearer ${this.token}` } });
+    if (token) {
+      modifiedReq = modifiedReq.clone({ setHeaders: { Authorization: `Bearer ${token}` } });
     }
 
     return next.handle(modifiedReq).pipe(
       catchError((error: HttpErrorResponse) => {
-        if (error.status === 401 && !this.isRefreshing && this.token) {
+        if (error.status === 401 && !this.isRefreshing && token) {
           return this.handle401Error(modifiedReq, next);
         } else {
           return throwError(() => error);

package/src/generators/app-module/files/src/app/modules/auth/auth-root.module.ts.template

@@ -1,26 +1,9 @@
 import { AXMAuthModule, AXMAuthenticationTypes, AXM_AUTH_CONFIG_TOKEN, configAuthModule } from '@acorex/modules/auth';
-import {
-  AXPAuthModule,
-  AXP_APPLICATION_LOADER,
-  AXP_FEATURE_LOADER,
-  AXP_PERMISSION_LOADER,
-  AXP_TENANT_LOADER,
-} from '@acorex/platform/auth';
 import { NgModule } from '@angular/core';
 import { environment } from '../../../environments/environment';
-import { <%= className %>ApplicationLoader } from './application.loader';
-import { <%= className %>Strategy } from './auth.strategy';
-import { <%= className %>FeatureLoader } from './feature.loader';
-import { <%= className %>PermissionLoader } from './permission.loader';
-import { <%= className %>TenantLoader } from './tenant.loader';
 
 @NgModule({
-  imports: [
-    AXMAuthModule,
-    AXPAuthModule.forRoot({
-      strategies: [<%= className %>Strategy],
-    }),
-  ],
+  imports: [AXMAuthModule],
   exports: [],
   providers: [
     {
@@ -28,6 +11,18 @@ import { <%= className %>TenantLoader } from './tenant.loader';
       useValue: configAuthModule({
         type: AXMAuthenticationTypes.UsernameEmailPassword,
         authConfig: { ...environment.oidcConfig },
+        baseUrl: environment.baseUrl,
+        logoutUrl: environment.logoutUrl,
+        signup: {
+          enable: true,
+          url: '/auth/register',
+        },
+        defaultStrategyName: 'user-pass',
+        externalProviders: {
+          google: {
+            providerName: 'google',
+          },
+        },
         signinPage: {
           description: `In this kind of post, the blogger introduces a person they've
           interviewed and provides some background information about the
@@ -37,22 +32,6 @@ import { <%= className %>TenantLoader } from './tenant.loader';
         },
       }),
     },
-    {
-      provide: AXP_TENANT_LOADER,
-      useClass: <%= className %>TenantLoader,
-    },
-    {
-      provide: AXP_APPLICATION_LOADER,
-      useClass: <%= className %>ApplicationLoader,
-    },
-    {
-      provide: AXP_PERMISSION_LOADER,
-      useClass: <%= className %>PermissionLoader,
-    },
-    {
-      provide: AXP_FEATURE_LOADER,
-      useClass: <%= className %>FeatureLoader,
-    },
   ],
 })
 export class <%= className %>AuthRootModule {}

package/src/generators/app-module/files/src/app/{app-version.provider.ts.template → modules/common/app-version.provider.ts.template}

@@ -1,5 +1,5 @@
 import { AXPAppVersion, AXPAppVersionProvider } from '@acorex/platform/common';
-import pkg from '../../../../package.json';
+import pkg from '../../../../../../package.json';
 
 export class <%= className %>AppVersionProvider implements AXPAppVersionProvider {
   provider(): Promise<AXPAppVersion> {
@@ -9,4 +9,6 @@ export class <%= className %>AppVersionProvider implements AXPAppVersionProvider
       date: new Date(),
     });
   }
-} 
+}
+
+

package/src/generators/app-module/files/src/app/modules/common/default-settings.providers.ts.template

@@ -0,0 +1,38 @@
+//#region ----   Imports   ----
+
+import { AXPRegionalSetting } from '@acorex/modules/locale-management';
+import {
+  AXP_SETTING_DEFAULT_VALUES_PROVIDERS,
+  AXPCommonSettings,
+  AXPSettingDefaultValuesProvider,
+} from '@acorex/platform/common';
+import { AXPThemeLayoutSetting } from '@acorex/platform/themes/shared';
+
+//#endregion
+
+//#region ----   App Default Settings Providers   ----
+
+export const APP_DEFAULT_SETTINGS_PROVIDER: AXPSettingDefaultValuesProvider = {
+  priority: 50,
+  async provide() {
+    return {
+      [AXPRegionalSetting.LocaleProfile]: 'en-US',
+      [AXPRegionalSetting.Language]: 'en-US',
+      [AXPRegionalSetting.TimeZone]: 'UTC',
+      [AXPRegionalSetting.FirstDayOfWeek]: 1,
+      [AXPThemeLayoutSetting.Palette]: 'golden-dusk',
+      [AXPThemeLayoutSetting.MenuBadgeVisible]: true,
+      [AXPCommonSettings.EnableOperationToasts]: true,
+    } as Record<string, unknown>;
+  },
+};
+
+export const APP_DEFAULT_SETTINGS_PROVIDERS = {
+  provide: AXP_SETTING_DEFAULT_VALUES_PROVIDERS,
+  useValue: APP_DEFAULT_SETTINGS_PROVIDER,
+  multi: true,
+};
+
+//#endregion
+
+

package/src/generators/app-module/files/src/app/modules/common/translation-root.module.ts.template

@@ -19,7 +19,8 @@ export class MyTranslationLoader implements AXTranslationLoader {
 
   load(options: AXTranslationLoaderOptions): Observable<AXTranslation> {
     try {
-      return this.http.get<AXTranslation>(`/assets/i18n/${options.lang}/${options.scope}.json`);
+      const scope = options.scope?.startsWith('general-') ? options.scope?.replace('-', '/') : options.scope;
+      return this.http.get<AXTranslation>(`/assets/i18n/${options.lang}/${scope}.json`);
     } catch (error) {
       console.error(error);
       return of({});

package/src/generators/app-module/files/src/app/modules/layout/entity.loader.ts.template

@@ -1,22 +1,39 @@
+//#region ----   Imports   ----
+
 import { AXPEntity } from '@acorex/platform/common';
 import { AXPEntityDefinitionLoader } from '@acorex/platform/layout/entity';
 import { Injectable, Injector, inject } from '@angular/core';
+import { RootConfig } from '../<%= name %>/const';
+
+//#endregion
+
+//#region ----   Root Entity Loader   ----
 
+/**
+ * Entity definition loader for <%= className %> module entities
+ */
 @Injectable()
 export class AXPRootEntityLoader implements AXPEntityDefinitionLoader {
+  
+  //#region ----   Services   ----
+  
   private injector = inject(Injector);
+  
+  //#endregion
+
+  //#region ----   Get Method   ----
 
   async get(moduleName: string, entityName: string): Promise<AXPEntity | null> {
-    return new Promise(async (resolve) => {
+    if (moduleName === RootConfig.module.name) {
       switch (entityName) {
-        case 'sample': {
-          const entity = (await import('../<%= name %>/sample/sample.entity')).sampleFactory;
-          resolve(entity(this.injector) as any);
-          break;
-        }
-        default:
-          resolve(null);
+        case RootConfig.entities.sample.name:
+          return (await import('../<%= name %>/sample/sample.entity')).sampleFactory(this.injector);
       }
-    });
+    }
+    return null;
   }
+
+  //#endregion
 }
+
+//#endregion

package/src/generators/app-module/files/src/app/modules/layout/layout-root.module.ts.template

@@ -1,46 +1,44 @@
+import { AXMAppVersionSlotComponent } from '@acorex/modules/platform-management';
 import {
   AXPCommonModule,
   AXPFooterTextSlotComponent,
   AXPNavBarSlotComponent,
+  AXPSettingService,
   AXP_MENU_PROVIDER,
   AXP_PLATFORM_CONFIG_TOKEN,
 } from '@acorex/platform/common';
-import { AXPLayoutBuilderModule, AXPWidgetsCatalog, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/builder';
+import { AXPWidgetCoreModule, AXPWidgetGroupEnum, AXPWidgetsCatalog, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/widget-core';
 import { AXPEntityModule, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import { AXPDefaultThemeModule } from '@acorex/platform/themes/default';
 import { AXP_THEME_PALETTE_PROVIDER } from '@acorex/platform/themes/shared';
-import { AXPComponentSlotModule } from '@acorex/platform/layout/components';
-
-
 import { NgModule, inject } from '@angular/core';
-import pkg from '../../../../../../package.json';
 import { AXPRootEntityLoader } from './entity.loader';
 import { AXPRootMenuProvider } from './menu.provider';
-
+import { AXPComponentSlotModule } from '@acorex/platform/layout/components';
+import { AXPPlatformScope } from '@acorex/platform/core';
 @NgModule({
   imports: [
     AXPDefaultThemeModule,
     AXPCommonModule,
     AXPEntityModule,
-    AXPLayoutBuilderModule.forChild({
+    AXPWidgetCoreModule.forChild({
       widgets: [],
       extendedWidgets: [],
     }),
     AXPComponentSlotModule.forRoot({
-      'rootfooter-start': [
+      'root-footer-start': [
         {
           name: 'version',
-          component: AXPFooterTextSlotComponent,
-          options: () => {
-            return { text: `v${pkg.version}` };
-          },
+          component: AXMAppVersionSlotComponent,
         },
         {
           name: 'copyright',
           component: AXPFooterTextSlotComponent,
-          options: () => {
-            const a = inject(AXP_PLATFORM_CONFIG_TOKEN);
-            return { text: a.copyright };
+          options: async () => {
+            const platformConfig = inject(AXP_PLATFORM_CONFIG_TOKEN);
+            const settingService = inject(AXPSettingService);
+            const copyrightText = await settingService.scope(AXPPlatformScope.Tenant).get("organization:copyright-text");
+            return { text: copyrightText ?? platformConfig.copyright };
           },
         },
       ],
@@ -52,7 +50,7 @@ import { AXPRootMenuProvider } from './menu.provider';
       ],
     }),
   ],
-  exports: [],
+  exports: [AXPDefaultThemeModule],
   providers: [
     {
       provide: AXP_MENU_PROVIDER,
@@ -73,4 +71,4 @@ import { AXPRootMenuProvider } from './menu.provider';
     },
   ],
 })
-export class AXPLayoutRootModule {}
+export class AXPLayoutRootModule { }

package/src/generators/app-module/files/src/app/modules/layout/menu.provider.ts.template

@@ -1,23 +1,9 @@
 import { AXPMenuProviderContext, AXPMenuProvider } from '@acorex/platform/common';
 import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
-import { cloneDeep, omit } from 'lodash-es';
-import { Observable, of } from 'rxjs';
 
 @Injectable()
 export class AXPRootMenuProvider implements AXPMenuProvider {
   async provide(context: AXPMenuProviderContext): Promise<void> {
-    context.addItems([
-    {
-      text: 'Sample',
-      path: '/<%= name %>/m/sample/e/sample/list',
-      icon: 'fa-solid fa-grid-2',
-      data: {
-        //requiredPermission: '',
-      },
-    },
-  ]);
+    // Intentionally empty; feature modules should register their own menus.
   }
-
-   
 }

package/src/generators/app-module/files/src/app/modules/layout/theme-palette.provider.ts.template

@@ -213,6 +213,63 @@ export class AXPRootThemePaletteProvider implements AXPThemePaletteProvider {
           light: '#fafafa',
         },
       },
+      {
+        name: 'cherry-blossom',
+        title: 'Cherry Blossom',
+        colors: {
+          primary: '#d63384',
+          secondary: '#f8b4cb',
+          success: '#20c997',
+          warning: '#fd7e14',
+          danger: '#dc3545',
+          accents: ['#6f42c1', '#0dcaf0', '#6c757d'],
+          dark: '#251821',
+          light: '#ffffff',
+        },
+      },
+      {
+        name: 'autumn-harvest',
+        title: 'Autumn Harvest',
+        colors: {
+          primary: '#d2691e',
+          secondary: '#cd853f',
+          success: '#228b22',
+          warning: '#daa520',
+          danger: '#b22222',
+          accents: ['#8b4513', '#4682b4', '#2f4f4f'],
+          dark: '#25140e',
+          light: '#ffffff',
+        },
+      },
+      {
+        name: 'arctic-glacier',
+        title: 'Arctic Glacier',
+        colors: {
+          primary: '#4169e1',
+          secondary: '#87ceeb',
+          success: '#32cd32',
+          warning: '#ffa500',
+          danger: '#dc143c',
+          accents: ['#483d8b', '#20b2aa', '#708090'],
+          dark: '#172028',
+          light: '#ffffff',
+        },
+      },
+      {
+        name: 'teal-ocean',
+        title: 'Teal Ocean',
+        colors: {
+          primary: '#018b77',
+          secondary: '#00a693',
+          neutral: '#606c76',
+          success: '#2d9c67',
+          warning: '#e9a01b',
+          danger: '#c02f1d',
+          accents: ['#006b5c', '#4db6ac', '#80cbc4'],
+          dark: '#131f1c',
+          light: '#ffffff',
+        },
+      },
     ]);
   }
 }

package/src/generators/app-module/files/src/app/modules/root/const.ts.template

@@ -1,6 +1,26 @@
-export const AXMSampleModuleConst = {
-  moduleName: 'sample',
-  moduleRoute: 'sample', 
-  categoryEntity: 'sample',
-  templateEntity: 'templates',
+//#region ----   Module Configuration   ----
+
+const config = {
+  i18n: '<%= name %>-module',
+  module: '<%= className %>Module',
 };
+
+export const RootConfig = {
+  config,
+  module: {
+    route: '<%= name %>',
+    name: '<%= className %>Module',
+    title: `t('module-name', {scope:"${config.i18n}"})`,
+    icon: 'fa-light fa-cube',
+  },
+  entities: {
+    sample: {
+      name: 'Sample',
+      title: `t("sample.individual-title",{scope:"${config.i18n}"})`,
+      source: `${config.module}.Sample`,
+      icon: 'fa-light fa-box',
+    },
+  },
+};
+
+//#endregion

package/src/generators/app-module/files/src/app/modules/root/menu.keys.ts.template

@@ -0,0 +1,9 @@
+//#region ----   Menu Keys   ----
+
+export const <%= className %>ModuleMenuKeys = {
+  Root: '<%= name %>-module:menu',
+  Samples: '<%= name %>-module:menu:samples',
+} as const;
+
+//#endregion
+

package/src/generators/app-module/files/src/app/modules/root/menu.provider.ts.template

@@ -0,0 +1,61 @@
+//#region ----   Imports   ----
+
+import { AXPSessionService } from '@acorex/platform/auth';
+import { AXPMenuProvider, AXPMenuProviderContext } from '@acorex/platform/common';
+import { AXPEntityService } from '@acorex/platform/layout/entity';
+import { inject } from '@angular/core';
+import { firstValueFrom } from 'rxjs';
+import { RootConfig } from './const';
+import { <%= className %>ModuleMenuKeys } from './menu.keys';
+import { <%= className %>ModulePermissionsKeys } from './permission.keys';
+
+//#endregion
+
+//#region ----   Menu Provider   ----
+
+export class <%= className %>ModuleMenuProvider implements AXPMenuProvider {
+  
+  //#region ----   Services   ----
+  
+  private entityService = inject(AXPEntityService);
+  private sessionService = inject(AXPSessionService);
+  
+  //#endregion
+
+  //#region ----   Provider Method   ----
+
+  async provide(context: AXPMenuProviderContext): Promise<void> {
+    const isAuthorized = await firstValueFrom(this.sessionService.isAuthorized$);
+    if (!isAuthorized) {
+      return;
+    }
+
+    const scope = RootConfig.config.i18n;
+    const module = RootConfig.module;
+
+    context.addItems([
+      {
+        name: <%= className %>ModuleMenuKeys.Root,
+        priority: 9000,
+        text: `t('root-menu', {scope:"${scope}"})`,
+        icon: module.icon,
+        data: {},
+        children: [
+          {
+            name: <%= className %>ModuleMenuKeys.Samples,
+            text: `t('samples-menu', {scope:"${scope}"})`,
+            path: this.entityService.createPath(module.name, RootConfig.entities.sample.name),
+            icon: RootConfig.entities.sample.icon,
+            priority: 1,
+            data: {},
+          },
+        ],
+      },
+    ]);
+  }
+
+  //#endregion
+}
+
+//#endregion
+