@simitgroup/simpleapp-generator 1.0.59 → 1.0.61

package/templates/basic/nuxt/pages.crud.vue.eta

@@ -1,3 +1,4 @@
+<% const skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>  
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp everytime regenerate code.
@@ -6,44 +7,86 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
-<% let skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>  
-  //import {InputTableColumnType,InputTableColumn} from "~/components/type";
-  import Column from "primevue/column";
-  const {$<%= it.typename %>Doc } = useNuxtApp();
+ import ConfirmPopup from 'primevue/confirmpopup';
+ import { useConfirm } from "primevue/useconfirm";
+ const confirm = useConfirm();
+ 
+ const {$<%= it.typename %>Doc,$event } = useNuxtApp();
   const doc = $<%= it.typename %>Doc()
   const data = doc.getReactiveData();
-  const columns = [
-    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-        <%let obj=it.jsonschema.properties[key] %>
-        <%if(skipcolumns.indexOf(key)>=0){%>/* skip system columns <%=key%>*/
-        <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',<%}%>
-    <%})%>
-    ]
-  //prepare subtable if exists
-  /*
-  <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-    <% let obj=it.jsonschema.properties[key] %>
+
+const fetchRecord = async (id:string) =>{
+  await doc.getById(id)
+}
+onMounted(()=>{
+  const id = String(useRoute().params.id);
+  fetchRecord(id);
+})
+const disabled = computed(()=>{
+  return false
+})
+
+const createData = async () => {
+  // disabled.value=true
+  
+  doc.create().then((res)=>{
+      //refresh()      
+      goTo(doc.getDocName(),res.data._id)
+    }).catch(err=>{
+      console.error(err)
+    })
+ 
+};
+const updateData = async () => {
+  
+  
+  doc.update().then(()=>{
+      // visible.value=false
+      refresh()
+    }).catch(err=>{
+      console.error(err)
+    })
+  
+};
+const deleteData = (event:Event) => {
     
-    <% if(obj.type=='array' && obj.items.type=='object' && obj.items['properties']){ %>
-        <%let tablefields = Object.keys(obj.items.properties) %>
-        const <%=it.name%>_<%=key%> :InputTableColumn[] = [
-        <% for(let a=0;a<tablefields.length;a++){%>
-              {type:InputTableColumnType.field, field:'<%= tablefields[a] %>',style:'width:10%'},      
-        <%}%>
-        ]  
-    <%}%>
-  <%})%>
-  */
-  //end
+    confirm.require({
+        target: event.currentTarget as HTMLElement,
+        message:'Delete?',
+        icon: 'pi pi-exclamation-triangle',
+        acceptClass: 'p-button-danger',
+        accept: ()=>{
+            // disabled.value=true 
+            doc.delete(data.value._id ?? "").then((res) => {              
+                refresh();    
+                goTo(doc.getDocName())
+            });
+        },
+        reject: () => {
+            console.log("Cancel delete")
+        }
+    })  
+};
+const newData = ()=>{
+  goTo(doc.getDocName(),'new')
+}
+const refresh = ()=>{
+  $event('RefreshDocumentList',{documentName:doc.getDocName()})
+}
 </script>
 <template>
-    <div>    
-    <CrudSimple :document="doc"  title="<%= it.typename %>"
-     #default="o" 
-     :path="`/${useRoute().params.xorg}/<%= it.name %>`"
-    :listColumns="columns"> 
-    
-      <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+    <SimpleAppForm #default="o" :document="doc">
+    <div class="simpleapp-tool-bar   col-span-4 text-left gap-4"  >
+              <Button class="" :disabled="disabled" @click="newData" type="button" v-if="canPerform(doc.getDocName(),'create')">New</Button>
+              <Button class="bg-primary-600 hover:bg-primary-400 text-white" :disabled="disabled" @click="createData" type="button" v-if="canPerform(doc.getDocName(),'create') && doc.isNew()">Create</Button>
+              <Button class="bg-primary-600 hover:bg-primary-400 text-white" :disabled="disabled" @click="updateData" type="button" v-if="canPerform(doc.getDocName(),'update') && !doc.isNew()">Update</Button>
+              <Button class="bg-danger-600 hover:bg-danger-400 text-white" :disabled="disabled" @click="deleteData($event)" type="button" v-if="canPerform(doc.getDocName(),'delete') && !doc.isNew()">Delete</Button>
+
+              
+              <ProgressSpinner v-if="disabled==true" style="width: 2rem; height: 2rem" ></ProgressSpinner>
+              <ConfirmPopup></ConfirmPopup>              
+            </div>
+     <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
       
         <% let obj=it.jsonschema.properties[key] %>
         <% if(skipcolumns.indexOf(key)>=0){ %>
@@ -177,10 +220,6 @@
             <!-- Can auto generate <%=obj.key %> -->  
             <!--  <%~ JSON.stringify(obj) %>-->  
         <%}%>
