@acorex/platform-generator 18.0.13 → 19.0.1

package/generators.json

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

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@acorex/platform-generator",
-  "version": "18.0.13",
+  "version": "19.0.1",
   "dependencies": {
     "@nx/devkit": "19.2.2",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@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"
+    "@acorex/platform": ">=19.0.0",
+    "@acorex/modules": ">=19.0.0",
+    "@acorex/styles": ">=19.0.0",
+    "@acorex/core": ">=19.0.0",
+    "@acorex/components": ">=19.0.0",
+    "@acorex/connectivity": ">=19.0.0"
   },
   "type": "commonjs",
   "main": "./src/index.js",

package/src/generators/app-module/files/project.json.template

@@ -146,10 +146,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "serve-prod": {
-          "browserTarget": "<%= name %>:build:serve-prod"
+          "buildTarget": "<%= name %>:build:serve-prod"
         },
         "serve-dev": {
-          "browserTarget": "<%= name %>:build:serve-dev"
+          "buildTarget": "<%= name %>:build:serve-dev"
         },
       },
       "defaultConfiguration": "development"
@@ -157,7 +157,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "<%= name %>:build"
+        "buildTarget": "<%= name %>:build"
       }
     },
     "lint": {

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

@@ -5,6 +5,7 @@ import { Component } from '@angular/core';
   template: `
      <router-outlet></router-outlet>
   `,
+  standalone: false
 })
 export class AppComponent {
 }

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

@@ -1,7 +1,8 @@
 import { AXDialogModule } from '@acorex/components/dialog';
 import { CommonModule } from '@angular/common';
-import { HTTP_INTERCEPTORS, provideHttpClient } from '@angular/common/http';
-import { APP_INITIALIZER, NgModule, isDevMode } from '@angular/core';
+import { HTTP_INTERCEPTORS, provideHttpClient,withInterceptorsFromDi } from '@angular/common/http';
+
+import {  NgModule, isDevMode } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule, provideRouter, withEnabledBlockingInitialNavigation } from '@angular/router';
@@ -11,14 +12,12 @@ import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { AppComponent } from './app.component';
 import { appRoutes } from './app.routes';
 import { BasicInterceptor } from './basic-interceptor.interceptor';
-
+import { AXCMockModule } from '@acorex/connectivity/mock';
 import { AXFormatModule } from '@acorex/core/format';
 import { AXValidationModule } from '@acorex/core/validation';
