@simitgroup/simpleapp-generator 1.2.8 → 1.3.0-alpha

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

@@ -1,300 +1,37 @@
 <template>
-  <div class="grid grid-cols-2">
-    <Card>
-      <template #header>
-        <h1 class="font-bold">{{ usertitle }}</h1>
-      </template>
-      <template #content>
-        <SimpleAppForm :document="userdoc" #default="o">
-          <div class="flex flex-col gap-2">
-            <SimpleAppInput
-              :input-type="SimpleAppInputType.text"
-              autofocus
-              :setting="o.getField('#/properties/fullName')"
-              v-model="userdata.fullName"
-            />
-
-            <SimpleAppInput
-              :input-type="SimpleAppInputType.text"
-              type="email"
-              :setting="o.getField('#/properties/email')"
-              v-model="userdata.email"
-            />
-
-            <SimpleAppInput
-              :input-type="SimpleAppInputType.checkbox"
-              :setting="o.getField('#/properties/active')"
-              v-model="userdata.active"
-            />
-            <SimpleAppInput
-              :input-type="SimpleAppInputType.textarea"
-              :setting="o.getField('#/properties/description')"
-              v-model="userdata.description"
-            />
-            <div>
-              <Button @click="saveUser" class="btn btn-primary">Save</Button>
-              <Button
-                v-if="canPerform('user', 'delete')"
-                @click="deleteUser"
-                class="btn btn-danger"
-                >Delete</Button
-              >
-            </div>
-          </div>
-        </SimpleAppForm>
-      </template>
-    </Card>
-
-    <Card class="m-2">
-      <template #header>
-        <div class="relative w-full ...">
-          <h1 class="font-bold">{{ permissiontitle }}</h1>
-          <div class="absolute top-0 right-0 h-16 w-16 ...">
-            <UserButtonPermissionInfo></UserButtonPermissionInfo>
-          </div>
-        </div>
-      </template>
-      <template #content>
-        <BlockUI :blocked="blockscreen">
-          <!-- <div class="text-right m mr-2">
-            
-          </div> -->
-
-          <div class="">
-            <Card
-              v-if="currentpermissions.length > 0"
-              v-for="o in orglist"
-              class="m-2"
-            >
-              <template #title>{{ o.orgName }}</template>
-              <template #content>
-                <table class="w w-full">
-                  <tr v-for="(b, index) in branchlist">
-                    <td v-if="checkBranchInOrg(o, b)" class="text-center">
-                      {{ b.branchCode }}
-                    </td>
-                    <td
-                      v-if="checkBranchInOrg(o, b)"
-                      class="text-center flex flex-row"
-                    >
-                      <div>
-                        <SelectButton
-                          v-model="currentpermissions[index]['group']"
-                          :options="grouplist"
-                          option-label="label"
-                          option-value="value"
-                          @change="applyPermission(currentpermissions[index])"
-                        ></SelectButton>
-                      </div>
-                    </td>
-                  </tr>
-                </table>
-              </template>
-            </Card>
-          </div>
-        </BlockUI>
-      </template>
-    </Card>
-  </div>
+  <Crud _id="" @after="after" />
 </template>
-<script setup lang="ts">
-// import Card from "primevue/card";
-import { SimpleAppInputType } from "~/types";
-import { Permission, User } from "../../../simpleapp/generate/openapi/api";
-import _ from "lodash";
-import SelectButton from "primevue/selectbutton";
-import { SearchBody, EventType } from "~/types";
-
-import {
-  UserListItem,
-  NotificationStatus,
-  Notification,
-  BranchListItem,
-  OrgListItem,
-  PermissionListItem,
-} from "~/types";
-const {
-  $event,
-  $PermissionDoc,
-  $OrganizationDoc,
-  $BranchDoc,
-  $UserDoc,
-  // $InvitationDoc,
-} = useNuxtApp();
-const userdoc = $UserDoc();
-const userdata = userdoc.getReactiveData();
-const currentpermissions = ref<Permission[]>([]);
-currentpermissions.value = [];
-const blockscreen = ref(false);
-const permlist = ref<PermissionListItem[]>([]);
-// const userlist = ref<UserListItem[]>([]);
-const orglist = ref<OrgListItem[]>([]);
-const branchlist = ref<BranchListItem[]>([]);
-const permdoc = $PermissionDoc();
-const orgdoc = $OrganizationDoc();
-const branchdoc = $BranchDoc();
-const permissiontitle = "Permission Information";
-const usertitle = "User Information";
-const grouplist = getAllGroups().map((item) => {
-  return { value: item, label: _.capitalize(item) };
-});
-
-/**
- * delete user
- * @param user:User object
- */
-const deleteUser = async (user: any) => {
-  await userdoc.delete(String(userdata.value._id));
-  //NotificationEvent
-  $event("RefreshUser", "");
-  goTo("user");
-};
 
-/**********applPermission ******/
+<script setup lang="ts">
 /**
- * apply permission:
- * _id:'', group:'' => skip
- * _id: '', group:'something' => create
- * _id:'something', 'group':'something' => update
- * _id:'something', group:'' => remove
+ * 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
  */
