@simitgroup/simpleapp-generator 1.0.31 → 1.0.33

package/templates/nest/Workflow.eta

@@ -0,0 +1,75 @@
+import { BPMNClient } from "bpmn-client";
+import { UserProvider } from './UserProvider';
+import { Injectable } from '@nestjs/common';
+
+export type UserTaskActorOptions={
+    userId:string
+    actGroups?:string[]
+    actUsers?:string[]
+}
+@Injectable()
+export class Workflow{
+    private static instance: Workflow;
+    server:BPMNClient
+
+    constructor(){
+        this.server= new BPMNClient(process.env.BPMN_HOST, process.env.BPMN_PORT, process.env.BPMN_API_KEY);
+    }
+    public static getInstance(): Workflow {
+        if (!Workflow.instance) {
+            Workflow.instance = new Workflow();
+        }
+        return Workflow.instance;
+      }
+
+    async executeWorkFlow(id: string, bpmnname: string, docstatus: string,data:any) {  
+        const workflowactoroptions : UserTaskActorOptions ={
+            userId:UserProvider.getInstance().getUid(),
+            actGroups:[],
+            actUsers:[]
+        }
+        var instance = await this.server.engine.start(bpmnname, data,null,workflowactoroptions);    
+        const res = {instanceId:instance.id,data:instance.data,name:instance.name,status:instance.status}        
+        return Promise.resolve(res);
+    }
+    async getMyUserTask(){        
+        const uid = UserProvider.getInstance().getUid()
+        const groups = UserProvider.getInstance().getGroups()
+        // 'assignments.candidateUsers': User.getInstance().getUid(),
+        // 'assignments.candidateGroups': User.getInstance().getGroups
+        
+        let anyof:any = [
+            {'items.assignments.assignee':uid},            
+        ]
+        let usersfilter={}
+        usersfilter[uid]={$in: 'items.assignments.candidateUsers'}
+        anyof.push(usersfilter)
+//{'data.tenantId': 1,'$or':[{
+//     'items.assignments.assignee': 'b2a49a8f-a943-4814-8087-60b1ef2f304f'
+// }]}
+        //any of the group
+        for(let i=0;i<groups.length;i++){
+            const gname = groups[i]
+            const tmp = {}
+            tmp[gname]={ $in: 'items.assignments.candidateGroups'}
+            anyof.push(tmp)
+        }
+        const filters = {
+            'data.tenantId': UserProvider.getInstance().getTenantId(),
+            '$or':anyof
+        }
+        console.dir(filters)
+
+        
+        // 'assignments.assignee': User.getInstance().getUid(),     
+        const client = new BPMNClient(process.env.BPMN_HOST, process.env.BPMN_PORT, process.env.BPMN_API_KEY);    
+        const items = await client.datastore.findItems(filters)
+        let data=[]
+        for(let i=0;i<items.length;i++){
+            if(items[i].status=='wait'){
+                data.push(items[i])
+            }
+        }
+        return Promise.resolve(data);
+      }
+}

package/templates/nest/app.controller.eta

@@ -0,0 +1,12 @@
+import { Controller, Get } from '@nestjs/common';
+import { AppService } from './app.service';
+
+@Controller()
+export class AppController {
+  constructor(private readonly appService: AppService) {}
+
+  @Get('myworkflowtask')
+  async getHello() {
+    return await this.appService.getMyTask();
+  }
+}

package/templates/nest/app.module.eta

@@ -10,6 +10,8 @@ import { ConfigModule } from '@nestjs/config';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { join } from 'path';
 import {TenantMiddleware} from './class/TenantMiddleware'
+import {AppController} from './app.controller'
+import {AppService} from './app.service'
 <% for(let i=0;i<it.length; i++){ %>
 import {<%= it[i].docname %>Module} from './docs/<%= it[i].doctype %>/<%= it[i].doctype %>.module'
 <%}%>
@@ -32,8 +34,10 @@ import {<%= it[i].docname %>Module} from './docs/<%= it[i].doctype %>/<%= it[i].
       tokenValidation: TokenValidation.ONLINE,
     }),
     <% for(let i=0;i<it.length; i++){ %><%= it[i].docname %>Module,<%}%>],