-import {
-  AXPDexieStorageService,
+import { 
   AXPImageUrlLogoConfig,
-  AXPTextLogoConfig,
-  AXPStorageService,
+  AXPTextLogoConfig, 
   AXP_PLATFORM_CONFIG_TOKEN,
   configPlatform,
 } from '@acorex/platform/common';
@@ -29,16 +28,8 @@ import { AXPLayoutRootModule } from './modules/layout/layout-root.module';
 import { AXLoadingDialogModule } from '@acorex/components/loading-dialog';
 import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/common';
 import { environment } from '../environments/environment';
-
-export function initApp() {
-  return () => {
-    const loadingText = document.querySelector('#loadingText');
-    return new Promise((resolve) => {
-      if (loadingText) loadingText.innerHTML = 'Initializing Modules...';
-      resolve(0);
-    });
-  };
-}
+import { AXMSampleEntityModule } from './modules/<%= name %>/sample/sample.module';
+ 
 
 
 @NgModule({
@@ -59,9 +50,11 @@ export function initApp() {
     AXPLayoutRootModule,
     AXDialogModule,
     AXLoadingDialogModule,
+    AXCMockModule,
     //
     AXPAuthRootModule,
     //
+    AXMSampleEntityModule,
     StoreDevtoolsModule.instrument({
       maxAge: 25, // Retains last 25 states
       logOnly: !isDevMode(), // Restrict extension to log-only mode
@@ -72,9 +65,8 @@ export function initApp() {
     }),
   ],
   providers: [
-    provideHttpClient(),
-    provideRouter(appRoutes, withEnabledBlockingInitialNavigation()),
-    { provide: APP_INITIALIZER, useFactory: initApp, multi: true, deps: [] },
+    provideHttpClient(withInterceptorsFromDi()),
+    provideRouter(appRoutes, withEnabledBlockingInitialNavigation()), 
     { provide: HTTP_INTERCEPTORS, useClass: BasicInterceptor, multi: true },
     {
       provide: AXP_ROOT_CONFIG_TOKEN, useValue: {
@@ -94,7 +86,7 @@ export function initApp() {
           'Copyright © 2024',
       }),
     },
-    { provide: AXPStorageService, useClass: AXPDexieStorageService },
+    
   ],
   declarations: [AppComponent],
   bootstrap: [AppComponent],

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

@@ -10,7 +10,7 @@ import { <%= upperCase(name) %>Strategy } from './auth.strategy';
 
 @NgModule({
   imports: [
-    AXMAuthModule.forRoot(),
+    AXMAuthModule ,
     AXPAuthModule.forRoot({
       strategies: [<%= upperCase(name) %>Strategy],
     }),

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

@@ -10,7 +10,7 @@ export class AXPRootEntityLoader implements AXPEntityDefinitionLoader {
     return new Promise(async (resolve) => {
       switch (entityName) {
         case 'sample': {
-          const entity = (await import('../<%= name %>/sample/sample.entity')).entityFactory;
+          const entity = (await import('../<%= name %>/sample/sample.entity')).sampleFactory;
           resolve(entity(this.injector) as any);
           break;
         }

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

@@ -3,20 +3,19 @@ import {
   AXPComponentSlotModule,
   AXPFooterTextSlotComponent,
   AXPMenuItem,
-  AXPNavBarSlotComponent,
-  AXPThemeSlotComponent,
+  AXPNavBarSlotComponent, 
   AXP_ENTITY_LOADER,
-  AXP_MENU_LOADER,
+  AXP_MENU_PROVIDER,
   AXP_PLATFORM_CONFIG_TOKEN,
 } from '@acorex/platform/common';
 import { AXPLayoutModule } from '@acorex/platform/layouts';
 import { NgModule, inject } from '@angular/core';
 import pkg from '../../../../../../package.json';
 import { AXPRootEntityLoader } from './entity.loader';
-import { AXPRootMenuLoader } from './menu.loader';
+import { AXPRootMenuProvider } from './menu.provider';
 import { AXPEntityModule, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import { AXPDefaultThemeModule } from '@acorex/platform/themes/default';
-
+import { AXPThemeSlotComponent } from '@acorex/platform/themes/shared';
 @NgModule({
   imports: [
     AXPDefaultThemeModule,
@@ -57,13 +56,15 @@ import { AXPDefaultThemeModule } from '@acorex/platform/themes/default';
   ],
   exports: [],
   providers: [
-    {
-      provide: AXP_MENU_LOADER,
-      useClass: AXPRootMenuLoader,
+     {
+      provide: AXP_MENU_PROVIDER,
+      useClass: AXPRootMenuProvider,
+      multi: true,
     },
     {
       provide: AXP_ENTITY_DEFINITION_LOADER,
       useClass: AXPRootEntityLoader,
+      multi:true
     },
   ],
 })

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

@@ -0,0 +1,104 @@
+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: 'Home',
+      path: '/<%= name %>/home',
+      icon: 'fa-solid fa-grid-2',
+      data: {
+        //requiredPermission: '',
+      },
+    },
+    {
+      text: 'Administration',
+      type: 'group',
+      data: {
+        requiredPermission: 'admin',
+      },
+    },
+    {
+      text: 'General Settings',
+      icon: 'fa-solid fa-gear',
+      data: {
+        requiredPermission: '<%= name %>.admin.settings',
+      },
+      children: [
+        {
+          text: 'Sample Dynamic Entity',
+          path: '/<%= name %>/m/sample/e/sample/list',
+        },
+      ]
+    },
+    {
+      text: 'Security Management',
+      path: '/security',
+      icon: 'fa-solid fa-lock',
+      data: {
+        requiredPermission: '<%= name %>.admin.settings',
+      },
+      opened: false,
+      children: [
+        {
+          text: 'User Management',
+          icon: 'fa-solid fa-users',
+        },
+        {
+          text: 'Roles Management',
+          icon: 'fa-solid fa-key',
+        },
+      ],
+    },
+    {
+      text: 'Security Management',
+      path: '/security',
+      icon: 'fa-solid fa-lock',
+      data: {
+        requiredPermission: 'platform.admin.settings',
+      },
+      opened: false,
+      children: [
+        {
+          text: 'User Management',
+          icon: 'fa-solid fa-users',
+        },
+        {
+          text: 'Roles Management',
+          icon: 'fa-solid fa-key',
+        },
+      ],
+    },
+    {
+      text: 'Tenant Management',
+      path: '/tenant-managemenet',
+      icon: 'fa-solid fa-sitemap',
+      data: {
+        requiredPermission: 'platform.admin.settings',
+      },
+    },
+    {
+      text: 'Reports',
+      type: 'group',
+      data: {
+        requiredPermission: 'platform.admin.reports',
+      },
+    },
+    {
+      text: 'log Management',
+      path: '/log-managemenet',
+      icon: 'fa-solid fa-file-lines',
+      data: {
+        requiredPermission: 'platform.admin.reports',
+      },
+    },
+  ]);
+  }
+
+   
+}

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

@@ -0,0 +1,6 @@
+export const AXMSampleModuleConst = {
+  moduleName: 'sample',
+  moduleRoute: 'sample', 
+  categoryEntity: 'sample',
+  templateEntity: 'templates',
+};

package/src/generators/app-module/files/src/app/modules/root/home/home.page.html.template

@@ -1,3 +1,3 @@
 <div class="ax-flex ax-p-7">
-    <div class="ax-font-bold ax-text-3xl">Welcome to ACoreX Platform</div>
+    <div class="ax-font-bold ax-text-2xl">Welcome to ACoreX Platform</div>
 </div>

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

@@ -1,29 +1,27 @@
-import { applyFilterArray, applySortArray } from '@acorex/modules/backend';
+ 
 import {
-  AXPDataGenerator,
   AXPEntity,
-  AXPEntityCommandScope,
-  AXPEntityDataProviderImpl,
-  AXPEntityQueryType,
-  AXPStorageService,
+  AXPEntityCommandScope, 
+  AXPEntityQueryType, 
 } from '@acorex/platform/common';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/builder';
 import { Injector } from '@angular/core';
-import { USERS } from '../mock.data';
+import { AXMSampleEntityService } from './sample.service'; 
+import { AXMSampleModuleConst } from '../const';
 
-export async function entityFactory(injector: Injector): Promise<AXPEntity | null> {
-  const storageService = injector.get(AXPStorageService);
-  const dataProvider = new AXPEntityDataProviderImpl<any>(storageService, 'users');
-  await dataProvider.initial(USERS);
+export async function sampleFactory(injector: Injector): Promise<AXPEntity | null> {
+  const dataService = injector.get(AXMSampleEntityService);
+
+ const moduleName = AXMSampleModuleConst.moduleName;
 
   const entityDef: AXPEntity = {
-    module: '<%= name %>',
-    name: 'sample',
-    source: '<%= name %>.sample',
+    module: moduleName,
+    name: AXMSampleModuleConst.categoryEntity,
+    source: '',
     title: 'Sample Entity',
     formats: {
-      individual: 'sample',
-      plural: 'sample',
+      individual: 'Sample',
+      plural: 'Samples',
     },
     relatedEntities: [],
     groups: [
@@ -106,17 +104,16 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
           },
         ],
       },
-      {
+       {
         name: 'email',
         title: 'Email',
         groupId: 'contact',
         schema: {
           dataType: 'string',
           interface: {
-            type: AXPWidgetsCatalog.text,
+            type: AXPWidgetsCatalog.contact,
             options: {
-              multiple: false,
-              hasLabel: false,
+              type: { id: 'email', title: 'Email' },
             },
           },
         },
@@ -133,10 +130,9 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
         schema: {
           dataType: 'string',
           interface: {
-            type: AXPWidgetsCatalog.phone,
+            type: AXPWidgetsCatalog.contact,
             options: {
-              multiple: false,
-              hasLabel: false,
+              type: { id: 'phone', title: 'phone' },
             },
           },
         },
@@ -167,16 +163,14 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
       create: {
         execute: async (data: any) => {
           console.log('CREATE', data);
-          const entity = Object.assign(data, { id: AXPDataGenerator.uuid() });
-          dataProvider.insertOne(entity);
-          return Promise.resolve(entity);
+           const res =await dataService.insertOne(data);
+          return {id: res};
         },
       },
       delete: {
         execute: async (id: any) => {
           console.log('DELETE', id);
-          await await dataProvider.deleteOne(id);
-          return Promise.resolve();
+          return await dataService.deleteOne(id);
         },
       },
       update: {
@@ -184,7 +178,7 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
           console.log('UPDATE', data);
           return new Promise((resolve) => {
             setTimeout(async () => {
-              await dataProvider.updateOne(data.id, data);
+              await dataService.updateOne(data.id, data);
               resolve(data);
             }, 1000);
           });
@@ -197,7 +191,7 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
           console.log('users=>byKey', id);
           return new Promise((resolve) => {
             setTimeout(async () => {
-              const entity = await dataProvider.getOne(id);
+              const entity = await dataService.getOne(id);
               resolve(entity);
             }, 500);
           });
@@ -206,14 +200,7 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
       },
       list: {
         execute: async (e: any) => {
-          console.log('users=>list', e);
-          const list = await dataProvider.getAll();
-          const sortedItems = applySortArray(list, e.sort);
-          const filteredItems = applyFilterArray(sortedItems, e.filter ? [e.filter] : []);
-          return Promise.resolve({
-            total: filteredItems.length,
-            items: filteredItems.slice(e.skip, (e.skip ?? 0) + (e.take ?? 0)),
-          });
+              return await dataService.query({ skip: e.skip, take: e.take, filter: e.filter, sort: e.sort });
         },
         type: AXPEntityQueryType.List,
       },
@@ -228,9 +215,6 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
             {
               id: 'contact',
             },
-            {
-              id: 'address',
-            },
           ],
           properties: [
             {
@@ -273,16 +257,6 @@ export async function entityFactory(injector: Injector): Promise<AXPEntity | nul
                 },
               },
             },
-            {
-              name: 'address',
-              layout: {
-                positions: {
-                  lg: {
-                    colSpan: 12,
-                  },
-                },
-              },
-            },
           ],
         },
         update: {

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

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import {
+  AXMSampleEntityService,
+  AXMSampleEntityServiceImpl
+} from './sample.service';
+
+@NgModule({
+  imports: [],
+  exports: [],
+  declarations: [],
+  providers: [
+    {
+      provide: AXMSampleEntityService,
+      useClass: AXMSampleEntityServiceImpl,
+    },
+  ],
+})
+export class AXMSampleEntityModule {}

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

@@ -0,0 +1,18 @@
+import { AXMEntityCrudServiceImpl } from '@acorex/platform/common';
+import { Injectable } from '@angular/core';
+import { AXMSampleModuleConst } from '../const';
+import { AXMSampleEntityModel } from './sample.types';
+import { AXMSampleCreateEntityModel } from './sample.types';
+
+export abstract class AXMSampleEntityService extends AXMEntityCrudServiceImpl<
+  string,
+  AXMSampleEntityModel,
+  AXMSampleCreateEntityModel
+> {}
+
+@Injectable()
+export class AXMSampleEntityServiceImpl extends AXMSampleEntityService {
+  constructor() {
+    super(`${AXMSampleModuleConst.moduleName}.${AXMSampleModuleConst.categoryEntity}`);  
+  }
+}

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

@@ -0,0 +1,15 @@
+import { AXPEntityModel } from '@acorex/platform/common';
+
+export interface AXMSampleEntityModel extends AXPEntityModel<string> {
+   firstname?: string;
+    lastname?: string;
+    phone?: string;
+    email?: string;
+    address?: string;
+}
+export interface AXMSampleCreateEntityModel extends AXPEntityModel<string> {
+   firstname?: string;
+    lastname?: string;
+    phone?: string;
+    email?: string;
+}

package/src/generators/app-module/files/src/assets/i18n/en/auth.json

@@ -6,10 +6,17 @@
   "username-email": "Username / Email",
   "firstname": "First Name",
   "lastname": "Last Name",
+  "register": "Register",
   "mobile": "Mobile",
   "processing": "Processing...",
   "redirecting": "Redirecting...",
   "backLogin": "Back to Login",
+  "profile": {
+    "title": "Profile",
+    "edit": "Edit Profile",
+    "logout": "Logout",
+    "settings": "Settings"
+  },
   "signin": {
     "title": "Sign In",
     "submit": "Sign In",
@@ -45,5 +52,10 @@
     "submit": "Reset Password",
     "remember": "Remember Password?",
     "hint": "Enter Your {{ name }}"
+  },
+  "management": {
+    "title": "Security",
+    "users": "Users",
+    "rols": "Roles"
   }
 }