@simitgroup/simpleapp-generator 1.1.26 → 1.1.28

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -81,13 +81,25 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
     })    
 
   }
-  setNew = ()=>{
-       
-        
-    const newdata = Default<%= it.typename%>(crypto.randomUUID())
-            this.setData(newdata)
+  setNew = ()=>{         
+      const newdata = Default<%= it.typename%>(crypto.randomUUID())
+      this.setData(newdata)
+      return true
     }
-
+  <%if(it.jsonschema.properties['readOnly'] || it.jsonschema.properties['documentStatus']){%>
+  public isReadOnly():boolean{      
+      <%if(it.jsonschema.properties['readOnly']){%>
+        const readonly = this.data.value?.readOnly 
+        if(readonly) return true
+      <%}%>
+      <%if(it.jsonschema.properties['documentStatus']){%>
+        const docstatus = this.data.value.documentStatus
+        const statussetting = this.schema['x-simpleapp-config'].allStatus?.find((item)=>item.status==docstatus)
+        if(statussetting && statussetting.readOnly) return true
+      <%}%>      
+      return false            
+    } 
+  <%}%>
 <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
     <% let obj=it.jsonschema.properties[key] %>
     
@@ -96,26 +108,54 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
        public add<%=key%> = () => {
         
         this.getReactiveData().value.<%= key %>.push(Default<%= it.typename%><%=capitalizeFirstLetter(key)%>(crypto.randomUUID()))
+        return this.getReactiveData().value.<%= key %>.length -1
        }
         
           
     <%}%>
   <%})%>
   
