@simitgroup/simpleapp-generator 1.2.7 → 1.3.0-alpha

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

@@ -0,0 +1,30 @@
+<template>
+  <Crud :_id="_id" @after="after" :paras="paras" />
+</template>
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+ import Crud from "./form.vue";import { User } from "~/simpleapp/generate/types";
+const props = defineProps<{ _id: string; paras?: User }>();
+const emits = defineEmits(["afterCreate", "after"]);
+
+const after = (actionName: string, data: User, result: any) => {
+  switch (actionName) {
+    case "new":
+      break;
+    case "create":
+      emits("afterCreate", data);
+      break;
+    case "update":
+      break;
+    case "delete":
+      break;
+  }
+  emits("after", actionName, data, result);
+};
+</script>

package/templates/nuxt/pages/[xorg]/{user.vue._eta → user.vue.eta}

@@ -1,3 +1,76 @@
+<template>
+  <title>{{ t("user") }}</title>
+  <div class="flex flex-row gap-4">
+    
+    <div v-if="!useDevice().isMobile || (useDevice().isMobile && !userid)"
+      class="w-full md:w-1/2 xl:w-1/3   p-4"
+    >
+      <TabView>
+        <TabPanel header="Active">
+          <ul role="list" class="divide-y divide-gray-100">
+            <li v-for="item in userlist" :key="item.email">
+              <NuxtLink
+                v-if="item.uid && item.active"
+                :to="getDocumentUrl('user',item._id)"
+              >
+                <UserProfileListItem :data="item"></UserProfileListItem>
+              </NuxtLink>
+            </li>
+          </ul>
+        </TabPanel>
+        <TabPanel header="Inactive">
+          <ul role="list" class="divide-y divide-gray-100">
+            <li v-for="item in userlist" :key="item.email">
+              <NuxtLink
+                v-if="item.uid && !item.active"
+                :to="getDocumentUrl('user',item._id)"
+              >
+                <UserProfileListItem :data="item"></UserProfileListItem>
+              </NuxtLink>
+            </li>
+          </ul>
+        </TabPanel>
+        <TabPanel header="Invite">
+          <div class="padding p-2">
+            <form @submit.prevent="true" class="w-full">
+              <div class="p-inputgroup flex flex-row">
+                <InputText
+                  class="flex-1"
+                  type="email"
+                  placeholder="email"
+                  v-model="inviteemail"
+                />
+                <div class="p-inputgroup-addon p p-0">
+                  <button
+                    label="Search"
+                    class="border rounded-tl-none rounded-bl-none btn btn-primary -ml-1 h-full p-3 rounded-r-md"
+                    @click="invite"
+                  >
+                    Invite
+                  </button>
+                </div>
+              </div>
+            </form>
+          </div>
+          <ul role="list" class="divide-y divide-gray-100">
+            <li v-for="item in userlist" :key="item.email">
+              <NuxtLink
+                v-if="!item.uid"
+                :to="getDocumentUrl('user',item._id)"
+              >              
+                <UserProfileListItem :data="item"></UserProfileListItem>
+              </NuxtLink>
+            </li>
+          </ul>
+        </TabPanel>
+      </TabView>
+    </div>
+    <div v-if="userid || !isMobile()" class="flex-1">
+      <NuxtPage :_id="userid" />
+    </div>
+  </div>
+</template>
+
 <script setup lang="ts">
 /**
  * invite user into current tenant (put user into user catalogue)
@@ -8,7 +81,7 @@
 // import userchild from './userchild.vue'
 import Menu from "primevue/menu";
 import Dialog from "primevue/dialog";
-import { SearchBody, EventType } from "~/types";
+import { SearchBody, EventType,UserProfile } from "~/types";
 import _ from "lodash";
 import Panel from "primevue/panel";
 import { ref } from "vue";
@@ -36,7 +109,7 @@ const {
   $UserDoc,
   // $InvitationDoc,
 } = useNuxtApp();
-
+const userid = computed(() => getPathPara("id"));
 const permdoc = $PermissionDoc();
 const orgdoc = $OrganizationDoc();
 const branchdoc = $BranchDoc();
@@ -61,6 +134,11 @@ const activeuser = ref("");
 const showpermissioninfo = ref(false);
 const permissionselected = ref();
 
+
+const selectUser = (user:any) =>{  
+    // goTo('user',user._id)
+}
+
 /**
  * 1. get all users from this tenant
  * @param resetpage after reload, will it reset user interface or remain as current
@@ -113,9 +191,9 @@ const invite = async () => {
   newuserdata.value.email = inviteemail.value;
   newuserdata.value.fullName = inviteemail.value.split("@")[0];
   newuserdata.value.active = true;
-  newuserdata.value.tenantId = currentuser.tenantId;
-  newuserdata.value.orgId = currentuser.orgId;
-  newuserdata.value.branchId = currentuser.branchId;
+  newuserdata.value.tenantId = currentuser?.tenantId;
+  newuserdata.value.orgId = currentuser?.orgId;
+  newuserdata.value.branchId = currentuser?.branchId;
 
   const invitedata = await inviteuserdoc.create();
   inviteemail.value = "";
@@ -123,82 +201,14 @@ const invite = async () => {
   // onSelectUser(invitedata);
 };
 
-$listen("RefreshUser", () => {
-  refreshList();
+$listen("RefreshDocumentList", async() => {
+  await refreshList();
 });
-onMounted(() => {
-  refreshList();
+onMounted(async () => {
+  await refreshList();
 });
 
 definePageMeta({
   menuPath: "setting/user",
-  })
+});
 </script>
-<template>
-  <div class="grid grid-cols-4">
-    <title>{{ t('user')}} </title>
-    <div v-if="userlist" class="m-2 p-2 border-r-2">
-      <TabView>
-        <TabPanel header="Active">
-          <ul role="list" class="divide-y divide-gray-100">
-            <li v-for="item in userlist" :key="item.email">
-              <NuxtLink
-                v-if="item.uid && item.active"
-                :to="`${getPageBaseUrl('user')}/${item._id}`"
-              >
-                <UserProfileListItem :data="item"></UserProfileListItem>
-              </NuxtLink>
-            </li>
-          </ul>
-        </TabPanel>
-        <TabPanel header="Inactive">
-          <ul role="list" class="divide-y divide-gray-100">
-            <li v-for="item in userlist" :key="item.email">
-              <NuxtLink
-                v-if="item.uid && !item.active"
-                :to="`${getPageBaseUrl('user')}/${item._id}`"
-              >
-                <UserProfileListItem :data="item"></UserProfileListItem>
-              </NuxtLink>
-            </li>
-          </ul>
-        </TabPanel>
-        <TabPanel header="Invite">
-          <div class="padding p-2">
-            <form @submit.prevent="true" class="w-full">
-              <div class="p-inputgroup flex flex-row ">
-                <InputText
-                class="flex-1"
-                  type="email"
-                  placeholder="email"
-                  v-model="inviteemail"
-                />
-                <div class="p-inputgroup-addon p p-0">
-                  <button label="Search" 
-                  class="border rounded-tl-none rounded-bl-none btn btn-primary -ml-1 h-full  p-3 rounded-r-md"                  
-                  @click="invite">
-                    Invite
-                  </button>
-                </div>
-                
-              </div>
-            </form>
-          </div>
-          <ul role="list" class="divide-y divide-gray-100">
-            <li v-for="item in userlist" :key="item.email">
-              <NuxtLink
-                v-if="!item.uid"
-                :to="`${getPageBaseUrl('user')}/${item._id}`"
-              >
-                <UserProfileListItem :data="item"></UserProfileListItem>
-              </NuxtLink>
-            </li>
-          </ul>
-        </TabPanel>
-      </TabView>
-    </div>
-    <div class="col-span-3 p-2">
-      <NuxtPage />
-    </div>
-  </div>
-</template>

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

@@ -0,0 +1,34 @@
+<template>
+  <div class="p-10 m-10 text-3xl border text-center dark:text-white">
+    {{ t('redirectToLoginPage') }}
+    <!-- <NuxtPage /> -->
+  </div>
+</template>
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-13
+ * Author: Ks Tan
+ */
+
+definePageMeta({
+  name: "Login",
+  auth: false,
+  layout: false
+});
+
+const route = useRoute();
+const { signIn } = useAuth();
+const callbackUrl = ref("");
+onMounted(async () => {
+  if (route.query.callbackUrl) {
+    callbackUrl.value = <string>route.query.callbackUrl;
+  } else {
+    callbackUrl.value = "/";
+  }
+  callbackUrl.value = decodeURIComponent(callbackUrl.value);
+  // console.log("callbackUrlcallbackUrlcallbackUrl", callbackUrl.value);
+  await signIn("keycloak", { callbackUrl: callbackUrl.value });
+});
+</script>

