@simitgroup/simpleapp-generator 2.0.0-l-alpha → 2.0.0-n-alpha

package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta

@@ -214,10 +214,10 @@ export class UserContext extends UserContextInfo {
     this.setXOrg(xOrg);
     await this.setUserToken(tokenstr);
     this.setUserType('normal');
-    // branchId: this.getBranchId(), active: true 
+    // branchId: this.getBranchId(), active: true
     const wh = await webhookModel.find({});
     if (Array.isArray(wh) && wh.length > 0) {
-      this.webhooks = this.webhooks.concat(wh);      
+      this.webhooks = this.webhooks.concat(wh);
     }
   };
 
@@ -492,7 +492,7 @@ export class UserContext extends UserContextInfo {
     this.ssoACL = <Record<string, { roles: string[] }>>tokeninfo?.resource_access ?? {};
     this.logger.debug(`User found ${this.uid}`);
 
-    const userProfile = await this.obtainProfileFromDB();    
+    const userProfile = await this.obtainProfileFromDB();
     if (userProfile) {
       this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
 
@@ -523,6 +523,19 @@ export class UserContext extends UserContextInfo {
         support: false,
       };
       this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
+
+      // console.log("rolegroups",rolegroups)
+      for (const group of this.groups) {
+        const roles: Role[] = rolegroups[group]()
+        //(<() => Role[]>rolegroups[group])();
+        for (let r = 0; r < roles.length; r++) {
+          if (!this.roles.includes(roles[r])) {
+            this.roles.push(roles[r]);
+          }
+        }
+      }
+
+
       this.moreProps = this.setMoreProps(userProfile);
       // this.package = userProfile['package'];
       // this.appintegration = await this.setAppIntegration();
@@ -534,7 +547,7 @@ export class UserContext extends UserContextInfo {
 
     if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
       this.roles.push(Role.SuperAdmin);
-    }    
+    }
     // this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
   };
 
@@ -922,7 +935,6 @@ export class UserContext extends UserContextInfo {
       //   }
     }
 
-    
     return results;
   }
 

package/templates/nest/src/simple-app/_core/framework/base/simple-app.service.ts.eta

