@simitgroup/simpleapp-generator 1.5.1-alpha → 1.6.0-alpha

package/templates/nest/src/simpleapp/generate/workflow/workflow.delegate.ts.eta

@@ -1,13 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2024-04-23
  * Author: Ks Tan
  */
 import {
   Injectable,
   InternalServerErrorException,
   Logger,
+  Inject,
 } from '@nestjs/common';
 import {
   IExecution,
@@ -19,13 +20,17 @@ import {
   BPMNServer,
   Execution,
 } from 'bpmn-server';
+import { UserResolverService } from '../../services/userresolver.service';
 import { moddleOptions } from 'bpmn-server/dist/elements/js-bpmn-moddle';
 let mydelegate: WorkflowDelegate;
 @Injectable()
 export class WorkflowDelegate implements IAppDelegate {
   protected logger = new Logger();
   server: BPMNServer;
-  servicesProvider: any = () => new Object();
+
+  @Inject(UserResolverService)
+  servicesProvider: UserResolverService;
+
   constructor() {}
   getServicesProvider = (execution: Execution) => this.servicesProvider;
 
@@ -60,7 +65,7 @@ export class WorkflowDelegate implements IAppDelegate {
 
   async messageThrown(messageId, data, messageMatchingKey: any, item: Item) {
     const msgId = item.node.messageId;
-    item.context.logger.log('Message Issued' + msgId);
+    // item.context.logger.log('Message Issued' + msgId);
     // issue it back for others to receive
     const resp = await item.context.engine.throwMessage(
       msgId,
@@ -68,19 +73,19 @@ export class WorkflowDelegate implements IAppDelegate {
       messageMatchingKey,
     );
     if (resp && resp.instance) {
-      item.context.logger.log(
-        ' invoked another process ' +
-          resp.instance.id +
-          ' for ' +
-          resp.instance.name,
-      );
+      // item.context.logger.log(
+      //   ' invoked another process ' +
+      //     resp.instance.id +
+      //     ' for ' +
+      //     resp.instance.name,
+      // );
     } else await this.issueMessage(messageId, data);
   }
 
   async issueMessage(messageId, data) {}
   async issueSignal(signalId, data) {}
   async signalThrown(signalId, data, messageMatchingKey: any, item: Item) {
-    item.context.logger.log('Signal Issued' + signalId);
+    // item.context.logger.log('Signal Issued' + signalId);
 
     const resp = await item.context.engine.throwSignal(
       signalId,
@@ -88,27 +93,27 @@ export class WorkflowDelegate implements IAppDelegate {
       messageMatchingKey,
     );
     if (resp && resp.instance) {
-      item.context.logger.log(
-        ' invoked another process ' +
-          resp.instance.id +
-          ' for ' +
-          resp.instance.name,
-      );
+      // item.context.logger.log(
+      //   ' invoked another process ' +
+      //     resp.instance.id +
+      //     ' for ' +
+      //     resp.instance.name,
+      // );
     } else await this.issueSignal(signalId, data);
   }
 
   consoleKeyTypes = (obj1) => {
     const keys = Object.getOwnPropertyNames(obj1);
-    console.log('consoleKeyTypesconsoleKeyTypesconsoleKeyTypes', keys);
+    // console.log('consoleKeyTypesconsoleKeyTypesconsoleKeyTypes', keys);
     for (let k = 0; k < keys.length; k++) {
       const key = keys[k];
 
       if (!obj1[key]) {
-        console.log(key, 'empty ');
+        // console.log(key, 'empty ');
       } else if (typeof obj1[key] == 'object') {
-        console.log(key, typeof obj1[key], Object.keys(obj1[key]));
+        // console.log(key, typeof obj1[key], Object.keys(obj1[key]));
       } else {
-        console.log(key, typeof obj1[key], obj1[key]);
+        // console.log(key, typeof obj1[key], obj1[key]);
       }
     }
   };
@@ -165,8 +170,8 @@ export class WorkflowDelegate implements IAppDelegate {
             return (${script});`;
       result = Function(js).bind(scope)();
     } catch (exc) {
-      console.log('error in script evaluation', js);
-      console.log(exc);
+      // console.log('error in script evaluation', js);
+      // console.log(exc);
     }
     return result;
   }
@@ -183,13 +188,13 @@ export class WorkflowDelegate implements IAppDelegate {
             var output=this.output;
             ${script}`;
       result = await new AsyncFunction(js).bind(scope)();
-      scope.token.log('..executing js is done ' + scope.id);
+      // scope.token.log('..executing js is done ' + scope.id);
     } catch (exc) {
-      scope.token.log(
-        'ERROR in executing Script ' + exc.message + '\n' + script,
-      );
-      console.log('error in script execution', js);
-      console.log(exc);
+      // scope.token.log(
+      //   'ERROR in executing Script ' + exc.message + '\n' + script,
+      // );
+      // console.log('error in script execution', js);
+      // console.log(exc);
     }
     return result;
   }

package/templates/nest/src/simpleapp/generate/workflow/workflow.service.ts.eta

@@ -2,7 +2,7 @@ import { error } from 'console';
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-04-19
+ * last change 2024-04-21
  * Author: Ks Tan
  */
 import { WorkflowConfig } from './workflow.config';
@@ -36,12 +36,14 @@ import {
 // import { configuration } from './configuration';
 import { UserContext } from '../commons/user.context';
 import { WorkflowName } from '../types';
+// import { UserResolverService } from '../../services/userresolver.service';
+
 //import * as formschemas from '../../workflow/formschema';
 export {
   WorkflowSettingApiSchema,
   WorkflowDataApiSchema,
 } from './workflow.type';
-
+import { SimpleAppRobotUserService } from 'src/simpleapp/generate/commons/robotuser.service';
 @Injectable()
 export class WorkflowService {
   protected bpmnServer: BPMNServer;
@@ -49,22 +51,27 @@ export class WorkflowService {
   constructor(
     private workflowconfig: WorkflowConfig,
     private eventEmitter: EventEmitter2,
+    // private userResolverService: UserResolverService,
+    private robotUserService: SimpleAppRobotUserService,
   ) {
-    const config  = this.workflowconfig.getConfig()
-    class HiddenLogger implements  ILogger{
-      setOptions(){}
-      clear(){}
-      get(){ return [] as any[]}
-      debug(){}
-      warn(){}
-      info(){}
-      reportError(err:any){
-        console.log("report Error:",err  )
+    const config = this.workflowconfig.getConfig();
+    class HiddenLogger implements ILogger {
+      setOptions() {}
+      clear() {}
+      get() {
+        return [] as any[];
+      }
+      debug() {}
+      warn() {}
+      info() {}
+      reportError(err: any) {
+        // console.log('report Error:', err);
+      }
+      async save(filename: any) {}
+      log() {}
+      error(err: any) {
+        // console.log('Error:', err);
       }
-      async save(filename:any){}
-      log(){}
-      error(err: any){console.log("Error:",err  )
-    }
     }
     this.bpmnServer = new BPMNServer(config, new HiddenLogger());
     this.bpmnServer.listener.on(
@@ -78,14 +85,14 @@ export class WorkflowService {
    * @param appuser
    * @returns array of usertask
    */
-  async getActorUserTask(appuser: UserContext, uid: string) {
+  async getActorUserTask(appuser: UserContext) {
     const tmp: any[] = await this.bpmnServer.dataStore.findItems({
       'items.status': 'wait',
       'data.tenantId': appuser.getTenantId(),
       //filter uid properties base on function
       $or: [
-        { 'items.assignee': appuser.getUname() },
-        { 'items.candidateUsers': appuser.getUname() },
+        { 'items.assignee': appuser.getUid() },
+        { 'items.candidateUsers': appuser.getId() },
         { 'items.candidateGroups': appuser.getGroups() },
       ],
     });
@@ -119,7 +126,7 @@ export class WorkflowService {
    * @returns array of usertask
    */
   async getMyUserTask(appuser: UserContext) {
-    return await this.getActorUserTask(appuser, appuser.getUid());
+    return await this.getActorUserTask(appuser);
   }
 
   /**
@@ -441,9 +448,14 @@ export class WorkflowService {
             schema: schema,
           };
         } else {
-          throw new InternalServerErrorException(
-            `Cannot resolve schema from invalid formKey '${schema}', example: 'jsonschema://SimpleApproveReject' or 'custom://your-custom-key'`,
-          );
+          return {
+            processName: processName,
+            elementId: elementId,
+            schema: 'default',
+          };
+          //throw new InternalServerErrorException(
+          //  `Cannot resolve schema from invalid formKey '${schema}', example: 'jsonschema://SimpleApproveReject' or 'custom://your-custom-key'`,
+          //);
         }
       } else {
         throw new NotFoundException(
@@ -486,6 +498,8 @@ export class WorkflowService {
    * @param event bpmn-server event instance
    */
   async applyEventListener(event) {
+    // console.log("Workflow", event.context.instance.name,", ID:",event.context.item.element.id,
+    // ", Type: " ,event.context.item.element.type, ", name: ", event.context.item.element.name, ", event type: ", event.event)
     if (event.context.item) {
       const workflowName: string = event.context.instance.name;
       const eventType: EXECUTION_EVENT = event.event;
@@ -495,6 +509,7 @@ export class WorkflowService {
       const elementProps = event.context.item.element.def;
       // const usertaskinput = event.context.item.input ?? null;
       const data = event.context.instance.data;
+      const appuser = this.robotUserService.prepareAppUser(data);
       const vars = {};
       Object.assign(vars, event.context.item.input);
       event.context.item.input = {};
@@ -513,7 +528,12 @@ export class WorkflowService {
           else if (eventType == EXECUTION_EVENT.node_wait)
             usertaskeventtype = 'wait';
           // console.log("event-------=================================",eventType,usertaskeventtype)
+          const assignee = event.context.item.assignee;
+          const candidateUsers = event.context.item.candidateUsers;
+          const candidateGroups = event.context.item.candidateGroups;
+
           if (usertaskeventtype) {
+            ('');
             const props: UserTaskData = {
               workflowName: workflowName,
               eventType: usertaskeventtype,
@@ -522,9 +542,9 @@ export class WorkflowService {
               elementName: elementName,
               elementProps: {
                 startedAt: event.context.item.startedAt,
-                assignee: event.context.item.assignee,
-                candidateGroups: event.context.item.candidateGroups,
-                candidateUsers: event.context.item.candidateUsers,
+                assignee: assignee,
+                candidateGroups: candidateGroups,
+                candidateUsers: candidateUsers,
                 dueDate: event.context.item.dueDate,
                 followUpDate: event.context.item.followUpDate,
                 priority: event.context.item.priority,
@@ -534,8 +554,12 @@ export class WorkflowService {
               vars: vars,
               options: options,
             };
+
+            //send notification
             this.eventEmitter.emit(
               `${workflowName}.${elementId}.${usertaskeventtype}`,
+              appuser,
+
               props,
             );
           }
@@ -560,6 +584,7 @@ export class WorkflowService {
             };
             this.eventEmitter.emit(
               `${workflowName}.${elementId}.${servicetaskeventtype}`,
+              // appuser,
               props,
             );
           }
@@ -569,4 +594,48 @@ export class WorkflowService {
       }
     }
   }
+
+  // async userResolver(
+  //   appuser: UserContext,
+  //   userids: string | string[] | undefined,
+  //   data: any,
+  // ) {
+  //   if (!userids) return undefined;
+  //   if (typeof userids == 'string') userids = [userids];
+  //   if (!Array.isArray(userids)) return undefined;
+  //   const newids: string[] = [];
+  //   for (let i = 0; i < userids.length; i++) {
+  //     let uid = userids[i].trim();
+  //     if (
+  //       uid.substring(0, 1) == '@' &&
+  //       uid.includes('[') &&
+  //       uid.includes(']')
+  //     ) {
+  //       const regextype = /(?<=\@)(.*?)(?=\[)/;
+  //       const regexvalue = /(?<=\[)(.*?)(?=\])/;
+
+  //       const usertype = uid.match(regextype)[0].trim();
+  //       const typevalue = uid.match(regexvalue)[0].trim();
+  //       let idvalue = '';
+  //       if (typevalue.substring(0, 6) == '$data.') {
+  //         const fieldpath = typevalue.replace('$data.', '');
+  //         idvalue = this.readFieldFromData(fieldpath, data);
+  //       }
+
+  //       uid = await this.userResolverService.resolve(
+  //         appuser,
+  //         usertype,
+  //         idvalue,
+  //         data,
+  //       );
+  //     }
+  //     if (uid) newids.push(uid);
+  //   }
+
+  //   return newids;
+  // }
+
+  // readFieldFromData(path: string, data: any) {
+  //   return path.split('.').reduce((o, i) => o[i], data);
+  // }
 }

package/templates/nest/src/simpleapp/generate/workflow/workflow.type.ts.eta

@@ -9,9 +9,9 @@ import { UserContext } from '../commons/user.context';
 export type WorkflowSettingApiSchema = {
   userServiceUrl: string;
   callBackUrl?: string;
-  assignee?: string;
-  candidateUsers?: string[];
-  candidategroups?: string[];
+  assignee?: string|string[];
+  candidateGroups?: string | string[];
+  candidateUsers?: string | string[];
 };
 
 export type WorkflowDataApiSchema = {
@@ -70,7 +70,7 @@ export type UserTaskData = {
   vars:any
   elementProps: {
     startedAt: string;
-    assignee?: string;
+    assignee?: string|string[];
     candidateGroups?: string | string[];
     candidateUsers?: string | string[];
     dueDate?: string;

package/templates/nest/src/simpleapp/services/sysmsg.service.ts._etaxxx

@@ -0,0 +1,43 @@
+/**
+ * This file was automatically generated by simpleapp generator. It is changable
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-24
+ * Author: Ks Tan
+ */
+
+import { InjectModel } from '@nestjs/mongoose';
+import { Model } from 'mongoose';
+import { Injectable } from '@nestjs/common';
+import { UserContext } from '../generate/commons/user.context';
+import { SystemmessageProcessor } from '../generate/processors/sysmsg.processor';
+//import { Systemmessage,SystemmessageHooks} from '../generate/types';
+import * as types from '../generate/types';
+export { Systemmessage } from '../generate/types';
+
+@Injectable()
+export class SystemmessageService extends SystemmessageProcessor {
+  public hooks: types.SystemmessageHooks = {
+    afterCreate : async(appuser:UserContext,data:types.Systemmessage) =>
+      await this.afterCreate(appuser,data)
+  };
+  constructor(@InjectModel('Systemmessage') mydoc: Model<types.Systemmessage>) {
+    super(mydoc);
+  }
+
+  async runDefault(appuser: UserContext) {
+    return await this.search(appuser, { uid: appuser.getUid() });
+  }
+  async afterCreate(appuser:UserContext,data:types.Systemmessage){
+    
+  }
+  
+  /***************************** begin x-document-api definitions *****************************************/
+ async runReadmsg(appuser:UserContext,id:string){
+  const data =  await this.findById(appuser, id); 
+  data.read=true
+  await await this.findIdThenUpdate(appuser,id,data)
+  return data
+ }
+ 
+  /***************************** end x-document-api definitions *****************************************/
+}

package/templates/nest/src/simpleapp/services/userresolver.service.ts._eta

@@ -0,0 +1,70 @@
+/**
+ * This file was automatically generated by simpleapp generator. It is changable
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-24
+ * Author: Ks Tan
+ */
+
+import { Injectable } from '@nestjs/common';
+import { SimpleAppRobotUserService } from '../generate/commons/robotuser.service';
+import { UserContext } from '../generate/commons/user.context';
+import { UserService } from './user.service';
+import { TeacherService } from './teacher.service';
+
+
+@Injectable()
+export class UserResolverService {
+  constructor(
+    private userService: UserService,
+    private teacherService: TeacherService,
+    private robotUserService: SimpleAppRobotUserService,
+  ) {}
+  async teacher(assignvalue: string, data: any) {
+    console.log('assign value for teacher', assignvalue);
+
+    const appuser = this.robotUserService.prepareAppUser(data);
+    console.log('gettenant', appuser.getBranchFilter());
+    return this.resolve(appuser, 'teacher', assignvalue, data);
+  }
+  async resolve(appuser: UserContext, usertype: string, id: string, data: any) {
+    let result = '';
+    switch (usertype) {
+      case 'user':
+        result = await this.resolveUser(appuser, id, data);
+        break;
+      case 'teacher':
+        result = await this.resolveTeacher(appuser, id, data);
+        break;
+
+      case 'group':
+        // result = await this.resolveTeacher(appuser,id,data)
+        break;
+    }
+    return result;
+  }
+
+  async getUser(appuser: UserContext, email: string) {
+    if (!email) return undefined;
+    console.log('get user from email ', email);
+    const user = await this.userService.search(appuser, { email: email });
+    console.log('user result', user);
+    if (user && user.length > 0) return user[0].uid;
+    else return undefined;
+  }
+  async resolveTeacher(
+    appuser: UserContext,
+    id: string | undefined,
+    data: any,
+  ) {
+    if (!id) return undefined;
+    console.log('Find teacher::', id);
+    const teacher = await this.teacherService.findById(appuser, id);
+    console.log('teacher', teacher);
+    return this.getUser(appuser, teacher.email);
+  }
+
+  async resolveUser(appuser: UserContext, id: string | undefined, data: any) {
+    const user = await this.userService.findById(appuser, id);
+    return user.uid;
+  }
+}

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

@@ -9,6 +9,9 @@ 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 { UserResolverService } from './services/userresolver.service';
 // auto import modules
 <% for(let i=0;i<it.modules.length; i++){ %>
 <% let obj = it.modules[i]%>
@@ -39,6 +42,7 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
 @Module({
   imports: [
   CloudApiModule,
+  PrintApiModule,
    MongooseModule.forFeature([
         <% for(let i=0;i<it.modules.length; i++){ %>
           <% let obj = it.modules[i]%>
@@ -56,11 +60,11 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
      <%for(let i=0; i<it.allbpmn.length;i++){%>
         <%let bpmn = it.allbpmn[i]%>
         <%=capitalizeFirstLetter(bpmn)%>ListenerService,
-    <%}%>
+    <%}%> UserResolverService,
   ],
   exports:[SimpleAppRobotUserService,AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
     <%= it.modules[i].docname %>Service,
     <%= it.modules[i].docname %>Resolver,
-    <%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,]
+    <%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,UserResolverService,]
 })
 export class GenerateModule {}

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

@@ -17,6 +17,11 @@ export type CodeLabelValue = {
   label: string
   value: number
 }
+export class KeyValue {
+  key: string;
+  value: string;  
+}
+
 export type UserPermission = {
   permId: string;
   branchId: number

package/templates/nuxt/components/button/ButtonAction.vue._eta

@@ -1,12 +1,18 @@
 <template>
-  <ButtonDefault v-if="!actionName" :animate="animate"><slot></slot>def</ButtonDefault>
-  <ButtonPrimary v-else-if="['create', 'update'].includes(actionName)"  :animate="animate"
+  <ButtonDefault v-if="!actionName" :animate="animate"
+    ><slot></slot>def</ButtonDefault
+  >
+  <ButtonPrimary
+    v-else-if="['create', 'update','print'].includes(actionName)"
+    :animate="animate"
     ><slot></slot
   ></ButtonPrimary>
-  <ButtonDanger v-else-if="['delete', 'void'].includes(actionName)"  :animate="animate"
+  <ButtonDanger
+    v-else-if="['delete', 'void'].includes(actionName)"
+    :animate="animate"
     ><slot></slot
   ></ButtonDanger>
-  <ButtonWarning v-else  :animate="animate"><slot></slot></ButtonWarning>
+  <ButtonWarning v-else :animate="animate"><slot></slot></ButtonWarning>
 </template>
 <script setup lang="ts">
 /**
@@ -15,5 +21,5 @@
  * last change 2024-03-01
  * author: Ks Tan
  */
-const props = defineProps<{ actionName?: string; animate?:boolean }>();
+const props = defineProps<{ actionName?: string; animate?: boolean }>();
 </script>

package/templates/nuxt/components/form/{FormBranch.vue.eta → FormBranch.vue._eta}

@@ -42,7 +42,7 @@
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp generator during initialization. 
- * IT IS NOT CHANGABLE
+ * --remove-this-line-to-prevent-override--
  * last change 2024-02-22
  * author: Ks Tan
  */

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

@@ -0,0 +1,38 @@
+<template>
+  <ImageToBase64Uploader
+    v-if="changable"
+    @image-uploaded="handleBase64"
+    #default
+    class="w-20 h-20"
+  >
+    <Avatar
+      :image="getAvatarLink(email ?? '', size)"
+      shape="circle"
+      size="xlarge"
+    />
+  </ImageToBase64Uploader>
+  <div v-else class="inline-block border rounded-lg w-20 h-20">
+    <Avatar
+      :image="getAvatarLink(email ?? '', size)"
+      shape="circle"
+      size="xlarge"
+    />
+  </div>
+</template>
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator during initialization. 
+ * IT IS NOT CHANGABLE
+ * last change 2024-04-06
+ * author: Ks Tan
+ */
+const props = defineProps<{
+  email?: string;
+  size: number;
+  changable: boolean;
+}>();
+const imageData = ref("");
+const handleBase64 = (data: string) => {
+  imageData.value = data;
+};
+</script>

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

@@ -0,0 +1,40 @@
+<template>
+  <ImageToBase64Uploader
+    v-if="changable"
+    #default
+    class="w-20 h-20 place-content-center"
+    @image-uploaded="handleBase64"
+  >
+    <Image :src="imageData"></Image>
+  </ImageToBase64Uploader>
+  <div v-else class="inline-block border rounded-lg w-20 h-20">
+    <Image :src="imageData"></Image>
+  </div>
+</template>
+<script lang="ts" setup>
+// import {KeyValue} from ''
+const props = defineProps<{
+  changable: boolean;
+}>();
+const imageData = ref("");
+const handleBase64 = async (data: string) => {
+  const keyvalue = {
+    key: "organizationLogo",
+    value: data,
+  };
+  
+  const uploadok = await useNuxtApp()
+    .$OrganizationDoc()
+    .getApi()
+    .runUploadlogo(keyvalue);
+  if (uploadok) {
+    await loadLogo();
+  }
+};
+const loadLogo = async () => {
+  await refreshOrgLogo();
+  imageData.value = getOrgLogo();  
+};
+
+onMounted(async () => await loadLogo());
+</script>