@simitgroup/simpleapp-generator 1.6.3-alpha → 1.6.4-b-alpha

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -102,28 +102,43 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           getCurrentXorg(){
             return  (useRoute().params.xorg) ? <String>useRoute().params.xorg : undefined           
           },
-          async pingSession(){
+          async pingSession():Promise<string>{
             let xorg = this.getCurrentXorg() 
             let apiurl=''
+            
             if(!xorg){
               apiurl = `${useRuntimeConfig().public.APP_URL}/api`
             }else{
-            apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+              const xorgdecode = atob(<string>xorg)
+              if(xorgdecode.includes('-')){
+                apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+              }else{                 
+                return Promise.reject('wrongxorg')
+              }
+            
             }
             const {$axios} = useNuxtApp()
-            const pingresult = await new PROFILEApi(undefined,apiurl,$axios).getSession()
-            return pingresult
+            try{
+              const pingresult = await new PROFILEApi(undefined,apiurl).getSession()
+              if(pingresult.status<300)
+                return Promise.resolve('ok')
+              else
+                return Promise.reject('relogin')  
+            }catch(e){
+              return Promise.reject(e)  
+            }
+            
           },
           async decideInvitation(id:string,decision:string){
             const apiurl = `${useRuntimeConfig().public.APP_URL}/api`
             const {$axios} = useNuxtApp()
-            console.log("decideInvitation",id,decision)
+            // console.log("decideInvitation",id,decision)
             const result = await new PROFILEApi(undefined,apiurl,$axios).decideInvitation(id,decision)
             
             if(result){
-              console.log(result)
+              // console.log(result)
             }else{
-              console.log(result)
+              // console.log(result)
             }
             //().then((res:AxiosResponse)=>{ }
           },
@@ -206,28 +221,41 @@ export default defineNuxtPlugin( async(nuxtApp) => {
     
     
     if( useRoute().meta.auth !==false){
-      
-      if(await useUserStore().pingSession()){
-        await useUserStore().loadRemoteUserInfo()
-        
-      }else{
-        await useUserStore().logout(useRoute().path)        
-      }    
-    }else{
-      // if(await useUserStore().pingSession()){
+      console.log("pingsessionres starat")
 
-      // }else{
+      try{
+        const pingsessionres = await useUserStore().pingSession()
+        if(pingsessionres == 'wrongxorg'){
+          navigateTo('/')
+        }
+        else if(pingsessionres){
+          await useUserStore().loadRemoteUserInfo()        
+        }
+        return {        
+            provide: {
+                userstore:useUserStore()
+              // base64url: Base64URL
+            }
+        }
+      }catch(e){
+          console.error("Ping issue cannot proceed:",e)
 
-      // }
+          if(e?.code=='ERR_BAD_RESPONSE'){
+                console.log("ping failed failed failed",e.code)
+                 throw createError({
+                  statusCode:e.code,
+                  statusMessage:e.message,
+                  fatal:true
+                })           
+              }
+            else
+              await useUserStore().logout(useRoute().path)    
+      }
+      
+    }else{
+      
     }
     
-    return {
-
-        
-        provide: {
-            userstore:useUserStore()
-          // base64url: Base64URL
-        }
-    }
+    
     
 });

package/templates/nuxt/plugins/70.recently.ts.eta

@@ -0,0 +1,55 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { defineNuxtPlugin } from "#app";
+import { LRUCache } from 'lru-cache'
+import {RecentlyValue} from "~/types"
+export default defineNuxtPlugin( async(nuxtApp) => {
+    const options = {
+        max: 20,
+      
+        // for use with tracking overall storage size
+        maxSize: 5000,
+        sizeCalculation: (value, key) => {
+          return 1
+        },
+      
+        dispose: (value, key) => {
+          //freeFromMemoryOrWhatever(value)
+        },
+      
+        // how long to live in ms
+        ttl: 1000 * 60 * 5,
+      
+        // return stale items before removing from cache?
+        allowStale: false,
+      
+        updateAgeOnGet: false,
+        updateAgeOnHas: false,
+      
+        fetchMethod: async (
+          key,
+          staleValue,
+          { options, signal, context }
+        ) => {},
+      }
+      
+      const recently = new LRUCache<string,RecentlyValue>(options)
+      const tmp = localStorage.getItem('recently' ); // Store keys as an array
+      if(tmp){
+        const histories = JSON.parse(tmp)
+        const keys=Object.keys(histories)
+        keys.forEach(key=>{
+            recently.set(key,histories[key])
+        })            
+      }
+      
+    return {        
+        provide: {
+            recently:recently
+        }
+    }    
+});

package/templates/nuxt/providers/my-provider.ts.eta

@@ -0,0 +1,22 @@
+import { joinURL } from 'ufo'
+import type { ProviderGetImage } from '@nuxt/image'
+import { createOperationsGenerator } from '#image'
+
+const operationsGenerator = createOperationsGenerator()
+
+export const getImage: ProviderGetImage = (
+  src,
+  { modifiers = {}, baseURL } = {}
+) => {
+
+  if (!baseURL) {
+    // also support runtime config 
+    baseURL = useRuntimeConfig().public.API_URL
+  }
+
+  const operations = operationsGenerator(modifiers)
+
+  return {
+    url: joinURL(baseURL, src + (operations ? '?' + operations : '')),
+  }
+}

package/templates/nuxt/server/api/[xorg]/{[...].ts.eta → [...].ts._eta}

@@ -1,6 +1,6 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * --remove-this-line-to-prevent-override--
  * last change 2024-02-23
  * Author: Ks Tan
  */
@@ -9,7 +9,7 @@
 import axios, { AxiosRequestConfig } from 'axios';
 import { getServerSession } from '#auth'
 import type { Session } from 'next-auth';
-
+import * as fs from 'fs'
 export default defineEventHandler(async (event:any) => {
     type additionalprops = {accessToken?:string} 
     let session:any=null
@@ -53,27 +53,44 @@ export default defineEventHandler(async (event:any) => {
             data: bodydata,
             params: querydata,
         }
-        axios(axiosConfig).then((res) => {
+        
+        try{            
+            const res =  await axios(axiosConfig)
             if (res.headers['content-type'] === 'image/png') {
-                // Set the response headers for the image
                 frontEndRes.setHeader('Content-Type', 'image/png');
                 frontEndRes.setHeader('Content-Disposition', 'inline');
-
-                // Send the image data as the response body
                 frontEndRes.end(Buffer.from(res.data, 'binary'));
-            } else {
-                // For non-image responses, set the Content-Type header and send the response body
-                // setHeader(event, 'Content-type', <string>res.headers['Content-Type']);
-
+            }else if(documentLink.includes('images/')){
+                // console.log(documentLink," Resdata of base64 photo",res.data.length)
+                let imageData
+                frontEndRes.setHeader('Content-Type', 'image/png');
+                
+                // console.log("load image for",documentLink)
+                if( res.data.length){
+                    console.log("obtain base64 from server length:",res.data.length)
+                    imageData = base64ToBuffer(res.data);
+                    
+                }else{
+                    // console.log("server no image, use default image")
+                    const folder = 'assets/images/'
+                    let filename = filename='unknown.png';
+                    const fullpath = folder+filename;
+                    if(fs.existsSync(fullpath)){
+                        imageData = fs.readFileSync(fullpath)
+                    }else{
+                        console.log(fullpath,'does not exists')
+                    }                    
+                }
+                 frontEndRes.end(Buffer.from(imageData, 'binary'));                                
+                
+            }else{
                 frontEndRes.statusCode = res.status;
                 if(res.statusText) {
                     frontEndRes.statusMessage = res.statusText;
                 }
-
                 resolve(res.data);
             }
-
-        }).catch((error) => {
+        }catch(error){
             if(!error?.response){
                 console.log("backend server no response ",error.code)              
                 reject({ 
@@ -94,13 +111,22 @@ export default defineEventHandler(async (event:any) => {
                 });         
                 
             }
-
-     
-        })
-
-        // resolve({
-        //     status: 'ok'
-        // })
+        }
     })
     
-})
+})
+
+
+
+function base64ToBuffer(base64String:string) {
+    // Split the base64 string into parts
+    const parts = base64String.split(',');
+    const contentType = parts[0].split(':')[1];
+    const base64Data = parts[1];
+  
+    // Decode the base64 data
+    const binaryString = atob(base64Data);
+    const buffer = new Buffer.from(binaryString, 'binary');
+  
+    return buffer
+  }

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -30,7 +30,9 @@ export class SimpleAppClient<
   TApi extends crudType,
 > {
   // protected defaultTimeOut=5000
-  protected unwantchobj;
+  protected ready = true;
+  protected delayAfterGetId = 0.5*1000;
+  protected unwantchobj:any;
   protected docapi;
   public event:Function|null=null;
   public listen:Function|null=null;
@@ -48,7 +50,7 @@ export class SimpleAppClient<
     this.docname = docname
     this.axios = useNuxtApp().$axios
   }
