@simitgroup/simpleapp-generator 1.0.9 → 1.0.15

package/templates/SimpleAppService.eta

@@ -3,7 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
-
+import foreignkeys from '../dicts/foreignkeys.json';
 import {
   NotFoundException,
   InternalServerErrorException,
@@ -11,9 +11,11 @@ import {
 @Injectable()
 export class SimpleAppService<T extends { _id?: string }> {
   protected jsonschema = { type: 'object', properties: {}, required: [] };
-  protected documentIdentityCode='code'
-  protected documentIdentityName='label'
-  protected LIMITPERPAGE=20
+  protected documentIdentityCode = 'code';
+  protected documentIdentityName = 'label';
+  protected documentName = 'category';
+  protected documentType = 'CAT';
+  protected LIMITPERPAGE = 20;
   protected data: T = { _id: '' } as T;
   protected doc: Model<T>;
   protected errorlist = [];
@@ -24,7 +26,7 @@ export class SimpleAppService<T extends { _id?: string }> {
   setSchema = (newschema) => (this.jsonschema = newschema);
   getSchema = () => this.doc.schema.obj;
   getData = () => {
-    console.log('thisdata', this.data);
+    //console.log('thisdata', this.data);
     return this.data;
   };
   setData = (newdata: T) => {
@@ -44,7 +46,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       throw new InternalServerErrorException(err.message);
     }
   }
-   async getAutoComplete(keyword: string) {
+  async getAutoComplete(keyword: string) {
     try {
       const filter1 = {};
       const filter2 = {};
@@ -69,9 +71,9 @@ export class SimpleAppService<T extends { _id?: string }> {
   }
   async findById(id: string) {
     try {
-      console.log('findById', id);
+      //console.log('findById', id);
       this.data = await this.doc.findById(id);
-      console.log('findById done', this.data);
+      //console.log('findById done', this.data);
     } catch (err) {
       //error
       throw new InternalServerErrorException(err.message);
@@ -81,7 +83,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       //data not found
       throw new NotFoundException('Document Not found:');
     }
-    console.log('this.data', this.data);
+    //console.log('this.data', this.data);
     return this.data;
     // return this;
   }
@@ -104,8 +106,14 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.findIdThenUpdate(id, this.data);
   }
   async delete() {
+    
     const id: string = this.getRecordId();
-    this.findIdThenDelete(id);
+    const dependency = await this.getRelatedRecords(id);
+    if (!dependency) {
+     return await this.findIdThenDelete(id);
+    } else {
+      return dependency;
+    }
   }
   hook(type: string, data: T) {
     return true;
@@ -113,9 +121,12 @@ export class SimpleAppService<T extends { _id?: string }> {
   validateData(data: T) {
     const ajv = new Ajv({ allErrors: true });
     addFormats(ajv);
-    ajv.addFormat('field-autocomplete-code', /.*$/)
-    ajv.addFormat('field-autocomplete-name', /.*$/)
-    ajv.addFormat('autocomplete', /.*$/)
+    ajv.addFormat('field-autocomplete-code', /.*$/);
+    ajv.addFormat('field-autocomplete-name', /.*$/);
+    ajv.addKeyword({
+      keyword: 'x-foreignkey',
+      type: 'string',
+    });
     if (!this.hook('pre-validation', data)) {
       const erromsg: string[] = [];
       for (let i = 0; i < this.errorlist.length; i++) {
@@ -126,7 +137,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     const validate = ajv.compile(this.jsonschema);
     const valid = validate(data);
     if (!valid) {
-      console.log(validate.errors);
+      //console.log(validate.errors);
       const erromsg: string[] = [];
       for (let i = 0; i < validate.errors.length; i++) {
         erromsg.push(validate.errors[i].message);
@@ -139,8 +150,14 @@ export class SimpleAppService<T extends { _id?: string }> {
   async findIdThenDelete(id: string) {
     // const data = await this.findById(id);
     try {
-      const deleteresult = await this.doc.findByIdAndDelete(id);
-      return deleteresult;
+      //console.log('deletedeletedeletedelete');
+      const dependency = await this.getRelatedRecords(id);
+      if (!dependency) {
+        const deleteresult = await this.doc.findByIdAndDelete(id);
+        return deleteresult;
+      } else {
+        return Promise.reject(dependency);
+      }
     } catch (err) {
       throw new InternalServerErrorException(err.message);
     }
@@ -150,13 +167,44 @@ export class SimpleAppService<T extends { _id?: string }> {
     // const existingdata = await this.findById(id);
 
     try {
-      console.log('findIdThenUpdate', id);
+      //console.log('findIdThenUpdate', id);
       this.validateData(data);
       // const result = await existingdata.doc.updateOne(data);
       const result = await this.doc.findByIdAndUpdate(id, data);
+
       return result;
     } catch (err) {
       throw new InternalServerErrorException(err.message);
     }
   }
+
+  //find what foreign key constraint
+  async getRelatedRecords(id: string) {
+    const foreignkeysettings = foreignkeys[this.documentName];
+    //console.log('foreignkeysettings', foreignkeysettings);
+    const propkeys = Object.getOwnPropertyNames(foreignkeysettings);
+
+    if (propkeys.length > 0) {
+      //console.log('Have properties');
+      for (let i = 0; i < propkeys.length; i++) {
+        const collectionname = propkeys[i];
+        //console.log('run ', i, collectionname);
+        const fobjs = foreignkeysettings[propkeys[i]];
+        const collection = this.doc.db.collection(collectionname);
+        //single schema may have multiple foreign key link here, loop all
+        for (let j = 0; j < fobjs.length; j++) {
+          const fkey = fobjs[j];
+          const filter = {};
+          filter[fkey] = id;
+          //console.log('getRelatedRecords get filter', collectionname, filter);
+          const result = await collection.findOne(filter);
+          //console.log('getRelatedRecords', result);
+          if (result) {
+            return Promise.reject(result);
+          }
+        }
+      }
+    }
+    return Promise.resolve(null);
+  }
 }

package/templates/basic/model.eta

@@ -30,6 +30,6 @@ const schemasetting = {
   <%}) %>
 };
 
-export const <%= it.doctype %>MongoSchema = new Schema(schemasetting)
+export const <%= it.doctype %>MongoSchema = new Schema(schemasetting,{collection: '<%= it.name %>'})
   .post('validate', (doc: <%= it.typename %>) => beforeSave(doc))
   .pre('save', () => {});

package/templates/basic/pageindex.vue.eta

@@ -0,0 +1,50 @@
+<template>
+<% let skipcolumns = ['_id','createdby','created','updatedby','updated','organization_id','branch_id','tenant_id','doctype'] %>
+    <div>    
+    <CrudSimple :document="doc"  title="<%= it.typename %>" #default="o" 
+    :listColumns="columns"> 
+    
+      <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+        <% let obj=it.jsonschema.properties[key] %>        
+        <% if(skipcolumns.indexOf(key)>=0){ %>
+        <% } else if(obj.type=='boolean'){ %>
+            <SimpleAppCheckbox :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+        <% } else if(obj.type=='number' || obj.type=='integer'){ %>
+            <SimpleAppNumber :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+        <% } else if(obj.type=='array'  && obj.items && obj.items.type =='string' ){ %>              
+            <SimpleAppChip :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+        <% } else if(obj.type=='object'  && typeof obj['x-foreignkey']!='undefined'){ %>              
+            <SimpleAppAutocomplete :setting="o.getField('#/properties/<%= key %>')"
+                    v-model="data.<%= key %>" optionLabel="label" :remote-src="getAutocomplete('<%=obj['x-foreignkey']%>')"/>
+        <% } else if(obj.type=='string'){ %>            
+                <% if(obj.format=='date'){ %>
+                    <SimpleAppText type="<%=formattype%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% } else if(obj.format=='email'){ %>
+                    <SimpleAppText type="<%=formattype%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% } else if(obj.enum){ %>
+                    <SimpleAppRadio :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+                <% } else {%>
+                        <SimpleAppText :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% }%>  
+        <% } else { %>           
+            <SimpleAppText  :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+        <% }%>
+      <%})%>   
+      
+    </CrudSimple>
+  </div>
+  </template>
+  <script setup lang="ts">
+  import { <%= it.typename %>Doc } from "../../simpleapp/simpleappdocs/<%= it.typename %>Doc";
+  const { $event, $listen } = useNuxtApp();
+  const doc = new <%= it.typename %>Doc($event, $listen);
+  const data = doc.getReactiveData();
+  const columns = [
+    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+        <%let obj=it.jsonschema.properties[key] %>
+        <%if(skipcolumns.indexOf(key)>=0){%>/* skip system columns <%=key%>*/
+        <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',<%}%>
+    <%})%>
+    ]
+  </script>
+  

package/templates/basic/pageindexwithid.vue.eta

@@ -0,0 +1 @@
+<template></template>

package/templates/basic/{apiclient.eta → simpleappclient.eta}

@@ -4,6 +4,7 @@
  * and regenerate this file.
  */
 import { SimpleAppClient } from "@simitgroup/simpleapp-vue-component/src/SimpleAppClient";
+
 // import { JSONSchema7 } from 'json-schema';
 import { Configuration,
       <%= it.doctype.toUpperCase()%>Api, 
@@ -20,10 +21,12 @@ export class <%= it.typename%>Doc extends SimpleAppClient<<%= it.typename%>,<%=
   public readonly schema= <%~ JSON.stringify(it.jsonschema) %>;
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityName='<%~ it.autocompletename %>'
-  constructor() {    
-    const apiconfig = new Configuration({ basePath:  useRuntimeConfig().public.SIMPLEAPP_BACKEND_URL });
+  constructor(event:any,listen?:any) {    
+    const apiconfig = new Configuration({ basePath:  useRuntimeConfig().public.APP_URL+'/api' });
     const apiobj = new <%= it.doctype.toUpperCase()%>Api(apiconfig)
-    super(apiobj)
+    super(apiobj,'<%= it.doctype %>','<%=it.name %>')
+    this.event=event
+    this.listen=listen
     
     this.setNew();    
   }

package/templates/nuxt/app.vue.eta

@@ -0,0 +1,8 @@
+<template>
+  <div>
+    <NuxtLayout>
+      <EventMonitor/>
+      <NuxtPage />
+    </NuxtLayout>
+    </div>
+</template>

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

@@ -0,0 +1,95 @@
+<template>
+    <div class="simpleapp-crudsimple">    
+        <button class="bg-primary" type="reset" @click="newData">New</button>
+        
+      
+      <SimpleAppDatatable
+            @row-dblclick="editRecord"
+            v-model="recordlist"
+            :setting="{}"
+            :columns="listColumns"
+          ></SimpleAppDatatable>
+
+      <DebugDocumentData v-model="data"/>
+    </div>
+
+    <Dialog v-model:visible="visible" modal header="Header" class="crudsimple-dialog" :autoZIndex="false" :style="{zIndex:100, width: '80vw' }">        
+        <SimpleAppForm :document="obj" :title="title" #default="o">     
+          <div class="simpleapp-tool-bar"   >
+            <button class="bg-default" @click="newData" type="reset">New</button>
+            <button class="bg-primary" @click="saveData" type="submit">Save</button>
+            <button class="bg-danger" @click="deleteData($event)">Delete</button>
+            <ConfirmPopup></ConfirmPopup>
+          </div>
+        <slot :data="o.data" :getField="o.getField" name="default"></slot>
+      </SimpleAppForm>
+    </Dialog>
+</template>
+<script setup lang="ts">
+
+import { SimpleAppClient } from '@simitgroup//simpleapp-vue-component/src/SimpleAppClient';
+import SimpleAppForm from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppForm.vue';
+import SimpleAppDatatable from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppDatatable.vue';
+import Dialog from 'primevue/dialog';
+import ConfirmPopup from 'primevue/confirmpopup';
+import { useConfirm } from "primevue/useconfirm";
+
+const confirm = useConfirm();
+const props = defineProps<{
+    document:SimpleAppClient<any,any>
+    listColumns:string[]
+    title:string
+}>()
+const visible = ref(false)
+const obj = props.document
+const data = obj.getReactiveData()
+const recordlist = ref();
+
+
+const refresh = () => {
+  obj.list().then((res:any) => {    
+    recordlist.value = res;
+  });
+};
+const newData = () => {
+    obj.setNew()
+    visible.value=true;
+};
+
+const editRecord = (event: any) => {
+  obj.getById(event.data._id);
+  visible.value=true
+};
+
+const saveData = () => {
+  if (data.value._id == "") {
+    obj.create().then(()=>visible.value=false).finally(() => refresh());
+  } else {
+    obj.update().then(()=>visible.value=false).finally(() => refresh());
+  }
+};
+const deleteData = (event:Event) => {
+    console.log("deleteData")
+    confirm.require({
+        target: event.currentTarget as HTMLElement,
+        message:'Delete?',
+        icon: 'pi pi-exclamation-triangle',
+        acceptClass: 'p-button-danger',
+        accept: ()=>{
+            obj.delete(data.value._id ?? "").then(()=>visible.value=false).finally(() => {
+                refresh();    
+            });
+        },
+        reject: () => {
+            console.log("Cancel delete")
+        }
+    })
+  
+};
+refresh();
+</script>
+<style scoped>
+.crudsimple-dialog{
+    z-index: 100;
+}
+</style>

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

@@ -0,0 +1,20 @@
+<template>
+    <div class="floatright">
+        <h3>data in json</h3>
+            <pre>
+            {{ modelValue }}
+            </pre>
+        </div>
+</template>
+<script setup lang="ts">
+const modelValue = defineModel()
+</script>
+<style scoped>
+.floatright{
+    position: fixed;
+    right: 0;
+    background-color: antiquewhite;
+    font-size: large;    
+    top: 0;
+}
+</style>

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

@@ -0,0 +1,79 @@
+<template>
+    <Toast group="default"/>
+    <Toast group="list">
+        <template #message="p">
+            <ol>
+                <li v-for="(item,index) in  p.message.detail" :key="index">{{item.instancePath}} {{ item.message }}</li>
+            </ol>            
+        </template>
+    </Toast>
+</template>
+<script setup lang="ts">
+
+import { useToast, } from 'primevue/usetoast';
+import type {  ToastMessageOptions } from 'primevue/toast';
+import Toast from 'primevue/toast';
+import { stringify } from 'ajv';
+const toast = useToast();
+const { $event,$listen } = useNuxtApp()
+let resmsg:ToastMessageOptions = {} as ToastMessageOptions
+
+$listen('*',(type:string,data:any)=>{
+    
+    
+    let duration = 3000
+    let severity:typeof resmsg['severity'] 
+    let isshow=true
+    let toastgroup='default'
+    if(type.indexOf('error')>=0){
+        duration = 0
+        severity='error'
+        
+    }
+    else if(type.indexOf('warn')>=0){
+        duration = 10000
+        severity='warn'
+    }
+    else if(type.indexOf('info')>=0){
+        duration = 3000
+        severity='info'
+        isshow=false
+    }
+    else if(type.indexOf('success')>=0){
+        duration = 3000
+        severity='success'
+    }
+    if(Array.isArray(data)){
+        toastgroup='list'
+    }
+    // let msg:string=prepareMsg(data,severity?.toString()??'')
+
+    if(isshow){
+        toast.removeAllGroups()
+        resmsg = { severity: severity, summary: type, detail :data, life: duration, group:toastgroup}
+        toast.add(resmsg)
+    }
+    
+    
+})
+const prepareMsg=(data:any,msgtype:string):string=>{
+    let res : string =''
+    
+    if(typeof data == 'string'){
+        res = data
+    }else if(Array.isArray(data)){
+        res+='<ul>'
+        for(let i=0;i<data.length;i++){
+            const d=data[i]
+            res+= '<li>'+d['instancePath']+':'+(d['message']?? JSON.stringify(d))+'</li>'
+        }
+        res+='</ul>'
+    }else if(typeof data =='object'){
+        res=JSON.stringify(data)
+    }
+    return res
+
+    
+}
+
+</script>

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

@@ -0,0 +1,18 @@
+<template>
+    <header>      
+        <!-- <MegaMenu :model="getMenus()" orientation="horizontal" />               -->
+        <Menubar :model="getMenus()">
+            <template #start>
+                <h1>[Logo Container]</h1>
+            </template>
+            <template #end>
+                <InputText placeholder="Search" type="text" />
+            </template>
+        </Menubar>
+    </header>
+</template>
+<script setup lang="ts">
+    // import MegaMenu from 'primevue/megamenu';
+    import Menubar from 'primevue/menubar';
+
+</script>

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

@@ -0,0 +1,24 @@
+
+import * as o from "../simpleapp/openapi";
+
+const getAutoComplete = (apiname: string): any => {
+  const config: o.Configuration = {
+    basePath: useRuntimeConfig().public.APP_URL + "/api",
+    isJsonMime: () => true,
+  };
+  const docsOpenapi: any = {
+    <% for(let i=0;i<it.length; i++){ %>
+        <% let obj = it[i]%>
+        '<%=obj.docname.toLowerCase()%>' : new o.<%=obj.doctype.toUpperCase()%>Api(config),
+        <%}%>
+  };
+  if (!docsOpenapi[apiname]) {
+    console.error(
+      `api for '${apiname}' does not exists, most probably define wrong x-foreignkey`,
+    );
+    return undefined;
+  } else {
+    return docsOpenapi[apiname];
+  }
+};
+export default getAutoComplete;

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

@@ -0,0 +1,9 @@
+export const getMenus =()=>[
+  {label: 'Cruds',icon: 'pi pi-fw pi-pencil',items:[
+  <% for(let i=0;i<it.length; i++){ %>
+    <% let obj = it[i]%>
+    {label: '<%=obj.docname.toLowerCase()%>', to:'/<%=obj.docname.toLowerCase()%>'},
+  <%}%>
+]},
+  {label: 'Profile',icon: 'pi pi-fw pi-user'},
+]

package/templates/nuxt/env.eta

@@ -0,0 +1,3 @@
+PORT=8800
+SIMPLEAPP_BACKEND_URL=http://localhost:8000
+APP_URL=http://localhost:8800

package/templates/nuxt/layouts.default.vue.eta

@@ -0,0 +1,10 @@
+
+<template>
+    <div>
+        <Menus />
+        <slot></slot>
+    </div>
+</template>
+<script lang="ts" setup>
+import Menus from '~/components/Menus.vue'
+</script>

package/templates/{nuxt.config.eta → nuxt/nuxt.config.ts.eta}

@@ -3,6 +3,7 @@ export default defineNuxtConfig({
   runtimeConfig:{    
     public:{
       SIMPLEAPP_BACKEND_URL: process.env.SIMPLEAPP_BACKEND_URL,
+      APP_URL: process.env.APP_URL,
     }
   },
   vite: {
@@ -13,14 +14,16 @@ export default defineNuxtConfig({
         }
     }
 },
+tailwindcss: {
+    // Options
+  },
   modules: [
-    // '@nuxtjs/tailwindcss',
+    '@nuxtjs/tailwindcss',
     // '@nuxtjs/color-mode'
 
   ],  
-  ssr: false,
+  ssr: true,
   css: [
-    // "assets/css/index.css",
     "primevue/resources/themes/lara-light-blue/theme.css",
     'primeicons/primeicons.css'
   ],

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

@@ -0,0 +1,3 @@
+<template>
+  <div>index page</div>
+</template>

package/templates/{nuxt.plugins.eta → nuxt/plugins.simpleapp.ts.eta}

@@ -1,7 +1,5 @@
 import { defineNuxtPlugin } from "#app";
 import PrimeVue from "primevue/config";
-import ToastService from 'primevue/toastservice';
-
 import SimpleAppAutocomplete from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppAutocomplete.vue'
 import SimpleAppAutocompletemulti from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppAutocompletemulti.vue'
 import SimpleAppCalendar from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppCalendar.vue'
@@ -25,8 +23,11 @@ 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 mitt from 'mitt'
+import ToastService from 'primevue/toastservice';
+import ConfirmationService from 'primevue/confirmationservice';
 
-
+const emitter = mitt()
 
 
 
@@ -55,7 +56,13 @@ export default defineNuxtPlugin((nuxtApp) => {
     .component("SimpleAppTextarea",SimpleAppTextarea)
     .component("SimpleAppValue",SimpleAppValue)
     .component("SimpleFieldContainer",SimpleFieldContainer)
-    .use(ToastService)
+    .use(ToastService).use(ConfirmationService)
     ;
+    return {
+        provide: {
+          event: emitter.emit, // Will emit an event
+          listen: emitter.on // Will register a listener for an event
+        }
+    }
     //other components that you need
 });