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

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

@@ -1,71 +1,30 @@
 <template>
   <div class="w-full">
-    <div v-if="waiting" class="p-4  w-full">
-        waiting..
-    </div>
-    <div v-else  class="w-full p-4">
-      
+    <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-for="tenant in alltenants" class="border rounded-lg p-2 m-2">
+        
         <TextTitle>{{ tenant.tenantName }}</TextTitle>
-        <ListView :list="tenant.permissions" url="/" idField="xOrg">
-          <template #default="{item,index}">
-            <div class="flex flex-row w-full justify-end">
-              <TextPrimary class="flex-1">{{ item.orgName }}</TextPrimary>
-              <TextPrimary>{{ item.branchCode }}</TextPrimary>
-              
-            </div>
-          </template>
-        </ListView>
+        <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="min-w-14 p=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>
+          </NuxtLink>
+        </div>
       </div>
-     
-      <!-- <card :pt="{ header: { class: 'text-xl text-gray-600' } }">
-        <template #header>
-          {{ tenant.tenantName }}
-        </template>
-        <template #content>
-          <ul>
-            <li v-for="o in getOrglist(tenant)">
-              <h1 class="subtitle-text">{{ o.orgName }}</h1>
-              <ul
-                role="list"
-                class="divide-y divide-gray-100 rounded-md border border-gray-200"
-              >
-                <li
-                  v-for="b in getBranchlist(tenant)"
-                  class="w-full items-center justify-between py-4 pl-4 pr-4 text-sm route-link-list"
-                >
-                  <NuxtLink
-                    :href="`/${b.xOrg}`"
-                    v-if="o.orgId == b.orgId"
-                    :external="true"
-                  >
-                    <div class="flex w-full flex-1 items-center">
-                      <p class="flex-1 flex-shrink-0 font-bold text-primary-600">
-                        {{ b.branchCode }}
-                      </p>
-                      <p class="text-right min-w-0 flex-1 gap-2">
-                        <span href="#" class="font-medium text-gray-600">{{
-                          b.group
-                        }}</span>
-                      </p>
-                    </div>
-                    <div class="flex-shrink-0">
-                      <span class="font-medium text-gray-400"
-                        >{{ useRuntimeConfig().public.APP_URL }}/{{
-                          b.xOrg
-                        }}</span
-                      >
-                    </div>
-                  </NuxtLink>
-                </li>
-              </ul>
-            </li>
-          </ul>
-
-        </template>
-      </card> -->
     </div>
-    
   </div>
 </template>
 <script setup lang="ts">
@@ -77,11 +36,12 @@
  */
 import _ from "lodash";
 import TextPrimary from "../text/TextPrimary.vue";
-const waiting = ref(true)
+import ImageOrganization from "../image/ImageOrganization.vue";
+const waiting = ref(true);
 const alltenants = ref();
 
 const loadAllTenants = async () => {
-  waiting.value=false
+  waiting.value = false;
   alltenants.value = (await getProfileApi().getAllTenants()).data;
 };
 
@@ -90,12 +50,13 @@ const loadAllTenants = async () => {
 // }>()
 const getBranchlist = (tenant: any) => tenant.permissions;
 
-const getOrglist = (tenant: any) =>
-  _.uniqBy(getBranchlist(tenant), "orgId").map((item: any) => ({
-    orgId: item.orgId,
-    orgCode: item.orgCode,
-    orgName: item.orgName,
-  }));
+// const getOrglist = (tenant: any) =>
+//   _.uniqBy(getBranchlist(tenant), "orgId").map((item: any) => ({
+//     orgId: item.orgId,
+    // orgRecordId:'aaa',// item.orgRecordId,
+  //   orgCode: item.orgCode,
+  //   orgName: item.orgName,
+  // }));
 
 onNuxtReady(() => {
   loadAllTenants();

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

@@ -48,10 +48,11 @@ export const getPageBaseUrl = (resourcename:string) =>{
  * @return boolean
  */
 export const canPerform = (resource:string,action:string):boolean =>{
-    return getUserStore().canPerform(resource,action)
+
+    return getUserStore().canPerform(upperFirst(resource),action)
 }
 export const haveAccess = (resource:string):boolean =>{
-    return getUserStore().haveAccess(resource)
+    return getUserStore().haveAccess(upperFirst(resource))
 }
 
 

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

@@ -13,6 +13,7 @@ const allroles:roletype[] = [
     <% for(let i=0;i<it.modules.length; i++){ %>
         <% const m = it.modules[i] %>
         <% const appconfig = m.schema["x-simpleapp-config"] %>                
+        {resource: '<%=m.docname%>', action:'access'},
         {resource: '<%=m.docname%>', action:'create'},
         {resource: '<%=m.docname%>', action:'update'},
         {resource: '<%=m.docname%>', action:'delete'},

package/templates/nuxt/error.vue._eta

@@ -1,5 +1,5 @@
 <template>
-  <div class="w w-full items-center justify-center py-12 bg bg-gray-500">
+  <div class="w w-full items-center justify-center py-12 bg bg-gray-500 flex flex-row">
             <div class="bg-white dark:bg-gray-600 p-1 border rounded-md flex items-center justify-center mx-4 w-7/8 md:w-2/3">
                 <div class="flex flex-col items-center py-16">
                     
@@ -11,7 +11,9 @@
                         <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">{{isNaN(error?.statusCode) ? t('server'): error?.statusCode}} Error</p>                    
                         <p class="px-4 pb-10 text-base leading-none text-left text-red-400">{{t(error?.statusMessage)}}</p>  
-                        <p>    <Button @click="handleError" class="btn-primary">{{ t('backToHome') }}</Button></p>                  
+                        <p>    
+                          <ButtonPrimary @click="handleError" class="bg-secondary-600 text-white p-2 rounded">{{ t('backToHome') }}</ButtonPrimary>
+                        </p>                  
                       </div>
                     </div>
                     

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

@@ -125,7 +125,7 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               else
                 return Promise.reject('relogin')  
             }catch(e){
-              return Promise.reject('catch go relogin')  
+              return Promise.reject(e)  
             }
             
           },
@@ -225,7 +225,6 @@ export default defineNuxtPlugin( async(nuxtApp) => {
 
       try{
         const pingsessionres = await useUserStore().pingSession()
-        console.log("pingsessionres",pingsessionres)
         if(pingsessionres == 'wrongxorg'){
           navigateTo('/')
         }
@@ -239,8 +238,18 @@ export default defineNuxtPlugin( async(nuxtApp) => {
             }
         }
       }catch(e){
+          console.error("Ping issue cannot proceed:",e)
 
-         await useUserStore().logout(useRoute().path)    
+          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{

package/templates/project/lang/default._json

@@ -71,5 +71,8 @@
     "messages":"Messages",
     "systemconfig": "System Config",
     "preview": "Preview",
-    "docnoformat":"Document Numbering Formats"
+    "docnoformat":"Document Numbering Formats",
+    "add":"Add",
+    "approve" : "Approve",
+    "decline":"Decline"
   }