@acorex/platform-generator 18.0.3 → 18.0.7

package/README.md

@@ -1,11 +1,11 @@
-# generator
-
-This library was generated with [Nx](https://nx.dev).
-
-## Building
-
-Run `nx build generator` to build the library.
-
-## Running unit tests
-
-Run `nx test generator` to execute the unit tests via [Jest](https://jestjs.io).
+# generator
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build generator` to build the library.
+
+## Running unit tests
+
+Run `nx test generator` to execute the unit tests via [Jest](https://jestjs.io).

package/generators.json

@@ -1,9 +1,9 @@
-{
-  "generators": {
-    "app-module": {
-      "factory": "./src/generators/app-module/generator",
-      "schema": "./src/generators/app-module/schema.json",
-      "description": "app-module generator"
-    }
-  }
-}
+{
+  "generators": {
+    "app-module": {
+      "factory": "./src/generators/app-module/generator",
+      "schema": "./src/generators/app-module/schema.json",
+      "description": "app-module generator"
+    }
+  }
+}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@acorex/platform-generator",
-  "version": "18.0.3",
+  "version": "18.0.7",
   "dependencies": {
     "@nx/devkit": "19.2.2",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@acorex/platform": "*",
-    "@acorex/modules": "*",
-    "@acorex/styles": "*",
-    "@acorex/core": "*",
-    "@acorex/components": "*"
+    "@acorex/platform": ">=18.0.0",
+    "@acorex/modules": ">=18.0.0",
+    "@acorex/styles": ">=18.0.0",
+    "@acorex/core": ">=18.0.0",
+    "@acorex/components": ">=18.0.0"
   },
   "type": "commonjs",
   "main": "./src/index.js",

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

@@ -25,7 +25,7 @@ import { AXPTranslationRootModule } from './modules/common/translation-root.modu
 import { AXPLayoutRootModule } from './modules/layout/layout-root.module';
 
 import { AXLoadingDialogModule } from '@acorex/components/loading-dialog';
-import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/core';
+import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/common';
 import { environment } from '../environments/environment';
 
 export function initApp() {

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/auth/permission.loader.ts.template

@@ -1,5 +1,5 @@
 import { AXPPermission, AXPPermissionLoader, AXPSessionContext } from '@acorex/platform/auth';
-import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/core';
+import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/common';
 import { Injectable, inject } from '@angular/core';
 import { Observable, map, of } from 'rxjs';
 

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

@@ -1,5 +1,5 @@
 import { AXPTenant, AXPTenantLoader, AXPSessionContext } from '@acorex/platform/auth';
-import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/core';
+import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/common';
 import { Injectable, inject } from '@angular/core';
 import { Observable, delay, of } from 'rxjs';
 

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

@@ -1,4 +1,4 @@
-import { AXPEntityConfig, AXPEntityLoader } from '@acorex/platform/layouts';
+import { AXPEntityConfig, AXPEntityLoader } from '@acorex/platform/common';
 import { Injectable, Injector, inject } from '@angular/core';
 
 @Injectable()

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

@@ -1,17 +1,21 @@
 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';
 import { AXPCommonModule, AXPMenuItem, AXPNavigateAction, AXP_MENU_LOADER, AXP_PLATFORM_CONFIG_TOKEN } from '@acorex/platform/common';
 import pkg from '../../../../../../package.json';
-import { AXPComponentSlotModule } from '@acorex/platform/layout';
+import { AXPComponentSlotModule } from '@acorex/platform/layout/builder';
 
 
 @NgModule({

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,16 +1,15 @@
 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: AXPEntityProperty[] = [
+const properties: AXPEntityPropertyConfig[] = [
     {
         name: 'firstname',
         title: 'First Name',
@@ -99,7 +98,7 @@ const columns: AXPEntityListDisplayColumnConfig[] = convertPropertiesToColumns(.
 export async function entityFactory(injector: Injector): Promise<AXPEntityConfig> {
 
     const entity: AXPEntityConfig = {
-        module: '<% name %>',
+        module: '<%= name %>',
         name: entityName,
         title: 'Sample Entity',
         properties: properties,

package/src/generators/app-module/files/src/environments/environment.dev.ts.template

@@ -4,7 +4,6 @@ export const environment = {
   //?
   oidcConfig: {
     authority: 'https://192.168.25.91:44320',
-    end_session_endpoint: 'https://192.168.25.91:44320/api/auth/logout',
     userinfo_endpoint: 'https://192.168.25.91:44320/api/userinfo',
     scope: 'openid profile email offline_access api1',
     client_id: 'acorex',

package/src/generators/app-module/files/src/environments/environment.local.ts.template

@@ -4,7 +4,6 @@ export const environment = {
   //?
   oidcConfig: {
     authority: 'https://localhost:44320',
-    end_session_endpoint: 'https://localhost:44320/api/auth/logout',
     userinfo_endpoint: 'https://localhost:44320/api/userinfo',
     scope: 'openid profile email offline_access api1',
     client_id: 'acorex',

package/src/generators/app-module/files/src/environments/environment.prod.ts.template

@@ -4,7 +4,6 @@ export const environment = {
   //?
   oidcConfig: {
     authority: 'https://asc.acorexui.com:44320',
-    end_session_endpoint: 'https://asc.acorexui.com:44320/api/auth/logout',
     userinfo_endpoint: 'https://asc.acorexui.com:44320/api/userinfo',
     scope: 'openid profile email offline_access api1',
     client_id: 'acorex',

package/src/generators/app-module/files/src/environments/environment.test.local.ts.template

@@ -4,7 +4,6 @@ export const environment = {
   //?
   oidcConfig: {
     authority: 'https://asctest.acorexui.com:44320',
-    end_session_endpoint: 'https://asctest.acorexui.com:44320/api/auth/logout',
     userinfo_endpoint: 'https://asctest.acorexui.com:44320/api/userinfo',
     scope: 'openid profile email offline_access api1',
     client_id: 'acorex',

package/src/generators/app-module/files/src/environments/environment.test.ts.template

@@ -4,7 +4,6 @@ export const environment = {
   //?
   oidcConfig: {
     authority: 'https://asctest.acorexui.com:44320',
-    end_session_endpoint: 'https://asctest.acorexui.com:44320/api/auth/logout',
     userinfo_endpoint: 'https://asctest.acorexui.com:44320/api/userinfo',
     scope: 'openid profile email offline_access api1',
     client_id: 'acorex',

package/src/generators/app-module/files/src/environments/environment.ts.template

@@ -4,7 +4,6 @@ export const environment = {
   //?
   oidcConfig: {
     authority: 'https://localhost:44320',
-    end_session_endpoint: 'https://localhost:44320/api/auth/logout',
     userinfo_endpoint: 'https://localhost:44320/api/userinfo',
     scope: 'openid profile email offline_access api1',
     client_id: 'acorex',

package/src/generators/app-module/schema.d.ts

@@ -1,4 +1,4 @@
-export interface AppModuleGeneratorSchema {
-  name: string;
-  title: string;
-}
+export interface AppModuleGeneratorSchema {
+  name: string;
+  title: string;
+}

package/src/generators/app-module/schema.json

@@ -1,27 +1,27 @@
-{
-  "$schema": "https://json-schema.org/schema",
-  "$id": "AppModule",
-  "title": "",
-  "type": "object",
-  "properties": {
-    "name": {
-      "type": "string",
-      "description": "",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "What name would you like to use?"
-    },
-    "title": {
-      "type": "string",
-      "description": "",
-      "$default": {
-        "$source": "argv",
-        "index": 1
-      },
-      "x-prompt": "What title would you like to use?"
-    }
-  },
-  "required": ["name", "title"]
-}
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "AppModule",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use?"
+    },
+    "title": {
+      "type": "string",
+      "description": "",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "x-prompt": "What title would you like to use?"
+    }
+  },
+  "required": ["name", "title"]
+}