@simitgroup/simpleapp-generator 1.6.7-m-alpha → 2.0.0-a-alpha

package/templates/nuxt/components/image/ImageOrganization.vue._eta

@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <ImageToBase64Uploader
+      v-if="changable"
+      #default
+      :class="` place-content-center bg-white rounded-md`"
+      @image-uploaded="handleBase64"
+      :imagePath="imagepath"
+    >
+      <!-- {{console.log("imagepath",imagepath)}} -->
+      <NuxtImg
+        v-if="orgRecordId"
+        class="w-full h-full rounded-md"
+        :key="imageKey"
+        :src="imagepath"
+        placeholder="/images/organization.png"
+        @error="onError"
+      />
+    </ImageToBase64Uploader>
+    <div
+      v-else
+      :class="` inline-block rounded-md bg-white text-black`"
+    >
+      <!-- {{console.log("imagepath",imagepath)}} -->
+
+      <NuxtImg
+        v-if="orgRecordId"
+        class="rounded-md min-w-10 min-h-10 h-full"
+        :src="imagepath"
+        placeholder="/images/organization.png"
+        @error="onError"
+      />
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { PHOTOSIZE } from "~/types";
+// import {KeyValue} from ''
+const props = defineProps<{
+  changable?: boolean;
+  orgRecordId?: string;
+  size: PHOTOSIZE;
+}>();
+const imageKey = ref(0);
+const orgRecordId = computed(
+  () => props.orgRecordId ?? getUserProfile()?.orgRecordId,
+);
+const xorgpath = getCurrentXorg() ? `${getCurrentXorg()}/` : "MC0wLTA/";
+const size = props.size ?? PHOTOSIZE.S64;
+const path = useOrganizationInfo().getBranchPhotoUrl(orgRecordId.value, size);
+const imagepath = ref(path)
+
+
+watch(
+  () => props.orgRecordId,
+  () => imageKey.value++,
+);
+const handleBase64 = async (data: string) => {
+  const keyvalue = {
+    key: "organizations/" + props.orgRecordId,
+    value: data,
+  };
+  // console.log("upload logo ", data);
+  const uploadok = await useNuxtApp()
+    .$OrganizationDoc()
+    .getApi()
+    .runUploadPhoto(orgRecordId.value,keyvalue)
+  if (uploadok) {
+    const realpath = `/api/${imagepath}`;
+    await fetch(realpath, { cache: "reload", credentials: "include" });
+    imageKey.value++;
+  }
+};
+const onError = () => {
+  imagepath.value = "/images/organization.png";
+};
+</script>

package/templates/nuxt/components/simpleApp/SimpleAppForm.vue.eta

