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

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

@@ -51,7 +51,8 @@
               :disabled="!canPerform(doc.getDocName(true), 'access')"
               @click="emitEvent(menu, $event)"
               :action-name="menu.action"
-              >{{ menu.label }}</ButtonAction>
+              >{{ menu.label }}</ButtonAction
+            >
             <ButtonAction
               v-else
               :disabled="!canPerform(doc.getDocName(true), menu.action)"
@@ -68,8 +69,8 @@
       <!-- right -->
       <div class="flex flex-row gap-2">
         <DebugDocumentData v-model="data" :label="t(doc.getDocName())" />
-        <div v-if="data.documentStatus">
-          <RendererDocHistories :data="data" />
+        <div>
+          <RendererDocHistories :data="data" :documentName="doc.getDocName()" />
         </div>
         <div v-for="(menu, index) in menus" :key="index">
           <div v-if="menu.label && menu.type == 'docstatus'">

package/templates/nuxt/components/user/UserTenantPicker.vue.eta

@@ -1,26 +1,28 @@
 <template>
-  <div class="w-full">
+  <div class="w-full p-4">
+    <LazyTenantCreator v-model:model-value="visibleCreateTenant"></LazyTenantCreator>
+    <ButtonPrimary @click="visibleCreateTenant=true">{{ t('newBusiness') }}</ButtonPrimary>
     <div v-if="waiting" class="p-4 w-full">waiting..</div>
-    <div v-else class="w-full p-2 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+    <div
+      v-else
+      class="w-full p-2 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
+    >
       <div v-for="tenant in alltenants" class="border rounded-lg p-2 m-2">
-        
         <TextTitle>{{ tenant.tenantName }}</TextTitle>
-        <div v-for=" item in tenant.permissions">
+        <div v-for="item in tenant.permissions">
           <NuxtLink :to="`/${item.xOrg}`" external>
-            <div class="flex flex-row gap-2 hover:bg-primary-100">        
+            <div class="flex flex-row gap-2 hover:bg-primary-100">
               <div class="min-w-14 p=2">
-                <ImageOrganization :orgRecordId="item.orgRecordId" :size="12"/>
-              </div>      
-              <div class="flex flex-col w-full justify-end gap-2">              
+                <ImageOrganization :orgRecordId="item.orgRecordId" :size="12" />
+              </div>
+              <div class="flex flex-col w-full justify-end gap-2">
                 <div class="flex flex-row gap-2">
                   <TextMain>{{ item.branchCode }}</TextMain>
                   <Tag v-for="groupname in item.groups">{{ t(groupname) }}</Tag>
                 </div>
                 <TextSubsubtitle>{{ item.orgName }}</TextSubsubtitle>
-                
-                
               </div>
-          </div>
+            </div>
           </NuxtLink>
         </div>
       </div>
@@ -39,7 +41,7 @@ import TextPrimary from "../text/TextPrimary.vue";
 import ImageOrganization from "../image/ImageOrganization.vue";
 const waiting = ref(true);
 const alltenants = ref();
