@simitgroup/simpleapp-generator 1.0.23 → 1.0.24

package/templates/nest/SimpleAppService.eta

@@ -4,10 +4,18 @@ import { Model } from 'mongoose';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import foreignkeys from '../dicts/foreignkeys.json';
+
 import {
   NotFoundException,
   InternalServerErrorException,
 } from '@nestjs/common/exceptions';
+import { User } from './User';
+
+export enum IsolationType {
+  'org' = 'org',
+  'tenant' = 'tenant',
+  'branch' = 'branch',
+}
 @Injectable()
 export class SimpleAppService<T extends { _id?: string }> {
   protected jsonschema = { type: 'object', properties: {}, required: [] };
@@ -16,11 +24,19 @@ export class SimpleAppService<T extends { _id?: string }> {
   protected documentName = 'category';
   protected documentType = 'CAT';
   protected LIMITPERPAGE = 20;
+  protected isolationtype: IsolationType = IsolationType.org;
+  protected isolationFilter: any = {};
   protected data: T = { _id: '' } as T;
-  protected doc: Model<T>;
+  private doc: Model<T>; //set private to prevent developer break data isolation control
   protected errorlist = [];
-  constructor(newdoc: Model<T>) {
+  constructor(
+    newdoc: Model<T>,
+    isolationtype: IsolationType = IsolationType.org,
+  ) {
     this.doc = newdoc;
+    this.isolationtype = isolationtype;
+
+    // this.tenantdoc = tenantdoc
   }
   getRecordId = (): string => this.data._id;
   setSchema = (newschema) => (this.jsonschema = newschema);
@@ -34,9 +50,27 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.data = { ...newdata };
     return this;
   };
+  getIsolationFilter = () => {
+    let isolationFilter = {};
+    switch (this.isolationtype) {
+      case 'branch':
+        isolationFilter = User.getInstance().getBranchFilter();
+        break;
+      case 'tenant':
+        isolationFilter = User.getInstance().getTenantFilter();
+        break;
+      case 'org':
+      default:
+        isolationFilter = User.getInstance().getOrgFilter();
+        break;
+    }
+    return isolationFilter;
+  };
   async list() {
     try {
-      const products = await this.doc.find();
+      //console.log("this.isolationFilter",this.getIsolationFilter())
+      const products = await this.doc.find(this.getIsolationFilter());
+      // console.log(products)
       const productlist = products.map((p: T) => {
         return p;
       });
@@ -53,6 +87,8 @@ export class SimpleAppService<T extends { _id?: string }> {
       filter1[this.documentIdentityCode] = { $regex: keyword };
       filter2[this.documentIdentityName] = { $regex: keyword };
       const filterobj = { $or: [filter1, filter2] };
+
+      Object.assign(filterobj, this.getIsolationFilter());
       const projections = {
         id: `\$_id`,
         label: `\$${this.documentIdentityCode}`,
@@ -69,31 +105,37 @@ export class SimpleAppService<T extends { _id?: string }> {
       throw new InternalServerErrorException(err.message);
     }
   }
-  async findById(id: string) {
+  async search(filters: Object) {
     try {
-      //console.log('findById', id);
-      this.data = await this.doc.findById(id);
-      //console.log('findById done', this.data);
+      Object.assign(filters, this.getIsolationFilter());
+      const products = await this.doc.find(filters);
+      const productlist = products.map((p: T) => {
+        return p;
+      });
+      //   console.log(products);
+      return productlist;
     } catch (err) {
-      //error
       throw new InternalServerErrorException(err.message);
     }
-
-    if (!this.data) {
-      //data not found
-      throw new NotFoundException('Document Not found:');
-    }
-    //console.log('this.data', this.data);
-    return this.data;
     // return this;
   }
+  async findById(id: string) {
+    const data = await this.search({ _id: id });
+    if (data.length == 1) {
+      // console.log('data0', data[0]);
+      return data[0];
+    } else {
+      return null;
+    }
+  }
 
   async create() {
     let result;
 
     try {
+      Object.assign(this.data, User.getInstance().getCreateFilter());
       delete this.data._id;
-      this.validateData(this.data);
+      this.validateData(this.data);      
       const newdoc = new this.doc(this.data);
       result = await newdoc.save();
     } catch (err) {
@@ -103,14 +145,14 @@ export class SimpleAppService<T extends { _id?: string }> {
   }
   async update() {
     const id: string = this.getRecordId();
+    Object.assign(this.data, User.getInstance().getUpdateFilter());
     this.findIdThenUpdate(id, this.data);
   }
   async delete() {
-    
     const id: string = this.getRecordId();
     const dependency = await this.getRelatedRecords(id);
     if (!dependency) {
-     return await this.findIdThenDelete(id);
+      return await this.findIdThenDelete(id);
     } else {
       return dependency;
     }
@@ -121,10 +163,10 @@ export class SimpleAppService<T extends { _id?: string }> {
   validateData(data: T) {
     const ajv = new Ajv({ allErrors: true });
     addFormats(ajv);
-    ajv.addFormat('field-autocomplete-code', /.*$/);
-    ajv.addFormat('field-autocomplete-name', /.*$/);
-    ajv.addFormat('x-text',/.*$/)
-    ajv.addFormat('x-html',/.*$/)
+    ajv.addFormat('x-document-no', /.*$/);
+    ajv.addFormat('x-document-name', /.*$/);
+    ajv.addFormat('x-text', /.*$/);
+    ajv.addFormat('x-html', /.*$/);
     ajv.addKeyword({
       keyword: 'x-foreignkey',
       type: 'string',
@@ -135,28 +177,36 @@ export class SimpleAppService<T extends { _id?: string }> {
       for (let i = 0; i < this.errorlist.length; i++) {
         erromsg.push(this.errorlist[i].message);
       }
+      console.log("pre-validation:",erromsg)
       throw new InternalServerErrorException(erromsg.join('\n'));
     }
     const validate = ajv.compile(this.jsonschema);
     const valid = validate(data);
+    //console.log(validate.errors);
     if (!valid) {
-      //console.log(validate.errors);
+      // console.log(validate.errors);
       const erromsg: string[] = [];
       for (let i = 0; i < validate.errors.length; i++) {
         erromsg.push(validate.errors[i].message);
       }
+      console.log("ajv erromsg: ",erromsg)
       throw new InternalServerErrorException(erromsg.join('\n'));
     }
     this.hook('post-validation', data);
   }
 
-  async findIdThenDelete(id: string) {
+  async findIdThenDelete(id: string): Promise<any> {
     // const data = await this.findById(id);
     try {
       //console.log('deletedeletedeletedelete');
       const dependency = await this.getRelatedRecords(id);
       if (!dependency) {
-        const deleteresult = await this.doc.findByIdAndDelete(id);
+        let filter = this.getIsolationFilter();
+        filter['_id'] = id;
+        const deleteresult = await this.doc.deleteOne(filter);
+        // this.doc.findByIdAndDelete(id)
+
+        //this.doc.findByIdAndDelete(id);
         return deleteresult;
       } else {
         return Promise.reject(dependency);
@@ -166,20 +216,26 @@ export class SimpleAppService<T extends { _id?: string }> {
     }
   }
 
-  async findIdThenUpdate(id: string, data: T) {
-    // const existingdata = await this.findById(id);
+  updateOne = async (data: T) => {
+    this.doc.updateOne(data);
+  };
+
+  findIdThenUpdate = async (id: string, data: T) => {
+    const existingdata = await this.findById(id);
 
     try {
-      //console.log('findIdThenUpdate', id);
+      Object.assign(data, User.getInstance().getUpdateFilter());
+      Object.assign(existingdata, data);
       this.validateData(data);
-      // const result = await existingdata.doc.updateOne(data);
-      const result = await this.doc.findByIdAndUpdate(id, data);
+      let filter = this.getIsolationFilter();
+      filter['_id'] = id;
+      const result = await this.doc.findOneAndUpdate(filter, data);
 
       return result;
     } catch (err) {
       throw new InternalServerErrorException(err.message);
     }
-  }
+  };
 
   //find what foreign key constraint
   async getRelatedRecords(id: string) {

package/templates/nest/TenantMiddleware.eta

@@ -0,0 +1,30 @@
+
+import { Injectable, NestMiddleware,Scope } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import {User} from './User'
+
+@Injectable({
+    scope: Scope.REQUEST
+})
+export class TenantMiddleware implements NestMiddleware {
+  use(req: Request, res: Response, next: NextFunction) {
+    req.headers['x-org']
+    if(req.headers['x-org']){        
+        const u =  User.getInstance()
+        try{
+            u.setXorg(req.headers['x-org'].toString())
+            u.setUser('user1')
+            //console.log(u.getInfo())
+            // u.uid='user1'
+            next();
+        }catch{
+            return res.status(401).send("Invalid x-org or user info")
+        }
+        
+    }else{
+        return res.status(401).send("undefine header string x-org")
+
+    }
+    
+  }
+}

package/templates/nest/User.eta

@@ -0,0 +1,80 @@
+import { Injectable, Scope } from '@nestjs/common';
+import Base64URL from '@darkwolf/base64url'
+
+@Injectable({
+    scope: Scope.REQUEST
+})
+export class User {
+    private static instance: User;
+    protected uid:string=''
+    protected uname:string=''
+    protected email:string=''
+    protected xOrg:string=''
+    protected tenantId:number=0
+    protected orgId:number=0
+    protected branchId:number=0
+    constructor() {}
+    public static getInstance(): User {
+        if (!User.instance) {
+            User.instance = new User();
+        }
+        return User.instance;
+    }
+    setUser = (uid:string)=>{
+        User.getInstance().uid=uid
+    }
+    getInfo=()=>{
+        return User.getInstance()
+    }
+    getBranchFilter=()=>{
+        return {
+            tenantId:User.getInstance().tenantId,
+            orgId: User.getInstance().orgId, 
+            branchId:User.getInstance().branchId
+        }
+    }
+    getTenantFilter=()=>{
+        return {tenantId:User.getInstance().tenantId}
+    }
+    getOrgFilter=()=>{
+        return {tenantId:User.getInstance().tenantId,orgId: User.getInstance().orgId}
+    }
+
+    getCreateFilter=()=>{
+        const u = User.getInstance()
+        return {
+            tenantId:u.tenantId,
+            orgId: u.orgId, 
+            branchId:u.branchId,
+            createdby: u.uid,
+            updatedby: u.uid,
+            created: new Date().getTime().toString(),
+            updated: new Date().getTime().toString()
+        }
+    }
+    getUpdateFilter=()=>{
+        const u = User.getInstance()
+        return {
+            updatedby: u.uid,
+            updated: new Date().getTime().toString()
+        }
+    }
+    setXorg = (xorg)=>{
+        try{
+            const decodedText:string = Base64URL.decodeText(xorg)
+            const arrXorg = decodedText.split('-')
+            
+            if(arrXorg.length==3){
+                const u = User.getInstance()
+                u.tenantId = Number(arrXorg[0])      
+                u.orgId = Number(arrXorg[1])      
+                u.branchId = Number(arrXorg[2])      
+            }else{
+                throw "invalid x-org"
+            }
+        }catch(err){
+            throw err
+        }
+        
+    }
+}

package/templates/nest/app.module.eta

@@ -1,7 +1,7 @@
-import { Module } from '@nestjs/common';
+import { Module,MiddlewareConsumer,NestModule } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { ConfigModule } from '@nestjs/config';
-
+import {TenantMiddleware} from './class/TenantMiddleware'
 <% for(let i=0;i<it.length; i++){ %>
 import {<%= it[i].docname %>Module} from './docs/<%= it[i].doctype %>/<%= it[i].doctype %>.module'
 <%}%>
@@ -12,4 +12,15 @@ import {<%= it[i].docname %>Module} from './docs/<%= it[i].doctype %>/<%= it[i].
   controllers: [],
   providers: [],
 })
-export class AppModule {}
+export class AppModule implements NestModule{
+  configure(consumer: MiddlewareConsumer) {
+    consumer
+      .apply(TenantMiddleware)
+      // .exclude('/api-yaml')
+      // .exclude('/api-json')
+      // .exclude('/api')
+      .forRoutes('*')
+      
+      
+  }
+}

package/templates/nest/inputvalidation-exception.eta

@@ -0,0 +1,6 @@
+import {HttpException,HttpStatus} from '@nestjs/common'
+export class InputValidationExceptions extends HttpException {
+    constructor() {
+      super('input error', HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+  }

package/templates/nest/nest.main.eta

@@ -9,6 +9,8 @@ async function bootstrap() {
     .setTitle(process.env.PROJECT_NAME)
     .setDescription(process.env.PROJECT_DESCRIPTION)
     .setVersion(process.env.PROJECT_VERSION)
+    .addApiKey({in:'header',name:'x-org',type:'apiKey',description:'base 64 url encode. example: MS0xLTE'},'x-org')
+    .addSecurityRequirements('x-org')
     .build();
   const document = SwaggerModule.createDocument(app, config);
   SwaggerModule.setup('api', app, document, {

package/templates/nuxt/components.crudsimple.vue.eta

@@ -1,32 +1,10 @@
-<template>
-    <div class="simpleapp-crudsimple">    
-        <button class="bg-primary" type="reset" @click="newData">New</button>
-        
-      
-      <SimpleAppDatatable
-            @row-dblclick="editRecord"
-            v-model="recordlist"
-            :setting="{}"
-            :columns="listColumns"
-          ></SimpleAppDatatable>
-
-      <DebugDocumentData v-model="data"/>
-    </div>
-
-    <Dialog v-model:visible="visible" modal header="Header" class="crudsimple-dialog" :autoZIndex="false" :style="{zIndex:100, width: '80vw' }">        
-        <SimpleAppForm :document="obj" :title="title" #default="o">     
-          <div class="simpleapp-tool-bar"   >
-            <button class="bg-default" :disabled="disabled" @click="newData" type="reset">New</button>
-            <button class="bg-primary" :disabled="disabled" @click="saveData" type="submit">Save</button>
-            <button class="bg-danger" :disabled="disabled" @click="deleteData($event)">Delete</button>
-            <ProgressSpinner v-if="disabled==true" style="width: 2rem; height: 2rem" ></ProgressSpinner>
-            <ConfirmPopup></ConfirmPopup>
-          </div>
-        <slot :data="o.data" :getField="o.getField" name="default"></slot>
-      </SimpleAppForm>
-    </Dialog>
-</template>
 <script setup lang="ts">
+/**
+* This file was automatically generated by simpleapp generator during initialization.
+ * DO NOT MODIFY IT BY HAND.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
 
 import { SimpleAppClient } from '@simitgroup//simpleapp-vue-component/src/SimpleAppClient';
 import SimpleAppForm from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppForm.vue';
@@ -34,7 +12,6 @@ import SimpleAppDatatable from '@simitgroup/simpleapp-vue-component/src/componen
 import Dialog from 'primevue/dialog';
 import axios from 'axios'
 import ProgressSpinner from 'primevue/progressspinner';
-
 import ConfirmPopup from 'primevue/confirmpopup';
 import { useConfirm } from "primevue/useconfirm";
 
@@ -42,6 +19,7 @@ const confirm = useConfirm();
 const props = defineProps<{
     document:SimpleAppClient<any,any>
     listColumns:string[]
+    path:string
     title:string
 }>()
 const visible = ref(false)
@@ -49,14 +27,12 @@ const obj = props.document
 const data = obj.getReactiveData()
 const disabled=ref(false)
 const recordlist = ref();
-const setCsrf=()=>{
-  // const { csrf } = useCsrf()
-  //   console.log('csrf',csrf)
-  //   axios.defaults.headers.common = {      
-  //     "X-CSRF-TOKEN": csrf
-  //   };
-}
-
+const router = useRouter()
+const route = useRoute()
+const filters = ref()
+defineShortcuts({
+  'ctrl_i': () => newData()
+})
 const refresh = () => {
   obj.list().then((res:any) => {    
     recordlist.value = res;
@@ -64,23 +40,27 @@ const refresh = () => {
   });
 };
 const newData = () => {
-    obj.setNew()
-    setCsrf()
-    visible.value=true;
+  router.push({ path: `${props.path}` })  
+  obj.setNew()    
+  visible.value=true;
 };
 
-const editRecord = (event: any) => {
-  obj.getById(event.data._id);
-  setCsrf()
+const triggerEdit = (event: any) => {
+  let id = event.data._id.toString()
+  editRecord(event.data._id);  
+  router.push({ path: `${props.path}/${id}` })  
+};
+const editRecord = (id:string) => {
+  obj.getById(id);
   visible.value=true
 };
 
 const saveData = () => {
   disabled.value=true
   if (data.value._id == "") {
-    obj.create().then(()=>{visible.value=false}).catch(()=>setCsrf()).finally(() => refresh());
+    obj.create().then(()=>{visible.value=false}).finally(() => refresh());
   } else {
-    obj.update().then(()=>visible.value=false).catch(()=>setCsrf()).finally(() => refresh());
+    obj.update().then(()=>visible.value=false).finally(() => refresh());
   }
 };
 const deleteData = (event:Event) => {
@@ -97,14 +77,47 @@ const deleteData = (event:Event) => {
             });
         },
         reject: () => {
-            setCsrf()            
             console.log("Cancel delete")
         }
-    })
-  
+    })  
 };
+
+if (route.params.id) {
+  const recordid:string = route.params.id.toString()
+  editRecord(recordid)  
+}
+
 refresh();
 </script>
+ 
+<template>
+    <div class="simpleapp-crudsimple">    
+      <button class="bg-primary" @click="newData" v-tooltip="'Add new(ctrl+i)'" >New</button>
+      <SimpleAppDatatable
+            @row-dblclick="triggerEdit"
+            v-model="recordlist"         
+            :setting="{}"
+            :columns="listColumns"
+          >         
+        </SimpleAppDatatable>
+
+      <DebugDocumentData v-model="data"/>
+    </div>
+
+    <Dialog v-model:visible="visible" modal header="Header" class="crudsimple-dialog" :autoZIndex="false" :style="{zIndex:100, width: '80vw' }">        
+        <SimpleAppForm :document="obj" :title="title" #default="o">     
+          <div class="simpleapp-tool-bar"   >
+            <button class="bg-default" :disabled="disabled" @click="newData" type="button">New</button>
+            <button class="bg-primary" :disabled="disabled" @click="saveData" type="submit">Save</button>
+            <button class="bg-danger" :disabled="disabled" @click="deleteData($event)" type="button">Delete</button>
+            <ProgressSpinner v-if="disabled==true" style="width: 2rem; height: 2rem" ></ProgressSpinner>
+            <ConfirmPopup></ConfirmPopup>
+          </div>
+        <slot :data="o.data" :getField="o.getField" name="default"></slot>
+      </SimpleAppForm>
+    </Dialog>
+</template>
+
 <style scoped>
 .crudsimple-dialog{
     z-index: 100;

package/templates/nuxt/components.debugdocdata.vue.eta

@@ -1,14 +1,22 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * DO NOT MODIFY IT BY HAND.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+
+const modelValue = defineModel()
+const isdebug = ref(useRuntimeConfig().public.DEBUGDATA)
+</script>
 <template>
-    <div class="floatright">
+    <div class="floatright" v-if="isdebug=='1'">
         <h3>data in json</h3>
             <pre>
             {{ modelValue }}
             </pre>
         </div>
 </template>
-<script setup lang="ts">
-const modelValue = defineModel()
-</script>
 <style scoped>
 .floatright{
     position: fixed;

package/templates/nuxt/components.eventmonitor.vue.eta

@@ -1,14 +1,10 @@
-<template>
-    <Toast group="default"/>
-    <Toast group="list">
-        <template #message="p">
-            <ol>
-                <li v-for="(item,index) in  p.message.detail" :key="index">{{item.instancePath}} {{ item.message }}</li>
-            </ol>            
-        </template>
-    </Toast>
-</template>
 <script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * DO NOT MODIFY IT BY HAND.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
 
 import { useToast, } from 'primevue/usetoast';
 import type {  ToastMessageOptions } from 'primevue/toast';
@@ -76,4 +72,14 @@ const prepareMsg=(data:any,msgtype:string):string=>{
     
 }
 
-</script>
+</script>
+<template>
+    <Toast group="default"/>
+    <Toast group="list">
+        <template #message="p">
+            <ol>
+                <li v-for="(item,index) in  p.message.detail" :key="index">{{item.instancePath}} {{ item.message }}</li>
+            </ol>            
+        </template>
+    </Toast>
+</template>

package/templates/nuxt/components.menus.vue.eta

@@ -1,18 +1,20 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * You may modify it by hand
+ * last change 2023-09-10
+ * author: Ks Tan
+ */
+
+// import MegaMenu from 'primevue/megamenu';
+import Menubar from 'primevue/menubar';
+const route = useRoute()
+const menus = getMenus(route.params.xorg)
+</script>
 <template>
     <header>      
         <!-- <MegaMenu :model="getMenus()" orientation="horizontal" />               -->
-        <Menubar :model="getMenus()">
-            <template #start>
-                <h1>[Logo Container]</h1>
-            </template>
-            <template #end>
-                <InputText placeholder="Search" type="text" />
-            </template>
+        <Menubar :model="menus">
         </Menubar>
     </header>
 </template>
-<script setup lang="ts">
-    // import MegaMenu from 'primevue/megamenu';
-    import Menubar from 'primevue/menubar';
-
-</script>

package/templates/nuxt/composables.getautocomplete.ts.eta

@@ -1,4 +1,10 @@
-
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * DO NOT MODIFY IT BY HAND.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+ 
 import * as o from "../simpleapp/openapi";
 
 const getAutoComplete = (apiname: string): any => {

package/templates/nuxt/composables.getmenus.ts.eta

@@ -1,8 +1,15 @@
-export const getMenus =()=>[
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * DO NOT MODIFY IT BY HAND.
+ * last change 2023-09-10
+ * author: Ks Tan
+ */
+ 
+export const getMenus =(xorg:string)=>[
   {label: 'Cruds',icon: 'pi pi-fw pi-pencil',items:[
   <% for(let i=0;i<it.length; i++){ %>
     <% let obj = it[i]%>
-    {label: '<%=obj.docname.toLowerCase()%>', to:'/<%=obj.docname.toLowerCase()%>'},
+    {label: '<%=obj.docname.toLowerCase()%>', to:`/${xorg}/<%=obj.docname.toLowerCase()%>`},
   <%}%>
 ]},
   {label: 'Profile',icon: 'pi pi-fw pi-user'},