@acorex/platform-generator 18.0.6 → 18.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acorex/platform-generator",
-  "version": "18.0.6",
+  "version": "18.0.7",
   "dependencies": {
     "@nx/devkit": "19.2.2",
     "tslib": "^2.3.0"

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

@@ -2,25 +2,13 @@ import { AXPAdminLayoutComponent, AX_ADMIN_ROUTES } from '@acorex/platform/layou
 import { Route } from '@angular/router';
 
 export const appRoutes: Route[] = [
-  {
+ {
+    path: '<%= name %>',
+    loadChildren: () => import('./modules/<%= name %>/<%= name %>-root.module').then((c) => c.<%= upperCase(name) %>RootModule),
+  },
+   {
     path: '',
     pathMatch: 'full',
-    redirectTo: '<%= name %>'
+    redirectTo: '<%= name %>',
   },
-  {
-    path: '',
-    component: AXPAdminLayoutComponent,
-    children: [
-      {
-        path: '<%= name %>',
-        loadChildren: () => import('./modules/<%= name %>/<%= name %>-root.module').then(c => c.<%= upperCase(name) %>RootModule)
-      },
-      {
-        path: '',
-        children: [
-          ...AX_ADMIN_ROUTES
-        ]
-      }
-    ]
-  }
 ];

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

@@ -1,4 +1,4 @@
-import { AXPAuthStrategy, AXPBaseCredentials, AXPRefreshTokenResult, AXPSignInResult, AXPUser } from '@acorex/platform/auth';
+import { AXPAuthStrategy, AXPBaseCredentials, AXPRefreshTokenResult, AXPSessionContext, AXPSignInResult, AXPUser } from '@acorex/platform/auth';
 import { AXPDataProvider } from '@acorex/platform/common';
 import { Injectable, Injector, inject } from '@angular/core';
 
@@ -77,7 +77,15 @@ export class <%= upperCase(name) %>Strategy implements AXPAuthStrategy {
     console.log('User signed out');
   }
 
-  refreshToken(refreshToken: string): Promise<AXPRefreshTokenResult> {
-    throw new Error('Method not implemented.');
+  async refreshToken(context: AXPSessionContext): Promise<AXPRefreshTokenResult> {
+    return {
+      succeed: true,
+      data: {
+        accessToken: 'access_token',
+        refreshToken: 'refresh_token',
+        application: context.application,
+        tenant: context.tenant,
+      }
+    }
   }
 }

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

@@ -1,11 +1,15 @@
 import {
   AXPAdminLayoutModule,
-  AXPFooterTextSlotComponent,
   AXPLayoutModule,
+} from '@acorex/platform/layouts';
+
+import {
+  AXPFooterTextSlotComponent,
   AXPNavBarSlotComponent,
   AXPThemeSlotComponent,
   AXP_ENTITY_LOADER,
-} from '@acorex/platform/layouts';
+  AXPComponentSlotModule,
+} from '@acorex/platform/common';
 import { NgModule, inject } from '@angular/core';
 import { AXPRootMenuLoader } from './menu.loader';
 import { AXPRootEntityLoader } from './entity.loader';

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

@@ -1,4 +1,5 @@
 import { AXPAuthGuard, AXPPermissionGuard } from '@acorex/platform/auth';
+import { AXPRootLayoutComponent } from '@acorex/platform/themes/default';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
@@ -11,9 +12,10 @@ const routes: Routes = [
   },
   {
     path: '',
+    component: AXPRootLayoutComponent,
     children: [
       {
-        //canActivate: [AXPAuthGuard],
+        canActivate: [AXPAuthGuard],
         path: 'home',
         loadComponent: () => import('./home/home.page').then((c) => c.<%= upperCase(name) %>HomePage),
       }

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

@@ -1,14 +1,13 @@
 import { AXDataSourceQuery } from '@acorex/components/common';
 import { applyFilterArray, applySortArray } from '@acorex/modules/backend';
 import {
-    AXPEntityConfig,
-    AXPEntityListDisplayColumnConfig,
-    AXPEntityProperty,
-    convertPropertiesToColumns,
-    widgetSchemas,
-} from '@acorex/platform/layouts';
+  AXPEntityConfig,
+  AXPEntityListDisplayColumnConfig,
+  convertPropertiesToColumns,
+  AXPEntityPropertyConfig,
+  widgetSchemas,
+} from '@acorex/platform/common';
 import { Injector } from '@angular/core';
-import { assign } from 'lodash-es';
 
 const properties: AXPEntityPropertyConfig[] = [
     {