@simitgroup/simpleapp-generator 1.0.46 → 1.0.48

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

@@ -12,68 +12,68 @@ import {
   InputTableColumn,
 } from "@simitgroup/simpleapp-vue-component/src/type";
 import Column from "primevue/column";
-const { $OrganizationDoc,$BranchDoc, $listen } = useNuxtApp();
+const { $OrganizationDoc, $BranchDoc, $listen } = useNuxtApp();
 //organization
 const doc = $OrganizationDoc();
 const data = doc.getReactiveData();
 const columns = ["orgCode", "orgName", "description", "tenantId", "orgId"];
-const branchlist = ref()
-const branchdoc = $BranchDoc()
-const branchdata = branchdoc.getReactiveData()
-const currentOrgId=ref()
-const debugdata= ref()
-const showbranchfrom = ref(false)
+const branchlist = ref();
+const branchdoc = $BranchDoc();
+const branchdata = branchdoc.getReactiveData();
+const currentOrgId = ref();
+const debugdata = ref();
+const showbranchfrom = ref(false);
 //branch
 
 const getBranchList = () => {
-  
-  branchdoc.getApi().runSearch({orgId:data.value.orgId}).then((res)=>{
-        branchlist.value =res.data
-      })
-}
-$listen('editRecord',async (editOrgid)=>{
-    //console.log('editRecord',editOrgid)
-    debugdata.value=data.value
-    if(editOrgid){
-      
-      currentOrgId.value=editOrgid
-      getBranchList()           
-    }    
-})
+  branchdoc
+    .getApi()
+    .runSearch({ orgId: data.value.orgId })
+    .then((res) => {
+      branchlist.value = res.data;
+    });
+};
+$listen("editRecord", async (editOrgid) => {
+  //console.log('editRecord',editOrgid)
+  debugdata.value = data.value;
+  if (editOrgid) {
+    currentOrgId.value = editOrgid;
+    getBranchList();
+  }
+});
 
