@simitgroup/simpleapp-generator 1.3.5-alpha → 1.4.1-alpha

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

@@ -0,0 +1,231 @@
+<template>
+  <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>
+              </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>
+
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+// import userchild from './userchild.vue'
+import Menu from "primevue/menu";
+import Dialog from "primevue/dialog";
+import { SearchBody, EventType, UserProfile } from "~/types";
+import _ from "lodash";
+import Panel from "primevue/panel";
+import { ref } from "vue";
+import {
+  UserListItem,
+  BranchListItem,
+  OrgListItem,
+  PermissionListItem,
+} from "~/types";
+import SelectButton from "primevue/selectbutton";
+import Button from "primevue/button";
+import InputText from "primevue/inputtext";
+import Card from "primevue/card";
+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,
+  $PermissionDoc,
+  $OrganizationDoc,
+  $BranchDoc,
+  $UserDoc,
+  // $InvitationDoc,
+} = useNuxtApp();
+const userid = computed(() => getPathPara("id"));
+const permdoc = $PermissionDoc();
+const orgdoc = $OrganizationDoc();
+const branchdoc = $BranchDoc();
+// const invitedoc = $InvitationDoc();
+const userdoc = $UserDoc();
+const userdata = userdoc.getReactiveData();
+//initialize require list in UI
+const permlist = ref<PermissionListItem[]>([]);
+const userlist = ref<UserListItem[]>([]);
+const orglist = ref<OrgListItem[]>([]);
+const branchlist = ref<BranchListItem[]>([]);
+const currentpermissions = ref<Permission[]>([]);
+const grouplist = getAllGroups().map((item) => {
+  return { value: item, label: _.capitalize(item) };
+});
+
+//initialize some runtime variable
+const blockscreen = ref(false);
+const inviteemail = ref("");
+const selected = ref("");
+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
+ */
+const refreshList = async (resetpage: boolean = true) => {
+  const items: any[] = [];
+  const searchbody: SearchBody = {
+    fields: [
+      "uid",
+      "email",
+      "created",
+      "fullName",
+      "active",
+      "lastActivity",
+      "description",
+    ],
+  };
+  userlist.value = await userdoc.search(searchbody);
+  //listUser();
+  // userlist.value = _.uniqBy(permlist.value, "uid");
+  if (resetpage) {
+    selected.value = "";
+    activeuser.value = "";
+  }
+  blockscreen.value = false;
+  // console.log("userlist", userlist.value);
+};
+
+/**
+ * identity branch object under org
+ * @param org object of org
+ * @param branch object of branch
+ */
+
+/**
+ * generate dialog for view each user group have what permission
+ */
+const previewPermission = () => {
+  showpermissioninfo.value = true;
+};
+
+/***** send or remove invitation  ******/
+
+const invite = async () => {
+  // const invitedata:User = {}
+  const currentuser = getUserProfile();
+  const inviteuserdoc = $UserDoc();
+  inviteuserdoc.setNew();
+  const newuserdata = inviteuserdoc.getReactiveData();
+  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;
+
+  const invitedata = await inviteuserdoc.create();
+  inviteemail.value = "";
+  await refreshList();
+  // onSelectUser(invitedata);
+};
+
+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({
+  menuPath: "setting/user",
+});
+</script>

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

@@ -0,0 +1,35 @@
+<template>
+    <div class="flex flex-col w-full gap-4 p-4">
+      <TextTitle class="text-center">{{ t("pickGroup") }}</TextTitle>
+      <div v-for="(groupName, index) in getUserProfile()?.groups" :key="index">
+        <div
+          class="border rounded-lg bg-primary-500 text-white p-4 text-center"
+          @click="pickGroup(groupName)"
+        >
+          {{ t(groupName) }}
+        </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>
+  

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