-
+  isReady = ()=>this.ready
   getDocType = () => this.doctype;
   getDocName = (capFirst:boolean=false) => capFirst ? upperFirst(this.docname) :this.docname;
   setNew = ()=>{}
@@ -67,6 +69,7 @@ export class SimpleAppClient<
   };
   
   async getById(id?: string) {
+    this.ready=false
     if(this.unwantchobj)this.unwantchobj()
     return await this.docapi.runFindOne(id,this.axios)
     .then((res: AxiosResponse) => {
@@ -74,9 +77,16 @@ export class SimpleAppClient<
       this.data.value={} as TData
       Object.assign(this.data.value, res.data);
       this.setWatchChange()
+      setTimeout(()=>{
+        this.ready=true
+      },this.delayAfterGetId)
+      
       return res;
     }).catch((res:any)=>{
       // if(this.event){this.event('error:getById',res)}
+      setTimeout(()=>{
+        this.ready=true
+      },this.delayAfterGetId)
       return Promise.reject(res)
     });
   }
@@ -89,6 +99,7 @@ export class SimpleAppClient<
   async create() {    
     const errors = this.validateFailed();
     const {$event} =useNuxtApp()
+
     if (errors) {
       $event('Notification',{
         documentName:this.getDocName(),
@@ -100,6 +111,7 @@ export class SimpleAppClient<
       return await Promise.reject(errors);
     } else {
       holdScreenStart()
+      this.ready=false
       return await this.docapi
         .runCreate(this.data.value,this.axios)
         .then((res: AxiosResponse) => {
@@ -112,6 +124,9 @@ export class SimpleAppClient<
           // })
           this.data.value = {} as TData
           this.data.value = { ...res.data };
+          setTimeout(()=>{
+            this.ready=true
+          },this.delayAfterGetId)
           holdScreenEnd()
           return res.data;
         }).catch((errors:any)=>{             
@@ -122,6 +137,9 @@ export class SimpleAppClient<
               data:errors.response.data
             })
             console.error('error:create',errors.response.data)
+            setTimeout(()=>{
+              this.ready=true
+            },this.delayAfterGetId)
             holdScreenEnd()
           return Promise.reject(errors)
         });
@@ -144,6 +162,7 @@ export class SimpleAppClient<
       return await Promise.reject(errors);
     } else {
       holdScreenStart()
+      this.ready=false
       return await this.docapi
         .runUpdate(recordid, this.data.value,this.axios)
         .then((res: AxiosResponse) => {
@@ -155,6 +174,9 @@ export class SimpleAppClient<
           //   data:errors
           // })        
           this.data.value = res.data     
+          setTimeout(()=>{
+            this.ready=true
+          },this.delayAfterGetId)
           holdScreenEnd()     
           return res.data;
         }).catch((errors:any)=>{
@@ -168,6 +190,9 @@ export class SimpleAppClient<
           // if(this.event){
           // this.event('error:update',errors.response.data.data)}
           console.error('error:update',errors.response.data)
+          setTimeout(()=>{
+            this.ready=true
+          },this.delayAfterGetId)
           holdScreenEnd()
           return Promise.reject(errors)
         });
@@ -178,6 +203,7 @@ export class SimpleAppClient<
     const {$event} =useNuxtApp()
     const recordid: string = this.data.value._id ?? '';
     holdScreenStart()
+    this.ready=false
       return await this.docapi
         .runPatch(recordid, this.data.value,this.axios)
         .then((res: AxiosResponse) => {
@@ -188,7 +214,10 @@ export class SimpleAppClient<
           //   status:NotificationStatus.success,
           //   data:errors
           // })        
-          this.data.value = res.data          
+          this.data.value = res.data    
+          setTimeout(()=>{
+            this.ready=true
+          },this.delayAfterGetId)      
           holdScreenEnd()
           return res.data;
         }).catch((errors:any)=>{
@@ -202,6 +231,9 @@ export class SimpleAppClient<
           // if(this.event){
           // this.event('error:update',errors.response.data.data)}
           console.error('error:patch',errors.response.data)
+          setTimeout(()=>{
+            this.ready=true
+          },this.delayAfterGetId)
           holdScreenEnd()
           return Promise.reject(errors)
         
@@ -213,6 +245,7 @@ export class SimpleAppClient<
     }
     const {$event} =useNuxtApp()
     holdScreenStart()
+    this.ready=false
     return await this.docapi.runDelete(id,this.axios)
       .then((res:AxiosResponse)=>{
         // if(this.event){this.event('success:delete',res.data)}
@@ -222,7 +255,11 @@ export class SimpleAppClient<
         //   status:NotificationStatus.success,
         //   data:res.data
         // })
+        setTimeout(()=>{
+            this.ready=true
+          },this.delayAfterGetId)
         holdScreenEnd()
+
         return Promise.resolve(res.data)
       }).catch((errors:any)=>{
         // if(this.event){this.event('error:delete',errors.response.data.data)}
@@ -233,6 +270,9 @@ export class SimpleAppClient<
           data:errors.response.data
         })
         console.error(errors.response.data)
+        setTimeout(()=>{
+            this.ready=true
+          },this.delayAfterGetId)
         holdScreenEnd()
         return Promise.reject(errors)
       });
@@ -261,6 +301,7 @@ export class SimpleAppClient<
     ajv.addFormat('text',/.*$/)
     ajv.addFormat('html',/.*$/)
     ajv.addFormat('documentno',/.*$/)
+    ajv.addFormat('money',/.*$/)
     
     ajv.addKeyword({ keyword: 'x-foreignkey', schemaType: 'string' });
     ajv.addKeyword({ keyword: 'x-simpleapp-config', schemaType: 'object' });

package/templates/nuxt/types/events.ts.eta

@@ -16,8 +16,9 @@ export type ViewRecord = {
     documentName: SimpleAppDocumentType
     viewer?: any 
     readonly?:boolean    
+    autoclose?:number
     paras?:any
-    after?: (eventType:FormCrudEvent,data:any )=>void
+    after?: (eventType:FormCrudEvent,data:any,dialogVisible:Ref<boolean> )=>void
     document?:SimpleAppClient<any,any>
 }
 export type RefreshDocumentList ={
@@ -37,5 +38,5 @@ export type EventType ={
     'SessionExpire': string
     'CloseDialog': string
     'pickGroup':string
-    'HoldScreen':boolean
+    'HoldScreen':boolean    
 }

package/templates/nuxt/types/others.ts.eta

@@ -6,6 +6,10 @@
  */
 import {SimpleAppClient} from '~/simpleapp/generate/clients/SimpleAppClient'
 import { SimpleAppDocumentType } from './documentlist';
+export type NameValue={
+  name:string;
+  value:number
+}
   export type ForeignKey = {
     _id: string;
     label: string;
@@ -31,7 +35,12 @@ import { SimpleAppDocumentType } from './documentlist';
     isolationType?:string
     url?:string
   }
-  
+  export type RecentlyValue = {
+    docName:string
+    label:string
+    branchId:number
+    time:string
+  }
   export type DocNoFormat ={
     docNoFormatName: string
     docNoFormatNo:string
@@ -52,4 +61,5 @@ import { SimpleAppDocumentType } from './documentlist';
       fields?: any[];
       
       sorts?: any[];
+      lookup?: {[key:string]:string};
   }

package/templates/nuxt/types/schema.ts.eta

@@ -30,16 +30,18 @@ export type DocumentStatus = {
     formula:string  //example "jslib.getDocumentSubTotal(@F{$.details})"
   } 
 export type SchemaConfig = {
-    isolationType: IsolationType  
+    isolationType: string  
     requiredRoles?:string[]
     pageType?: string  
     uniqueKey?:string  
     uniqueKeys?:string[][]
     documentTitle?:string 
     generateDocumentNumber?:boolean
+    docNoPattern?:string
     documentDate?:string
     allStatus?:DocumentStatus[]
     additionalApis?:DocumentApi[]      
+    search?:string[]
     additionalAutoCompleteFields ?: string[]
     // libs?:ImportLibs[]   // both process class and frontend client class will import same lib
     formulas?: Formula[]  

package/templates/nuxt/types/simpleappinput.ts.eta

@@ -36,7 +36,7 @@ export enum SimpleAppInputType  {
     'money'='money',
     'rating'='rating',
     'slider'='slider',
-
+    'user'='user',
 }
 
 

package/templates/nuxt/types/user.ts.eta

@@ -4,6 +4,7 @@
  * last change 2024-02-23
  * Author: Ks Tan
  */
+import {Branch} from "~/simpleapp/generate/openapi"
 export type UserListItem = {
     _id: string
     uid?:string
@@ -31,7 +32,12 @@ export type UserListItem = {
     group:string
     active:boolean
   }
-  
+  export type UserStoreBranch ={
+    branch:Branch
+    group:string[]
+    xOrg:string
+    _id:string
+  }
   
   export type PermissionListItem = {
     branchId: number  
@@ -66,12 +72,7 @@ export type UserProfile = {
   offsetMinute:number
   timeZone:string
   fullName : string
-  branches: {
-    _id: string
-    branch: any
-    group: string
-    xOrg: string
-  }[]
+  branches: UserStoreBranch[]
   invites: {
     _id: string;
     email: string;

package/templates/project/jsonschemas/branch.json._eta

@@ -15,6 +15,7 @@
       "branchId"
     ]
   },
+  "required":["branchCode","branchName","organization"],
   "properties": {
     "_id": {
       "type": "string"

package/templates/project/jsonschemas/invoice.json._eta

@@ -8,6 +8,7 @@
     "documentTitle": "invoiceTitle",
     "documentDate": "invoiceDate",
     "generateDocumentNumber": true,
+    "docNoPattern":"INV/@BranchCode/[00000]",
     "pageType": "crud",
     "formulas": [
       { "jsonPath": "$.details[*]", "formula": "sharelibs.getSubtotal($item)" },
@@ -57,7 +58,7 @@
       "examples": ["Sales to XYZ"],
       "minLength": 3
     },
-    "invoiceTotal": { "type": "number", "default": 0 },
+    "invoiceTotal": { "type": "number", "default": 0.00,"format":"money"  },
     "details": {
       "type": "array",
       "items": {
@@ -73,8 +74,8 @@
             }
           },
           "quantity": { "type": "integer", "default": 1 },
-          "unitPrice": { "type": "number", "default": 0 },
-          "subTotal": { "type": "number", "default": 0 }
+          "unitPrice": { "type": "number", "default": 0.00,"format":"money"  },
+          "subTotal": { "type": "number", "default": 0.00,"format":"money"  }
         }
       }
     },

package/templates/project/jsonschemas/organization.json._eta

@@ -18,7 +18,7 @@
     "additionalApis":[{
         "action":"getlogo",
         "entryPoint":"logo",
-        "requiredRole":[],
+        "requiredRole":["User"],
         "method":"get",
         "schema":"string",
         "responseType":"String",
@@ -26,7 +26,7 @@
       },{
         "action":"uploadlogo",
         "entryPoint":"logo",
-        "requiredRole":[],
+        "requiredRole":["Admin"],
         "method":"post",
         "schema":"KeyValue",
         "responseType":"String",

package/templates/project/lang/default._json

@@ -36,6 +36,7 @@
     "suspendcustomer": "Suspend Customer",
     "formKeyNotFound": "Formkey not found \"{formKey}\"",
     "selectAll": "Select All",
+    "clear": "Clear",
     "branches":"Branches",
     "accessRights": "Access Rights",
     "fullName":"Full Name",
@@ -69,6 +70,9 @@
     "printPreview": "Print Preview",
     "messages":"Messages",
     "systemconfig": "System Config",
-    "preview": "Preview"
-
+    "preview": "Preview",
+    "docnoformat":"Document Numbering Formats",
+    "add":"Add",
+    "approve" : "Approve",
+    "decline":"Decline"
   }