-      <%})%>   
-      
-    </CrudSimple>
-  </div>
-  </template>
-
-  
+      <%})%>  
+    </SimpleAppForm>
+</template>

package/templates/basic/nuxt/pages.landing.vue.eta

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and 
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+<% const skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>  
+  //import {InputTableColumnType,InputTableColumn} from "~/components/type";
+  import Column from "primevue/column";
+  import MultiTextRender from '~/components/renderers/MultiTextRender.vue'
+    import BooleanRender from '~/components/renderers/BooleanRender.vue'
+    import DateRender from '~/components/renderers/DateRender.vue'
+    import ForeignKeyRender from '~/components/renderers/ForeignKeyRender.vue'
+
+  const {$<%= it.typename %>Doc } = useNuxtApp();
+  const doc = $<%= it.typename %>Doc()
+  const data = doc.getReactiveData();
+  const visible = ref(false)
+
+definePageMeta({
+  name: '<%= it.typename %>',
+  layout:'documentlist',
+  documentName: '<%= it.typename.toLowerCase() %>',
+  columns: [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+        <%let obj=it.jsonschema.properties[key] %>
+        <%if(skipcolumns.indexOf(key)>=0){%>/* skip system columns <%=key%>*/
+        <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',
+        <%} else if(obj.type =='object' && obj['x-foreignkey'] ){%>
+            { 
+              title:'<%=capitalizeFirstLetter(key)%>', 
+              field:'<%=key%>',
+              component:ForeignKeyRender,
+              componentSetting:{collection:'<%=key%>' }
+            },
+        <%}%>
+    <%})%>],
+  sorts:[
+    <%if(it.jsonschema['x-simpleapp-config'] && it.jsonschema['x-simpleapp-config']['uniqueKey']){%>
+        ['<%=it.jsonschema['x-simpleapp-config']['uniqueKey']%>','asc'],
+    <%}%>
+
+    ]
+});
+
+const newData = () => {  
+        doc.setNew()        
+        goTo(doc.getDocName(),'new')
+        visible.value=true
+    };
+    
+
+const exitRecord = ()=>{
+        goTo(doc.getDocName())
+        console.log("exitRecord")
+    }
+
+watch(()=> useRoute().fullPath ,(newvalue,oldvalue)=>{
+  visible.value =  useRoute().params.id ? true : false
+})
+
+onNuxtReady(()=>{
+  visible.value = useRoute().params.id ? true : false;
+})
+</script>
+<template>
+   <div>
+    <Button class="bg-primary-600 hover:bg-primary-400 text-white"  v-if="canPerform(String(useRoute().meta.name),'create')" @click="newData">New</Button>    
+    <Dialog v-model:visible="visible"
+                :pt="{root:{class:'w-full h-full bg-white'}}"  
+                modal :header="doc.getDocName()" 
+                :autoZIndex="false" 
+                @update:visible="exitRecord"                
+                >                 
+                <NuxtPage />
+        </Dialog>
+    <!--  -->
+  </div>
+</template>
+
+  

package/templates/nest/.env._eta

@@ -29,3 +29,4 @@ AUTH_SECRET_KEY=<%=it.configs.oauthSetting.oauthAuthSecretKey%>
 
 AUTH_ORIGIN=http://localhost:8080
 
+ADMIN_EMAIL = 

package/templates/nest/src/simpleapp/generate/commons/exceptions/SimpleAppExceptionFilter.ts.eta

@@ -29,7 +29,7 @@ export class SimpleAppExceptionFilter implements ExceptionFilter {
       const session:ClientSession = request['sessionuser'].getDBSession()
       if(session.inTransaction())session.abortTransaction()      
     }
-    console.log('exceptionexception',typeof exception,Object.keys(exception),exception)
+    // console.log('exceptionexception',typeof exception,Object.keys(exception),exception)
     let errordata
     let finalstatus
     let msg

package/templates/nest/src/simpleapp/generate/commons/roles/roles.group.ts.eta