-  controllers: [],
-  providers: [ {
+  controllers: [AppController],
+  providers: [
+    AppService,
+    {
     provide: APP_GUARD,     
     useClass: AuthGuard,
   },

package/templates/nest/app.service.eta

@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+import { Workflow } from './class/Workflow';
+@Injectable()
+export class AppService {
+  async getMyTask() {
+    return await Workflow.getInstance().getMyUserTask()
+  }
+}

package/templates/nest/nest.env.eta

@@ -6,6 +6,13 @@ PROJECT_NAME=SimpleApp Demo1
 PROJECT_DESCRIPTION=Try CRUD
 PROJECT_Version=1.0.0
 
+BPMN_HOST=<%=it.bpmnsetting.BPMN_HOST%>
+
+BPMN_PORT=<%=it.bpmnsetting.BPMN_PORT%>
+
+BPMN_API_KEY=<%=it.bpmnsetting.BPMN_API_KEY%>
+
+
 OAUTH2_BASEURL=<%=it.keycloaksetting.OAUTH2_BASEURL%>
 
 OAUTH2_REALM=<%=it.keycloaksetting.OAUTH2_REALM%>

package/templates/nuxt/components.debugdocdata.vue.eta

@@ -29,6 +29,6 @@ const visible = ref(false)
     right: 0;
     background-color: antiquewhite;
     font-size: large;    
-    top: 0;
+    top: 20;
 }
 </style>

package/templates/nuxt/components.menus.vue.eta

@@ -7,14 +7,50 @@
  */
 
 // import MegaMenu from 'primevue/megamenu';
-import Menubar from 'primevue/menubar';
-const route = useRoute()
-const menus = getMenus(route.params.xorg)
+// import Menubar from 'primevue/menubar';
+// const route = useRoute()
+// const menus = getMenus(route.params.xorg)
+import MenuIndex from "../pages/[xorg]/index.vue"
+import TenantIndex from "../pages/index.vue"
+import Dialog from 'primevue/dialog';
+import {ref} from 'vue'
+const visible = ref(false)
+const visibletenant = ref(false)
+const logout = async () => {
+        const { signOut } = useAuth();
+        const { data } = await <any>useFetch('/api/auth/logout');
+        const addPath = encodeURIComponent("/login");
+        signOut({ redirect: false });
+        window.location.href = data?.value?.path + addPath;
+    };
 </script>
 <template>
-    <header>      
+    <!-- <header>       -->
         <!-- <MegaMenu :model="getMenus()" orientation="horizontal" />               -->
-        <Menubar :model="menus">
-        </Menubar>
-    </header>
+    <div class="bg-white border-b-2 border-b-gray-300  h-10 flex">
+        <Dialog v-model:visible="visible" modal header="Pick Document" :autoZIndex="false" :style="{zIndex:100, width: '80vw' }">
+            <MenuIndex></MenuIndex>
+        </Dialog>
+        <Dialog v-model:visible="visibletenant" modal header="Pick Tenant" :autoZIndex="false" :style="{zIndex:100, width: '80vw' }">
+            <TenantIndex></TenantIndex>
+        </Dialog>
+        
+        <div class="flex-1">
+            <NuxtLink to="/"><i class="pi pi-home m-2"></i>Home</NuxtLink>     
+        </div>
+        <div class="flex-1 p-1">
+            <A class="text-center  cursor-pointer"  @click="visible=true"><i class="pi pi-microsoft mr-2"></i>Menu</A>
+        </div>
+        <div class="flex-1 p-1">
+            <A class="text-center  cursor-pointer"  @click="visibletenant=true"><i class="pi pi-globe mr-2"></i>Switch Tenant</A>
+        </div>
+        <div class="flex-1 text-right p-1">
+            <A class=" cursor-pointer" @click="logout()">
+                <i class="pi pi-sign-out mr-2"></i>logout
+            </A>
+        </div>
+            
+        
+    </div>
+    <!-- </header> -->
 </template>

package/templates/nuxt/composables.stringHelper.ts.eta

@@ -0,0 +1,5 @@
+export const camelCaseToWords = (s: string) =>{
+    const result = s.replace(/([A-Z])/g, ' $1');
+    return result.charAt(0).toUpperCase() + result.slice(1);
+  }
+  

package/templates/nuxt/nuxt.config.ts.eta

@@ -30,7 +30,7 @@ tailwindcss: {
   security: {
     //csrf: true,   // been force to off csrf cash it crash with nuxt-auth
   },
-  ssr: true,
+  ssr: false,
   
   css: [
     "primevue/resources/themes/lara-light-blue/theme.css",

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

@@ -2,18 +2,22 @@
 /**
  * This file was automatically generated by simpleapp generator during initialization.
  * You may modify it for your need
- * last change 2023-09-09
+ * last change 2023-09-20
  * author: Ks Tan
  */
- </script>
+ 
+const menus = getMenus();
+</script>
 <template>
   <div>
-  <h1>index page</h1>
-  <ul>
-    <li><NuxtLink :external="true" to="/MS0xLTE" >MS0xLTE (1-1-1)</NuxtLink></li>
-    <li><NuxtLink :external="true" to="/Mi0yLTI" >Mi0yLTI (2-2-2)</NuxtLink></li>
-  </ul>
-  
+    <div class="desktop-shortcut-link">
+      
+        <NuxtLink v-for="menu in menus[1].items"  :external="true" :to="menu.to">
+          <div>
+            {{ camelCaseToWords(menu.label) }}
+          </div>
+        </NuxtLink>
+      
+    </div>
   </div>
-  
 </template>

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

@@ -5,15 +5,65 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
- </script>
+import { ref, Ref } from "vue";
+import { TenantDoc } from "../simpleapp/simpleappdocs/TenantDoc";
+// import OrderList from 'primevue/orderlist';
+import Panel from "primevue/panel";
+
+const { $event, $listen } = useNuxtApp();
+const route = useRoute();
+const doc = new TenantDoc("", $event, $listen);
+type tenantDataType = {
+  tenantId: number;
+  tenantCode: string;
+  tenantName: string;
+  xorg: string;
+};
+const initialtenant: tenantDataType[] = [];
+const tenantlist = ref(initialtenant);
+
+doc.getApi().getMyTenants()
+  .then((res: any) => {
+    for (let i = 0; i < res.data.length; i++) {
+      const x = res.data[i];
+      const tmp: tenantDataType = {
+        xorg: x.xOrg,
+        tenantId: x.tenantId,
+        tenantCode: x.tenantCode,
+        tenantName: x.tenantName,
+      };
+      tenantlist.value.push(tmp);
+    }
+    console.log(tenantlist.value);
+  });
+// const mytenant = doc.get
+</script>
 <template>
   <div>
-  <h1>index page</h1>
-  <ul>
-    <li><NuxtLink :external="true" to="/MS0xLTE" >MS0xLTE (1-1-1)</NuxtLink></li>
-    <li><NuxtLink :external="true" to="/Mi0yLTI" >Mi0yLTI (2-2-2)</NuxtLink></li>
-  </ul>
-  
+    <Panel header="Tenant List">
+      <div>
+        <NuxtLink
+          v-for="item in tenantlist"
+          :external="true"
+          :to="item.xorg"
+          class="tenant-link"
+        >
+          <div class="flex flex-wrap p-2 align-items-center gap-3">
+            <div class="flex-1 flex flex-column gap-2">
+              <span class="font-bold">{{ item.tenantName }}</span>
+              <div class="flex align-items-center gap-2">
+                <span>{{ item.xorg }}</span>
+              </div>
+            </div>
+            <span class="font-bold text-900">{{ item.tenantCode }}</span>
+          </div>
+        </NuxtLink>
+      </div>
+    </Panel>
   </div>
-  
 </template>
+<style scoped>
+.p-panel {
+  @apply m-2;
+}
+</style>

package/templates/nuxt/plugins.simpleapp.ts.eta

@@ -45,6 +45,14 @@ const emitter = mitt()
 export default defineNuxtPlugin((nuxtApp) => {
     //const { csrf } = useCsrf()    
     //axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
+    const myaxios = axios.create()
+    myaxios.interceptors.response.use((response) => response, (error) => {
+      if(error.response.status==401){
+        console.error("sso session expired, redirect to logout page")
+        const { signOut } = useAuth();
+        signOut({redirect:false});
+      }      
+    });
     nuxtApp.vueApp.use(PrimeVue, { ripple: true });
     nuxtApp.vueApp
     .component("SimpleAppAutocomplete",SimpleAppAutocomplete)
@@ -81,7 +89,8 @@ export default defineNuxtPlugin((nuxtApp) => {
     return {
         provide: {
           event: emitter.emit, // Will emit an event
-          listen: emitter.on // Will register a listener for an event
+          listen: emitter.on, // Will register a listener for an event
+          axios: myaxios
         }
     }
     //other components that you need

package/templates/nuxt/server.api.ts.eta

@@ -127,7 +127,8 @@ export default defineEventHandler(async (event) => {
             // console.log('#####################################')
 
             if (error.response?.status && error.response.status == '401') {
-                return reject({ statusMessage: 'Unauthorized', statusCode: 401 });
+                //return reject({ statusMessage: 'Unauthorized', statusCode: 401 });
+                return sendRedirect(event, '/login', 401)
                 // throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
             }
 

package/templates/nuxt/tailwind.css.eta

@@ -5,7 +5,7 @@
 button {
     @apply p-2  border-2
 }
-.simpleapp-input-container{
+.simpleapp-input-container,.simpleapp-input-container,.simpleapp-input-container .simpleapp-inputfield{
     @apply flex flex-col
 }
 .simpleapp-input-container .p-chips ul{
@@ -33,4 +33,17 @@ button {
 }
 .bg-warning{
     @apply bg-orange-600  text-white
+}
+
+.desktop-shortcut-link{
+    @apply m-2 m-2 p-2 space-x-2 rounded-sm text-center grid grid-cols-4 gap-4
+}
+.desktop-shortcut-link div{
+    @apply  bg-teal-300 p-2
+}
+.desktop-shortcut-link div:hover{
+    @apply  bg-teal-600 p-2
+}
+.tenant-link:hover div{
+    @apply bg-gray-300
 }

package/tsconfig.json

@@ -13,5 +13,8 @@
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "paths": {"@": ["./"]}
-    }
+    },
+    "exclude": [
+      "node_modules" , "./dist" , "./tools"
+   ]
   }

package/templates/nest/User.eta

@@ -1,115 +0,0 @@
-import { Injectable, Scope } from '@nestjs/common';
-import Base64URL from '@darkwolf/base64url';
-import  * as jwt from   'jsonwebtoken'
-
-
-
-      
-
-@Injectable({
-  scope: Scope.REQUEST,
-})
-export class User {
-  private static instance: User;
-  protected uid: string = '';
-  protected uname: string = '';
-  protected email: string = '';
-  protected fullname:string=''
-  protected xOrg: string = '';
-  protected tenantId: number = 0;
-  protected orgId: number = 0;
-  protected branchId: number = 0;
-  protected accessrights:any = {}
-  protected token:string = ''
-  protected refreshtoken:string = ''
-  constructor() {}
-  public static getInstance(): User {
-    if (!User.instance) {
-      User.instance = new User();
-    }
-    return User.instance;
-  }
-  setUserToken = (tokenstr: string) => {
-    const tokeninfo = jwt.decode(tokenstr)
-    // realm_access: {
-      //   roles: [
-      //     'default-roles-simitdeveloper',
-      //     'offline_access',
-      //     'uma_authorization'
-      //   ]
-      // },
-      // resource_access: { account: { roles: [Array] } },
-      // scope: 'openid email profile',
-      // sid: '53192f53-d4af-413b-b8d7-1e186419fe53',
-      // email_verified: false,
-      // name: 'kstan kstan',
-      // preferred_username: 'kstan',
-      // given_name: 'kstan',
-      // family_name: 'kstan',
-      // email: 'kstan@simitgroup.com'
-    
-    const u = User.getInstance()
-    u.token = tokenstr
-    u.uid = tokeninfo.sub;
-    u.email = tokeninfo.email
-    u.uname = tokeninfo.preferred_username
-    u.fullname = tokeninfo.name
-    u.accessrights = tokeninfo.resource_access
-  };
-  getInfo = () => {
-    return User.getInstance();
-  };
-  getBranchFilter = () => {
-    return {
-      tenantId: User.getInstance().tenantId,
-      orgId: User.getInstance().orgId,
-      branchId: User.getInstance().branchId,
-    };
-  };
-  getTenantFilter = () => {
-    return { tenantId: User.getInstance().tenantId };
-  };
-  getOrgFilter = () => {
-    return {
-      tenantId: User.getInstance().tenantId,
-      orgId: User.getInstance().orgId,
-    };
-  };
-
-  getCreateFilter = () => {
-    const u = User.getInstance();
-    return {
-      tenantId: u.tenantId,
-      orgId: u.orgId,
-      branchId: u.branchId,
-      createdby: u.uid,
-      updatedby: u.uid,
-      created: new Date().getTime().toString(),
-      updated: new Date().getTime().toString(),
-    };
-  };
-  getUpdateFilter = () => {
-    const u = User.getInstance();
-    return {
-      updatedby: u.uid,
-      updated: new Date().getTime().toString(),
-    };
-  };
-  setXorg = (xorg) => {
-    try {
-      const decodedText: string = Base64URL.decodeText(xorg);
-      const arrXorg = decodedText.split('-');
-
-      if (arrXorg.length == 3) {
-        const u = User.getInstance();
-        u.tenantId = Number(arrXorg[0]);
-        u.orgId = Number(arrXorg[1]);
-        u.branchId = Number(arrXorg[2]);
-      } else {
-        throw 'invalid x-org';
-      }
-    } catch (err) {
-      throw err;
-    }
-  };
-}