@simitgroup/simpleapp-generator 1.6.4-alpha → 1.6.4-b-alpha

package/templates/nuxt/components/renderer/RendererForeignKey.vue.eta

@@ -23,19 +23,24 @@ type SettingProp = { collection: SimpleAppDocumentType; displayField?: string };
 const modelValue = defineModel<ForeignKey>();
 
 const emits = defineEmits(["after"]);
-const props = defineProps<{value?:ForeignKey;  setting: SettingProp }>();
+const props = defineProps<{ value?: ForeignKey; setting: SettingProp }>();
 const displayText = computed(() => {
   const s = props.setting;
   if (!modelValue.value && !props.value) return undefined;
-  else if (!s.collection) return modelValue.value??props.value;
-  else if (s.displayField) return modelValue.value[s.displayField] ??props.value[s.displayField];
-  else return modelValue.value?.label ??props.value?.label;
+  else if (!s.collection) return modelValue.value ?? props.value;
+  else if (s.displayField) {
+    if(modelValue.value) return modelValue.value[s.displayField]
+    else if (props.value) props.value[s.displayField];
+    else return ''
+  }
+    
+  else return modelValue.value?.label ?? props.value?.label;
 });
 const { $event } = useNuxtApp();
 const viewer = ref();
 const viewRecord = () => {
   viewer.value = getDocument(props.setting.collection)?.viewer;
-  const value = modelValue.value?? props.value
+  const value = modelValue.value ?? props.value;
   // getDocumentUrl(setting.collection,modelValue ? modelValue['_id']:'')
   //getDocumentUrl(setting.collection,modelValue ? modelValue['_id']:'')
   $event("ViewRecord", {

package/templates/nuxt/components/select/SelectTemplate.vue.eta

@@ -25,15 +25,17 @@
       filter
       :placeholder="placeholder"
     >
-    <template #value="slotProps">
-      <slot name="value" :slotProps="slotProps">
-      </slot>
-    </template>
-    <template #option="slotProps">
-      <slot name="default" :option="slotProps.option" :index="slotProps.index">
-      </slot>
-    </template>
-      
+      <template #value="slotProps">
+        <slot name="value" :slotProps="slotProps"> </slot>
+      </template>
+      <template #option="slotProps">
+        <slot
+          name="default"
+          :option="slotProps.option"
+          :index="slotProps.index"
+        >
+        </slot>
+      </template>
     </MultiSelect>
     <Dropdown
       class="w-full md:w-full"
@@ -47,13 +49,16 @@
       optionValue="value"
       :placeholder="placeholder"
     >
-    <template #value="slotProps">
-      <slot name="value" :item="getItem(modelValue)"></slot>
-    </template>
-      <template #option="slotProps" >
-        <slot name="default" :option="slotProps.option" :index="slotProps.index"></slot>        
+      <template #value="slotProps">
+        <slot name="value" :item="getItem(modelValue)"></slot>
+      </template>
+      <template #option="slotProps">
+        <slot
+          name="default"
+          :option="slotProps.option"
+          :index="slotProps.index"
+        ></slot>
       </template>
-
     </Dropdown>
   </div>
 </template>
@@ -80,7 +85,7 @@ const props = defineProps<{
 }>();
 // const initvalue = props.multiple==true ? [] : ''
 const modelValue = defineModel<string | string[]>();
-
+const allowAddNew = computed(()=> props.allowAddNew && canPerform(props.documentName,'create'))
 const list = ref<ForeignKey[]>([]);
 const fieldid = randomUUID();
 
@@ -88,7 +93,7 @@ const options = ref<
   {
     value: string;
     label: string;
-    more:any;
+    more: any;
   }[]
 >([]);
 const getListOptions = async () => {
@@ -102,17 +107,17 @@ const getListOptions = async () => {
   options.value = list.value.map((item) => ({
     value: item._id,
     label: item.label,
-    more: item
+    more: item,
   }));
 };
 onMounted(async () => {
-  
   await getListOptions();
   if (modelValue.value) change(modelValue.value);
 });
-const getItem = (id: string) => list.value?.find((item) => {  
-return  item._id == id
-});
+const getItem = (id: string) =>
+  list.value?.find((item) => {
+    return item._id == id;
+  });
 
 const change = (id: string | string[]) => {
   const selectedItem = getItem(id);

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

@@ -285,7 +285,7 @@ const getListFromAutocompleteApi = (event: any) => {
       console.log("Run autocomplete?");
       list.value = res.data;
 
-      if (props.allowAddNew) {
+      if (props.allowAddNew && canPerform(upperFirst(targetDocument),'create')) {
         list.value = list.value.concat({
           _id: "new",
           label: "<" + t("new") + ">",
@@ -333,7 +333,7 @@ const setFocus = (ev: any) => {
 const openViewer = (readonly: boolean) => {
   if (remotedoc) {
     $event("ViewRecord", {
-      _id: (modelValue.value?._id ?? '' )as string,
+      _id: (modelValue.value?._id ?? "") as string,
       eventId: randomUUID(),
       label: (readonly
         ? modelValue.value?.label

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

@@ -2,63 +2,59 @@
   <Calendar
     :pt="pt"
     :inputId="uuid"
-    :path="setting.instancepath"      
+    :path="setting.instancepath"
     v-model="datetimevalue"
-    @update:modelValue="updateDateTime"      
+    @update:modelValue="updateDateTime"
     showButtonBar
     :readonly="readonly"
-    :placeholder="placeholder"     
+    :placeholder="placeholder"
     :showTime="showtime"
     :timeOnly="timeOnly"
     hourFormat="12"
     v-bind="componentProps as CalendarProps"
-  />    
+  />
 </template>
 <script setup lang="ts">
 // :date-format="getDateFormat()"
-import { CalendarProps } from 'primevue/calendar';
-const props =defineProps<{
- pt:any 
- uuid:string
- placeholder?:string
- setting: any;
- readonly?: boolean;
- componentProps?:CalendarProps
- type: "date"|"time"|"datetime"
-}>()
-
-
-const emits = defineEmits(['change'])
-const showtime = props.type == 'date'? false : true
-const timeOnly = props.type=='time'?true:false
+import { CalendarProps } from "primevue/calendar";
+const props = defineProps<{
+  pt: any;
+  uuid: string;
+  placeholder?: string;
+  setting: any;
+  readonly?: boolean;
+  componentProps?: CalendarProps;
+  type: "date" | "time" | "datetime";
+}>();
+
+const emits = defineEmits(["change"]);
+const showtime = props.type == "date" ? false : true;
+const timeOnly = props.type == "time" ? true : false;
 const modelValue = defineModel<string>({ required: true });
 const datetimevalue = ref<Date>();
 
+const refreshFromParent = () => {
+  if (modelValue.value === undefined || modelValue.value == "")
+    datetimevalue.value = undefined;
+  else if (props.type == "time")
+    datetimevalue.value = stringToDate(
+      "2000-01-01 " + (modelValue.value ?? "00:00:00"),
+    );
+  else if (props.type == "date")
+    datetimevalue.value = stringToDate(modelValue.value + "T00:00:00");
+  else datetimevalue.value = stringToDate(modelValue.value);
+};
 
-const refreshFromParent = ()=>{
-if(modelValue.value === undefined || modelValue.value=='')
-datetimevalue.value = undefined
-else if(props.type=='time')
-datetimevalue.value = stringToDate(('2000-01-01 '+modelValue.value??'00:00:00'))
-else if(props.type=='date')
-datetimevalue.value = stringToDate((modelValue.value)+'T00:00:00')
-else
-datetimevalue.value = stringToDate(modelValue.value)
-}
-
-watch(modelValue, () => refreshFromParent())
+watch(modelValue, () => refreshFromParent());
 
 const updateDateTime = (value: any) => {
-if (!value) modelValue.value = "";
-else if(props.type=='datetime')modelValue.value = dateToISOString(value)
-else if(props.type=='date')modelValue.value = dateToString(value)
-else if(props.type=='time') modelValue.value = dateToTimeString(value)
-
-  
+  if (!value) modelValue.value = "";
+  else if (props.type == "datetime") modelValue.value = dateToISOString(value);
+  else if (props.type == "date") modelValue.value = dateToString(value);
+  else if (props.type == "time") modelValue.value = dateToTimeString(value);
 
-emits('change');
+  emits("change");
 };
 
-
-refreshFromParent()
-</script>
+refreshFromParent();
+</script>

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

@@ -47,6 +47,14 @@
         <div v-for="(menu, index) in menus" :key="index">
           <div v-if="menu.label && menu.type == 'crud'">
             <ButtonAction
+              v-if="menu.action == 'print'"
+              :disabled="!canPerform(doc.getDocName(true), 'access')"
+              @click="emitEvent(menu, $event)"
+              :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
@@ -66,6 +74,7 @@
         <div v-for="(menu, index) in menus" :key="index">
           <div v-if="menu.label && menu.type == 'docstatus'">
             <ButtonAction
+              :disabled="!canPerform(doc.getDocName(true), menu.action)"
               @click="emitEvent(menu, $event)"
               :action-name="menu.action"
               >{{ menu.label }}</ButtonAction
@@ -74,22 +83,8 @@
         </div>
       </div>
     </div>
-    <ConfirmPopup></ConfirmPopup>
   </div>
-  <!-- <Dialog v-model:visible="visiblePrintFormats" :header="t('printFormats')">
-    <div>
-      <ListView
-        :list="printformats"
-        #default="{ item, index }"
-        @click="printPdf"
-      >
-        <div class="flex flex-col">
-          <TextBold>{{ t(item.formatName) }}</TextBold>
-          <TextSubtitle>{{ item.description }}</TextSubtitle>
-        </div>
-      </ListView>
-    </div>
-  </Dialog> -->
+
   <OverlayPanelWithToolBar
     v-if="visiblePrintPreview"
     v-model="visiblePrintPreview"
@@ -193,7 +188,12 @@ const data = doc.getReactiveData();
 
 const createData = async () => {
   try {
-    setRecentDocument(data.value._id,{docName:doc.getDocName(),label:title.value})
+    setRecentDocument(data.value._id, {
+      docName: doc.getDocName(),
+      label: title.value,
+      branchId: data.value.branchId,
+      time: new Date().toISOString(),
+    });
     return await doc.create();
   } catch (e) {
     console.debug("validation error:", e);
@@ -201,7 +201,12 @@ const createData = async () => {
 };
 const updateData = async () => {
   try {
-    setRecentDocument(data.value._id,{docName:doc.getDocName(),label:title.value})
+    setRecentDocument(data.value._id, {
+      docName: doc.getDocName(),
+      label: title.value,
+      branchId: data.value.branchId,
+      time: new Date().toISOString(),
+    });
     return await doc.update();
   } catch (e) {
     console.debug("validation error:", e);
@@ -209,7 +214,7 @@ const updateData = async () => {
 };
 const deleteData = async () => {
   try {
-    getRecently().delete(data.value._id)
+    getRecently().delete(data.value._id);
     return await doc.delete();
   } catch (e) {
     console.debug("validation error:", e);
@@ -218,13 +223,27 @@ const deleteData = async () => {
 
 type Datatype = keyof typeof data.value;
 const config = doc.getSchema()["x-simpleapp-config"];
-const titlefield = (config.documentTitle ?? config.uniqueKey) as Datatype;
+const titlefield = (
+  config.allStatus && config.allStatus.length > 0
+    ? config.uniqueKey
+    : config.documentTitle
+) as Datatype;
 const title = computed(() =>
   data.value[titlefield as Datatype]
     ? data.value[titlefield as Datatype]
     : t(doc.getDocName()),
 );
-const printformats = doc.getSchema()["x-simpleapp-config"]?.printFormats;
+const printformats = computed(() => {
+  const formats = doc.getSchema()["x-simpleapp-config"]?.printFormats;
+  if (Array.isArray(formats)) {
+    return formats.map((item) => {
+      item.formatName = t(item.formatName);
+      return item;
+    });
+  } else {
+    return [];
+  }
+});
 const menu = ref();
 const menus = computed(() =>
   [...getActions(), ...getDocActions()].filter((item) => showMenuButton(item)),
@@ -251,11 +270,18 @@ const emitMobileEvent = (itemevent: MenuItemCommandEvent) => {
 
 const printPdf = async (dropdown?: DropdownChangeEvent) => {
   let index = 0;
-
-  if (printformats && printformats.length > 0 && dropdown !== undefined) {
-    index = printformats?.findIndex((item) => item.formatId == dropdown.value);
+  setRecentDocument(data.value._id, {
+    docName: doc.getDocName(),
+    label: title.value,
+    branchId: data.value.branchId,
+    time: new Date().toISOString(),
+  });
+  if (printformats && printformats.value.length > 0 && dropdown !== undefined) {
+    index = printformats.value.findIndex(
+      (item) => item.formatId == dropdown.value,
+    );
   }
-  let format: SchemaPrintFormat = printformats[index];
+  let format: SchemaPrintFormat = printformats.value[index];
   printservererror.value = false;
   const formatid: string = format.formatId;
   currentprintformat.value = formatid;
@@ -295,7 +321,7 @@ const getActions = () => {
       });
     }
   });
-  if (printformats && printformats.length > 0) {
+  if (printformats && printformats.value.length > 0) {
     crudmenus.push({
       action: "print",
       label: t("preview"),
@@ -334,6 +360,12 @@ const emitEvent = async (menu: FormMenu, clickEvent: Event | MouseEvent) => {
     } else if (menu.action == "update") {
       if (await updateData()) emits("on", FormCrudEvent.update);
     } else if (menu.type == "docstatus") {
+      setRecentDocument(data.value._id, {
+        docName: doc.getDocName(),
+        label: title.value,
+        branchId: data.value.branchId,
+        time: new Date().toISOString(),
+      });
       emits("on", FormCrudEvent.setDocStatus, menu.action);
     } else if (menu.action == FormCrudEvent.exit)
       emits("on", FormCrudEvent.exit);

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

@@ -3,6 +3,7 @@
     v-bind="$attrs"
     stripedRows
     resizableColumns
+    :rowClass="()=>'align-top'"
     class="simpleapp-datatable p-datatable-sm"
     :value="modelValue"
   >
@@ -11,16 +12,16 @@
     </template>
     <template #header v-if="!setting.readonly && !readonly">
       <div class="flex flex-row gap-2">
-      <slot name="header">
-        <Button
-          icon="pi pi-plus"
-          @click="addNew()"
-          class="simpleapp-datatable-add btn-primary"
-          type="button"
-          >{{ t("add") }}</Button
-        >
-      </slot>
-    </div>
+        <slot name="header">
+          <Button
+            icon="pi pi-plus"
+            @click="addNew()"
+            class="simpleapp-datatable-add btn-primary"
+            type="button"
+            >{{ t("add") }}</Button
+          >
+        </slot>
+      </div>
     </template>
     <slot>
       <Column class="text-center" header="undefine columns">

package/templates/nuxt/components/user/UserButtonPermissionInfo.vue.eta

@@ -6,6 +6,7 @@
     <Sidebar
       v-model:visible="showpermissioninfo"
       modal
+      :pt="{ root: { class: 'w-2/3' } }"
       :header="permissiontitle"
       position="right"
     >
@@ -55,7 +56,7 @@
             <div class="text text-gray-400">{{ copied }}</div>
           </div>
           <pre id="permissionstr">
-                            {{ permissions }}
+                            {{ computedpermissions }}
                         </pre
           >
         </div>
@@ -65,7 +66,7 @@
           v-else="showjson"
         >
           <div class="m mr-3">{{ res }}</div>
-          <div class="gap-4" v-if="allactions">
+          <div class="gap-4" v-if="allactions" >
             <SelectButton
               v-if="mode == 'edit'"
               multiple
@@ -75,12 +76,12 @@
 
             <span v-else v-for="actionname in allactions[res]" class="m m-1">
               <Chip
-                class="bg-primary"
+                class="bg-primary-600 text-white"
                 v-if="canPerformAction(selectedgroup, res, actionname)"
                 severity="success"
-                :label="actionname"
+                :label="t(actionname)"
               ></Chip>
-              <Chip v-else :label="actionname"></Chip>
+              <Chip v-else :label="t(actionname)"></Chip>
             </span>
           </div>
         </div>
@@ -110,8 +111,16 @@ const mode = ref("preview");
 
 const allresources = getUniqueResource();
 const allactions = ref();
-const permissions = ref();
-
+const permissions = ref<{ [key: string]: string[] }>();
+const computedpermissions = computed(() => {
+  const tmp: { [key: string]: string[] } = {};
+  for (const keyname in permissions.value) {
+    if (permissions.value[keyname].length > 0)
+      tmp[keyname] = permissions.value[keyname];
+  }
+  return tmp;
+  // return permissions.value.filter((item:string[],key:string)=>item.length>0)
+});
 const activeroles = ref();
 const copied = ref("");
 
@@ -136,7 +145,7 @@ const selectGroup = (selectedgroup: any) => {
   permissions.value = {};
   for (let i = 0; i < allresources.length; i++) {
     const r = allresources[i];
-    console.log(r);
+    // console.log(r);
     const actions = getActionFromResource(r);
     allactions.value[r] = actions;
     permissions.value[r] = getGroupResourcePermission(groupname, r).map(

package/templates/nuxt/components/user/UserInvitation.vue.eta

@@ -1,19 +1,29 @@
 <template>
-<Dialog v-model:visible="visible" modal :header="popuptitle" class="crudsimple-dialog" :autoZIndex="false" :style="{zIndex:100 }">            
+  <Dialog
+    v-model:visible="visible"
+    modal
+    :header="popuptitle"
+    class="crudsimple-dialog">
     <div v-if="invites">
-        
-        <div v-for="item in invites" class="w w-auto p p-2 grid grid-cols-3 hover-list-primary border">
-            <div class="flex flex-col col-span-2">
-                <div class="font font-bold">{{item.tenantName}}</div>
-                <div class="text text-xs text-gray-500 italic">{{ item.created }}</div>
-            </div>
-            <div >
-                <Button class="btn-primary" @click="approve(item._id)">Approve</Button>
-                <Button class="btn-danger" @click="decline(item._id)">Decline</Button>
-            </div>
+      <div
+        v-for="item in invites"
+        class="w w-auto p p-2 grid grid-cols-3 hover-list-primary border"
+      >
+        <div class="flex flex-col col-span-2">
+          <div class="font font-bold">{{ item.tenantName }}</div>
+          <div class="text text-xs text-gray-500 italic">
+            {{ item.created }}
+          </div>
         </div>
-    </div>        
-</Dialog>
+        <div class="flex flex-row gap-2">
+          <ButtonPrimary @click="approve(item._id)"
+            >{{t('approve')}}</ButtonPrimary
+          >
+          <ButtonDanger @click="decline(item._id)">{{t('decline')}}</ButtonDanger>
+        </div>
+      </div>
+    </div>
+  </Dialog>
 </template>
 <script setup lang="ts">
 /**
@@ -22,35 +32,33 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-    import Dialog from 'primevue/dialog';
-    import {onMounted, ref} from 'vue'
-    import {EventType} from '../types'
-    import ProgressSpinner from 'primevue/progressspinner'
-    const {$userstore,$event}= useNuxtApp()
-    const disabled = ref(false)
-    const visible=ref(false)
-    const invites = ref()
-    const invitationmsg = "There is some invitation to join their organization:"
-    const popuptitle = ref(invitationmsg)
-    onMounted(()=>{
-        invites.value =  getUserProfile().invites
-        if(invites.value.length>0){
-            visible.value=true
-        }
-    })
-    
-    const approve = async (id:string) =>{
-       
-    //    await reloadUserStore()
-       await $userstore.decideInvitation(id,'accept')
-       $event('InvitationAccepted',id)
-       visible.value=false
-    }
-    const decline = async (id:string) => {
-    //    await reloadUserStore()
-       await $userstore.decideInvitation(id,'reject')
-       $event('InvitationRejected',id)
-       visible.value=false
-    }
-    
-    </script>
+import Dialog from "primevue/dialog";
+import { onMounted, ref } from "vue";
+import { EventType } from "../types";
+import ProgressSpinner from "primevue/progressspinner";
+const { $userstore, $event } = useNuxtApp();
+const disabled = ref(false);
+const visible = ref(false);
+const invites = ref();
+const invitationmsg = "There is some invitation to join their organization:";
+const popuptitle = ref(invitationmsg);
+onMounted(() => {
+  invites.value = getUserProfile().invites;
+  if (invites.value.length > 0) {
+    visible.value = true;
+  }
+});
+
+const approve = async (id: string) => {
+  //    await reloadUserStore()
+  await $userstore.decideInvitation(id, "accept");
+  $event("InvitationAccepted", id);
+  visible.value = false;
+};
+const decline = async (id: string) => {
+  //    await reloadUserStore()
+  await $userstore.decideInvitation(id, "reject");
+  $event("InvitationRejected", id);
+  visible.value = false;
+};
+</script>