@@ -47,7 +47,7 @@ const getField = (path: string) => {
   type defaulttype = typeof alldefaults;
   type keytype = keyof defaulttype;
 
-  const x: keytype = ("Default" + props.document.getDocName(true)) as keytype;
+  const x: keytype = ("Default" + props.document.getResourceName()) as keytype;
   const defaultvalue = alldefaults[x](randomUUID());
   return {
     path: path,

package/templates/nuxt/components/simpleApp/SimpleAppFormToolBar.vue._eta

@@ -53,19 +53,24 @@
               :action-name="menu.action"
               >{{ menu.label }}</ButtonAction
             >
-            <ButtonAction
-              v-else
-              :disabled="!canPerform(doc.getDocName(true), menu.action)"
-              @click="emitEvent(menu, $event)"
-              :action-name="menu.action"
-              >{{ menu.label }}</ButtonAction
-            >
+            <template v-else>
+              <ButtonAction
+                v-if="!(hideButtons ?? []).includes(menu.action)"
+                :disabled="!canPerform(doc.getDocName(true), menu.action)"
+                @click="emitEvent(menu, $event)"
+                :action-name="menu.action"
+                >{{ menu.label }}</ButtonAction
+              >
+            </template>
           </div>
         </div>
+        <div><slot name="left"></slot></div>
       </div>
 
       <!-- center -->
-      <div class="flex flex-row"></div>
+      <div class="flex flex-row">
+        <div><slot name="center"></slot></div>
+      </div>
       <!-- right -->
       <div class="flex flex-row gap-2">
         <DebugDocumentData v-model="data" :label="t(doc.getDocName())" />
@@ -82,8 +87,11 @@
             >
           </div>
         </div>
+        <div><slot name="right"></slot></div>
+        <slot name="actions"></slot>
       </div>
     </div>
+    <Toast ref="toast" />
   </div>
 
   <OverlayPanelWithToolBar
@@ -98,13 +106,13 @@
     </template>
     <template #headerCenter>
       <div class="flex flex-row gap-2 justify-center">
-        <Dropdown
+        <Select
           :options="printformats"
           option-label="formatName"
           option-value="formatId"
           v-model="currentprintformat"
           @change="printPdf"
-        ></Dropdown>
+        ></Select>
         <ButtonPrimary @click="showPrintFormats"
           ><i class="pi pi-refresh"
         /></ButtonPrimary>
@@ -183,9 +191,11 @@ const pdfReady = ref(false);
 const props = defineProps<{
   document: SimpleAppClient<any, any>;
   disableaction?: string[];
+  hideButtons?: ("create" | "update" | "delete")[];
 }>();
 const doc = props.document;
 const data = doc.getReactiveData();
+const toast = ref(null);
 
 const createData = async () => {
   try {
@@ -213,11 +223,24 @@ const updateData = async () => {
     console.debug("validation error:", e);
   }
 };
+
 const deleteData = async () => {
   try {
     getRecently().delete(data.value._id);
+    // toast.value?.add({
+    //       severity: 'success',
+    //       summary: 'Success',
+    //       detail: 'The data was deleted successfully.',
+    //       life: 4000,
+    //     });
     return await doc.delete();
   } catch (e) {
+    // toast.value?.add({
+    //       severity: 'error',
+    //       summary: 'Action Denied',
+    //       detail: e,
+    //       life: 4000,
+    //     });
     console.debug("validation error:", e);
   }
 };
@@ -340,17 +363,20 @@ const getActions = () => {
 const showPrintFormats = async () => {
   await printPdf();
 };
-const emitEvent = async (menu: FormMenu, clickEvent: Event | MouseEvent) => {
+const emitEvent = async (menu: FormMenu, clickEvent?: Event | MouseEvent) => {
   if (menu.action == "delete") {
     confirm.require({
-      target: clickEvent.target as HTMLElement,
+      target: clickEvent?.target as HTMLElement,
       header: t("deleteRecord"),
       message: `${t("deleteThisRecord?")}`,
 
       // icon: "pi pi-exclamation-triangle gap-4",
       acceptClass: "bg-danger-600 text-white",
       accept: async () => {
-        if (await deleteData()) emits("on", FormCrudEvent.delete);
+        if (await deleteData()) {
+          emits("on", FormCrudEvent.delete);
+          emitEvent({ action: "exit", type: "menu", label: "" }, clickEvent);
+        }
       },
     });
   } else {
@@ -385,16 +411,22 @@ const getDocActions = () => {
   if (allstatus) {
     const stateconfig = allstatus.find((item) => item.status === docstatus);
     docactionmenus =
-      stateconfig?.actions.map((item) => ({
-        action: item,
-        label: statusNames[item],
-        type: "docstatus",
-        icon: getActionIcon(item),
-        command: emitMobileEvent,
-      })) ?? [];
+      stateconfig?.actions
+        .filter(
+          (item) =>
+            !(props.disableaction && props.disableaction.includes(item)),
+        )
+        .map((item) => ({
+          action: item,
+          label: statusNames[item],
+          type: "docstatus",
+          icon: getActionIcon(item),
+          command: emitMobileEvent,
+        })) ?? [];
   }
   return docactionmenus;
 };
+
 const showMenuButton = (menu: FormMenu) => {
   if (menu.separator) return true;
 
@@ -463,6 +495,49 @@ const togglePdfMenu = async () => {
     files: [file],
   });
 };
+
+// onMounted(() => {
+//   document.onkeydown = async function (e) {
+//     const capturekeys = ['s','d','p']
+
+//   //   let capturekey=''
+//   //   switch (props.actionName) {
+//   //   case "create":
+//   //   case "update":
+//   //   capturekey= "s";
+//   //     break;
+//   //   case "delete":
+//   //   capturekey= "d";
+//   //     break;
+//   //   case "print":
+//   //   capturekey= "p";
+//   //     break;
+//   //   case "confirm":
+//   //   capturekey= "enter";
+//   //     break;
+//   //   case "void":
+//   //   capturekey= "";
+//   //     break;
+//   //   case "draft":
+//   //   capturekey= "";
+//   //     break;
+//   // }
+
+//   // console.log("Capture key",e)
+//   //  if (capturekeys.includes(e.key) && (e.ctrlKey || e.metaKey)) {
+//   //     e.preventDefault();
+//   //     let eventdata={} as FormMenu
+//   //     if(e.key=='s' && doc.isNew()) eventdata.action='create'
+//   //     else if(e.key=='s' && !doc.isNew()) eventdata.action='update'
+//   //     else if(e.key=='d' && !doc.isNew()) eventdata.action='delete'
+//   //     else if(e.key=='p' && !doc.isNew()) eventdata.action='print'
+
+//   //     if(eventdata.action) await emitEvent(eventdata)
+
+//   //   }
+
+//   };
+// });
 </script>
 <style>
 .vue-pdf-embed {

package/templates/nuxt/components/user/UserButtonCreateTenant.vue._eta

@@ -46,33 +46,32 @@ const errCreateTenant = ref();
 const onhold = ref(false);
 
 const createTenant = async () => {
-  holdScreenStart()
+  holdScreenStart();
   onhold.value = true;
-
-  getProfileApi()
-    .createTenant(data.value)
-    .then((res: AxiosResponse) => {
-      if (res && res.status && res.status == 201) {
+  try{
+    const tmp:AxiosResponse = await getProfileApi().createTenant(data.value)
+    const res = tmp.data
+    await reloadUserStore()
+    if (res && res.status && res.status == 201) {
         if (res.data && res.data["xOrg"]) {
           const xorg = res.data["xOrg"];
-          navigateTo("/" + xorg, { external: true });
+          navigateTo("/" + xorg);
         }
       }
-    })
-    .catch((err) => {
-      errCreateTenant.value = err["message"];
-      console.error("errCreateTenant", err.response.data.data);
+  }catch(e){
+    const err = e as AxiosError
+    errCreateTenant.value = err["message"];
+    console.error("errCreateTenant", err.response?.data?.data);
 
-      useNuxtApp().$event("Notification", {
-        documentName: "tenant",
-        status: NotificationStatus.error,
-        summary: t("createError"),
-        data: err.response?.data?.data,
-      });
-    })
-    .finally(() => {
-      onhold.value = false;
-      holdScreenEnd()
+    useNuxtApp().$event("Notification", {
+      documentName: "tenant",
+      status: NotificationStatus.error,
+      summary: t("createError"),
+      data: err.response?.data?.data,
     });
+  }finally{
+     onhold.value = false;
+      holdScreenEnd();
+  }  
 };
 </script>

package/templates/nuxt/components/user/UserTenantPicker.vue._eta

@@ -17,7 +17,7 @@
               </div>
               <div class="flex flex-col w-full justify-end gap-2">
                 <div class="flex flex-row gap-2">
-                  <TextMain>{{ item.branchCode }}</TextMain>
+                  <TextMain>{{ item.branch.label }}</TextMain>
                   <Tag v-for="groupname in item.groups">{{ t(groupname) }}</Tag>
                 </div>
                 <TextSubsubtitle>{{ item.orgName }}</TextSubsubtitle>

package/templates/nuxt/composables/docformat.generate.ts.eta

@@ -4,8 +4,10 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
+import {DOCNOApi} from '~/simpleapp/generate/openapi'
+
 export const getDocFormats = async (doctype:string)=>{    
-    const docno = useNuxtApp().$DocnoformatDoc();
+    const docno = new DOCNOApi(getAxiosConfig())
     const docnoformats = await docno.runListDocFormats(doctype)
-    return docnoformats
+    return docnoformats.data
 }

package/templates/nuxt/enums/enums.generate.ts.eta

@@ -7,7 +7,7 @@
 <% if (module.schema && module.schema.properties) { %>
 <% Object.entries(module.schema.properties).forEach(function([propName, prop]) { %>
 <% if (prop.enum) { %>
-export enum <%= module.docname %><%= propName.charAt(0).toUpperCase() + propName.slice(1) + 'Enum' %> {
+export enum <%=  upperFirstCase(module.docname) %><%= propName.charAt(0).toUpperCase() + propName.slice(1) + 'Enum' %> {
 <% prop.enum.forEach(function(enumValue, index) { %>
 <% if (enumValue === '') { %>
   EMPTY = ''<%= index < prop.enum.length - 1 ? ',' : '' %>

package/templates/nuxt/middleware/30.acl.global.ts.eta

@@ -7,7 +7,7 @@
 import { getUserProfile } from './../composables/getUserStore.generate';
 import  {MenuData} from '~/types'
 export default defineNuxtRouteMiddleware((to, from) => {      
-  const userprofile = getUserProfile()
+  // const userprofile = getUserProfile()
   //skip auto then simply allow
   if(!to.meta.auth){
     return true
@@ -26,12 +26,12 @@ export default defineNuxtRouteMiddleware((to, from) => {
       if(resourcename===undefined){//home page
         
         // return true  //no permission needed
-        if(userprofile.group==''){
-          console.error("no access right to current xorg")
-          return navigateTo('/')
-        }else{
+        //if(userprofile.group==''){
+        //  console.error("no access right to current xorg")
+        //  return navigateTo('/')
+        //}else{
           return true
-        }
+        //}
         
       }else{        
         const {$userstore} = useNuxtApp()  

package/templates/nuxt/nuxt.config.ts._eta

@@ -18,6 +18,7 @@ export default defineNuxtConfig({
             API_URL: process.env.API_URL,
             DEBUGDATA: process.env.DEBUGDATA,
             PROJECT_NAME: process.env.PROJECT_NAME,
+            avatarUrl: "process.env.AVATAR_URL",
         }
     },
     vite: {

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

@@ -2,36 +2,42 @@
   <div class="p-10 m-10 text-3xl border text-center dark:text-white">
     <div class="flex flex-col justify-center">
       <div class="pi pi-spin pi-spinner" style="font-size: 8rem"></div>
-      <div>{{ t("login")+'...' }}</div>
+      <div>{{ t("login") + "..." }}</div>
     </div>
     <!-- <NuxtPage /> -->
   </div>
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-22
- * author: Ks Tan
+ * 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
+  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 });
+onNuxtReady(async () => {
+  setTimeout(async () => {
+    if (getUserProfile().email) {
+      console.log('getUserProfile',getUserProfile().email)
+      navigateTo("picktenant");
+    } else {
+      if (route.query.callbackUrl) {
+        callbackUrl.value = <string>route.query.callbackUrl;
+      } else {
+        callbackUrl.value = "/";
+      }
+      callbackUrl.value = decodeURIComponent(callbackUrl.value);
+      // await signIn("keycloak", { callbackUrl: callbackUrl.value });
+    }
+  }, 2000);
 });
 </script>

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

@@ -1,59 +1,49 @@
 <template>
   <title>{{ t("profile") }}</title>
   <div class="p-4 place-items-center text-center justify-center flex flex-row">
-    <ImageAvatar :size="128" changable class="cursor-pointer"/>
+    <ImageAvatar :size="128" changable class="cursor-pointer" />
   </div>
   <div class="p-4">
     <div class="px-4 sm:px-0">
-      <h3
-        class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-400"
-      >
-        {{ t("userinfo") }}
+      <h3 class="text-base font-semibold leading-7 text-gray-900">
+        {{ t("userInfo") }}
       </h3>
     </div>
     <div class="mt-6 border-t border-gray-100">
       <dl class="divide-y divide-gray-100">
         <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
-          <dt
-            class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
-          >
+          <dt class="text-sm font-medium leading-6 text-gray-900">
             {{ t("fullName") }}
           </dt>
           <dd
-            class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0 dark:text-gray-300"
+            class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0"
           >
             {{ getUserProfile().fullName }}
           </dd>
         </div>
         <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
-          <dt
-            class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
-          >
+          <dt class="text-sm font-medium leading-6 text-gray-900">
             {{ 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"
+            class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0"
           >
-            {{ getUserProfile()?.groups }}
+            {{ capitalizeGroups(getUserProfile()?.groups).join(", ") }}
           </dd>
         </div>
         <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
-          <dt
-            class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
-          >
+          <dt class="text-sm font-medium leading-6 text-gray-900">
             {{ t("email") }}
           </dt>
           <dd
-            class="mt-1 text-sm leading-6 text-gray-700 dark:text-gray-300 sm:col-span-2 sm:mt-0"
+            class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0"
           >
             {{ getProfileEmail() }}
           </dd>
         </div>
 
         <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
-          <dt
-            class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
-          >
+          <dt class="text-sm font-medium leading-6 text-gray-900">
             {{ t("branches") }}
           </dt>
           <dd class="mt-2 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
@@ -65,16 +55,16 @@
                 class="flex items-center justify-between py-4 pl-4 pr-5 text-sm leading-6"
                 v-for="b in getUserProfile().branches"
               >
-                <NuxtLink :href="`/${b.xOrg}`" :external="true">
+                <NuxtLink :href="`/${b.xOrg}`">
                   <div class="flex w-0 flex-1 items-center">
                     <i class="pi pi-sitemap"></i>
                     <div class="ml-4 flex min-w-0 flex-1 gap-2">
                       <span class="truncate font-medium">
                         {{ b.branch.branchName }}
                       </span>
-                      <span class="flex-shrink-0 text-gray-400">{{
-                        b.branch.branchCode
-                      }}</span>
+                      <span class="flex-shrink-0 text-gray-400">
+                        {{ b.branch.branchCode }}
+                      </span>
                     </div>
                   </div>
                   <div class="ml-4 flex-shrink-0">
@@ -92,18 +82,16 @@
         </div>
 
         <div
-          v-if="useRuntimeConfig().public.DEBUGDATA == '1'"
+          v-if="useRuntimeConfig().public.debugData == '1'"
           class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0"
         >
-          <dt
-            class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-400"
-          >
+          <dt class="text-sm font-medium leading-6 text-gray-900">
             {{ 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"
+            class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0"
           >
             <div>
               <p>{{ t("accessRights") }}</p>
@@ -123,9 +111,13 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2023-10-28
  * Author: Ks Tan
  */
+const capitalizeGroups = (groups: string[] | undefined): string[] => {
+  if (!groups) return [];
+  return groups.map((group) => group.charAt(0).toUpperCase() + group.slice(1));
+};
 </script>