@simitgroup/simpleapp-generator 1.3.4-alpha → 1.4.0-alpha

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

@@ -1,72 +1,79 @@
 <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 class="w-full flex flex-col p-3">
+
+  
+    <div><TextTitle>{{ t('user') }}</TextTitle></div>
+    <div class="flex flex-row w-full ">
+      <title>{{ t("user") }}</title>    
+      
+      <div class="w-full md:w-1/2 xl:w-1/3">
+        <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>
-              </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" />
+              </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="!isMobile()" class="flex-1">
+        <NuxtPage :_id="userid" />
+      </div>
+      <OverlaySideBarCrud
+        v-if="dialogvisible"
+        v-model="dialogvisible"
+        closeEventName="user"
+      >
+        <NuxtPage :_id="userid" />
+      </OverlaySideBarCrud>
     </div>
   </div>
 </template>
@@ -81,7 +88,7 @@
 // import userchild from './userchild.vue'
 import Menu from "primevue/menu";
 import Dialog from "primevue/dialog";
-import { SearchBody, EventType,UserProfile } from "~/types";
+import { SearchBody, EventType, UserProfile } from "~/types";
 import _ from "lodash";
 import Panel from "primevue/panel";
 import { ref } from "vue";
@@ -99,7 +106,7 @@ import TabView from "primevue/tabview";
 import TabPanel from "primevue/tabpanel";
 import { Permission, User } from "~/simpleapp/generate/openapi/api";
 import BlockUI from "primevue/blockui";