package/templates/nuxt/pages/profile.vue.eta

@@ -52,7 +52,7 @@
           <dt
             class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
           >
-            {{t('branches')}}
+            {{ t("branches") }}
           </dt>
           <dd class="mt-2 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
             <ul
@@ -88,6 +88,7 @@
             </ul>
           </dd>
         </div>
+     
 
         <div
           v-if="useRuntimeConfig().public.DEBUGDATA == '1'"
@@ -96,14 +97,22 @@
           <dt
             class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
           >
-            {{t('accessRights')}}
+            {{ t("more") }}
             <p class="text-danger-600">{{ t("onlyAppearInDebugMode") }}</p>
             <p class="text-danger-600">{{ getUserProfile().sessionId }}</p>
           </dt>
           <dd
             class="mt-1 text-sm leading-6 text-gray-700 dark:text-gray-300 sm:col-span-2 sm:mt-0"
           >
-            {{ getUserProfile().roles }}
+            <div>
+              <p>{{t('accessRights')}}</p>
+              {{ getUserProfile().roles }}
+            </div>
+            <div>
+              <p>{{ t('others') }}</p>
+              {{ getUserProfile()?.country }} / {{ getUserProfile()?.currency }} / {{ getUserProfile()?.offsetMinute }}
+            </div>
+            
           </dd>
         </div>
       </dl>

