@simitgroup/simpleapp-generator 1.6.4-c-alpha → 1.6.4-d-alpha

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -41,6 +41,7 @@ import {
   MoreProjectionType,
   DeleteResultType,
   WorkflowName,
+  TextSearchBody,
 } from '../types';
 @Injectable()
 export class SimpleAppService<T extends { _id?: string; __v?: number }> {
@@ -269,6 +270,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
           .sort(sort);
       } else {
         const pipelines = this.searchToAggregate(
+          appuser,
           filters,
           projection,
           sort,
@@ -293,14 +295,17 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     // return this;
   }
 
-  async fullTextSearch(appuser: UserContext, keyword: string) {
+  async fullTextSearch(appuser: UserContext, body: TextSearchBody) {
     const isolationFilter = { ...this.getIsolationFilter(appuser) };
     this.polishIsolationFilter(isolationFilter);
 
-    const filters = { $text: { $search: keyword } };
+    const filters = { $text: { $search: body.keyword } };
     const newfilters: FilterQuery<T> = { ...filters, ...isolationFilter };
-
-    return await this.doc.find(newfilters);
+    const fields = body.fields;
+    const sorts = body.sorts;
+    //not yet support lookup mapper
+    const lookup = body.lookup;
+    return await this.doc.find(newfilters, fields, sorts);
   }
   async findById(appuser: UserContext, id: string) {
     if (this.hooks.beforeFetchRecord)
@@ -335,7 +340,14 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         await this.validateData(appuser, data);
         this.applyNestedDateTime(appuser, data, 'create');
       }
+
       const result = await this.doc.insertMany(datas);
+      await this.audittrail.addManyEvents(
+        appuser,
+        this.documentName,
+        'createMany',
+        datas,
+      );
       return result;
     } else {
       throw new BadRequestException(
@@ -346,6 +358,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
 
   async create(appuser: UserContext, data: T) {
     let result;
+
     if (!data._id) {
       data._id = crypto.randomUUID();
     }
@@ -354,6 +367,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       dbsession.startTransaction();
     }
 
+
     this.logger.debug(
       'this.withDocNumberFormat :' +
         this.withDocNumberFormat +
@@ -365,7 +379,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       await this.genNewDocNo(appuser, data);
     }
 
-    if (this.hooks.beforeCreate) await this.hooks.beforeCreate(appuser, data);
+    
     let isolationFilter: any = { ...appuser.getCreateFilter() };
     isolationFilter = this.polishIsolationFilter(isolationFilter, data);
 
@@ -379,11 +393,19 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     this.logger.debug(data, `after create validation`);
     this.applyNestedDateTime(appuser, data, 'create');
 
+    if (this.hooks.beforeCreate) await this.hooks.beforeCreate(appuser, data);
     this.logger.debug(data, `Create Record ${this.documentName}`);
     const newdoc = new this.doc(data);
     await this.identifyForeignKeys(appuser, data);
     try {
       result = await newdoc.save({ session: dbsession });
+      await this.audittrail.addEvent(
+        appuser,
+        this.documentName,
+        result._id,
+        'create',
+        data,
+      );
       appuser.addInsertedRecordId(this.documentName, result._id);
     } catch (err) {
       this.logger.error(err);
@@ -543,6 +565,13 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         const result = await this.doc
           .deleteOne(filterIsolation)
           .session(dbsession);
+        await this.audittrail.addEvent(
+          appuser,
+          this.documentName,
+          id,
+          'delete',
+          deletedata,
+        );
 
         appuser.addDeletedRecordId(this.documentName, id);
         const deleteresult: DeleteResultType<T> = {
@@ -576,50 +605,64 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
   // };
 
   findIdThenUpdate = async (appuser: UserContext, id: string, data: T) => {
-    
     try {
-    //version exists, need ensure different only 1
+      //version exists, need ensure different only 1
       const existingdata = await this.findById(appuser, id);
-      if(!existingdata) throw new NotFoundException(`${this.documentName} findIdThenUpdate:  _id:${id} not found`, 'not found');
+      if (!existingdata)
+        throw new NotFoundException(
+          `${this.documentName} findIdThenUpdate:  _id:${id} not found`,
+          'not found',
+        );
 
-      this.logger.debug("update id:"+id,this.documentName+' findIdThenUpdate')
+      this.logger.debug(
+        'update id:' + id,
+        this.documentName + ' findIdThenUpdate',
+      );
       if (typeof data.__v == 'number' && data.__v != existingdata.__v) {
         throw new BadRequestException(
           `You submit older version data "v${data.__v}"" but latest version = "v${existingdata.__v}"`,
         );
       }
-      this.logger.debug("warn1",existingdata)
-    data.__v = existingdata.__v + 1;
-    // if (!existingdata) {
-    //   throw new NotFoundException(`${id} not found`, 'not found');
-    // }
-    this.logger.debug("warn2")
-    if (this.hooks.beforeUpdate)
-      await this.hooks.beforeUpdate(appuser, id, data, existingdata);
+      this.logger.debug('warn1', existingdata);
+      data.__v = existingdata.__v + 1;
+      // if (!existingdata) {
+      //   throw new NotFoundException(`${id} not found`, 'not found');
+      // }
+      this.logger.debug('warn2');
+      if (this.hooks.beforeUpdate)
+        await this.hooks.beforeUpdate(appuser, id, data, existingdata);
+
+      const dbsession = appuser.getDBSession();
+      if (dbsession && !dbsession.inTransaction()) {
+        dbsession.startTransaction();
+      }
+      // try {
+      Object.assign(data, appuser.getUpdateFilter());
+      // Object.assign(existingdata, data);
 
-    const dbsession = appuser.getDBSession();
-    if (dbsession && !dbsession.inTransaction()) {
-      dbsession.startTransaction();
-    }
-    // try {
-    Object.assign(data, appuser.getUpdateFilter());
-    // Object.assign(existingdata, data);
+      delete data['_id'];
+      this.reCalculateValue(data);
 
-    delete data['_id'];
-    this.reCalculateValue(data);
+      // existingdata['_id']=''
+      await this.validateData(appuser, data, id);
 
-    // existingdata['_id']=''
-    await this.validateData(appuser, data, id);
+      const isolationFilter = { ...this.getIsolationFilter(appuser) };
+      this.polishIsolationFilter(isolationFilter);
+      isolationFilter['_id'] = id;
+      this.applyNestedDateTime(appuser, data, 'update');
 
-    const isolationFilter = { ...this.getIsolationFilter(appuser) };
-    this.polishIsolationFilter(isolationFilter);
-    isolationFilter['_id'] = id;
-    this.applyNestedDateTime(appuser, data, 'update');
-    
       const result = await this.doc.findOneAndReplace(isolationFilter, data, {
         session: dbsession,
         new: true,
       });
+      await this.audittrail.addEvent(
+        appuser,
+        this.documentName,
+        id,
+        'update',
+        data,
+      );
+
       appuser.addUpdatedRecordId(this.documentName, data._id);
       if (this.hooks.afterUpdate)
         await this.hooks.afterUpdate(appuser, id, existingdata, result);
@@ -679,7 +722,13 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         session: dbsession,
         new: true,
       });
-
+      await this.audittrail.addEvent(
+        appuser,
+        this.documentName,
+        id,
+        'patch',
+        data,
+      );
       appuser.addUpdatedRecordId(this.documentName, data._id);
 
       if (this.hooks.afterUpdate)
@@ -781,12 +830,27 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       const createresult = await this.create(appuser, data);
       if (this.hooks.afterSetStatus)
         await this.hooks.afterSetStatus(appuser, docstatus, createresult);
+      await this.audittrail.addEvent(
+        appuser,
+        this.documentName,
+        id,
+        docstatus,
+        data,
+      );
+
       return createresult;
     } else {
       const updateresult = await this.findIdThenPatch(appuser, id, data);
       const finaldata = await this.findById(appuser, id);
       if (this.hooks.afterSetStatus)
         await this.hooks.afterSetStatus(appuser, docstatus, finaldata);
+      await this.audittrail.addEvent(
+        appuser,
+        this.documentName,
+        id,
+        docstatus,
+        data,
+      );
 
       this.callWebhook(appuser, docstatus, finaldata);
       return updateresult;
@@ -975,6 +1039,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
   }
 
   searchToAggregate(
+    appuser: UserContext,
     filter: FilterQuery<T>,
     columns: string[],
     sort: string[][],
@@ -1002,6 +1067,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
           as: '_' + to,
           localField: lookup[tokey],
           foreignField: foreignField,
+          pipeline: [{ $match: { tenantId: appuser.getTenantId() } }],
         },
       });
       pipelines.push({ $unwind: '$_' + to });

package/templates/nest/src/simpleapp/profile/profile.service.ts.eta

@@ -103,6 +103,11 @@ export class ProfileService {
     const tenantdata: Tenant = {
       tenantId: 1,
       tenantName: tenantName,
+      clientSetting: {        
+              auditTrail:false,
+              webhook:false,
+              support:false,        
+      },
       active: true,
       owner: {
         _id: appuser.getId(),

package/templates/nest/src/simpleapp/simpleapp.module.ts.eta

@@ -8,9 +8,9 @@ import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import {DocNumberFormatGenerator} from './generate/commons/docnogenerator.service'
 import { AuditTrail } from './generate/commons/audittrail.service';
-import { CloudapiModule } from 'src/cloudapi/cloudapi.module';
-import { PrintapiModule } from 'src/printapi/printapi.module';
-import { RunWebhookService } from 'src/simpleapp/generate/commons/runwebhook.service'
+import { CloudapiModule } from '../cloudapi/cloudapi.module';
+import { PrintapiModule } from '../printapi/printapi.module';
+import { RunWebhookService } from '../simpleapp/generate/commons/runwebhook.service'
 import { UserResolverService } from './services/userresolver.service';
 // auto import modules
 <% for(let i=0;i<it.modules.length; i++){ %>

package/templates/nest/src/simpleapp/types/index.ts._eta

@@ -29,3 +29,17 @@ export type UserPermission = {
   groups: string[]
   userId : string
 }
+export type OutstandingByStudent = {
+  _id: string;
+  student: ForeignKey;
+  level: ForeignKey;
+  totalAmt: number;
+  invoices: ForeignKey[];
+};
+
+export type TextSearchBody = {
+  keyword:string;
+  fields?:string[];
+  sorts?:string[][];
+  lookup?: Record<string,string>;
+}

package/templates/nuxt/app.vue.eta

@@ -1,5 +1,7 @@
 <template>
-  <NuxtLayout :name="getLayout()">     
+  <NuxtLayout>     
+    
+    <!-- <NuxtLayout :name="getLayout()">      -->
     <ConfirmDialog></ConfirmDialog>         
     <DynamicDialog />
     <SessionBlock/>
@@ -28,13 +30,13 @@ watch(()=>useRoute().params['xorg'],async (newval,oldvalue)=>{
 })
 
 const getLayout = ()=>{
-  const { status } = useAuth();   
+  // const { status } = useAuth();   
    
-  if(status.value=='unauthenticated') return 'loginlayout'
-  else {
-    if (isMobile()) return 'mobile'
-    else 'default'
-  } 
+  // if(status.value=='unauthenticated') return 'loginlayout'
+  // else {
+  //   if (isMobile()) return 'mobile'
+  //   else 'default'
+  // } 
 }
 
 onMounted(()=>{

package/templates/nuxt/components/image/ImageAvatar.vue.eta._vue

@@ -1,30 +1,23 @@
 <template>
-  <div class="inline-block border rounded-lg w-20 h-20 bg-white">
-    <Avatar v-if="email"
-      :image="getAvatarLink(<string>email, size)"
+  <div :class="`inline-block border rounded-lg w-${size} h-${size} bg-white`">
+    <Avatar
+      :image="getAvatarLink(<string>id, size*3)"
       shape="circle"
-      size="xlarge"
-    />
-    <Avatar v-else-if="id"
-      :image="getAvatarByUid(<string>id, size)"
-      shape="circle"
-      size="xlarge"
+      class="w-full h-full"
     />
+   
+    
   </div>
-
-  
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator during initialization. 
+ * This file was automatically generated by simpleapp generator during initialization.
  * --remove-this-line-to-prevent-override--
  * last change 2024-04-06
  * author: Ks Tan
  */
 const props = defineProps<{
-  email?: string;
   id?: string;
   size: number;
 }>();
-
 </script>

package/templates/nuxt/components/list/ListView.vue.eta

@@ -1,15 +1,23 @@
-<template>
-  <div class="relative">
-    <div v-if="header">
-      <slot name="header">
-        <TextMain class="text-gray-800 pl-2 pt-2">{{ header }}</TextMain>
-      </slot>
-      <hr class="mt-2" />
-    </div>
-    <div v-if="withFilter" class="flex flex-row p-2">
-      <InputGroup :pt="{ root: { class: 'p-0' } }">
-        <InputGroupAddon
-          v-if="filter !== undefined && Object.keys(filter).length > 0"
+<template>  
+    <Listbox      
+      ref="listview"
+      :options="filterlist" 
+      v-model="selectedItem" 
+      :optionLabel="titleField" 
+      :filter="withFilter"
+      :optionValue="idField"
+      
+      :filterFields="filterFields"
+      :pt="{filterContainer:{class:'p-inputgroup'}}"
+      >          
+      <template #empty>
+          <slot name="nodata">
+              <NodataLarge/>
+          </slot>
+      </template> 
+      <template #filtericon="sss">
+        <!-- <i class="pi pi-refresh"/> -->
+        <InputGroupAddon v-if="filter !== undefined && Object.keys(filter).length > 0"
           :pt="{
             root: {
               class:
@@ -18,20 +26,15 @@
           }"
           @click="showMoreFilter"
         >
-        </InputGroupAddon>
-        <InputGroupAddon
-          v-else
-          :pt="{ root: { class: 'p-0 pi pi-filter cursor-pointer p-3' } }"
-          @click="showMoreFilter"
-        >        
-        </InputGroupAddon>
-        <InputText
-          :placeholder="t('searchKeyword')"
-          v-model="searchvalue"
-          type="search"
-          :pt="{ root: { class: 'p-1' } }"
-          ref="listviewfilter"
-        />
+      </InputGroupAddon>
+      <InputGroupAddon
+        v-else-if="filter !== undefined"
+        :pt="{ root: { class: 'p-0 pi pi-filter cursor-pointer p-3' } }"
+        @click="showMoreFilter"
+      >
+      </InputGroupAddon>
+        <slot name="filterInputGroupAddon"></slot>
+        
         <InputGroupAddon
           :pt="{
             root: {
@@ -42,73 +45,53 @@
           v-if="withAddNew"
           @click="emits('add')"
         >
-
         </InputGroupAddon>
-        <slot name="inputAddOn"></slot>
-      </InputGroup>
-    </div>
-
-    <div
-      v-if="showIndex"
-      class="flex flex-col fixed left-1 top-1/5 gap-2 z-10 rounded border bg-white dark:bg-black opacity-90"
-    >
-      <NuxtLink
-        class="text-primary-600 dark:text-primary-400 text-lg p-2"
-        :url="'#' + l"
-        v-for="l in allLetters"
-        >{{ l }}</NuxtLink
-      >
-    </div>
+      </template>
+      
+      <template #header="{options,value}">                
+          <div>
+            <slot name="header">
+              <TextMain class="text-gray-800 pl-2 pt-2">{{ header }}</TextMain>
+            </slot>
+            <hr class="mt-2" />
+          </div>          
+      </template>
 
-    <div v-if="filterlist && filterlist.length > 0">
-      <div>
-        <div v-for="(item, index) in filterlist">
-          <!-- :class="isMobile() ? '' : 'overflow overflow-y-scroll overflow-auto '" -->
-          <div
-            :id="titleField && item[titleField] && item[titleField][0]"
-          ></div>
-          <div
-            class="w-full bg-gray-400 dark:bg-gray-500 p-1 pl-2 top-0 sticky opacity-90"
-            v-if="
-              showIndex && titleField && showCategoryBar(item[titleField][0])
-            "
-          >
-            <span>{{ item[titleField][0] }}</span>
-          </div>
+      <template #option="{option,index}">
+        <div
+          :id="titleField && option[titleField] && option[titleField][0]"
+        ></div>
+        <div
+          class="w-full bg-gray-400 dark:bg-gray-500 p-1 pl-2 top-0 sticky opacity-90"
+          v-if="
+            showIndex && titleField && showCategoryBar(option[titleField][0])
+          "
+        >
+          <span>{{ option[titleField][0] }}</span>
+        </div>
+        <div class="border-l-none border-r-none listview-item">
+        <!--     :to="getUrl(option)" -->
           <div
-            @click="onClick(index, item, $event)"
-            :class="`border-l-none border-r-none listview-item dark:border-t-gray-700 ${
-              index > 0 ? 'border-t-2' : ''
-            }`"
+        
+            :class="`p-2 ${showClickEffect ? 'listlink' : ''}`"
           >
-            <NuxtLink
-              :to="getUrl(item)"
-              :class="`p-2 ${showClickEffect ? 'listlink' : ''}`"
-            >
-              <slot name="default" :item="item" :index="index">
-                <div class="flex flex-row">
-                  <div class="flex-1 mr-2 dark:text-white">
-                    {{ item[titleField ?? ""] }}
-                  </div>
-                  <div class="text-right dark:text-gray-400 text-gray-600">
-                    {{ item[subTitleField ?? ""] }}
-                  </div>
+            <slot name="default" :item="option" :index="index">
+              <div class="flex flex-row">
+                <div class="flex-1 mr-2 dark:text-white">
+                  {{ option[titleField ?? ""] }}
                 </div>
-              </slot>
-            </NuxtLink>
+                <div class="text-right dark:text-gray-400 text-gray-600">
+                  {{ option[subTitleField ?? ""] }}
+                </div>
+              </div>
+            </slot>
           </div>
         </div>
-      </div>
-    </div>
-    <div v-else>
-      <div class="w-full h-20 p-2 border-l-none border-r-none">
-        <slot name="nodata">
-          <div class="border-round border-1 surface-border p-4 surface-card">
-            {{ t("noDataFound") }}
-          </div>
-        </slot>
-      </div>
-    </div>
+      </template>        
+    </Listbox>        
+  
+    
+  
 
     <Dialog
       v-model:visible="visibleMoreFilter"
@@ -129,7 +112,7 @@
         </div>
       </template>
     </Dialog>
-  </div>
+  
 </template>
 <script setup lang="ts" generic="T extends { [key: string]: any }">
 /**
@@ -141,8 +124,10 @@
 import { ref } from "vue";
 import { ListItem } from "~/types/listview";
 import _ from "lodash";
+const listview = ref(null)
 const visibleMoreFilter = ref(false);
 const listviewfilter = ref();
+const selectedItem = ref('')
 const props = withDefaults(
   defineProps<{
     list: T[];
@@ -150,40 +135,31 @@ const props = withDefaults(
     urlsuffix?: string;
     header?: string;
     titleField?: string;
-    idField?: string;
+    idField: string;
     subTitleField?: string;
     withFilter?: boolean;
     filter?: { [key: string]: any };
     withAddNew?: boolean;
     showIndex?: boolean;
     showClickEffect?: boolean;
+    
   }>(),
   {
     idField: "_id",
   },
 );
+const filterFields=computed(()=>{
+  const fields:string[] = []
+  if(props.titleField) fields.push(props.titleField)
+  if(props.subTitleField) fields.push(props.subTitleField)
+  return fields
+})
 const letters = ref<string[]>([]);
 let lastchar = "";
 
 const emits = defineEmits(["add", "runFilter", "clearFilter", "click"]);
 const searchvalue = ref("");
-const selecteditem = ref("");
-const clickRow = (item: ListItem) => {
-  // emit('clickitem',item)
-  // selecteditem.value = item.code
-};
-const getUrl = (item: any) => {
-  const urlsuffix =
-    props.urlsuffix === undefined || props.urlsuffix == ""
-      ? ""
-      : "/" + props.urlsuffix;
-  if (props.url && props.idField) {
-    if (_.last(props.url) == "/")
-      return `${props.url}${item[props.idField]}${urlsuffix}`;
-    else return `${props.url}/${item[props.idField]}${urlsuffix}`;
-  } else return undefined;
-  // :to="url ? `${url}/${item[idField]}` : undefined"
-};
+
 const filterlist = computed(() => {
   let newlist: T[] = [];
   if (!Array.isArray(props.list)) {
@@ -236,9 +212,6 @@ const showCategoryBar = (letter: string) => {
   }
 };
 
-const onClick = (index: number, data: T, event: Event | MouseEvent) => {
-  emits("click", index, data, event);
-};
 
 const showMoreFilter = () => {
   visibleMoreFilter.value = true;
@@ -251,7 +224,20 @@ const runFilter = () => {
   visibleMoreFilter.value = false;
   emits("runFilter");
 };
-onMounted(() => {
-  // if(props.withFilter) listviewfilter.value.$el.focus()
-});
+
+watch(selectedItem,(newvalue)=>{
+  if(newvalue){
+    emits("click",newvalue);
+    if(props.url){
+      navigateTo(props.url+'/'+newvalue)
+    }
+    
+  }
+})
+
+function setFocus(){
+  const listbodyid = listview.value?.$el?.id
+  document.querySelector(`#${listbodyid} .p-listbox-list`)?.focus()
+}
+defineExpose({setFocus})
 </script>