@simitgroup/simpleapp-generator 1.0.59 → 1.0.61

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

@@ -6,48 +6,52 @@
  */
 import _ from 'lodash'
 import {MenuData} from '~/types'
-import {alldocuments} from '../simpleapp/generate/commons/documents'
+import {getAllDocuments} from '../simpleapp/generate/commons/documents'
 export const getDocTypes = ()=>{
-  return alldocuments.filter(item=>item.page!='')
+  return getAllDocuments().filter(item=>item.page!='')
+}
+
+export const getPublicResource = (xorg:string) : MenuData[] => {
+  // const xorg = getUserStore().getCurrentXorg()
+  const menus:MenuData[] = [
+    {label: 'Home',icon: 'pi pi-fw pi-home', url:`/${xorg}`},
+    {label: "Profile", url:`/profile`, isolationType:'none', icon:''},
+    {label: "Profile", url:`/${xorg}/profile`, isolationType:'none', icon:''},
+    {label: 'Signout',icon: 'pi pi-fw pi-home', command: () => logout()},
+    {label: 'Signin',icon: 'pi pi-fw pi-home', 'url':'/login'},
+  ]
+  return menus
 }
 export const getMenus =() :MenuData[]=>{
-    const logout = async () => {
-        const { signOut } = useAuth();
-        const { data } = await <any>useFetch('/api/auth/logout');
-        const addPath = encodeURIComponent("/login");
-        signOut({ redirect: false });
-        window.location.href = data?.value?.path + addPath;
-    };
-  const {$userstore}=useNuxtApp()
-  const route = useRoute();
-  const xorg = route.params.xorg
-  let data =[];
-  //sss
-  let allmenus = alldocuments.filter(item=>item.page!='')
+//     const logout = async () => {
+//         const { signOut } = useAuth();
+//         const { data } = await <any>useFetch('/api/auth/logout');
+//         const addPath = encodeURIComponent("/login");
+//         signOut({ redirect: false });
+//         window.location.href = data?.value?.path + addPath;
+//     };
+  
+//   const route = useRoute();
+  const xorg = getUserStore().getCurrentXorg()
+//   let data:MenuData[] =[];
+//   //sss
+  let allmenus = getAllDocuments().filter(item=>item.page!='')
 
- const roles = $userstore.getUserInfo().roles
+ const roles = getUserProfile().roles
   let allowmenus=[]
   for(let i=0; i< allmenus.length;i++){
     const keyword = allmenus[i].docName
     // if(m.label)
    
-    if($userstore.haveAccess(keyword)){
+    if(getUserStore().haveAccess(keyword)){
       const m:MenuData = {label: keyword, url:`/${xorg}/${keyword}`, isolationType:allmenus[i].isolationType}
       allowmenus.push(m)
     }     
   }
-
-  if(xorg){
-    data =[
-      {label: 'Home',icon: 'pi pi-fw pi-home', url:'/'},
-      {label: 'Cruds',icon: 'pi pi-fw pi-pencil',items:allowmenus},      
-      {label: 'Signout',icon: 'pi pi-fw pi-home', command: () => logout()},
-    ]
-  }else{
-    data= [
-      {label: 'Home',icon: 'pi pi-fw pi-home', url:'/'},
-      {label: 'Signout',icon: 'pi pi-fw pi-home', command: () => logout()},
-      ]
-  }
-  return data
+//   data = publicMenus()
+//   if(xorg){
+//     data.push({label: 'Cruds',icon: 'pi pi-fw pi-pencil',items:allowmenus})
+//   }
+//   console.log('data',data)
+  return allowmenus
 }

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

@@ -10,7 +10,12 @@ export const reloadUserStore = async () =>{
 export const getUserProfile =  () =>{
     return getUserStore().getUserInfo()
 }
-
+export const getCurrentXorg = () =>{
+    return getUserStore().getCurrentXorg()
+}
+export const getPageBaseUrl = (resourcename:string) =>{
+    return `/${getCurrentXorg()}/${resourcename}`;
+}
 /**
  * verify current user can perform specific action base on backend RBAC
  * @param resource:string upper case first letter document name

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

@@ -0,0 +1,15 @@
+export const getDocumentUrl = (document:string,id?:string,querystr?:string)=>{
+    let path = `/${getCurrentXorg()}/${document}`
+    if(id){
+        path = path + '/'+id
+    }
+    if(querystr){
+        path=path+'?'+querystr
+    }
+    return path
+}
+
+
+export const goTo = (document:string,id?:string,querystr?:string)=>{    
+    navigateTo(getDocumentUrl(document,id,querystr))   
+}

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

@@ -0,0 +1,21 @@
+import {NotificationStatus} from '~/types'
+export const getStatusColor = (status:NotificationStatus) => {
+    console.log("get status color",status)
+    switch(status){
+        case NotificationStatus.error:
+            return 'bg bg-danger-600 text-white';
+        break;
+        case NotificationStatus.warn:
+            return 'bg bg-warning-600 text-white';
+        break;
+        case NotificationStatus.info:
+            return 'bg bg-secondary-600 text-white';
+        break;        
+        case NotificationStatus.success:
+        default:    
+            return 'bg bg-primary-600 text-white';
+        break;
+
+    }
+
+}

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

@@ -1,5 +1,15 @@
+import {Md5} from 'ts-md5'
 export const camelCaseToWords = (s: string) =>{
     const result = s.replace(/([A-Z])/g, ' $1');
     return result.charAt(0).toUpperCase() + result.slice(1);
   }
-  
+  
+
+export const md5=(s:string)=>  new Md5().appendStr(s).end()
+
+export const getAvatarLink = (email:string, size:number):string=>{
+  return `https://api.simbiz.cloud/cloudapi/avatar/${md5(email)}?size=${size}`
+  
+}
+
+export const toLocalDate = (dateiso8601:string)=> new Date(String(dateiso8601)).toLocaleDateString()

package/templates/nuxt/error.vue._eta

@@ -1,9 +1,24 @@
 <template>
-    <div class="mt-7 max-w-sm mx-auto text-center card">
-      <p class="mt text-7xl font font-bold">{{error.statusCode}}</p>
-      <p class="mt text-6xl">Oops</p>
-      <p class="mt ">{{error.message}}</p>
-    </div>
+  <div class="flex items-center justify-center py-12 bg bg-gray-500">
+            <div class="bg-white border rounded-md flex items-center justify-center mx-4 md:w-2/3">
+                <div class="flex flex-col items-center py-16">
+                    
+                    <div class="flex flex-row">
+                      <div class="w w-40">
+                        <svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-13.59 -13.59 480.17 480.17" xml:space="preserve" fill="#000000" stroke="#000000" stroke-width="0.00452986"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <g> <g> <g> <path style="fill:#010002;" d="M0,0v452.986h452.986V0H0z M403.223,24.655c8.132,0,14.668,6.558,14.668,14.625 c0,8.111-6.536,14.711-14.668,14.711c-8.089,0-14.668-6.601-14.668-14.711C388.576,31.234,395.134,24.655,403.223,24.655z M352.035,24.655c8.046,0,14.647,6.558,14.647,14.625c0,8.111-6.601,14.711-14.647,14.711c-8.132,0-14.668-6.601-14.668-14.711 C337.389,31.234,343.903,24.655,352.035,24.655z M417.955,418.624H35.053V85.701h382.903V418.624z"></path> <path style="fill:#010002;" d="M226.493,398.952c80.394,0,145.495-65.101,145.495-145.43s-65.101-145.495-145.495-145.495 c-80.373,0-145.516,65.165-145.516,145.495C80.977,333.873,146.12,398.952,226.493,398.952z M142.044,198.516l29.444-29.444 l55.005,55.027l54.984-55.027l29.379,29.444L255.894,253.5l54.984,54.941l-29.423,29.444l-54.962-54.962l-55.005,54.984 l-29.444-29.444l54.984-54.941L142.044,198.516z"></path> </g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> <g> </g> </g> </g></svg>
+                      </div>
+                      <div>
+                        <h1 class="px-4 pt-2 pb-4 text-left text-5xl font-bold leading-10 text-gray-800">OOPS!</h1>                    
+                        <p class="px-4 mt mb-4 text-4xl text-left font font-bold">{{error.statusCode}} Error</p>                    
+                        <p class="px-4 pb-10 text-base leading-none text-left text-gray-400">{{error.message}}</p>                    
+                      </div>
+                    </div>
+                    
+                </div>
+                
+                
+            </div>
+        </div>
 </template>
 <script setup lang="ts">
 

package/templates/nuxt/layouts/documentlist.vue.eta

@@ -0,0 +1,166 @@
+<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 { FilterMatchMode } from 'primevue/api';
+import Column from 'primevue/column';
+import {ref} from 'vue'
+import _ from 'lodash'
+import { SimpleAppClient } from  '../simpleapp/generate/clients/SimpleAppClient' //'../SimpleAppClient';
+import Dialog from 'primevue/dialog';
+import {SearchBody,CellSetting} from '~/types'
+    const {$listen} = useNuxtApp()  
+    const defaultlist:CellSetting[] = []
+    const recordlist = ref([]);
+    
+    const metas = useRoute().meta
+    const documentName = ref(String(metas.documentName))
+    const tablecolumns = ref<CellSetting[]>([]) 
+    const sorts = metas.sorts as string[][]
+
+    const filters = ref({
+        'global': {value: null, matchMode: FilterMatchMode.CONTAINS},
+    });
+//     onNuxtReady(()=>{
+//         console.log("Listen ReloadLayout")
+//         $listen('ReloadLayout',(screenname)=>{
+//             console.log("Reload layout",screenname)
+//             // const metas = useRoute().meta
+//             // renderLayout()
+
+            
+//         })
+    
+//     })
+    provide('refreshLayout',(docname:string)=>{
+        console.log("refresh layout:",docname)
+    })
+//     onMounted(()=>{
+//         console.log("On Mounted at layout")
+        
+//     })
+    let obj = getDocument(documentName.value)
+//       console.log("obj",obj)
+//     const data = obj?.getReactiveData()
+//     const disabled=ref(false)
+    
+//     const documentTitle =  _.upperFirst(documentName)
+
+// // const props = defineProps<{
+// //     document:SimpleAppClient<any,any>
+// //     listColumns:string[]
+// //     path:string
+// //     title:string
+// //     sorts?: any
+// // }>()
+
+    
+    
+
+//     const route = useRoute()
+    
+//     const popuptitle = ref("New "+documentTitle)
+//     const systemwindows = ref(false)
+//     const currentjsonschema:any = obj?.getSchema()
+
+    
+//     const recordId = computed(()=>route.params.id)
+//     const setNew = computed(()=>route.query.new)
+
+//     const updateVisible = () =>{  
+//         console.log("UpdateVisible")
+//         if(recordId.value || setNew.value){
+//         visible.value = true
+//         }else{
+//         visible.value = false
+//         }
+//     }
+//     watch(route,(a,b)=>{
+//         console.log('watch route change',a,b)
+//     },{deep:true})
+    
+//     watch(recordId,()=>{  
+//     updateVisible()
+//     })
+//     watch(setNew,()=>{  
+//     updateVisible()
+//     })
+
+    const refresh = async() => {
+        tablecolumns.value= !useRoute().meta.columns ? [] : useRoute().meta.columns as CellSetting[] 
+        documentName.value = String(useRoute().meta.documentName)
+        const searchbody: SearchBody = {
+            fields: tablecolumns.value.concat(['created']),
+            sorts:  metas.sorts as string[][]
+        }
+        obj = getDocument(documentName.value)
+
+        obj?.search(searchbody).then((res:any) => {    
+            recordlist.value = res;
+            // disabled.value=false
+        });
+    };
+    
+    onNuxtReady(()=>{
+        refresh() 
+        // updateVisible()
+    })
+
+    const renderLayout =()=>{
+        const metas = useRoute().meta
+        // console.log(obj?.getDocName(),'==',data)
+        // if(obj?.getDocName()==data.documentName){
+        //     console.log("Refresh now")
+        //     refresh()
+        // }
+    }
+
+watch(()=> useRoute().meta ,(newvalue,oldvalue)=>{
+    refresh()
+})
+
+   
+
+
+</script> 
+<template>
+    <div>
+
+        <HeaderBar />
+        <Invitation/>      
+         <SimpleAppDatatable :value="recordlist" :columns="tablecolumns" :title="documentName"> 
+            <template #toolbar>
+                <div class="w-full text-left">
+                    <slot>
+                        undefine page content
+                    </slot>                     
+                </div>                
+            </template>
+            <template #additionaltoolbar>
+                <Button class="bg-secondary-600 hover:bg-secondary-400 text-white" @click="refresh()" type="button" >Refresh</Button>                                                                            
+            </template>
+            <Column header=" ">
+                <template #body="{index,data}">
+                    <NuxtLink :to="getDocumentUrl(String(useRoute().meta.documentName),data._id)">
+                        <Button icon="pi pi-pencil" class="bg-primary-600 hover:bg-primary-400 text-white" >Edit</Button>
+                    </NuxtLink>            
+                </template>
+            </Column>
+        </SimpleAppDatatable>  
+        <!--      
+        <DebugDocumentData v-model="data"/>
+        -->
+        <!-- <Dialog v-model:visible="visible"
+                :pt="{root:{class:'w-full h-full'}}"  
+                modal :header="documentName" 
+                :autoZIndex="false" 
+                @update:visible="exitRecord"                
+                >                 
+          <slot></slot>        
+        </Dialog>  -->
+        
+    </div>    
+</template>

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

@@ -5,11 +5,14 @@
  * Author: Ks Tan
  */
 import { getUserProfile } from './../composables/getUserStore.generate';
+import  {MenuData} from '~/types'
 export default defineNuxtRouteMiddleware((to, from) => {  
   
   const userprofile = getUserProfile()
   
-  if(to.fullPath=='/login'){        
+
+  //is public resource
+  if( getPublicResource(String(to.params['xorg'])).filter((item:MenuData)=>to.fullPath === item.url)){        
     return true
   }// no permission control needed yet    
     else if(!to.params['xorg']){

package/templates/nuxt/pages/[xorg]/organization/index.vue.eta

@@ -24,7 +24,7 @@ const showbranchfrom = ref(false);
 const getBranchList = () => {
   branchdoc
     .getApi()
-    .runSearch({ orgId: data.value.orgId })
+    .runSearch({ filter:{orgId: data.value.orgId }})
     .then((res) => {
       branchlist.value = res.data;
     });
@@ -117,7 +117,7 @@ const saveBranch = async () => {
             :columns="['branchId', 'branchCode', 'branchName', 'active']"
           >
             <template #header>
-              <Button class=" btn-primary" @click="editBranch('')" type="button">
+              <Button class="btn-primary" @click="editBranch('')" type="button">
                 <span class="font font-normal">Add Branch</span>
               </Button>
             </template>
@@ -125,7 +125,7 @@ const saveBranch = async () => {
               <template #body="{ index, data }">
                 <Button
                   type="button"
-                  class=" btn-primary"
+                  class="btn-primary"
                   @click="editBranch(data._id)"
                 >
                   Edit
@@ -157,7 +157,7 @@ const saveBranch = async () => {
               :setting="o.getField('#/properties/description')"
             />
             <!-- <SimpleAppNumber :readonly="true" v-model="branchdata.orgId" :setting="o.getField('#/properties/orgId')"/> -->
-            <Button class=" btn-primary" type="button" @click="saveBranch">
+            <Button class="btn-primary" type="button" @click="saveBranch">
               Save
             </Button>
           </SimpleAppForm>

package/templates/nuxt/pages/[xorg]/profile.vue.eta

@@ -0,0 +1,6 @@
+<template>
+    <profile></profile>
+  </template>
+  <script setup lang="ts">
+  import profile from '../profile.vue'
+  </script>

package/templates/nuxt/pages/[xorg]/user/[id].vue.eta

@@ -0,0 +1,6 @@
+<script setup lang="ts">
+import Index from './index.vue'
+</script>
+<template>
+  <index></index>
+</template>