+
+  public getActions(){
+    const actions =  super.getActions()
+    actions.docstatus=[
+        <%for(let i=0;i<it.docStatusSettings.length;i++){%>
+        <% let setting = it.docStatusSettings[i] %> 
+        '<%=setting.statusName%>',
+        <%}%> 
+    ]
+    actions.api=[  
+          <%for(let i=0;i<it.apiSettings.length;i++){%>
+          <% let api = it.apiSettings[i] %>
+          '<%=api.action%>',
+          <%}%> 
+          ]
+    return actions
+  }
+
+
   /*****************************begin x-document-api code*****************************************/
 
   <%for(let i=0;i<it.apiSettings.length;i++){%>
   <% let api = it.apiSettings[i] %>
-  async run<%=capitalizeFirstLetter(api.action)%>(<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
-          <%let subpath = api.entryPoint.split('/')%>
-          <% for(let a=0;a<subpath.length;a++){%>
-            <%const partstr = subpath[a]%>
-            <%if(partstr.includes(':')){%>
-              <% const paraname = partstr.replace(':','') %>  
-               <%=paraname%>: string,
-            <%}%>    
-          <%}%>  
-        <%}%>
+  async run<%=capitalizeFirstLetter(api.action)%>(
+    <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+      <%let subpath = api.entryPoint.split('/')%>
+      <% for(let a=0;a<subpath.length;a++){%>
+        <%const partstr = subpath[a]%>
+        <%if(partstr.includes(':')){%>
+          <% const paraname = partstr.replace(':','') %>  
+            <%=paraname%>: string,
+        <%}%>    
+      <%}%>  
+    <%}%>
+    <% if(api.queryPara && api.queryPara.length>0) {%>
+      <%for(let j=0; j<api.queryPara.length ; j++){%>          
+        <%=api.queryPara[j]%>: string,
+      <%}%> 
+    <%}%>
+     
+
          <% if(['post','put','patch'].includes(api.method)){ %>data:any<%}%>  
         ){
     //const recordid: string = this.data.value._id ?? '';
@@ -236,7 +276,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
   /***************************** begin document status code*****************************************/
   <%for(let i=0;i<it.docStatusSettings.length;i++){%>
     <% let setting = it.docStatusSettings[i] %> 
-    async setStatus<%=capitalizeFirstLetter(setting.status)%>(id:string,data:<%= it.typename%>,runValidate:boolean=false) {
+    async setStatus<%=capitalizeFirstLetter(setting.status)%>(id?:string,data:<%= it.typename%>,runValidate:boolean=false) {
       const {$event} =useNuxtApp()
       if(runValidate){
         const errors = this.validateFailed();

package/templates/nest/src/simpleapp/generate/commons/middlewares/tenant.middleware.ts.eta

@@ -96,7 +96,7 @@ export class TenantMiddleware implements NestMiddleware {
       this.logger.warn(err, 'invalid xorg or user info');
       this.logger.error(err);
       if (err == 'invalid x-org') {
-        return res.status(403).send(err);
+        return res.status(401).send(err);
       } else {
         return res.status(401).send(err);
       }

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

@@ -90,6 +90,9 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.data = { ...newdata };
     return this;
   };
+  public isReadOnly(): boolean {
+    return false;
+  }
   reCalculateValue(data: T) {}
   getIsolationFilter = (appuser: UserContext) => {
     let isolationFilter = {};
@@ -506,7 +509,7 @@ export class SimpleAppService<T extends { _id?: string }> {
         .session(dbsession);
       appuser.addUpdatedRecordId(this.documentName, data._id);
       await this.hook(appuser, HookType.afterUpdate, result);
-      return await this.findById(appuser,id);
+      return await this.findById(appuser, id);
     } catch (err) {
       throw new InternalServerErrorException(err.message);
     }
@@ -593,8 +596,11 @@ export class SimpleAppService<T extends { _id?: string }> {
       await this.hook(appuser, HookType.afterSetStatus, createresult);
       return createresult;
     } else {
-      const updateresult = await this.findIdThenUpdate(appuser, id, data);
-      await this.hook(appuser, HookType.afterSetStatus, data);
+      const originalresult = await this.findById(appuser,id)
+      const newdata = {...originalresult,...data}
+      const updateresult = await this.findIdThenUpdate(appuser, id, newdata);
+      const finaldata = await this.findById(appuser,id)
+      await this.hook(appuser, HookType.afterSetStatus, finaldata);
       return updateresult;
     }
   }

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

@@ -67,6 +67,28 @@ export class ProfileController {
     }
   }
 
+
+  @Get('session')
+  @Roles(Role.Everyone, Role.User)
+  @ApiOperation({
+    operationId: 'getSession',
+    description: 'Get current user session',
+  })
+  @ApiResponse({
+    status: 200,
+    type: () => String,
+    description: 'Success',
+  })
+  @ApiResponse({ status: 401, type: Object, description: 'Expired' })
+  async getSession(@AppUser() appuser: UserContext) {   
+    const result = await this.profileservice.getSession(appuser);    
+    if (result) {
+      return result;
+    } else {
+      throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
+    }
+  }
+  
   @Get('/tenants')
   @Roles(Role.Everyone, Role.User)
   @ApiOperation({

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

@@ -224,4 +224,8 @@ export class ProfileService {
   async getAllTenants(appuser: UserContext) {
     return await appuser.getAllTenants();
   }
+
+  async getSession(appuser:UserContext){
+    return 'OK'
+  }
 }

package/templates/nuxt/components/header/HeaderBreadcrumb.vue.eta

@@ -24,7 +24,8 @@ const items = computed(()=>{
             pathlabel = getUserProfile().branchName
             data.push ({ label: pathlabel }) 
         }else{
-            pathlabel = t(p)
+            
+            pathlabel =  useNuxtApp().$i18n.te(p) ? t(p) :p
             data.push ({ label: pathlabel  , url:pathurl}) 
         }
 

package/templates/nuxt/components/renderer/RendererDate.vue.eta

@@ -1,6 +1,6 @@
 <template >
-    <span>{{ toLocalDate(modelValue) }}</span>
+    <span>{{ toLocalDate(value??'') }}</span>
 </template>
 <script lang="ts" setup>
-    const modelValue = defineModel()    
+const props = defineProps<{value?:string}>()
 </script>

package/templates/nuxt/components/renderer/RendererForeignKey.vue.eta

@@ -1,14 +1,23 @@
 <template>    
     <span  v-if="setting?.collection" @click="viewRecord" class="text-primary-700 hover:text-primary-500 cursor-pointer">        
-        {{modelValue?.label}}
+            {{ displayText }}    
     </span>
-    <span v-else>{{modelValue?.label || modelValue}}</span>
+    <span v-else>{{ displayText }}</span>
 </template>
 <script setup lang="ts">
+import { ForeignKey } from '~/types';
 
 
-const modelValue = defineModel<{label:string,_id:string}>()
-const props = defineProps<{setting:any}>()
+type SettingProp = {collection:string, displayField?:string}
+const modelValue = defineModel<ForeignKey>()
+const props = defineProps<{setting:SettingProp}>()
+const displayText = computed(()=>{
+    const s = props.setting
+    if (!modelValue.value) return undefined
+    else if(!s.collection) return modelValue.value    
+    else if(s.displayField) return modelValue.value[s.displayField]
+    else return modelValue.value.label
+})
 const {$event} = useNuxtApp()
 const viewer=ref()
 const viewRecord = () => {

package/templates/nuxt/components/simpleApp/SimpleAppAutocomplete.vue.eta

@@ -1,6 +1,7 @@
 <template>   
         <AutoComplete v-model="modelValue"  v-if="!readonly" ref="autocompleteinput"
-               forceSelection optionLabel="label"                
+               forceSelection optionLabel="label"  
+               @focus="($event.target as HTMLInputElement).select()"              
                @item-select="pickAutoComplete"
                @complete="getListFromAutocompleteApi"       
                :placeholder="t('keyword')"
@@ -128,13 +129,14 @@ const openViewer = (readonly:boolean) =>{
         const schema:SchemaType = remotedoc.docClass.getSchema()
         const labelfield = schema['x-simpleapp-config'].documentTitle as string
         const codefield  = schema['x-simpleapp-config'].uniqueKey as string
+        const docname = props.setting.fieldsetting['x-foreignkey']
         $event('ViewRecord',{
             _id: modelValue.value?._id as string,
             eventId: crypto.randomUUID(),
-            label: modelValue.value?.label as string,
+            label: (readonly ? modelValue.value?.label : `${t('new') + ' '+ t(docname) }`)  as string,
             readonly:readonly,
-            viewer : getDocument(props.setting.fieldsetting['x-foreignkey'])?.viewer,
-            documentName: props.setting.fieldsetting['x-foreignkey'],
+            viewer : getDocument(docname)?.viewer,
+            documentName: docname,
 
             //after create, auto copy value into auto complete
             afterCreate:(data:any)=>{                

package/templates/nuxt/components/simpleApp/SimpleAppFieldContainer.vue.eta

@@ -57,7 +57,7 @@ const readonlyclass="simpleapp-value-readonly"
 let schema:any 
 
 const fielddesc = computed(()=>{
-    return props.description ?? schema.description ?? ''
+    return props.description ?? ''
 })
 
 if(props.setting.fieldsetting && props.setting.fieldsetting.type){

package/templates/nuxt/components/simpleApp/SimpleAppForm.vue.eta

@@ -6,6 +6,7 @@
 </template>
 <script setup lang="ts" >
 // import type {SimpleAppFieldSetting} from '/types'    
+import * as jsonpath from 'jsonpath';
 import { SimpleAppClient } from  '~/simpleapp/generate/clients/SimpleAppClient'
 import type { JSONSchema7,JSONSchema7Definition } from 'json-schema';
 import _ from 'lodash'
@@ -17,6 +18,9 @@ import _ from 'lodash'
     if(!props.document){
         throw "undefine SimpleAppForm property 'document'"
     }
+
+    const isreadonly = computed(()=> props.readonly ? props.readonly: props.document.isReadOnly())
+
     // const obj = {schema:props.schema,data: props.schema}
     const getField = (path:string)=>{
         // console.log("simpleform topath",path)
@@ -37,7 +41,7 @@ import _ from 'lodash'
             modelField: 'email',
             isrequired: getIsRequired(schema,path),
             errors: props.document.getErrors(),
-            readonly: props.readonly
+            readonly: isreadonly.value
         } //as SimpleAppFieldSetting
     }
 
@@ -102,31 +106,18 @@ import _ from 'lodash'
     // let paths = path.replace('#/','').split('/')    
     // return '/'+paths[1]
    }
-   const getPathObject=(schema:JSONSchema7,path:string):JSONSchema7|undefined=>{
+   const getPathObject=(schema:JSONSchema7,path:string):JSONSchema7|undefined=>{    
     // console.log("path",path)
-    if(!path){
+    if(!path || !path.includes('#/properties')){
         console.error('unknown path')
         return undefined
     }
-    try{
-        let paths:string[] = path.replace('#/','').split('/')    
-        let tmp :JSONSchema7Definition= schema
-        // console.log(path)
-        for(let i=0;i<paths.length;i++){
-            
-            //silly code, but it seems require to avoid typescript complaint.
-            //ultimately it is to obtain result as "tmp=tmp[path[i]]"
-            const key1 = paths[i] as keyof JSONSchema7
-            let jsonkey: keyof JSONSchema7 = key1
-            let obj:JSONSchema7 = {} as JSONSchema7
-            Object.assign(obj,tmp[jsonkey])
-            tmp = {...obj}            
-        }
-        // console.log('final ',path,tmp)
-        return tmp
+    try{        
+        const modifiedpath = path.replace('#','$').replaceAll('/','.')        
+        const queryresult = jsonpath.query(schema,modifiedpath)[0]
+        return queryresult     
     }catch(err:any){
-        console.error(err.message)
-        
+        console.error(err.message)        
     }    
    }
 </script>

package/templates/nuxt/components/simpleApp/SimpleAppFormToolBar.vue.eta

@@ -0,0 +1,106 @@
+<template>
+    <div class="simpleapp-tool-bar flex flex-row text-left gap-4">           
+        <div v-for="(menu,index) in menus" :key="index">
+            <div>
+                <Button v-if="showMenuButton(menu)" @click="emitEvent(menu,$event)">{{ menu.label  }}</Button>
+            </div>
+            
+        </div>  
+        <div v-for="(menu,index) in getDocActions()" :key="index">
+            <div>
+                <Button @click="emitEvent(menu,$event)">{{ menu.label  }}</Button>
+            </div>
+            
+        </div>     
+        <ConfirmPopup></ConfirmPopup>    
+    </div>
+</template>
+<script setup lang="ts">
+
+import { SimpleAppClient } from '~/simpleapp/generate/clients/SimpleAppClient';
+import { useConfirm } from "primevue/useconfirm";
+const confirm = useConfirm();
+import {FormActions,FormMenu} from '~/types'
+
+const ismodify = ref(false)
+const props = defineProps<{
+    document: SimpleAppClient<any,any>,    
+    disableaction? : string[]
+}>()
+
+const emits = defineEmits(['on'])
+const doc = props.document
+const data = doc.getReactiveData()
+
+const menus = ref<FormMenu[]>([])
+
+
+const getActions = () => {
+    const actions = doc.getActions()
+    
+    // Object.keys(actions).forEach((key)=>{ //crud, api, docstatus
+        actions['crud'].forEach((item)=>{ 
+            if(props.disableaction && props.disableaction.includes(item)){/*skip this item*/}
+            else{                
+                menus.value.push({
+                    action: item,
+                    label: t(item),                    
+                    type: 'crud'               
+                })
+            }
+        })
+    // })        
+    return actions
+}
+
+getActions()
+
+const emitEvent = (menu:FormMenu, clickEvent:any)=>{  
+    if(menu.action=='delete'){
+        confirm.require({
+            target: clickEvent.currentTarget as HTMLElement,
+            message: `${t("delete")}?`,
+            icon: "pi pi-exclamation-triangle",
+            acceptClass: "p-button-danger",
+            accept: () => emits('on',menu.action)
+        });
+    }else{
+        emits('on',menu.action)    
+    }   
+    
+}
+
+
+const getDocActions = () =>{
+        const docstatus:string = data.value.documentStatus
+        const allstatus = doc.getSchema()['x-simpleapp-config'].allStatus
+        let docactionmenus:FormMenu[] = []
+        type stringlist = {[key:string]:string}
+        const statusNames:stringlist = {}
+        allstatus?.forEach(item=>{
+            statusNames[item.status]=t(item.statusName)
+        })
+        if(allstatus){
+            const stateconfig = allstatus.find((item)=>item.status===docstatus)
+            docactionmenus = stateconfig?.actions.map(item=>({
+                    action: item,
+                    label: statusNames[item],                    
+                    type: 'docstatus'  
+            })) ?? []                   
+        }
+        return docactionmenus
+    
+}
+const showMenuButton = (menu:FormMenu)=>{
+    
+    if(!canPerform(doc.getDocName(),menu.action)) return false
+    if(doc.isNew() && menu.action == 'create')  return true    
+    if(!doc.isNew() && menu.action == 'new')  return true
+    if(!doc.isNew() && menu.action == 'update')  return true
+    if(!doc.isNew() && menu.action == 'delete')  return true    
+    
+    if(menu.type == 'api' ) return false
+    return false
+}
+
+</script>