-
+const dialogvisible = ref(false);
 //initialize api
 const {
   $listen,
@@ -134,10 +141,9 @@ const activeuser = ref("");
 const showpermissioninfo = ref(false);
 const permissionselected = ref();
 
-
-const selectUser = (user:any) =>{  
-    // goTo('user',user._id)
-}
+const selectUser = (user: any) => {
+  // goTo('user',user._id)
+};
 
 /**
  * 1. get all users from this tenant
@@ -201,11 +207,22 @@ const invite = async () => {
   // onSelectUser(invitedata);
 };
 
-$listen("RefreshDocumentList", async() => {
+const showDialogIfNeeded = () => {
+  if (isMobile()) {
+    if (userid.value != "") dialogvisible.value = true;
+    else dialogvisible.value = false;
+  }
+};
+watch(
+  () => useRoute().path,
+  () => showDialogIfNeeded(),
+);
+$listen("RefreshDocumentList", async () => {
   await refreshList();
 });
 onMounted(async () => {
   await refreshList();
+  showDialogIfNeeded();
 });
 
 definePageMeta({

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

@@ -27,12 +27,12 @@
           <dt
             class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
           >
-            {{ t("group") }}
+            {{ t("groups") }}
           </dt>
           <dd
             class="mt-1 text-sm leading-6 text-gray-700 dark:text-gray-300 sm:col-span-2 sm:mt-0"
           >
-            {{ getUserProfile().group }}
+            {{ getUserProfile()?.groups }}
           </dd>
         </div>
         <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
@@ -88,7 +88,6 @@
             </ul>
           </dd>
         </div>
-     
 
         <div
           v-if="useRuntimeConfig().public.DEBUGDATA == '1'"
@@ -105,14 +104,15 @@
             class="mt-1 text-sm leading-6 text-gray-700 dark:text-gray-300 sm:col-span-2 sm:mt-0"
           >
             <div>
-              <p>{{t('accessRights')}}</p>
+              <p>{{ t("accessRights") }}</p>
               {{ getUserProfile().roles }}
             </div>
             <div>
-              <p>{{ t('others') }}</p>
-              {{ getUserProfile()?.country }} / {{ getUserProfile()?.currency }} / {{ getUserProfile()?.offsetMinute }}
+              <p>{{ t("others") }}</p>
+              {{ getUserProfile()?.country }} /
+              {{ getUserProfile()?.currency }} /
+              {{ getUserProfile()?.offsetMinute }}
             </div>
-            
           </dd>
         </div>
       </dl>

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

@@ -9,6 +9,7 @@ import {PROFILEApi} from '../simpleapp/generate/openapi'
 import {UserProfile} from '~/types'
 import axios, { Axios, AxiosResponse } from 'axios'
 import _ from 'lodash'
+import { group } from "console";
 
 
 export default defineNuxtPlugin( async(nuxtApp) => {
@@ -33,7 +34,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           email: ref(''),
           fullName: ref(''),
           roles:ref<string[]>([]),
-          group:ref(''),
+          groups:ref<string[]>([]),
+          currentGroup:ref(''),
           branches:ref([]),
           invites : ref([]),
           time:ref(''),
@@ -78,11 +80,19 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               this.email = res.data.email
               this.fullName = res.data.fullName              
               this.branches = res.data.branches
-              this.group = res.data.group
+              this.groups = res.data.groups                            
               this.roles = res.data.roles
               this.time = res.data.time              
               this.invites = res.data.invites
               this.moreProps = res.data.moreProps
+
+              let cachegroup = useCookie('currentGroup').value  ?? ''                            
+              if(!this.groups || !this.groups.includes(cachegroup)){
+                cachegroup=''                
+              }
+              this.currentGroup = cachegroup
+              useNuxtApp().$event('pickGroup',cachegroup)
+
               return Promise.resolve(true)
                 // return true
             }).catch((err:any)=>{            
@@ -183,7 +193,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               branches:this.branches??[],
               invites: this.invites ?? [],
               roles:this.roles,
-              group:this.group,
+              groups:this.groups,
+              currentGroup:this.currentGroup,
               time:this.time,
               moreProps: this.moreProps
               

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

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2024-03-08
  * Author: Ks Tan
  */
 import Ajv from 'ajv';
@@ -28,7 +28,7 @@ export class SimpleAppClient<
   TData extends { _id?: string,created?:string },
   TApi extends crudType,
 > {
-  protected defaultTimeOut=5000
+  // protected defaultTimeOut=5000
   protected docapi;
   public event:Function|null=null;
   public listen:Function|null=null;
@@ -38,11 +38,13 @@ export class SimpleAppClient<
   protected docname = '';
   protected errorlist = ref({});
   protected completeformula = true;
+  protected axios ;
   
   constructor(apiobj: TApi,doctype:string,docname:string) {
     this.docapi = apiobj;
     this.doctype=doctype
     this.docname = docname
+    this.axios = useNuxtApp().$axios
   }
 
   getDocType = () => this.doctype;
@@ -63,7 +65,7 @@ export class SimpleAppClient<
   };
   
   async getById(id?: string) {
-    return await this.docapi.runFindOne(id,{timeout:this.defaultTimeOut})
+    return await this.docapi.runFindOne(id,this.axios)
     .then((res: AxiosResponse) => {
       // if(this.event){this.event('info:getById',res.data)}
       Object.assign(this.data.value, res.data);
@@ -88,7 +90,7 @@ export class SimpleAppClient<
       return await Promise.reject(errors);
     } else {
       return await this.docapi
-        .runCreate(this.data.value,{timeout:this.defaultTimeOut})
+        .runCreate(this.data.value,this.axios)
         .then((res: AxiosResponse) => {
           // if(this.event){this.event('success:create',res.data);return res.data}
           // console.log(this.getDocName(), "ok")
@@ -104,9 +106,9 @@ export class SimpleAppClient<
               documentName:this.getDocName(),
               summary:'Record create failed',
               status:NotificationStatus.error,
-              data:errors.response.data.data
+              data:errors.response.data
             })
-            console.error('error:create',errors.response.data.data)
+            console.error('error:create',errors.response.data)
           return Promise.reject(errors)
         });
     }
@@ -128,7 +130,7 @@ export class SimpleAppClient<
       return await Promise.reject(errors);
     } else {
       return await this.docapi
-        .runUpdate(recordid, this.data.value,{timeout:this.defaultTimeOut})
+        .runUpdate(recordid, this.data.value,this.axios)
         .then((res: AxiosResponse) => {
           // if(this.event){this.event('success:update',res.data)}
           // $event('Notification',{
@@ -144,12 +146,12 @@ export class SimpleAppClient<
             documentName:this.getDocName(),
             summary:'Record update failed',
             status:NotificationStatus.error,
-            data:errors.response.data.data
+            data:errors.response.data
           })
           // console.error('error:update---',errors,",---",errors.message)
           // if(this.event){
           // this.event('error:update',errors.response.data.data)}
-          console.error('error:update',errors.response.data.data)
+          console.error('error:update',errors.response.data)
           return Promise.reject(errors)
         });
     }