-const editBranch=(recordId:string)=>{
-  console.log("edit nested",currentOrgId,recordId)
-  showbranchfrom.value=true
-  debugdata.value=branchdata.value
-  if(!recordId){
-    branchdoc.setNew()
-  }else{
-    branchdoc.getById(recordId)
+const editBranch = (recordId: string) => {
+  console.log("edit nested", currentOrgId, recordId);
+  showbranchfrom.value = true;
+  debugdata.value = branchdata.value;
+  if (!recordId) {
+    branchdoc.setNew();
+  } else {
+    branchdoc.getById(recordId);
   }
-}
-const saveBranch= async()=>{
-  branchdata.value.orgId=data.value.orgId
+};
+const saveBranch = async () => {
+  branchdata.value.orgId = data.value.orgId;
   branchdata.value.organization = {
     _id: data.value._id,
     orgId: data.value.orgId,
-    label: data.value.orgName
-  }
-  if(branchdata.value._id==''){
-    console.log("Create")
-    await branchdoc.create()
-  }else{
-    console.log("update")
-    await branchdoc.update()
+    label: data.value.orgName,
+  };
+  if (branchdoc.isNew()) {
+    console.log("Create");
+    await branchdoc.create();
+  } else {
+    console.log("update");
+    await branchdoc.update();
   }
-  getBranchList()
-
-}
+  getBranchList();
+};
 
 //end
 </script>
 <template>
   <div>
-    <DebugDocumentData v-model="debugdata"/>
+    <DebugDocumentData v-model="debugdata" />
     <CrudNestedDoc
       :document="doc"
       title="Organization"
@@ -116,33 +116,57 @@ const saveBranch= async()=>{
       </div>
       <div class="grid grid-cols-4 gap-4 w-full">
         <div class="col-span-2">
-          
-          <SimpleAppDatatable v-model="branchlist" :columns="['branchId','branchCode','branchName','active']">
+          <SimpleAppDatatable
+            v-model="branchlist"
+            :columns="['branchId', 'branchCode', 'branchName', 'active']"
+          >
             <template #header>
-              <button class="btn-primary" @click="editBranch('')" type="button" ><span class="pi pi-plus "> </span></button>
-            </template>            
-            <Column header="Action" >
-                  <template #body="{index,data}">
-                    <button type="button" class="btn-primary" @click="editBranch(data._id)">Edit</button>
-                  </template>
-              </Column>   
-            
+              <Button class=" btn-primary" @click="editBranch('')" type="button">
+                <span class="font font-normal">Add Branch</span>
+              </Button>
+            </template>
+            <Column header="Action">
+              <template #body="{ index, data }">
+                <Button
+                  type="button"
+                  class=" btn-primary"
+                  @click="editBranch(data._id)"
+                >
+                  Edit
+                </Button>
+              </template>
+            </Column>
           </SimpleAppDatatable>
         </div>
-        <div class="col-span-2" >
-          <SimpleAppForm :document="branchdoc" #default="o" v-if="showbranchfrom">
-              <SimpleAppText v-model="branchdata.branchCode" :setting="o.getField('#/properties/branchCode')"/>
-              <SimpleAppText v-model="branchdata.branchName" :setting="o.getField('#/properties/branchName')"/>
-              <SimpleAppCheckbox v-model="branchdata.active" :setting="o.getField('#/properties/active')"/>
-              <SimpleAppTextarea v-model="branchdata.description" :setting="o.getField('#/properties/description')"/>
-              <!-- <SimpleAppNumber :readonly="true" v-model="branchdata.orgId" :setting="o.getField('#/properties/orgId')"/> -->
-              <button class="btn-primary" type="button" @click="saveBranch">Save</button>
-              
+        <div class="col-span-2">
+          <SimpleAppForm
+            :document="branchdoc"
+            #default="o"
+            v-if="showbranchfrom"
+          >
+            <SimpleAppText
+              v-model="branchdata.branchCode"
+              :setting="o.getField('#/properties/branchCode')"
+            />
+            <SimpleAppText
+              v-model="branchdata.branchName"
+              :setting="o.getField('#/properties/branchName')"
+            />
+            <SimpleAppCheckbox
+              v-model="branchdata.active"
+              :setting="o.getField('#/properties/active')"
+            />
+            <SimpleAppTextarea
+              v-model="branchdata.description"
+              :setting="o.getField('#/properties/description')"
+            />
+            <!-- <SimpleAppNumber :readonly="true" v-model="branchdata.orgId" :setting="o.getField('#/properties/orgId')"/> -->
+            <Button class=" btn-primary" type="button" @click="saveBranch">
+              Save
+            </Button>
           </SimpleAppForm>
         </div>
-        
       </div>
     </CrudNestedDoc>
-    
   </div>
 </template>

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

@@ -156,7 +156,7 @@ onMounted(() => {
 });
 </script>
 <template>
-  <button @click="refreshList()" class="pi pi-refresh"></button>
+  <Button @click="refreshList()" class="pi pi-refresh"></Button>
   <Dialog
     v-model:visible="showpermissioninfo"
     modal
@@ -204,8 +204,8 @@ onMounted(() => {
                   placeholder="email"
                   v-model="inviteemail"
                 />
-                <button label="Search" class="btn btn-primary" @click="invite"
-                  >Invite</button
+                <Button label="Search" class=" btn-primary" @click="invite"
+                  >Invite</Button
               >
             
             </div>
@@ -221,10 +221,10 @@ onMounted(() => {
                 {{ invitation.email }}
               </div>
               <div>
-                <button
+                <Button
                   class="btn-danger pi pi-times"
                   @click="deleteInvitation(invitation._id)"
-                ></button>
+                ></Button>
               </div>
             </div>
           </div>
@@ -235,10 +235,10 @@ onMounted(() => {
       <div class="flex flex-row w w-full">
         <div class="text text-xl p p-2 text-left flex-1">{{ activeuser }}</div>
         <div class="text-right m mr-2">
-          <button
+          <Button
             class="btn-primary pi pi-question"
             @click="previewPermission"
-          ></button>
+          ></Button>
         </div>
       </div>
 

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

@@ -7,7 +7,7 @@
  */
 import Menu from "primevue/menu";
 import Dialog from "primevue/dialog";
-import {SearchBody} from '~/types'
+import { SearchBody } from "~/types";
 import _ from "lodash";
 import Panel from "primevue/panel";
 import { ref } from "vue";
@@ -67,7 +67,9 @@ const permissiontitle = "Permission Information";
  */
 const refreshList = async (resetpage: boolean = true) => {
   const items: any[] = [];
-  const searchbody: SearchBody = {fields:['uid','email','created','fullname','active']}
+  const searchbody: SearchBody = {
+    fields: ["uid", "email", "created", "fullname", "active"],
+  };
   userlist.value = await userdoc.search(searchbody);
   //listUser();
   // userlist.value = _.uniqBy(permlist.value, "uid");
@@ -90,13 +92,25 @@ const refreshList = async (resetpage: boolean = true) => {
  */
 const onSelectUser = async (menuitem: any) => {
   const user: UserListItem = { ...menuitem };
-  const orgsearchbody: SearchBody = {fields:['orgId','orgCode','orgName','active']}
-  const branchsearchbody: SearchBody = {fields:['orgId','branchId','branchCode','branchName','active']}
+  const orgsearchbody: SearchBody = {
+    fields: ["orgId", "orgCode", "orgName", "active"],
+  };
+  const branchsearchbody: SearchBody = {
+    fields: ["orgId", "branchId", "branchCode", "branchName", "active"],
+  };
   const permsearchbody: SearchBody = {
-    filter:{$or: [{ uid: user.uid }, { user_id: user._id }],},
-    fields:['uid','branchId','tenantId','orgId','active','group','created']
-  }
-  
+    filter: { $or: [{ uid: user.uid }, { user_id: user._id }] },
+    fields: [
+      "uid",
+      "branchId",
+      "tenantId",
+      "orgId",
+      "active",
+      "group",
+      "created",
+    ],
+  };
+
   orglist.value = await orgdoc.search(orgsearchbody);
   branchlist.value = await branchdoc.search(branchsearchbody);
   permlist.value = await permdoc.search(permsearchbody);
@@ -238,21 +252,11 @@ onMounted(() => {
 });
 </script>
 <template>
-  <button
+  <Button
     @click="refreshList()"
     v-if="useRuntimeConfig().public.DEBUGDATA"
     class="pi pi-refresh"
-  ></button>
-  <Dialog
-    v-model:visible="showpermissioninfo"
-    modal
-    :header="permissiontitle"
-    :autoZIndex="false"
-    :style="{ zIndex: 100, width: '80vw' }"
-  >
-    <PermissionInfo></PermissionInfo>
-  </Dialog>
-
+  ></Button>  
   <div class="grid grid-cols-4">
     <div v-if="userlist">
       <TabView>
@@ -281,11 +285,11 @@ onMounted(() => {
                 </div>
                 <div class="basis-1/6 m-2">
                   <!-- only debug mode can delete user -->
-                  <button
+                  <Button
                     v-if="useRuntimeConfig().public.DEBUGDATA"
                     class="pi pi-times btn-danger"
                     @click="deleteUser(item)"
-                  ></button>
+                  ></Button>
                 </div>
               </a>
             </template>
@@ -316,11 +320,11 @@ onMounted(() => {
                 </div>
                 <div class="basis-1/6 m-2">
                   <!-- only debug mode can delete user -->
-                  <button
+                  <Button
                     v-if="useRuntimeConfig().public.DEBUGDATA"
                     class="pi pi-times btn-danger"
                     @click="deleteUser(item)"
-                  ></button>
+                  ></Button>
                 </div>
               </a>
             </template>
@@ -335,9 +339,9 @@ onMounted(() => {
                   placeholder="email"
                   v-model="inviteemail"
                 />
-                <button label="Search" class="btn btn-primary" @click="invite">
+                <Button label="Search" class="btn btn-primary" @click="invite">
                   Invite
-                </button>
+                </Button>
               </div>
             </form>
           </div>
@@ -364,10 +368,10 @@ onMounted(() => {
                   <div class="text text-sm text-right">{{ item.email }}</div>
                 </div>
                 <div class="basis-1/6 m-2">
-                  <button
+                  <Button
                     class="pi pi-times btn-danger"
                     @click="deleteUser(item)"
-                  ></button>
+                  ></Button>
                 </div>
               </a>
             </template>
@@ -415,17 +419,13 @@ onMounted(() => {
       >
         <BlockUI :blocked="blockscreen">
           <div class="text-right m mr-2">
-            <button
-              class="btn-primary pi pi-question"
-              @click="previewPermission"
-            ></button>
+            <ButtonPermissionInfo></ButtonPermissionInfo>           
           </div>
 
           <div class="grid grid-cols-2">
             <Card v-for="o in orglist" class="m-2">
               <template #title>{{ o.orgName }}</template>
               <template #content>
-                
                 <table class="w w-full">
                   <thead class="">
                     <tr>

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

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * You may modify it for your need
- * last change 2023-09-09
- * author: Ks Tan
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
  */
 import _ from "lodash";
 import InputText from "primevue/inputtext";
@@ -11,28 +11,21 @@ import Dialog from "primevue/dialog";
 import { ref, Ref } from "vue";
 import { SimpleAppEventType } from "../simpleapp/generate/commons/events";
 import { TenantDoc } from "../simpleapp/docs/TenantDoc";
-import ProgressSpinner from 'primevue/progressspinner';
+import ProgressSpinner from "primevue/progressspinner";
 import Panel from "primevue/panel";
 import Card from "primevue/card";
 import { AxiosResponse } from "axios";
 
 const { $event, $listen, $userstore } = useNuxtApp();
-const errCreateTenant = ref();
 const branches = ref([]);
-const data = ref();
-const visible = ref(false);
 const userprofile = ref();
-const createtitle = ref("Create My Company");
 const orgList = ref();
-const onhold = ref(false)
+
 const loadProfile = async () => {
   await reloadUserStore();
   userprofile.value = getUserProfile();
   console.log("useprofile", userprofile.value);
-  data.value = {
-    tenantName: "",
-  };
-
+  
   branches.value = userprofile.value.branches;
 
   orgList.value = _.uniqBy(branches.value, "branch.orgId").map((item) => ({
@@ -52,34 +45,6 @@ onMounted(() => {
   loadProfile();
 });
 
-const createTenant = async () => {
-
-  onhold.value=true
-  const { $axios, $listen } = useNuxtApp();
-
-  const openapi = getApi();
-  const apipath = `${useRuntimeConfig().public.API_URL}`;
-  let profileapi = new openapi.PROFILEApi(undefined, apipath, $axios);
-
-  profileapi
-    .createTenant(data.value)
-    .then((res) => {
-      if (res && res.status && res.status == 201) {
-        if (res.data && res.data["xOrg"]) {
-          const xorg = res.data["xOrg"];
-          navigateTo("/" + xorg, { external: true });
-        }
-      }
-
-    })
-    .catch((err) => {
-      errCreateTenant.value = err["message"];
-      console.error("errCreateTenant", err);
-
-    }).finally(()=>{
-      onhold.value=false
-    });
-};
 </script>
 <template>
   <div class="grid grid-cols-2">
@@ -87,38 +52,7 @@ const createTenant = async () => {
     <Panel header="Create New Tenant">
       <div>
         <h1>Create new one?</h1>
-        <DebugDocumentData
-          v-model="data"
-          label="CreateTenant"
-        ></DebugDocumentData>
-        <button class="btn-primary" @click="visible = true">
-          Create My Company
-        </button>
-
-        <Dialog
-          v-model:visible="visible"
-          modal
-          :header="createtitle"
-          class="crudsimple-dialog"
-        >
-          <form @submit.prevent="true" class="flex flex-col text-center">
-
-            <div v-if="errCreateTenant" class="text-error">
-              {{ errCreateTenant }}
-            </div>
-            <ProgressSpinner v-if="onhold"></ProgressSpinner>
-            <InputText v-else
-              type="text"
-              autofocus="true"
-              v-model:model-value="data.tenantName"
-              placeholder="Organization Name"
-            />
-
-            <button class="btn-primary" type="submit" @click="createTenant">
-              Create
-            </button>
-          </form>
-        </Dialog>
+        <ButtonCreateTenant></ButtonCreateTenant>
       </div>
     </Panel>
     <Panel header="Reserved">
@@ -130,11 +64,11 @@ const createTenant = async () => {
       <template #header>
         <div class="flex flex-row">
           <div class="font font-bold">Login To</div>
-          <button
+          <Button
             class="pi pi-refresh ml-4"
             @click="loadProfile"
             v-if="useRuntimeConfig().public.DEBUGDATA"
-          ></button>
+          ></Button>
         </div>
       </template>
       <div class="grid grid-cols-2">
@@ -180,12 +114,3 @@ const createTenant = async () => {
     </Panel>
   </div>
 </template>
-
-<style scoped>
-.p-panel {
-  @apply m-2;
-}
-/* .tenant-link:hover div {
-  @apply bg-gray-300;
-} */
-</style>

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

@@ -1,7 +1,10 @@
-<template>
-  <NuxtPage />
-</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
+ */
 definePageMeta({
   name: "Login",
   auth: false,
@@ -19,3 +22,6 @@ onMounted(async () => {
   await signIn("keycloak", { callbackUrl: callbackUrl });
 });
 </script>
+<template>
+  <NuxtPage />
+</template>

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

@@ -1,21 +1,16 @@
-// import { Tailwind } from 'primevue/passthrough/tailwind';
-import Tailwind from "primevue/passthrough/tailwind";
-
-// const Base64URL =  require('@darkwolf/base64url');
-
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * DO NOT MODIFY IT BY HAND.
- * last change 2023-09-09
- * author: Ks Tan
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
  */
 import { defineNuxtPlugin } from "#app";
 import axios, { Axios, AxiosResponse } from 'axios'
-import PrimeVue from "primevue/config";
+// import PrimeVue from "primevue/config";
 import mitt from 'mitt'
-import ToastService from 'primevue/toastservice';
-import ConfirmationService from 'primevue/confirmationservice';
-import Tooltip from 'primevue/tooltip';
+// import ToastService from 'primevue/toastservice';
+// import ConfirmationService from 'primevue/confirmationservice';
+// import Tooltip from 'primevue/tooltip';
 const emitter = mitt()
 
 export default defineNuxtPlugin( async(nuxtApp) => {
@@ -34,12 +29,14 @@ export default defineNuxtPlugin( async(nuxtApp) => {
         return Promise.reject(error)
       }
     });
-    nuxtApp.vueApp.use(PrimeVue, { ripple: true,Tailwind:true, pt: Tailwind});
-    nuxtApp.vueApp    
-    .use(ToastService)
-    .use(ConfirmationService)
-    .directive('tooltip', Tooltip)
-    ;    
+    
+    // nuxtApp.vueApp.use(PrimeVue, { ripple: true,Tailwind:true, pt: Tailwind});
+    // nuxtApp.vueApp.use(PrimeVue,  { unstyled: true, pt: {} });
+    // nuxtApp.vueApp    
+    // .use(ToastService)
+    // .use(ConfirmationService)
+    // .directive('tooltip', Tooltip)
+    // ;    
 
   
     return {

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

@@ -1,8 +1,15 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { defineNuxtPlugin } from "#app";
 import {PROFILEApi} from '../simpleapp/generate/openapi'
 import axios, { Axios, AxiosResponse } from 'axios'
 import _ from 'lodash'
 
+
 export default defineNuxtPlugin( async(nuxtApp) => {
 
 
@@ -13,6 +20,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           branchId:ref(0),
           branchCode:ref(''),
           branchName:ref(''),
+          orgCode:ref(''),
+          orgName:ref(''),
           uid: ref(''),
           email: ref(''),
           fullName: ref(''),
@@ -45,14 +54,15 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               this.branchId = res.data.branchId
               this.branchCode = res.data.branchCode
               this.branchName = res.data.branchName
+              this.orgCode = res.data.orgCode
+              this.orgName = res.data.orgName
               this.uid = res.data.uid
               this.email = res.data.email
               this.fullName = res.data.fullName              
               this.branches = res.data.branches
               this.group = res.data.group
               this.roles = res.data.roles
-              this.time = res.data.time
-              
+              this.time = res.data.time              
               this.invites = res.data.invites
               
               return Promise.resolve(true)
@@ -66,9 +76,12 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               }
             })            
           },
+          getAvatarLink(size:number){
+            return `https://i.pravatar.cc/${size}`
+          },
           getCurrentXorg(){
             const currentxorg:string = String(useRoute().params.xorg)
-            return _.find(this.branches,{xorg:currentxorg})
+            return currentxorg //_.find(this.branches,{xorg:currentxorg})
           },
           async decideInvitation(id:string,decision:string){
             const apiurl = `${useRuntimeConfig().public.APP_URL}/api`
@@ -125,12 +138,15 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               email : this.email,
               branchCode: this.branchCode,
               branchName: this.branchName,
+              orgCode: this.orgCode,
+              orgName: this.orgName,
               fullName : this.fullName,        
               branches:this.branches??[],
               invites: this.invites ?? [],
               roles:this.roles,
               group:this.group,
               time:this.time,
+              currentxorg: this.getCurrentXorg()
   
               
             }