-
+const visibleCreateTenant = ref(false)
 const loadAllTenants = async () => {
   waiting.value = false;
   alltenants.value = (await getProfileApi().getAllTenants()).data;
@@ -53,10 +55,10 @@ const getBranchlist = (tenant: any) => tenant.permissions;
 // const getOrglist = (tenant: any) =>
 //   _.uniqBy(getBranchlist(tenant), "orgId").map((item: any) => ({
 //     orgId: item.orgId,
-    // orgRecordId:'aaa',// item.orgRecordId,
-  //   orgCode: item.orgCode,
-  //   orgName: item.orgName,
-  // }));
+// orgRecordId:'aaa',// item.orgRecordId,
+//   orgCode: item.orgCode,
+//   orgName: item.orgName,
+// }));
 
 onNuxtReady(() => {
   loadAllTenants();

package/templates/nuxt/composables/getOpenApi.generate.ts.eta

@@ -38,51 +38,9 @@ export const getDocumentApi = (documentName: string): any => {
 
   const config = getAxiosConfig()
   const docsOpenapi: any = {
-           'tenant': new o.TENANTApi(config),
-            'organization': new o.ORGApi(config),
-            'branch': new o.BRANCHApi(config),
-            'permission': new o.PERMApi(config),
-            'autoincreament': new o.AUTOINCApi(config),
-            'docnoformat': new o.DOCNOApi(config),
-            'systemmessage': new o.SYSMSGApi(config),
-            'keyvaluepair': new o.KVPAIRApi(config),
-            'webhook': new o.WEBHOOKApi(config),
-            'academysession': new o.ACADEMYSESSIONApi(config),
-            'accounttransaction': new o.ACCTRANSApi(config),
-            'agent': new o.AGENTApi(config),
-            'area': new o.AREAApi(config),
-            'attendance': new o.ATTApi(config),
-            'category': new o.CATApi(config),
-            'creditnote': new o.CNApi(config),
-            'enrollment': new o.ENROLLApi(config),
-            'enrollmenttransaction': new o.ENROLLTRANSApi(config),
-            'holiday': new o.HOLIDAYApi(config),
-            'invoice': new o.INVApi(config),
-            'level': new o.LVLApi(config),
-            'parent': new o.PARENTApi(config),
-            'payment': new o.PAYApi(config),
-            'paymentmethod': new o.PAYMETHODApi(config),
-            'product': new o.PRDApi(config),
-            'productpackage': new o.PRDPKGApi(config),
-            'race': new o.RACEApi(config),
-            'refund': new o.REFUNDApi(config),
-            'refundtype': new o.REFUNDTYPEApi(config),
-            'religion': new o.RELIGIONApi(config),
-            'room': new o.ROOMApi(config),
-            'roomtype': new o.ROOMTYPEApi(config),
-            'schedule': new o.SCHEDULEApi(config),
-            'school': new o.SCHOOLApi(config),
-            'stopenrollment': new o.STOPENROLLApi(config),
-            'stopreason': new o.STOPREASONApi(config),
-            'student': new o.STUApi(config),
-            'studentgroup': new o.STUGROUPApi(config),
-            'studentsource': new o.STUDENTSRCApi(config),
-            'studentsummary': new o.STUSUMApi(config),
-            'teacher': new o.TEACHERApi(config),
-            'teachergroup': new o.TEACHERGROUPApi(config),
-            'tuitionclass': new o.TUITIONApi(config),
-            'user': new o.USERApi(config),
-                  
+       <% for(let i=0;i<it.modules.length; i++){ %>
+                '<%=it.modules[i].docname.toLowerCase()%>': new o.<%=it.modules[i].doctype.toUpperCase()%>Api(config),                
+              <%}%>                             
     };
 
   if (!docsOpenapi[documentName]) {
@@ -100,10 +58,9 @@ export const getAllApi=()=>{
     return o
 }
 
-export const getWorkflowApi = () => {
-  return new o.WorkflowApi(getAxiosConfig())
-  
-}
+//export const getWorkflowApi = () => {
+  //return new o.WorkflowApi(getAxiosConfig())  
+//}
 
 export const getProfileApi = () => {
   return new o.PROFILEApi(getAxiosConfig())

package/templates/nuxt/composables/stringHelper.generate.ts.eta

@@ -23,12 +23,12 @@ export const getAvatarLink = (email:string, size:number):string=>{
 }
 export const getAvatarByUid = (id:string, size:number):string=>{
   const url = `${useRuntimeConfig().public.APP_URL}/api/${getCurrentXorg()}`
-  return `${url}/images/student/${id}`;
+  return `${url}/images/user/${id}`;
   
 }
 
 export const getDefaultLocale =()=> useNuxtApp().$i18n.defaultLocale
-export const t = (txt:string,options?:any):string => !txt || txt.trim()=='' ? '' : useNuxtApp().$i18n.t(txt,options)
+export const t = (txt:string,options?:any):string => typeof txt !='string' ?'' : useNuxtApp().$i18n.t(txt.trim(),options)
 export const upperFirst = (str:string) => _.upperFirst(str)
 export const labelSorter = (a,b)=>{
    const nameA = a.label.toUpperCase(); // ignore upper and lowercase

package/templates/nuxt/middleware/30.acl.global.ts.eta

@@ -6,11 +6,12 @@
  */
 import { getUserProfile } from './../composables/getUserStore.generate';
 import  {MenuData} from '~/types'
-export default defineNuxtRouteMiddleware((to, from) => {  
-  
-  // return true;
+export default defineNuxtRouteMiddleware((to, from) => {      
   const userprofile = getUserProfile()
-  if(to.path=='/relogin'){
+  //skip auto then simply allow
+  if(!to.meta.auth){
+    return true
+  }else if(to.path=='/relogin'){
     return true
   }else if( getPublicResource(String(to.params['xorg'])).filter((item:MenuData)=>to.fullPath === item.url)){        
     return true
@@ -37,7 +38,7 @@ export default defineNuxtRouteMiddleware((to, from) => {
         if($userstore.haveAccess(resourcename)){                    
           return true
         }else{
-          console.error("access deny, redirect to '/'")
+       //   congetWorkflowApisole.error("access deny, redirect to '/'")
           return navigateTo('/')
           // abortNavigation()
         }

package/templates/nuxt/pages/[xorg]/pickgroup.vue._eta

@@ -1,35 +1,36 @@
 <template>
-    <div class="flex flex-col w-full gap-4 p-4">
-      <TextTitle class="text-center">{{ t("pickGroup") }}</TextTitle>
+  <div>
+    <TextTitle class="text-center">{{ t("pickGroup") }}</TextTitle>
+    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 w-full gap-4 p-4">
+      
       <div v-for="(groupName, index) in getUserProfile()?.groups" :key="index">
         <div
-          class="border rounded-lg bg-primary-500 text-white p-4 text-center"
+          class="border rounded-lg bg-primary-500 text-white p-4 text-center cursor-pointer"
           @click="pickGroup(groupName)"
         >
           {{ t(groupName) }}
         </div>
-      </div>    
+      </div>
     </div>
-  </template>
-  <script lang="ts" setup>
-  /**
-   * This file was automatically generated by simpleapp generator during initialization. It is changable.
-   * --remove-this-line-to-prevent-override--
-   * last change 2024-04-09
-   * author: Ks Tan
-   */
-  const pickGroup = async (groupName: string) => {
-      try{        
-          useCookie('currentGroup').value= groupName
-          localStorage.setItem('currentGroup',groupName)
-          useNuxtApp().$userstore.currentGroup = groupName;
-          useNuxtApp().$event("pickGroup", groupName);
-          goTo("");
-      }catch(e){
-          alert("something wrong")
-          console.error(e)
-      }
-    
-  };
-  </script>
-  
+</div>
+</template>
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-09
+ * author: Ks Tan
+ */
+const pickGroup = async (groupName: string) => {
+  try {
+    useCookie("currentGroup").value = groupName;
+    localStorage.setItem("currentGroup", groupName);
+    useNuxtApp().$userstore.currentGroup = groupName;
+    useNuxtApp().$event("pickGroup", groupName);
+    goTo("");
+  } catch (e) {
+    alert("something wrong");
+    console.error(e);
+  }
+};
+</script>

package/templates/nuxt/pages/picktenant.vue._eta

@@ -2,13 +2,13 @@
   <div class="flex flex-col w-full">
     <TextTitle class="text-center p-2">{{ t("pickYourDatabase") }}</TextTitle>
     <div class="flex flex-col">
-      
       <div class="p-4">
-        {{ t('welcome ') }} {{ getUserProfile()?.fullName }}
-        <UserButtonCreateTenant></UserButtonCreateTenant>
+        {{ t("welcome ") }} {{ getUserProfile()?.fullName }}
       </div>
       <UserTenantPicker></UserTenantPicker>
+      
     </div>
+
   </div>
 </template>
 <script lang="ts" setup>

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

@@ -7,7 +7,7 @@
 import { defineNuxtPlugin } from "#app";
 import {PROFILEApi} from '../simpleapp/generate/openapi'
 import {UserProfile} from '~/types'
-import axios, { Axios, AxiosResponse } from 'axios'
+import axios, { Axios, AxiosError, AxiosResponse } from 'axios'
 import _ from 'lodash'
 import { group } from "console";
 
@@ -109,12 +109,17 @@ export default defineNuxtPlugin( async(nuxtApp) => {
             if(!xorg){
               apiurl = `${useRuntimeConfig().public.APP_URL}/api`
             }else{
-              const xorgdecode = atob(<string>xorg)
-              if(xorgdecode.includes('-')){
-                apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
-              }else{                 
+              try{
+                const xorgdecode = atob(<string>xorg)
+                if(xorgdecode.includes('-')){
+                  apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+                }else{                 
+                  return Promise.reject('wrongxorg')
+                }
+              }catch(e){
                 return Promise.reject('wrongxorg')
               }
+              
             
             }
             const {$axios} = useNuxtApp()
@@ -218,43 +223,58 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           }
         }        
       })
-    
-    
-    if( useRoute().meta.auth !==false){
-      console.log("pingsessionres starat")
-
+     
+     
       try{
         const pingsessionres = await useUserStore().pingSession()
-        if(pingsessionres == 'wrongxorg'){
-          navigateTo('/')
-        }
-        else if(pingsessionres){
+        
+        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)
+        
+      }catch(e:any){              
+          
+          //server down, stop page
+          if(e == 'wrongxorg'){
+            navigateTo('/picktenant',{external:true})
+          }
+          else if(e?.code=='ERR_BAD_RESPONSE'){                
                  throw createError({
                   statusCode:e.code,
                   statusMessage:e.message,
                   fatal:true
                 })           
+          }else if(e?.response?.status==302){ //no session            
+            //need authentication, relogin
+            if( useRoute().meta.auth !==false){              
+              await useUserStore().logout(useRoute().path)
+            }
+            else {
+              //pulic page, do nothing`
+              return    {
+                 provide: {
+                  userstore:useUserStore()
+                 }
               }
-            else
-              await useUserStore().logout(useRoute().path)    
+              
+            }
+          }
+            // else
+            //   
       }
       
-    }else{
+
+
+      return {        
+          provide: {
+              userstore:useUserStore()
+          }
+      }
+    // }else{
       
-    }
+    //     console.log("No need auth")
+    //     return true
+    // }
     
     
     

package/templates/nuxt/server/api/profile/[...].ts.eta

@@ -75,6 +75,34 @@ export default defineEventHandler(async (event:any) => {
 
                 // Send the image data as the response body
                 frontEndRes.end(Buffer.from(res.data, 'binary'));
+            }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 = 'public/images/'
+                    let filename = ''
+                    if(documentLink.includes('student')) filename='student.png';
+                    else if(documentLink.includes('teacher')) filename='teacher.png';                    
+                    else if(documentLink.includes('organization')) filename='organization.png';
+                    else  filename='unknown.png';
+                    const fullpath = folder+filename;
+                    // console.log("photo path",fullpath)
+                    if(fs.existsSync(fullpath)){
+                        imageData = fs.readFileSync(fullpath)
+                    }else{
+                        console.log(fullpath,'does not exists')
+                    }                    
+                }
+                 frontEndRes.end(Buffer.from(imageData, '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']);
@@ -113,4 +141,19 @@ export default defineEventHandler(async (event:any) => {
         // })
     })
     
-})
+})
+
+
+
+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

@@ -10,7 +10,7 @@ import addErrors from 'ajv-errors';
 import { ref } from 'vue';
 import type { Ref } from 'vue';
 import type { AxiosResponse } from 'axios';
-import {SearchBody,Notification,NotificationStatus,SchemaType,FormActions} from '~/types'
+import {SearchBody,TextSearchBody,Notification,NotificationStatus,SchemaType,FormActions} from '~/types'
 
 // import { useToast, } from 'primevue/usetoast';
 // import type {  ToastMessageOptions } from 'primevue/toast';
@@ -24,6 +24,7 @@ type crudType = {
   runDelete: Function;
   runSearch: Function;
   runDefault:Function;
+  runFullTextSearch:Function;
 };
 export class SimpleAppClient<
   TData extends { _id?: string,created?:string },
@@ -349,4 +350,9 @@ export class SimpleAppClient<
     }
     return data
   }
+
+  async runFullTextSearh(body:TextSearchBody) {
+      const response = await this.docapi.runFullTextSearch(body)
+      return response.data
+    }
 }

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

@@ -16,7 +16,13 @@ export type NameValue={
     code?: string
     [key:string]: any
   };
-  
+  export type TextSearchBody = {
+    keyword: string;
+    fields?: string[];
+    sorts?: string[][];
+    lookup?: Record<string, string>;
+  };
+
   export type DocumentMetaData =  {
     docName:string
     docType:string