@@ -159,7 +161,7 @@ export class SimpleAppClient<
     const {$event} =useNuxtApp()
     const recordid: string = this.data.value._id ?? '';
       return await this.docapi
-        .runPatch(recordid, this.data.value,{timeout:this.defaultTimeOut})
+        .runPatch(recordid, this.data.value,this.axios)
         .then((res: AxiosResponse) => {
           // if(this.event){this.event('success:update',res.data)}
           // $event('Notification',{
@@ -175,12 +177,12 @@ export class SimpleAppClient<
             documentName:this.getDocName(),
             summary:'Record patch failed',
             status:NotificationStatus.error,
-            data:errors.response.data.data
+            data:errors.response.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)
+          console.error('error:patch',errors.response.data)
           return Promise.reject(errors)
         
     })
@@ -190,7 +192,7 @@ export class SimpleAppClient<
       id = this.data.value._id ?? ''
     }
     const {$event} =useNuxtApp()
-    return await this.docapi.runDelete(id,{timeout:this.defaultTimeOut})
+    return await this.docapi.runDelete(id,this.axios)
       .then((res:AxiosResponse)=>{
         // if(this.event){this.event('success:delete',res.data)}
         // $event('Notification',{
@@ -206,14 +208,14 @@ export class SimpleAppClient<
           documentName:this.getDocName(),
           summary:'Record delete failed',
           status:NotificationStatus.error,
-          data:errors.response.data.data
+          data:errors.response.data
         })
-        console.error(errors.response.data.data)
+        console.error(errors.response.data)
         return Promise.reject(errors)
       });
   }
   async search(searchbody:SearchBody) {
-    return await this.docapi.runSearch(searchbody,{timeout:this.defaultTimeOut})
+    return await this.docapi.runSearch(searchbody,this.axios)
         .then((res:AxiosResponse)=>{
           // if(this.event){this.event('info:listready',res.data);}
           return res.data

package/templates/nuxt/simpleapp/generate/commons/documents.ts.eta

@@ -14,7 +14,7 @@ export const getAllDocuments=():DocumentMetaData[]  => [
       <% const conf =  d.schema["x-simpleapp-config"] %>
       {docName:'<%= d['docname'].toLowerCase() %>',docType:'<%= d['doctype'].toUpperCase()%>',page: '<%=d['pagetype']%>', isolationType:'<%=conf['isolationType']%>', 
             documentDate:'<%=conf['documentDate']??""%>', docNumber:<%=conf['generateDocumentNumber']??false%>, 
-            <%if(d['pagetype']){%>viewer: () => import('~/components/viewer/Viewer<%=d['docname']%>.vue'),<%}%>               
+            viewer: () => import('~/components/viewer/Viewer<%=d['docname']%>.vue'),
               docClass: useNuxtApp().$<%=d['docname']%>Doc()},
     <%}%>
   ]

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

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

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

@@ -11,7 +11,7 @@ export enum SimpleAppInputType  {
     'date'='date',
     'time'='time',
     'calendar'='calendar',
-
+    'datetime'='datetime',
 
     'autocomplete'='autocomplete',
     'autocompletemultiple'='autocompletemultiple',
@@ -66,4 +66,5 @@ export type FormMenu = {
     command? : Function
     event?:FormCrudEvent
     [key:string] : any
-}
+}
+

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

@@ -81,7 +81,8 @@ export type UserProfile = {
     created: string;
   }[]
   roles: string[]
-  group: string
+  groups: string[]
+  currentGroup:string
   time: string
   moreProps: any  
 }