@simitgroup/simpleapp-generator 1.0.29 → 1.0.32

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/nest/nest.main.eta

@@ -13,10 +13,10 @@ async function bootstrap() {
         in: 'header',name: 'x-org',type: 'apiKey',description: 'base 64 url encode. example: MS0xLTE',
       },'x-org',)
     .addOAuth2({
-        name:'oauth2',in:'header',type:'oauth2',flows:{          
+        type:'oauth2',flows:{          
           implicit:{          
             authorizationUrl: `${process.env.OAUTH2_CONFIGURL}/protocol/openid-connect/auth`,
-            scopes:[],                      
+            scopes:{},                      
           }}},'oauth2')
     .addSecurityRequirements('x-org')
     .addSecurityRequirements('oauth2')

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

@@ -31,7 +31,7 @@ const router = useRouter()
 const route = useRoute()
 const filters = ref()
 defineShortcuts({
-  'ctrl_i': () => newData()
+  'ctrl_enter': () => newData()
 })
 const refresh = () => {
   obj.list().then((res:any) => {    
@@ -91,7 +91,7 @@ refresh();
  
 <template>
     <div class="simpleapp-crudsimple">    
-      <button class="bg-primary" @click="newData" v-tooltip="'Add new(ctrl+i)'" >New</button>
+      <button class="bg-primary" @click="newData" v-tooltip="'Add new(ctrl+enter)'" >New</button>
       <SimpleAppDatatable
             @row-dblclick="triggerEdit"
             v-model="recordlist"                                 

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

@@ -5,17 +5,23 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
+// import Panel from 'primevue/panel';
+// import ScrollPanel from 'primevue/scrollpanel';
+import Dialog from 'primevue/dialog';
 
+import {ref} from 'vue'
 const modelValue = defineModel()
 const isdebug = ref(useRuntimeConfig().public.DEBUGDATA)
+const visible = ref(false)
 </script>
 <template>
     <div class="floatright" v-if="isdebug=='1'">
-        <h3>data in json</h3>
-            <pre>
-            {{ modelValue }}
-            </pre>
-        </div>
+        <button @click="visible=true">Debug</button>
+        <Dialog v-model:visible="visible" modal header="Debug data" :style="{ width: '80vw' }">
+            <pre>{{ modelValue }}</pre>
+        </Dialog>                
+    </div>
+        
 </template>
 <style scoped>
 .floatright{
@@ -23,6 +29,6 @@ const isdebug = ref(useRuntimeConfig().public.DEBUGDATA)
     right: 0;
     background-color: antiquewhite;
     font-size: large;    
-    top: 0;
+    top: 20;
 }
 </style>

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

@@ -7,14 +7,29 @@
  */
 
 // 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)
+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">
+        
+        <div class="flex-1">
+            <NuxtLink to="/"><i class="pi pi-home m-2"></i>Home</NuxtLink>     
+        </div>
+        <div class="flex-1"></div>
+            <button class="text-right" @click="logout()">
+            <i class="pi pi-sign-out "></i>logout
+        </button>
+    </div>
+    <!-- </header> -->
 </template>

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

@@ -17,11 +17,9 @@ const getAutoComplete = (apiname: string): any => {
     isJsonMime: () => true,
   };
   const docsOpenapi: any = {
-                    'category' : new o.CATApi(config),
-                        'leadtype' : new o.LEADTApi(config),
-                        'level' : new o.LVLApi(config),
-                        'product' : new o.PRDApi(config),
-                        'studentgroup' : new o.STGApi(config),
+            <% for(let i=0;i<it.length; i++){ %>
+                '<%=it[i].docname.toLowerCase()%>': new o.<%=it[i].doctype.toUpperCase()%>Api(config),                
+              <%}%>
           };
   if (!docsOpenapi[apiname]) {
     console.error(

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

@@ -6,7 +6,13 @@
  */
 
 export const getMenus =()=>{
-  
+    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;
+    };
   const route = useRoute();
   const xorg = route.params.xorg
   let data =[];
@@ -19,9 +25,13 @@ export const getMenus =()=>{
                 {label: '<%=obj.docname.toLowerCase()%>', to:`/${xorg}/<%=obj.docname.toLowerCase()%>`},
               <%}%>
       ]},      
+      {label: 'Signout',icon: 'pi pi-fw pi-home', command: () => logout()},
     ]
   }else{
-    data= [{label: 'Home',icon: 'pi pi-fw pi-home', url:'/'},]
+    data= [
+      {label: 'Home',icon: 'pi pi-fw pi-home', url:'/'},
+      {label: 'Signout',icon: 'pi pi-fw pi-home', command: () => logout()},
+      ]
   }
   return data
 }

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

@@ -5,15 +5,16 @@
  * last change 2023-09-09
  * 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">
+      <div v-for="menu in menus[1].items" class="">
+        <NuxtLink :external="true" :to="menu.to">{{ menu.label }}</NuxtLink>
+      </div>
+    </div>
   </div>
-  
 </template>

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

@@ -5,15 +5,68 @@
  * 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()
+  .getMyTenant()
+  .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

@@ -30,6 +30,9 @@ import SimpleAppTextarea from '@simitgroup/simpleapp-vue-component/src/component
 import SimpleAppValue from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppValue.vue'
 import SimpleFieldContainer from '@simitgroup/simpleapp-vue-component/src/components/SimpleFieldContainer.vue'
 import SimpleAppDatatable from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppDatatable.vue'
+import SimpleAppInputTable from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppInputTable.vue'
+import SimpleAppDynamicInput from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppDynamicInput.vue'
+
 import mitt from 'mitt'
 import ToastService from 'primevue/toastservice';
 import ConfirmationService from 'primevue/confirmationservice';
@@ -66,6 +69,10 @@ export default defineNuxtPlugin((nuxtApp) => {
     .component("SimpleAppTextarea",SimpleAppTextarea)
     .component("SimpleAppValue",SimpleAppValue)
     .component("SimpleFieldContainer",SimpleFieldContainer)
+    .component("SimpleAppDatatable",SimpleAppDatatable)
+    .component("SimpleAppDynamicInput",SimpleAppDynamicInput)
+    .component("SimpleAppInputTable",SimpleAppInputTable)
+    
     //.component("Quill",Quill)  // cause problem in ssr mode
     .use(ToastService)
     .use(ConfirmationService)

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,10 +5,18 @@
 button {
     @apply p-2  border-2
 }
-
+.simpleapp-input-container,.simpleapp-input-container,.simpleapp-input-container .simpleapp-inputfield{
+    @apply flex flex-col
+}
+.simpleapp-input-container .p-chips ul{
+    width: 100%
+}
 .input-error{
    @apply text-red-500   
 }
+.input-error input{
+    @apply border-red-600
+ }
 .simpleapp-tool-bar button{
     margin-right: 1rem;
 }
@@ -25,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;
-    }
-  };
-}