-const applyPermission = async (d: Permission) => {
-  let result;
-  // console.log("apply permission", d);
-  blockscreen.value = true;
-  d._id = String(d._id ?? "");
-  d.group = String(d.group ?? "");
-  permdoc.setNew();
-  const data = permdoc.getReactiveData();
-  data.value = {
-    orgId: d.orgId,
-    branchId: d.branchId,
-    group: d.group,
-    userId: d.userId,
-  };
-  // console.log("apply permission", data.value);
-  if (!d._id && !d.group) {
-    //no changes
-  } else if (!d._id && d.group) {
-    result = await permdoc.create();
-  } else if (d._id && d.group) {
-    data.value = d;
-    result = await permdoc.update();
-  } else if (d._id && !d.group) {
-    d.group = "";
-    data.value = d;
-    result = await permdoc.delete(d._id);
-  } else {
-    console.warn("unknown apply permission", result);
-  }
-  //   refreshList(false);
-  onSelectUser(String(d.userId));
-  blockscreen.value = false;
-};
-
-const checkBranchInOrg = (org: OrgListItem, branch: BranchListItem) => {
-  return org.orgId === branch.orgId;
-};
-
-const saveUser = async () => {
-  await userdoc.update();
-  $event("RefreshUser", "");
-  onSelectUser(String(userdata.value._id));
-};
-
-const onSelectUser = async (userId: string) => {
-  console.log("onSelectUser", userId);
-  // .addRoute()
-  // const user: UserListItem = { ...menuitem };
-  const orgsearchbody: SearchBody = {
-    fields: ["orgId", "orgCode", "orgName", "active"],
-  };
-  const branchsearchbody: SearchBody = {
-    fields: ["orgId", "branchId", "branchCode", "branchName", "active"],
-  };
-  const permsearchbody: SearchBody = {
-    filter: { userId: userId },
-    fields: [
-      "uid",
-      "userId",
-      "branchId",
-      "tenantId",
-      "orgId",
-      "active",
-      "group",
-      "created",
-    ],
-  };
-
-  orglist.value = await orgdoc.search(orgsearchbody);
-  branchlist.value = await branchdoc.search(branchsearchbody);
-  permlist.value = await permdoc.search(permsearchbody);
-  await userdoc.getById(userId);
-  // console.log("orglist.value", orglist.value);
-  // console.log("branchlist.value", branchlist.value);
-  // console.log("permlist.value", permlist.value);
-  // selected.value = String(user._id);
-
-  // activeuser.value = user.fullName;
-  //sso id from keycloak
-  // const uid = String(user.uid);
-  //_id from mongodb
-
-  currentpermissions.value = [];
-
-  for (let i = 0; i < branchlist.value.length; i++) {
-    const b = branchlist.value[i];
-    const permdata = getPermssionData(userId, b.branchId);
-    const tmp: Permission = {
-      _id: permdata?._id,
-      userId: userId,
-      tenantId: b.tenantId,
-      orgId: b.orgId,
-      branchId: b.branchId,
-      group: permdata.group,
-    };
-    currentpermissions.value.push(tmp);
+import Crud from "./form.vue";
+import { User } from "~/simpleapp/generate/types";
+
+const doc = useNuxtApp().$UserDoc();
+
+const props = defineProps<{ _id: string }>();
+const after = (actionName: string, data: User, result: any) => {
+  switch (actionName) {
+    case "new":
+      goTo(doc.getDocName(), "new");
+      break;
+    case "create":
+      goTo(doc.getDocName(), data._id);
+      refreshDocumentList(doc.getDocName());
+      break;
+    case "update":
+      refreshDocumentList(doc.getDocName());
+      break;
+    case "delete":
+      goTo(doc.getDocName(), "new");
+      refreshDocumentList(doc.getDocName());
+      break;
   }
-  // console.log("currentpermissions", currentpermissions);
-  blockscreen.value = false;
 };
-/**
- * prepare dataobj (existing or empty dummy data) for each branch permission
- * @param uid
- * @param branchId
- */
-const getPermssionData = (userId: string, branchId: number) => {
-  // console.log("getPermssionData", userId, branchId);
-  const result = permlist.value.find((item: any) => {
-    // console.log(
-    //   item.userId,
-    //   "== ",
-    //   userId,
-    //   " &&",
-    //   item.branchId,
-    //   "==",
-    //   branchId,
-    // );
-    return item.userId == userId && item.branchId == branchId;
-  });
-
-  //  console.log("permlist.value.",permlist.value,result)
-  let pm: Permission = {
-    _id: result?._id ?? "",
-    orgId: result?.orgId ?? 0,
-    tenantId: result?.tenantId ?? 0,
-    branchId: branchId,
-    userId: userId,
-    group: result?.group ?? "",
-  };
-  return pm;
-};
-
-onMounted(async () => {
-  const id = getPathPara('id')
-  if(id){
-    await onSelectUser(id);
-  }
-  
-});
 </script>

package/templates/nuxt/pages/[xorg]/{organization/[id]/branches/[bid].vue → user/new.vue.eta}

@@ -1,3 +1,7 @@
+<template>
+  <Crud _id="new" @after-create="redirect" />
+</template>
+
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp everytime regenerate code.
@@ -6,8 +10,10 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
-import Crud from "./new.vue";
+
+ import Crud from "./form.vue";const { $UserDoc } = useNuxtApp();
+const doc = $UserDoc();
+const redirect = (data: any) => {
+  goTo(doc.getDocName(), data._id);
+};
 </script>
-<template>
-  <Crud />
-</template>

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

@@ -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/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';
@@ -58,11 +59,9 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           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 ?? [],