package/templates/nuxt/plugins/10.simpleapp-event.ts.eta

@@ -10,6 +10,7 @@ import axios, { Axios, AxiosResponse } from 'axios'
 import {Notification,EventType} from '~/types'
 // import PrimeVue from "primevue/config";
 import mitt from 'mitt'
+
 // import ToastService from 'primevue/toastservice';
 // import ConfirmationService from 'primevue/confirmationservice';
 // import Tooltip from 'primevue/tooltip';
@@ -23,44 +24,44 @@ export default defineNuxtPlugin( async(nuxtApp) => {
     //const { csrf } = useCsrf()    
     //axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
     const myaxios = axios.create({timeout:5000})
-    myaxios.interceptors.response.use((response) => response, (error) => {
-      console.error('errorerrorerrorerror',error)
-      
-      if(error.code == 'ERR_BAD_REQUEST'){
-        console.error("axios ERR_BAD_REQUEST, redirect to relogin")
-      }
-      else if(error.code){        
-        throw createError({
-          statusCode:error.code,
-          statusMessage:error.message,
-          fatal:true
-        })           
-      }
-      else if(error.response.status==401){        
-        console.error("axios 401 session expired, pop up for relogin")
-      }else if(error.response && error.response.status){
-        let errmsg = error.response.message
-        let errorcode =error.response.status
-        if(error.response?.data && error.response?.data?.message){
-          errmsg = error.response.data.message
-          errorcode = error.response.data.statusCode
+    myaxios.interceptors.response.use(
+      (response) => {        
+        return  response
+      }, 
+      (error) => {
+        if(error.code && error.code == 'ERR_BAD_REQUEST'){
+          console.error("axios ERR_BAD_REQUEST, redirect to relogin")
+        }        
+        else if(error.code){        
+          throw createError({
+            statusCode:error.code,
+            statusMessage:error.message,
+            fatal:true
+          })           
         }
-        
-        throw createError({
-          statusCode:errorcode,
-          statusMessage:errmsg,
-          fatal:true
-        })  
-          // return Promise.reject(error)
-      }else{
-        console.error("unknown error")
-        throw createError({statusCode:500,statusMessage:"Internal server error"}) 
-      }
-    });
-    
+        else if(error.response && error.response.status==302){        
+          console.error("axios 302 session expired, start login flow")
+        }else if(error.response && error.response.status){
+          let errmsg = error.response.message
+          let errorcode =error.response.status
+          if(error.response?.data && error.response?.data?.message){
+            errmsg = error.response.data.message
+            errorcode = error.response.data.statusCode
+          }
+          
+          throw createError({
+            statusCode:errorcode,
+            statusMessage:errmsg,
+            fatal:true
+          })  
+            // return Promise.reject(error)
+        }else{
+          console.error("unknown error")
+          throw createError({statusCode:500,statusMessage:"Internal server error"}) 
+        }
+      });      
     return {
         provide: {
-          
           event: emitter.emit, // Will emit an event
           listen: emitter.on, // Will register a listener for an event
           axios: myaxios,

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

@@ -27,6 +27,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           orgName:ref(''),
           timeZone:ref(''),
           currency:ref(''),
+          country: ref(''),
+          offsetMinute: ref(0),
           uid: ref(''),
           email: ref(''),
           fullName: ref(''),
@@ -70,6 +72,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               this.orgName = res.data.orgName
               this.timeZone = res.data.timeZone
               this.currency = res.data.currency
+              this.country = res.data.country
+              this.offsetMinute = res.data.offsetMinute
               this.uid = res.data.uid
               this.email = res.data.email
               this.fullName = res.data.fullName              
@@ -173,6 +177,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               orgName: this.orgName,
               currency: this.currency,
               timeZone: this.timeZone,
+              country: this.country,
+              offsetMinute: this.offsetMinute,
               fullName : this.fullName,        
               branches:this.branches??[],
               invites: this.invites ?? [],

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

@@ -19,63 +19,30 @@ export default defineEventHandler(async (event:any) => {
         session = await getServerSession(event)
         
     } catch (error) {
-        return sendRedirect(event, '/login', 401)
+        throw createError({ statusText: 'Unauthorized', status: 302 })
+    }
+    if(!session) {
+       throw createError({ statusText: 'Unauthorized', status: 302 })
     }
 
-    return new Promise<any>(async (resolve, reject) => {
-        if(!session) {
-        //if(!session || !session.accessToken) {    
-            reject({ statusMessage: 'Unauthorized', statusCode: 401 });
-            throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
-        }
-        // console.log("------hihi------")
-        const seperateSymbol = '.';
-        // const seperateSymbol = '&';
+    return new Promise<any>(async (resolve, reject) => {       
         const xOrg = event.context.params?.xorg ?? ''
         const documentLink = event.context.params?._ ?? ''
-        // const platform = event.context.params?.platform ?? ''
-        
-
-        // console.error("event.context???",event.context)
         const accessToken = session?.accessToken;
         
-        // const allowPlatform = ['report-api', 'cloudapi'];
-        // if(!key || !platform || !allowPlatform.includes(platform) || !accessToken) {
-        //     reject({ statusMessage: 'Unauthorized', statusCode: 401 });
-        //     // throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
-        // }
-
-        // let tenantKey = '', organizationKey = '';
-        // let xOrg = '';
-
-        // if(key !== 'system') {
-        //     [tenantKey, organizationKey] = key.split(seperateSymbol);
-        //     xOrg = `${tenantKey}/${organizationKey}/`;
-        // }
-
-        // if(key === 'system' && platform == 'cloudapi') {
-        //     // xOrg = 'MC0wLTA'
-        // }
 
         let forwardData: any = {};
-
         const req = event.node.req;
-
-        if(req.method == 'POST' || req.method == 'PUT') {
+        if(req.method == 'POST' || req.method == 'PUT' || req.method == 'PATCH' ) {
 
             forwardData = await readBody(event);
         } else {
             forwardData = getQuery(event);
         }
 
-        // if(typeof forwardData === "object" && "_branch" in forwardData) {
-        //     xOrg = xOrg + forwardData._branch;
-        //     delete forwardData._branch;
-        // }
 
         const frontEndRes = event.node.res;
         const url = process.env.SIMPLEAPP_BACKEND_URL + '/' + documentLink;
-        // console.warn('backend server-----',req.method,url,forwardData)
         const axiosConfig: any = {
             method: req.method,
             url: url,
@@ -115,7 +82,7 @@ export default defineEventHandler(async (event:any) => {
                     statusCode: 503,                    
                 });            
             }else if (error.response.status == 401) {
-                return sendRedirect(event, '/login', 401)             
+                return sendRedirect(event, '/login', 302)             
             }else{
                 const responseCode = error.response.data?.statusCode ? error.response.data.statusCode : error.response.status 
                 const responseMsg = error.response.data ? error.response.data.message : error.response.statusText 

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

@@ -21,43 +21,14 @@ export default defineEventHandler(async (event:any) => {
     } catch (error) {
         return sendRedirect(event, '/login', 401)
     }
-
+    if(!session) {
+        throw createError({ statusText: 'Unauthorized', status: 302 })
+     }
     return new Promise<any>(async (resolve, reject) => {
-        if(!session) {
-        //if(!session || !session.accessToken) {    
-            reject({ statusMessage: 'Unauthorized', statusCode: 401 });
-            throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
-        }
-        //console.log("------hihi------",event.context.params)
         
         const seperateSymbol = '.';
-        // const seperateSymbol = '&';
-        // const xOrg = event.context.params?.xorg ?? ''
         const documentLink = event.context.params?._ ?? ''
-        // const platform = event.context.params?.platform ?? ''
-        
-
-        // console.error("event.context???",event.context)
         const accessToken = session?.accessToken;
-        
-        // const allowPlatform = ['report-api', 'cloudapi'];
-        // if(!key || !platform || !allowPlatform.includes(platform) || !accessToken) {
-        //     reject({ statusMessage: 'Unauthorized', statusCode: 401 });
-        //     // throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
-        // }
-
-        // let tenantKey = '', organizationKey = '';
-        // let xOrg = '';
-
-        // if(key !== 'system') {
-        //     [tenantKey, organizationKey] = key.split(seperateSymbol);
-        //     xOrg = `${tenantKey}/${organizationKey}/`;
-        // }
-
-        // if(key === 'system' && platform == 'cloudapi') {
-        //     // xOrg = 'MC0wLTA'
-        // }
-
         let forwardData: any = {};
 
         const req = event.node.req;

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

@@ -20,6 +20,7 @@ type crudType = {
   runFindOne: Function;  
   runCreate: Function;
   runUpdate: Function;  
+  runPatch: Function;  
   runDelete: Function;
   runSearch: Function
 };
@@ -97,7 +98,7 @@ export class SimpleAppClient<
           //   status:NotificationStatus.success
           // })
           this.data.value = { ...res.data };
-          return res;
+          return res.data;
         }).catch((errors:any)=>{   
           // console.log(this.getDocName(),"-----failed")
             $event('Notification',{
@@ -154,6 +155,37 @@ export class SimpleAppClient<
         });
     }
   }
+
+  async patch() {
+    const {$event} =useNuxtApp()
+    const recordid: string = this.data.value._id ?? '';
+      return await this.docapi
+        .runPatch(recordid, this.data.value,{timeout:this.defaultTimeOut})
+        .then((res: AxiosResponse) => {
+          // if(this.event){this.event('success:update',res.data)}
+          // $event('Notification',{
+          //   documentName:this.getDocName(),
+          //   summary:'Record update success',
+          //   status:NotificationStatus.success,
+          //   data:errors
+          // })        
+          this.data.value = res.data          
+          return res.data;
+        }).catch((errors:any)=>{
+          $event('Notification',{
+            documentName:this.getDocName(),
+            summary:'Record patch failed',
+            status:NotificationStatus.error,
+            data:errors.response.data.data
+          })
+          // console.error('error:update---',errors,",---",errors.message)
+          // if(this.event){
+          // this.event('error:update',errors.response.data.data)}
+          console.error('error:patch',errors.response.data.data)
+          return Promise.reject(errors)
+        
+    })
+  }
   async delete(id?: string) {
     if(!id){
       id = this.data.value._id ?? ''
@@ -219,7 +251,14 @@ export class SimpleAppClient<
       const tmp: { [key: string]: any } = {};
       if (errors) {
         for (let i = 0; i < errors?.length; i++) {
-          const key: string = errors[i]['instancePath'];
+          const err = errors[i]
+          let key: string =  err.instancePath
+          if(err.keyword == 'required'){            
+            key += `/${err.params.missingProperty}`
+          }
+          
+          
+
           if (!tmp[key]) {
             tmp[key] = [];
           }
@@ -240,7 +279,7 @@ export class SimpleAppClient<
 
   public getActions():FormActions{
     const data:FormActions =  {
-      crud:['new','create','update','delete',],
+      crud:['create','update','delete',],
       docstatus:[],
       api:[]
     }

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

@@ -51,4 +51,11 @@ export type CalResource = ForeignKey  & {
     displayName: string; //use to display at calendar, undefine will use foreignkey label
     email?: string; //for generate avatar only
 };
-  
+export type CalViewClickSlotEvent = {
+  split:string
+  date:Date
+}
+
+export type CalViewChange = {
+  startDate: Date
+}

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

@@ -4,12 +4,3 @@
  * last change 2024-02-03
  * Author: Ks Tan
  */
-export type CellSetting  = {
-    title: string
-    field: string
-    cssClass?:string
-    moreFields?: string[]
-    rendererName ?: string
-    rendererSetting ?:any
- } | string 
-

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

@@ -32,4 +32,5 @@ export type EventType ={
     'RefreshDocumentList': RefreshDocumentList
     'ViewRecord': ViewRecord
     'SessionExpire': string
+    'CloseDialog': string
 }