@simitgroup/simpleapp-generator 1.3.4-alpha → 1.4.0-alpha

package/templates/nest/src/simpleapp/generate/commons/user.context.ts.eta

@@ -3,6 +3,9 @@
  * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2024-01-01
  * Author: Ks Tan
+ * permission design
+ * 1. during sign in, user can pick run as what group user
+ * 2.
  */
 import {
   Injectable,
@@ -50,7 +53,7 @@ export class UserContext {
   protected ssoACL: any = {};
   protected token: string = '';
   protected refreshtoken: string = '';
-  protected group: string = '';
+  protected groups: string[] = [];
   protected branchCode: string = '';
   protected branchName: string = '';
   protected orgCode: string = '';
@@ -92,7 +95,7 @@ export class UserContext {
   getTimeZone = () => this.timeZone;
   getCountry = () => this.country;
   getOffsetMinute = () => this.offsetMinute;
-  getGroup = () => this.group;
+  getGroups = () => this.groups;
   getCurrency = () => this.currency;
   getMoreProps = () => this.moreProps;
   getRoles = () => this.roles;
@@ -107,7 +110,7 @@ export class UserContext {
         data.push({
           _id: b._id,
           branch: b.branch[0],
-          group: b.group,
+          groups: b.groups,
           xOrg: this.generateXorg(b.tenantId, b.orgId, b.branchId),
         });
       }
@@ -204,9 +207,16 @@ export class UserContext {
       if (this.tenantId > 0) {
         const myperm = userinfo.permissions[0];
 
-        if (myperm && myperm.group) {
-          userinfo.group = myperm.group;
-          userinfo.roles = rolegroups[userinfo.group]();
+        if (myperm && myperm.groups) {
+          userinfo.groups = myperm.groups;
+          userinfo.roles = [] as Role[];
+          for (let g = 0; g < userinfo.groups.length; g++) {
+            const roles: Role[] = rolegroups[userinfo.groups[g]]();
+            for (let r = 0; r < roles.length; r++) {
+              if (!userinfo.roles.includes(roles[r]))
+                userinfo.roles.push(roles[r]);
+            }
+          }
 
           userinfo.branchRecordId = myperm.currentbranch[0].branchRecordId;
           userinfo.branchCode = myperm.currentbranch[0].branchCode;
@@ -220,7 +230,7 @@ export class UserContext {
           userinfo.offsetMinute = myperm.currentorg[0].offsetMinute;
         }
       } else {
-        userinfo.group = '';
+        userinfo.groups = [];
       }
 
       const currentitme = new Date(this.lastActivity).getTime();
@@ -273,7 +283,7 @@ export class UserContext {
       this.offsetMinute = userinfo['offsetMinute'] ?? '';
       this.orgRecordId = userinfo['orgRecordId'] ?? '';
       this.branchRecordId = userinfo['branchRecordId'] ?? '';
-      this.group = userinfo['group'] ?? '';
+      this.groups = userinfo['groups'] ?? [];
       this.roles = userinfo['roles'] ?? [Role.Everyone, Role.User];
       this.moreProps = this.setMoreProps(userinfo);
     } else {
@@ -286,7 +296,7 @@ export class UserContext {
     }
     this.logger.debug(
       `${this.uid} have _id (${this.getId()}), group (${
-        this.group
+        this.groups
       }) and role (${this.getRoles()})`,
     );
 
@@ -397,7 +407,7 @@ export class UserContext {
       email: this.getEmail(),
       uid: this.getUid(),
       fullName: this.getFullname(),
-      group: this.group,
+      groups: this.groups,
       roles: this.getRoles(),
       branches: this.getBranches(),
       invites: await this.getInvites(),
@@ -506,7 +516,7 @@ export class UserContext {
     const o = this.ssoACL;
     const ssoclient = process.env.OAUTH2_CLIENTID;
     const adminRole = process.env.OAUTH2_ADMINROLE;
-    const adminemails = process.env.ADMIN_EMAIL.split(',')
+    const adminemails = process.env.ADMIN_EMAIL.split(',');
     // return false
     if (adminemails.includes(this.getEmail())) {
       return true;
@@ -631,7 +641,7 @@ export class UserContext {
                 _id: item._id,
                 orgId: item.orgId,
                 branchId: item.branchId,
-                group: item.group,
+                groups: item.groups,
                 orgCode: item.org[0].orgCode,
                 orgName: item.org[0].orgName,
                 branchCode: item.branch[0].branchCode,

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -273,6 +273,31 @@ export class SimpleAppService<T extends { _id?: string }> {
     }
   }
 
+  /**
+   * create many from array, for performance reason it submit all item in 1 go, so it won't implement hooks
+   * @param appuser 
+   * @param datas 
+   */
+  async createMany (appuser: UserContext, datas: T[]){
+    if(Array.isArray(datas)){
+      for(let i=0 ; i< datas.length; i++){
+        const data = datas[i]
+        let isolationFilter: any = { ...appuser.getCreateFilter() };
+        isolationFilter = this.polishIsolationFilter(isolationFilter, data);
+        
+        Object.assign(data, isolationFilter);
+        this.reCalculateValue(data);
+        await this.validateData(appuser, data);
+        this.applyNestedDateTime(appuser, data, 'create');        
+      }
+      const result = await this.doc.insertMany(datas)
+      return result
+
+    }else{
+      throw new BadRequestException(this.getDocumentType() +': create many only support array')
+    }
+  }
+  
   async create(appuser: UserContext, data: T) {
     let result;
     if (!data._id) {
@@ -553,7 +578,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     }
 
     if (this.hooks.beforeUpdate)
-      await this.hooks.beforeUpdate(appuser, id, data,existingdata);
+      await this.hooks.beforeUpdate(appuser, id, data, existingdata);
 
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {

package/templates/nest/src/simpleapp/generate/workflow/workflow.service.ts.eta

@@ -67,7 +67,7 @@ export class WorkflowService {
       $or: [
         { 'items.assignee': appuser.getUname() },
         { 'items.candidateUsers': appuser.getUname() },
-        { 'items.candidateGroups': appuser.getGroup() },
+        { 'items.candidateGroups': appuser.getGroups() },
       ],
     });
     const result: UserTaskType[] = tmp.map((proc) => {

package/templates/nest/src/simpleapp/profile/profile.service.ts.eta

@@ -166,7 +166,7 @@ export class ProfileService {
       branchId: branchResult.branchId,
       uid: appuser.getUid(),
       userId: userRecordId,
-      group: 'admin',
+      groups: ['admin'],
     };
     this.logger.log(permdata, 'create Permission data');
     const permResult = await this.permsvc.create(appuser, permdata);

package/templates/nest/src/simpleapp/profile/profile.types.ts.eta

@@ -10,7 +10,7 @@ export type RegTenant = {
   export type ProfileUserBranch = {
     _id: string  
     branch: any  
-    group: string
+    groups: string[]
     xOrg: string
   };
   export type ProfileUserInvites = {

package/templates/nest/src/simpleapp/services/perm.service.ts.eta

@@ -6,23 +6,20 @@
  */
 import { InjectModel } from '@nestjs/mongoose';
 import { Model, PipelineStage } from 'mongoose';
-import { Injectable } from '@nestjs/common';
+import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { PermissionProcessor } from '../generate/processors/perm.processor';
-import { Permission,PermissionHooks } from '../generate/types';
+import * as types from '../generate/types';
 import { UserContext } from '../generate/commons/user.context';
 export { Permission } from '../generate/types';
 
 @Injectable()
 export class PermissionService extends PermissionProcessor {
   protected strictIsolation = false;
-  protected hooks : PermissionHooks = {};
-  constructor(
-    @InjectModel('Permission') mydoc: Model<Permission>,    
-    ) {
+  protected hooks: types.PermissionHooks = {};
+  constructor(@InjectModel('Permission') mydoc: Model<types.Permission>) {
     super(mydoc);
   }
 
-
   async runListUser(appuser: UserContext) {
     const getallrecords: PipelineStage = { $match: {} };
     const lookupuser: PipelineStage = {
@@ -55,4 +52,5 @@ export class PermissionService extends PermissionProcessor {
     // delete result['users'][0]
     return finalresult;
   }
+
 }

package/templates/nest/src/simpleapp/services/user.service.ts.eta.old

@@ -0,0 +1,118 @@
+/**
+ * This file was automatically generated by simpleapp generator. It is changable
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+
+/**
+ * This file was automatically generated by simpleapp generator.
+ 
+ * last change 2023-09-23
+ * Author: Ks Tan
+ */
+import { InjectModel } from '@nestjs/mongoose';
+import { Model, PipelineStage } from 'mongoose';
+import { Injectable, InternalServerErrorException, NotFoundException } from '@nestjs/common';
+import { UserContext } from '../generate/commons/user.context';
+import { UserProcessor } from '../generate/processors/user.processor';
+//import { User,UserHooks} from '../generate/types';
+import * as types from '../generate/types';
+import { PermissionService } from './perm.service';
+export { User } from '../generate/types';
+
+@Injectable()
+export class UserService extends UserProcessor {
+  protected strictIsolation = false;
+
+  public hooks: types.UserHooks = {};
+  constructor(
+    @InjectModel('User') mydoc: Model<types.User>,
+    private permService:PermissionService
+    ) {
+    super(mydoc);
+  }
+
+  /***************************** begin x-document-api definitions *****************************************/
+  async runGetPermission(
+    appuser: UserContext,
+
+    id: string,
+  ) {
+    const pipelines:PipelineStage[] = []
+
+    pipelines.push({
+      $match:{userId : id}
+    })
+    // tenantId: {type:'integer',default:1,minimum:0},
+    // orgId: {type:'integer',default:1,minimum:0 },
+    // branchId: {type:'integer',default:1,minimum:0 },
+    // group: {type: "string"},
+    // uid: {type: "string",description:"sso unique identity, which is keycloak sub"},
+    // userId : {type:"string","x-foreignkey":"user", format:"uuid",description:"primary key from user" }
+
+
+    // tenantId: {type:'integer',default:1,minimum:1 },
+    // orgId: {type:'integer',default:1,minimum:1 },
+    // branchId: {type:'integer',default:1,minimum:1 },
+    // organization:{
+    //   type:"object",
+    //   "x-foreignkey":"organization",
+    //   properties:{
+    //       "_id":{"type":"string"},
+    //       "code":{"type":"string"},
+    //       "label":{"type":"string"},
+    //       "orgId":{"type":"integer"}
+    //   }
+    // },
+    // branchCode: {type: "string",minLength:1},
+    // branchName: {type: "string",minLength:1},
+    pipelines.push({ $lookup: {
+      from: 'branch',
+      as :'branch',
+      localField:'branchId',
+      foreignField:'branchId',                  
+    }})
+    type TmpPermissionType =  types.Permission & { branch: types.Branch[]}
+    try{        
+        const results = await this.permService.aggregate(appuser,pipelines) as TmpPermissionType[]        
+        if(results ){
+          
+          const perms : types.UserPermission[] = results.map(item=>{
+            const b = item.branch[0]
+            console.log("b==",b)
+            const perm:types.UserPermission = {
+              _id:item._id,
+              groups:item.groups,
+              userId:item.userId,
+              branchId:item.branchId,
+              branch: {
+                _id: b._id,
+                code: b.branchCode,
+                label: b.branchName,
+                organization: b.organization
+              }             
+            }
+            return perm
+          })
+          return perms      
+        }else{
+          return []
+        }
+    }catch(e){
+      console.log("unknown error",e)
+      throw new InternalServerErrorException(e)
+    }
+  }
+  async runUpdatePermission(
+    appuser: UserContext,
+
+    id: string,
+
+    data: types.UserPermission[],
+  ) {
+    return 'OK';
+  }
+
+  /***************************** end x-document-api definitions *****************************************/
+}

package/templates/nest/src/simpleapp/types/index.ts._eta

@@ -10,3 +10,11 @@ export type ForeignKey = {
     label: string
     [key:string]:any
   };
+
+export type UserPermission = {
+  permId: string;
+  branchId: number
+  branch: ForeignKey
+  groups: string[]
+  userId : string
+}

package/templates/nuxt/app.vue._eta

@@ -1,26 +1,40 @@
-<template>  
-    <NuxtLayout :name="getLayout()">      
-      <SessionBlock/>
-      <EventDocumentViewer></EventDocumentViewer>      
-      <EventDecision/>
-      <EventNotification/>
-      <NuxtPage />
-    </NuxtLayout>
+<template>
+  <NuxtLayout :name="getLayout()">      
+    <SessionBlock/>
+    <EventDocumentViewer></EventDocumentViewer>      
+    <EventDecision/>
+    <EventNotification/>
+    <NuxtPage/>
+  </NuxtLayout>
 </template>
+
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-22
- * author: Ks Tan
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-11-12
+ * Author: Ks Tan
  */
-watch(()=>useRoute().params['xorg'],(newval,oldvalue)=>{
-  reloadUserStore()
+watch(()=>useRoute().params['xorg'],async (newval,oldvalue)=>{
+  await reloadUserStore()  
+  if(getPathPara('xorg','')!=''){
+    if(!getUserProfile()?.currentGroup) goTo('pickgroup')
+  }  
 })
 
 const getLayout = ()=>{
-  const { status } = useAuth();    
+  const { status } = useAuth();   
+   
   if(status.value=='unauthenticated') return 'loginlayout'
-  else return useDevice().isMobile ? 'mobile' : 'default'
+  else {
+    if (isMobile()) return 'mobile'
+    else 'default'
+  } 
 }
-</script>
+
+onMounted(()=>{
+  const currentgroup = useCookie('currentGroup').value
+  //if no xorg, no enforce pick group
+  if(getCurrentXorg() &&  !currentgroup)  goTo('pickgroup')
+})
+</script>

package/templates/nuxt/assets/css/style.css._eta

@@ -13,16 +13,16 @@
     @apply bg-gray-300 dark:bg-gray-600
 }
 
-[aria-selected=true]{
+/* [aria-selected=true]{
     @apply bg-primary-100
-}
-
+} */
+/* 
 [data-pc-group-section=pagebutton]{
     @apply p-2 m-0 rounded-none border
 }
 [data-pc-section=pagebutton]{
     @apply p-3 m-0 border
-}
+} */
 html {
     overflow: hidden;
     overscroll-behavior: none;

package/templates/nuxt/assets/primevue/passthrough.ts._eta

@@ -25,9 +25,15 @@ const CustomTailwind = usePassThrough(
             // title:{class:''},
             // header:{class:''}
         },       
-        tabpanel:{
-            headerTitle:{class:'m-0 p-0'},            
-        },
+        // tabview:{
+            // tabpanel:{
+            //     headeraction:{class:'p-tabview-nav-link p-tabview-header-action items-center cursor-pointer flex overflow-hidden relative select-none text-decoration-none select-none border-b-2 p-5 font-bold rounded-t-md transition-shadow duration-200 m-0 transition-colors duration-200  bg-white border-blue-500 text-blue-500 dark:bg-gray-600 dark:border-blue-300 dark:text-blue-300'}
+            // },
+        // },
+        
+        // tabpanel:{
+        //     headerTitle:{class:'m-0 p-0'},            
+        // },
         accordiontab:{
             content:{style:'padding: 0.7rem;'}
             
@@ -49,7 +55,7 @@ const CustomTailwind = usePassThrough(
         //},
         button:{root:{class: 'focus:outline-none transition duration-150 ease-in-out rounded p-2 m-1 border dark:border-gray-600'}},
         dialog:{
-            root:{class:[' w-full max-h-full bodycolorclass max-w-full md:h-3/4 lg:h-1/2 border m-2 rounded-lg']},
+            root:{class:[' w-full md:w-auto bodycolorclass max-w-full md:h-3/4 lg:h-1/2 border  border-gray-400 dark:bg-gray-700 m-2 rounded-lg']},
             header:{class: 'p-dialog-header flex items-center  text-2xl justify-between shrink-0 border-t-0  rounded-tl-lg rounded-tr-lg p-6 bodycolorclass'},
             footer:{class:'p-dialog-footer flex gap-2 shrink-0 justify-end align-center border-t-0 px-6 pb-6 text-right rounded-b-lg bodycolorclass'},
             content:{class:'p-dialog-content overflow-y-auto  px-6 pb-8 pt-0  rounded-bl-lg rounded-br-lg h-full bodycolorclass'}