@@ -63,7 +63,7 @@ export class SimpleAppService<T extends SchemaFields> {
   protected withDocNumberFormat = false;
   protected foreignkeys = {};
   private eventEmitter: EventEmitter2;
-  private logSvc: SimpleAppLogService;
+  private logService: SimpleAppLogService;
   // protected userprovider = new UserContext() ;
 
   constructor(
@@ -73,7 +73,7 @@ export class SimpleAppService<T extends SchemaFields> {
     isolationtype: IsolationType = IsolationType.org,
     eventEmitter: EventEmitter2,
     docnogenerator: SimpleAppDocumentNoFormatService,
-    logSvc: SimpleAppLogService,
+    logService: SimpleAppLogService,
     runWebHook: RunWebhookService,
   ) {
     // console.log("-------init simpleapp service abstract class -------userprovider=",typeof this.userprovider)
@@ -83,7 +83,7 @@ export class SimpleAppService<T extends SchemaFields> {
     this.doc = newdoc;
     this.docnogenerator = docnogenerator;
     this.isolationtype = isolationtype;
-    this.logSvc = logSvc;
+    this.logService = logService;
     this.runWebHook = runWebHook;
     // this.tenantdoc = tenantdoc
   }
@@ -479,16 +479,14 @@ export class SimpleAppService<T extends SchemaFields> {
       if (dbsession && !dbsession.inTransaction()) {
         dbsession.startTransaction({ readPreference: 'primary' });
       }
-      
-      try{
+
+      try {
         const result = await this.doc.insertMany(datas, { session: dbsession });
-        await this.addManyAuditEvents(appuser, this.documentName, 'createMany', datas);  
+        await this.addManyAuditEvents(appuser, this.documentName, 'createMany', datas);
         return result;
-      }catch(e){
-        throw e
+      } catch (e) {
+        throw e;
       }
-      
-      
     } else {
       throw new BadRequestException(this.getDocumentType() + ': create many only support array');
     }
@@ -600,7 +598,7 @@ export class SimpleAppService<T extends SchemaFields> {
       appuser.addInsertedRecordId(this.documentName, result._id);
     } catch (err) {
       this.logger.error(err);
-      throw err
+      throw err;
     }
 
     try {
@@ -786,7 +784,7 @@ export class SimpleAppService<T extends SchemaFields> {
       await this.identifyForeignKeys(appuser, data);
 
       //new way of hook
-      await this.runEvent(appuser, `${this.documentName}.beforeUpdate`, { id: id, prevData: existingdata, newData: data }, false);
+      await this.runEvent(appuser, this.setHookName('beforeUpdate'), { id: id, prevData: existingdata, newData: data }, false);
 
       // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appuser, id, existingdata, data);
 
@@ -845,7 +843,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       await this.identifyForeignKeys(appuser, data);
 
-      await this.runEvent(appuser, `${this.documentName}.beforeUpdate`, { data: data }, false);
+      await this.runEvent(appuser, this.setHookName('beforeUpdate'), { data: data }, false);
 
       // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appuser, id, existingdata, data);
 
@@ -904,7 +902,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       //patch not suitable trigger afterupdate
       // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appuser, id, existingdata, data);
-
+      await this.runEvent(appuser, this.setHookName('beforePatch'), { id: id, patchData: data,prevData:existingdata }, false);
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
         dbsession.startTransaction({ readPreference: 'primary' });
@@ -937,7 +935,7 @@ export class SimpleAppService<T extends SchemaFields> {
         await this.addAuditEvent(appuser, this.documentName, id, 'patch', data);
       }
       appuser.addUpdatedRecordId(this.documentName, data._id);
-
+      await this.runEvent(appuser, this.setHookName('afterPatch'), { id: id, patchData: data, prevData:existingdata }, false);
       return result; //await this.findById(appuser, id);
     } catch (err) {
       this.logger.error(err.message, 'findIdThenPath error');
@@ -1092,11 +1090,13 @@ export class SimpleAppService<T extends SchemaFields> {
    * @param      {any}          data       The data
    * @return     {Promise}      { description_of_the_return_value }
    */
-  async runEvent(appuser: UserContext, eventName: string, payloads: any, enforce: boolean = true) {
+  async runEvent(appuser: UserContext, eventName: string, payloads: any, enforce: boolean = true) {    
     try {
       if (enforce && !this.eventEmitter.hasListeners(eventName)) {
         throw new InternalServerErrorException(`${eventName} seems no listener`);
       } else if (this.eventEmitter.hasListeners(eventName)) {
+
+        console.log("run eventName",eventName)
         const res = await this.eventEmitter.emitAsync(eventName, appuser, payloads);
 
         if (!res) {
@@ -1298,9 +1298,9 @@ export class SimpleAppService<T extends SchemaFields> {
   }
 
   async addAuditEvent(appUser: UserContext, documentName: string, id: string, eventType: string, data: any) {
-    await this.logSvc.addEvent(appUser, documentName, id, eventType, data);
+    await this.logService.addEvent(appUser, documentName, id, eventType, data);
   }
   async addManyAuditEvents(appUser: UserContext, documentName: string, eventType: string, datas: any) {
-    await this.logSvc.addManyEvents(appUser, documentName, eventType, datas);
+    await this.logService.addManyEvents(appUser, documentName, eventType, datas);
   }
 }

package/templates/nest/src/simple-app/_core/framework/generator-version.ts.eta

@@ -0,0 +1 @@
+export const generatorVersion='<%=it.version%>'

package/templates/nest/src/simple-app/apis/additional-api.module.ts._eta

@@ -0,0 +1,17 @@
+/**
+ * This file was automatically generated by simpleapp generator. It is changable.
+ * last change 2025-09-023
+ * --remove-this-line-to-prevent-override--
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+@Module({
+  imports: [
+
+  ],
+  controllers: [],
+  providers: [],
+  exports: [
+  ],
+})
+export class AdditionalApiModule { }

package/templates/nest/src/simple-app/apis/resource-api.module.ts.eta

@@ -5,6 +5,7 @@
  * Author: Ks Tan
  */
 import { Module } from '@nestjs/common';
+import { AdditionalApiModule } from './additional-api.module';
 <% const loadapi = true; %>
 <% for(let i=0;i<it.modules.length; i++){ %>
 <% let obj = it.modules[i]%>
@@ -15,7 +16,7 @@ import { Module } from '@nestjs/common';
 
 
 @Module({
-  imports: [
+  imports: [AdditionalApiModule,
      <% for(let i=0;i<it.modules.length; i++){ %>
       <% let obj = it.modules[i]%>
       <% if( loadapi && obj.api && obj.api.length>0 && !getSystemResources().includes(obj.docname)){%>

package/templates/nest/src/simple-app/events/branch-event/branch-event.service.ts._eta

@@ -12,15 +12,15 @@ import { GenerateLogoService } from 'src/simple-app/features/generate-image/gene
 @Injectable()
 export class BranchEventService implements EventBeforeCreate<Branch>, EventAfterCreate<Branch> {
   constructor(
-    private branchSvc: BranchService,
-    private autoIncreamentSvc: AutoIncreamentService,
-    private docNoGeneratorSvc: DocumentNoFormatService,
-    private generateLogoSvc: GenerateLogoService,
+    private branchService: BranchService,
+    private autoIncreamentService: AutoIncreamentService,
+    private docNoGeneratorService: DocumentNoFormatService,
+    private generateLogoService: GenerateLogoService,
   ) {}
 
   @OnEvent('branch.before-create')
   async beforeCreate(appUser: UserContext, payload: CreatePayload<Branch>) {
-    const searchresult = await this.autoIncreamentSvc.runGenerateNextNo(appUser, 'branch', 'branchId');
+    const searchresult = await this.autoIncreamentService.runGenerateNextNo(appUser, 'branch', 'branchId');
     payload.data.branchId = searchresult.nextNo;
     console.log('branch.before-create', payload);
   }
@@ -33,8 +33,8 @@ export class BranchEventService implements EventBeforeCreate<Branch>, EventAfter
         throw new BadRequestException('Create branch failed due to branchId=0')
       }
 
-      await this.docNoGeneratorSvc.generateBranchDefaultDocNumbers(appUser, data);
-      await this.generateLogoSvc.generateLogo(appUser, data.branchName, data._id, data.tenantId, data.orgId, data.branchId);
+      await this.docNoGeneratorService.generateBranchDefaultDocNumbers(appUser, data);
+      await this.generateLogoService.generateLogo(appUser, data.branchName, data._id, data.tenantId, data.orgId, data.branchId);
     }catch(e){
       return e
     }

package/templates/nest/src/simple-app/events/organization-event/organization-event.service.ts._eta

@@ -17,14 +17,14 @@ export class OrganizationEventService implements
   EventBeforeUpdate<Organization>
    {
   constructor(
-    private organizationSvc: OrganizationService,
-    private autoIncreamentSvc: AutoIncreamentService,
-    private generateLogoSvc: GenerateLogoService,
+    private organizationService: OrganizationService,
+    private autoIncreamentService: AutoIncreamentService,
+    private generateLogoService: GenerateLogoService,
   ) {}
 
   @OnEvent('organization.before-create',{suppressErrors:false})
   async beforeCreate(appUser: UserContext, payload: CreatePayload<Organization>) {
-    const searchresult = await this.autoIncreamentSvc.runGenerateNextNo(appUser, 'organization', 'orgId');
+    const searchresult = await this.autoIncreamentService.runGenerateNextNo(appUser, 'organization', 'orgId');
     payload.data.orgId = searchresult.nextNo;
     console.log('organization.before-create', payload);
   }
@@ -35,7 +35,7 @@ export class OrganizationEventService implements
     if (data.orgId == 0) {
       throw new BadRequestException('Create branch failed due to orgId=0');
     }
-    // await this.generateLogoSvc.generateLogo(appUser, data.orgName, data._id, data.tenantId, data.orgId, data.organizationId);
+    // await this.generateLogoService.generateLogo(appUser, data.orgName, data._id, data.tenantId, data.orgId, data.organizationId);
   }
 
   @OnEvent('organization.after-create',{suppressErrors:false})

package/templates/nest/src/simple-app/events/permission-event/permission-event.service.ts.eta

@@ -9,7 +9,7 @@ import { CreatePayload } from 'src/simple-app/_core/features/event/event.type';
 @Injectable()
 export class PermissionEventService implements EventBeforeCreate<Permission>, EventAfterCreate<Permission> {
   constructor(
-    private permissionSvc: PermissionService,
+    private permissionService: PermissionService,
   ) {}
 
   @OnEvent('permission.before-create')

package/templates/nest/src/simple-app/events/tenant-event/tenant-event.service.ts_eta

@@ -10,13 +10,13 @@ import { AutoIncreamentService } from 'src/simple-app/_core/features/auto-increa
 @Injectable()
 export class TenantEventService implements EventBeforeCreate<Tenant>, EventAfterCreate<Tenant> {
   constructor(
-    private tenantSvc: TenantService,
-    private autoIncreamentSvc: AutoIncreamentService,
+    private tenantService: TenantService,
+    private autoIncreamentService: AutoIncreamentService,
   ) {}
 
   @OnEvent('tenant.before-create')
   async beforeCreate(appUser: UserContext, payload: CreatePayLoad<Tenant>) {
-    const searchresult = await this.autoIncreamentSvc.runGenerateNextNo(appUser, 'tenant', 'tenantId');
+    const searchresult = await this.autoIncreamentService.runGenerateNextNo(appUser, 'tenant', 'tenantId');
     payload.data.tenantId = searchresult.nextNo;
   }
 

package/templates/nuxt/components/image/ImageOrganization.vue._eta

@@ -5,30 +5,25 @@
       #default
       :class="` place-content-center bg-white rounded-md`"
       @image-uploaded="handleBase64"
-      :imagePath="imagepath"
+      :src="`${server}/organizations/${orgId}`"
     >
-      <!-- {{console.log("imagepath",imagepath)}} -->
       <NuxtImg
-        v-if="orgRecordId"
-        class="w-full h-full rounded-md"
+        v-if="orgId"
+        class="w-full h-full rounded-lg"
         :key="imageKey"
-        :src="imagepath"
-        placeholder="/images/organization.png"
-        @error="onError"
+        :src="`${server}/organizations/${orgId}`"
+        :placeholder="`/organizations/${props.orgId}`"
       />
     </ImageToBase64Uploader>
-    <div
-      v-else
-      :class="` inline-block rounded-md bg-white text-black`"
-    >
-      <!-- {{console.log("imagepath",imagepath)}} -->
-
+    <div v-else :class="` inline-block rounded-md bg-white text-black`">
       <NuxtImg
-        v-if="orgRecordId"
-        class="rounded-md min-w-10 min-h-10 h-full"
-        :src="imagepath"
-        placeholder="/images/organization.png"
-        @error="onError"
+        v-if="orgId"
+        class="w-full h-full rounded-lg"
+        :width="size"
+        :height="size"
+        :src="`${server}/organizations/${orgId}`"
+        :key="imageKey"
+        :placeholder="`/organizations/${props.orgId}`"
       />
     </div>
   </div>
@@ -36,42 +31,52 @@
 <script lang="ts" setup>
 import { PHOTOSIZE } from "~/types";
 // import {KeyValue} from ''
+const server = useRuntimeConfig().public.imageUrl;
+console.log("server", server);
+const uploading = ref(false);
+const emits = defineEmits(["upload"]);
 const props = defineProps<{
   changable?: boolean;
+  orgId: number;
   orgRecordId?: string;
   size: PHOTOSIZE;
 }>();
 const imageKey = ref(0);
-const orgRecordId = computed(
-  () => props.orgRecordId ?? getUserProfile()?.orgRecordId,
-);
-const xorgpath = getCurrentXorg() ? `${getCurrentXorg()}/` : "MC0wLTA/";
-const size = props.size ?? PHOTOSIZE.S64;
-const path = useOrganizationInfo().getBranchPhotoUrl(orgRecordId.value, size);
-const imagepath = ref(path)
 
 
+useNuxtApp().$listen("RefreshPhoto", (resource: string[]) => {
+  if (resource[0] == "organization" && resource[1] == props.orgRecordId) {
+    imageKey.value = new Date().getTime();
+  }
+});
+
 watch(
-  () => props.orgRecordId,
+  () => props.orgId,
   () => imageKey.value++,
 );
 const handleBase64 = async (data: string) => {
   const keyvalue = {
-    key: "organizations/" + props.orgRecordId,
+    key: "organizations/" + props.orgId,
     value: data,
+    id: props.orgRecordId,
   };
+  uploading.value = true;
   // console.log("upload logo ", data);
   const uploadok = await useNuxtApp()
     .$OrganizationDoc()
     .getApi()
-    .runUploadPhoto(orgRecordId.value,keyvalue)
+    .runUploadPhoto(<string>props.orgRecordId, keyvalue);
   if (uploadok) {
-    const realpath = `/api/${imagepath}`;
-    await fetch(realpath, { cache: "reload", credentials: "include" });
-    imageKey.value++;
+    imageKey.value = new Date().getTime();
+    uploading.value = false;
+    emits("upload", keyvalue.key);
+    setTimeout(() => {
+      useNuxtApp().$event("RefreshPhoto", [
+        "organization",
+        <string>props.orgRecordId ,
+        keyvalue.key ?? "",
+      ]);
+    }, 1500);
   }
 };
-const onError = () => {
-  imagepath.value = "/images/organization.png";
-};
 </script>

package/templates/nuxt/composables/goTo.generate.ts.eta

@@ -4,50 +4,64 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-export const getDocumentUrl = (document:string,id?:string,querystr?:string)=>{
-    
-    let path = `/${getCurrentXorg()}/${document}`
-    if(id){
-        path = path + '/'+id
-    }
-    if(querystr){
-        path=path+'?'+querystr
-    }
-    return path
-}
+export const getDocumentUrl = (
+  document: string,
+  id?: string,
+  querystr?: string,
+) => {
+  let path = `/${getCurrentXorg()}/${document}`;
+  if (id) {
+    path = path + "/" + id;
+  }
+  if (querystr) {
+    path = path + "?" + querystr;
+  }
+  return path;
+};
 
-export const getPathResource=()=>{
-    return useRoute().path.toString().replace('/'+getCurrentXorg(),'')
-}
-
-export const goTo = (document:string,id?:string,querystr?:string)=>{    
-    navigateTo(getDocumentUrl(document,id,querystr))   
-}
+export const getPathResource = () => {
+  return useRoute()
+    .path.toString()
+    .replace("/" + getCurrentXorg(), "");
+};
 
+export const goTo = (
+  document: string,
+  id?: string,
+  querystr?: string,
+  options?: Parameters<typeof navigateTo>[1],
+) => {
+  navigateTo(getDocumentUrl(document, id, querystr), options);
+};
 
 export const goBranch = (branchRecordId: string) => {
-    const parenturl = getDocumentUrl("organization");
-    const branchUrl = `${parenturl}/${branchRecordId}`;
-    navigateTo(branchUrl);
-  };
+  const parenturl = getDocumentUrl("organization");
+  const branchUrl = `${parenturl}/${branchRecordId}`;
+  navigateTo(branchUrl);
+};
 
-export const getPathPara = (paraname:string,emptyvalue:string=''):string=>{
-   const paravalue = useRoute().params[paraname]
-   if(paravalue){
-    return paravalue.toString()
-   }else{
-    return emptyvalue
-   }
-}
-export const getPathQuery = (paraname:string,emptyvalue:string|string[]=''):string|string[]=>{
-    const paravalue = useRoute().query[paraname]
-    if( paraname.includes('[')){
-        return (typeof paravalue == 'string'? [paravalue] : paravalue) as string[]
-    }else if(typeof paravalue == 'string'){
-        return paravalue.toString()
-    }
-    else{
-     return emptyvalue
-    }
- }
-export const setCurrentUrl = (path:string)=>useRouter().push({path:path})
+export const getPathPara = (
+  paraname: string,
+  emptyvalue: string = "",
+): string => {
+  const paravalue = useRoute().params[paraname];
+  if (paravalue) {
+    return paravalue.toString();
+  } else {
+    return emptyvalue;
+  }
+};
+export const getPathQuery = (
+  paraname: string,
+  emptyvalue: string | string[] = "",
+): string | string[] => {
+  const paravalue = useRoute().query[paraname];
+  if (paraname.includes("[")) {
+    return (typeof paravalue == "string" ? [paravalue] : paravalue) as string[];
+  } else if (typeof paravalue == "string") {
+    return paravalue.toString();
+  } else {
+    return emptyvalue;
+  }
+};
+export const setCurrentUrl = (path: string) => useRouter().push({ path: path });

package/templates/nuxt/composables/roles.generate.ts.eta

@@ -13,14 +13,14 @@ const allroles:roletype[] = [
     <% for(let i=0;i<it.modules.length; i++){ %>
         <% const m = it.modules[i] %>
         <% const appconfig = m.schema["x-simpleapp-config"] %>                
-        {resource: '<%=m.docname%>', action:'access'},
-        {resource: '<%=m.docname%>', action:'create'},
-        {resource: '<%=m.docname%>', action:'update'},
-        {resource: '<%=m.docname%>', action:'delete'},
-        {resource: '<%=m.docname%>', action:'search'},       
+        {resource: '<%=m.typename%>', action:'access'},
+        {resource: '<%=m.typename%>', action:'create'},
+        {resource: '<%=m.typename%>', action:'update'},
+        {resource: '<%=m.typename%>', action:'delete'},
+        {resource: '<%=m.typename%>', action:'search'},       
         <% if(Array.isArray(appconfig?.allStatus) && appconfig.allStatus.length>0){%> 
         <% for(let sindex=0;sindex<appconfig.allStatus.length;sindex++){%> 
-         {resource: '<%=m.docname%>', action:'<%=appconfig.allStatus[sindex].status%>'},       
+         {resource: '<%=m.typename%>', action:'<%=appconfig.allStatus[sindex].status%>'},       
         <%}%> 
         <%}%> 
     <%}%>

package/templates/nuxt/composables/stringHelper.generate.ts.eta

@@ -23,7 +23,7 @@ export const md5=(s:string)=>  new Md5().appendStr(s).end()
 // }
 export const getAvatarByUid = (id:string, size?:number):string=>{  
   if(size===undefined)size=160
-  return `${useRuntimeConfig().public.avatarUrl}/${md5(id)}?size=${size}`
+  return `${useRuntimeConfig().public.imageUrl}/id?width=${size}&height=${size}`
 }
 export const updateAvatarVersion = ()=>{
   myAvatarVersion.value++

package/templates/nuxt/pages/profile.vue._eta

@@ -89,6 +89,7 @@
             {{ t("more") }}
             <p class="text-danger-600">{{ t("onlyAppearInDebugMode") }}</p>
             <p class="text-danger-600">{{ getUserProfile().sessionId }}</p>
+            <div>generator: {{generatorVersion}} </div>
           </dt>
           <dd
             class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0"

package/templates/nuxt/plugins/19.simpleapp-mini-app-store.ts.eta

@@ -13,7 +13,7 @@ import {
   MINIAPPMANAGERApi,
 } from "~/simpleapp/generate/openapi";
 import { MiniAppFormWithMiniAppCode } from "~/simpleapp/generate/features/miniApp/app/types/miniApp";
-import { MiniappEnvEnum } from "~/enums/enums.generate";
+import { MiniappEnvEnum } from "~/enums";
 
 export default defineNuxtPlugin(async () => {
   /**