@@ -7,7 +7,7 @@
 import {Role} from './roles.enum'
 
 <% Object.getOwnPropertyNames(it.allroles).forEach((key)=>{ %>
-export const <%=key%>=[
+export const <%=key%>=()=>[
     Role.User,
     <%for(let i=0; i <it.allroles[key].length; i++){%>
     Role.<%=it.allroles[key][i]%>,

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

@@ -21,8 +21,10 @@ import {   Permission,  }  from './../types/perm.type';
 import {ProfileUserBranch , ProfileUserInvites} from '../../profile/profile.types'
 
 import {ClientSession}  from 'mongoose'
-@Injectable()
+
+@Injectable({scope:Scope.REQUEST})
 export class UserContext {
+  protected sessionId : string =crypto.randomUUID()
   protected logger = new Logger()
   protected uid: string = '';
   protected _id: string = '';
@@ -42,6 +44,7 @@ export class UserContext {
   protected orgCode: string = '';
   protected orgName: string = '';  
   protected branches: any[] = []
+  protected lastActivity : string = new Date().toISOString()
   protected invites: any[] = []  //User + field tenant:Tenant[]
   protected roles: string[] = [];
   protected modifiedRecords:ModifiedRecords = {createds:{},updateds:{},deleteds:{}}
@@ -49,7 +52,8 @@ export class UserContext {
   constructor(
     private readonly usermodel:Model<User>,
     private readonly permmodel:Model<Permission>,
-    private dbsession:ClientSession
+    private dbsession:ClientSession,
+    
     ) {
     
   }
@@ -119,21 +123,19 @@ export class UserContext {
    */
   obtainProfileFromDb = async () : Promise<User|undefined>=>{
     const filter = { $match:{uid:this.uid,tenantId:this.tenantId} }
-    
-    
-
 
     const joinpermission:PipelineStage = {$lookup: {
       from : 'permission',
-      localField : 'uid',
-      foreignField : 'uid',
+      localField : '_id',
+      foreignField : 'userId',
       as : 'permissions',
       pipeline:[
-          { $match:{
-            uid:this.uid,
-            tenantId:this.tenantId,
-            orgId:this.orgId,
-            branchId:this.branchId,            
+          { 
+            $match:{
+              // userId:this.getId(),
+              tenantId:this.tenantId,
+              orgId:this.orgId,
+              branchId:this.branchId,            
           }},
           {$lookup:{from: 'branch',localField: 'branchId',foreignField:'branchId',as: 'currentbranch'}},
           {$lookup:{from: 'organization',localField: 'orgId',foreignField:'orgId',as: 'currentorg'}}
@@ -154,22 +156,38 @@ export class UserContext {
     // console.log("obtainProfileFromDbobtainProfileFromDb ",users)
     if(users && users.length>0){
       const userinfo = users[0]
-      // console.log("userinfouserinfouserinfouserinfouserinfouserinfo ",userinfo)
+      console.log("userinfouserinfouserinfouserinfouserinfouserinfo ",userinfo)
 
       if(this.tenantId>0){
         const myperm=userinfo.permissions[0]
         if(myperm && myperm.group){
           userinfo.group = myperm.group                    
-          userinfo.roles = rolegroups[userinfo.group]   
+          userinfo.roles = rolegroups[userinfo.group]()
           userinfo.branchCode = myperm.currentbranch[0].branchCode
           userinfo.branchName = myperm.currentbranch[0].branchName          
           userinfo.orgCode = myperm.currentorg[0].orgCode
           userinfo.orgName = myperm.currentorg[0].orgName
+          
         }    
       }else{        
         userinfo.group = '' 
       }
+      console.log('userinfouserinfouserinfouserinfo',userinfo)
+      const currentitme = new Date(this.lastActivity).getTime()
+      console.log(" userinfo.lastactivity  userinfo.lastactivity  userinfo.lastactivity ", userinfo.lastActivity )
+      const dblastactivity = userinfo.lastActivity ?? '2000-01-01T00:00:00Z' 
+      const lastvisit = new Date( dblastactivity).getTime() ?? 0
+      // if(currentitme - lastvisit)
+      console.log(`${userinfo._id}:  ${this.lastActivity}: ${currentitme} -  ${dblastactivity}:${lastvisit} = ${currentitme - lastvisit}`)
+
+      //update last activtity dont too frequent
+      if(!dblastactivity || currentitme - lastvisit > 5000 ){         
+        const newusermodel = await this.usermodel.findById(userinfo._id)      
+        newusermodel.lastActivity= this.lastActivity        
+        const result = await newusermodel.save()
+      }
       
+      // const result =  await this.usermodel.findOneAndUpdate({_id: userinfo._id},{lastActivity: new Date().toISOString})
       return userinfo  
     }else{
       return undefined
@@ -200,7 +218,7 @@ export class UserContext {
       this.orgCode = userinfo['orgCode'] ?? ''
       this.orgName = userinfo['orgName'] ?? ''
       this.group = userinfo['group'] ?? ''
-      this.roles = userinfo['roles'] ?? [Role.Everyone,Role.User,Role.SuperAdmin]
+      this.roles = userinfo['roles'] ?? [Role.Everyone,Role.User]
     }else{
       this.logger.debug(`Set unknown id of current user`,'setUserToken' )   
       // this.group = ''
@@ -291,6 +309,7 @@ export class UserContext {
     // obtain basic user info
     const userinfo = {
       _id: this.getId() ,
+      sessionId:this.sessionId,
       tenantId: this.getTenantId(),
       orgId: this.getOrgId(),
       branchId: this.getBranchId(),
@@ -310,14 +329,17 @@ export class UserContext {
 
     if(this.getId()!=''){
       this.logger.debug(userinfo,"obtain permissions and invitations")
-      const filter:PipelineStage ={ $match:{uid:this.uid }} as PipelineStage
+      const filter:PipelineStage ={ $match:{
+        uid:this.uid,
+        tenantId :this.tenantId
+       }} as PipelineStage
       const permission:PipelineStage = {$lookup: {
       from : 'permission',
-      localField : 'uid',
-      foreignField : 'uid',
+      localField : '_id',
+      foreignField : 'userId',
       as : 'permissions',
       pipeline:[
-        {$match:{uid: this.uid,},},
+        // {$match:{userId: this.getId(),},},
         {$lookup:{from : 'branch',localField : 'branchId',foreignField : 'branchId',as : 'branch',}},
       ]
     }}
@@ -340,6 +362,7 @@ export class UserContext {
     this.logger.debug(pipeline,"getUserInfo")
     // // // const users = await usermodel.find(filter)
     const users = await this.usermodel.aggregate(pipeline)
+    this.logger.debug(users,'users from aggregate')
 
     
     this.invites = users[0].invites
@@ -388,11 +411,13 @@ export class UserContext {
     const o = this.ssoACL    
     const ssoclient = process.env.OAUTH2_CLIENTID
     const adminRole = process.env.OAUTH2_ADMINROLE    
-    if( o[ssoclient] && o[ssoclient]['roles'] && o[ssoclient]['roles'] == adminRole ){
-      //console.log("isadmin")
+    // return false
+    if(this.getEmail()===process.env.ADMIN_EMAIL){
+      return true
+    }    
+    else if( o[ssoclient] && o[ssoclient]['roles'] && o[ssoclient]['roles'] == adminRole ){
           return true
     }else{     
-      //console.log("not admin")
       return false
     }
     
@@ -425,4 +450,84 @@ export class UserContext {
     }
 
   }
+
+
+  async getAllTenants (){
+    const results = []
+    if(this.getId()!=''){
+        const filteruser:PipelineStage ={ $match:{
+          uid:this.uid,
+          tenantId :{'$gt':0}
+        }} as PipelineStage
+
+        const getTenantData:PipelineStage = { $lookup:{
+          from : 'tenant',
+          localField : 'tenantId',
+          foreignField : 'tenantId',
+          as : 'tenant',}}
+
+        const permission:PipelineStage = {$lookup: {
+        from : 'permission',
+        localField : '_id',
+        foreignField : 'userId',
+        as : 'permissions',
+        pipeline:[
+          
+          {$lookup:{from : 'organization',localField : 'orgId',foreignField : 'orgId',as : 'org',}},
+          {$lookup:{from : 'branch',localField : 'branchId',foreignField : 'branchId',as : 'branch',}},
+        ]
+      }}
+      
+      const pipelines:PipelineStage[] =[filteruser,getTenantData,permission]
+      // const users=[]
+      this.logger.warn(pipelines,"pipelines")
+      const users = await this.usermodel.aggregate(pipelines)    
+      
+      if(users){
+
+        
+        const activeusers = users.filter((u)=>{
+          // console.log(u.active,'===',true, ' && ',u.tenant[0].active,'===',true)
+          return u.active===true && u.tenant[0].active===true
+        })
+        // return activeusers
+        activeusers.forEach((u)=>{
+
+          const permissions = u.permissions.filter((item:any)=>{
+            return item.org[0].active && item.branch[0].active
+           })
+           .map((item:any)=>{
+  
+            return {
+              _id: item._id,
+              orgId: item.orgId,
+              branchId: item.branchId,
+              group: item.group,
+              orgCode: item.org[0].orgCode,
+              orgName: item.org[0].orgName,
+              branchCode: item.branch[0].branchCode,
+              branchName: item.branch[0].branchName,
+              xOrg: this.generateXorg(u.tenantId,item.orgId,item.branchId)
+            }
+           })
+  
+  
+  
+            
+           results.push({
+            _id: u._id,
+            fullname : u.fullname,
+            tenantId: u.tenantId,
+            tenantName: u.tenant[0].tenantName,
+            permissions: permissions
+           })
+        })
+        
+      }
+
+
+      
+    }
+    return results
+  }
 }

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

@@ -236,7 +236,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       await this.hook(appuser,HookType.beforeSearch, newfilters);
       // console.log("before _find",newfilters)
       // console.log("this.doc",this.doc)
-      const products = await this.doc.find(newfilters,projection).sort(sort);
+      const products = await this.doc.find(newfilters,projection,{session:appuser.getDBSession()}).sort(sort);
       // console.log("after search",products)
       const productlist = products.map((p: T) => {
         return p;

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

@@ -67,6 +67,31 @@ export class ProfileController {
     }
   }
 
+  @Get('/tenants')
+  @Roles(Role.Everyone, Role.User)
+  @ApiOperation({
+    operationId: 'getAllTenants',
+    description: 'Get all tenants',
+  })
+  @ApiResponse({
+    status: 200,
+    type: () => [MyProfileApiSchema],
+    description: 'Success',
+  })
+  @ApiResponse({ status: 401, type: Object, description: 'Undefine profile' })
+  async getAllTenants(@AppUser() appuser: UserContext) {
+    this.logger.debug(
+      `access getAllTenants API by ${appuser.getUid()},(${appuser.getId()})`,
+    );
+    const result = await this.profileservice.getAllTenants(appuser);
+    this.logger.debug('getProfile result is:');
+    this.logger.debug(result);
+    if (result) {
+      return result;
+    } else {
+      throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
+    }
+  }
 
   @Post('/tenant')
   @Roles(Role.Everyone)
@@ -106,10 +131,8 @@ export class ProfileController {
       decision,
     );
     if (result) {
-      console.log('result', result);
       return result;
     } else {
-      console.log('throw error');
       throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
     }
   }

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

@@ -74,7 +74,11 @@ export class ProfileService {
       active: true,
       doctype: 'user',
     } as User;
-
+    if (appuser.getTenantId() == 0) {
+      data.tenantId = 0;
+      data.orgId = 0;
+      data.branchId = 0;
+    }
     const createresult = await this.usersvc.create(appuser, data);
     const userinfo = await appuser.getUserInfo();
     userinfo._id = createresult._id;
@@ -161,7 +165,7 @@ export class ProfileService {
       orgId: orgResult.orgId,
       branchId: branchResult.branchId,
       uid: appuser.getUid(),
-      user_id: appuser.getId(),
+      userId: userRecordId,
       group: 'admin',
     };
     this.logger.log(permdata, 'create Permission data');
@@ -172,6 +176,16 @@ export class ProfileService {
 
     this.logger.log(permResult, 'create Permission result');
 
+
+    //tenant owner shall map to userId for that tenant
+    
+    const tenantUpdateData = await this.tenantsvc.findById(appuser,tenantResult._id)
+    this.logger.log(tenantUpdateData, `update tenant owner(${tenantResult._id})`);
+    tenantUpdateData.owner._id = userRecordId    
+    const updateTenantOwnerResult = await this.tenantsvc.findIdThenUpdate(appuser,tenantResult._id,tenantUpdateData)
+    if (!updateTenantOwnerResult) {
+      throw new BadRequestException('Update tenant owner failed');
+    }
     const xorg: string = Base64URL.encodeText(
       `${tenantResult.tenantId}-${orgResult.orgId}-${branchResult.branchId}`,
     );
@@ -197,4 +211,8 @@ export class ProfileService {
   async decideInvitation(appuser: UserContext, id: string, decision: string) {
     return await appuser.decideInvitation(id, decision);
   }
+
+  async getAllTenants(appuser: UserContext) {
+    return await appuser.getAllTenants();
+  }
 }