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

package/templates/nuxt/plugins/40.pusher.ts.eta

@@ -0,0 +1,18 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { defineNuxtPlugin } from "#app";
+import Pusher from 'pusher-js';
+export default defineNuxtPlugin( async(nuxtApp) => {
+    const pusherkey =  (useRuntimeConfig().app.PUSHER_KEY ?? '') as string
+    const pushercluster = (useRuntimeConfig().app.PUSHER_CLUSTER ?? '') as string    
+    const pusher = new Pusher(pusherkey, { cluster: pushercluster,});
+    return {        
+        provide: {
+            pusher:pusher
+        }
+    }    
+});

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -22,13 +22,15 @@ type crudType = {
   runUpdate: Function;  
   runPatch: Function;  
   runDelete: Function;
-  runSearch: Function
+  runSearch: Function;
+  runDefault:Function;
 };
 export class SimpleAppClient<
   TData extends { _id?: string,created?:string },
   TApi extends crudType,
 > {
   // protected defaultTimeOut=5000
+  protected unwantchobj;
   protected docapi;
   public event:Function|null=null;
   public listen:Function|null=null;
@@ -65,18 +67,25 @@ export class SimpleAppClient<
   };
   
   async getById(id?: string) {
+    if(this.unwantchobj)this.unwantchobj()
     return await this.docapi.runFindOne(id,this.axios)
     .then((res: AxiosResponse) => {
       // if(this.event){this.event('info:getById',res.data)}
       this.data.value={} as TData
       Object.assign(this.data.value, res.data);
+      this.setWatchChange()
       return res;
     }).catch((res:any)=>{
       // if(this.event){this.event('error:getById',res)}
       return Promise.reject(res)
     });
   }
+  setWatchChange(){}
 
+  async runDefault(){
+    const res = await this.docapi.runDefault() 
+    return res.data
+  }
   async create() {    
     const errors = this.validateFailed();
     const {$event} =useNuxtApp()

package/templates/nuxt/simpleapp/generate/commons/roles.ts.eta

@@ -8,11 +8,14 @@ type roletype = {resource:string, action:string}
 const allroles:roletype[] = [
 <% for(let i=0;i<it.modules.length; i++){ %>
         <% const m = it.modules[i] %>
+        {resource: '<%=m.docname%>', action:'access'},
         {resource: '<%=m.docname%>', action:'create'},
         {resource: '<%=m.docname%>', action:'update'},
         {resource: '<%=m.docname%>', action:'delete'},
         {resource: '<%=m.docname%>', action:'search'},
-       
+        <%if(m.schema['x-simpleapp-config']['printFormats']){%>
+            {resource: '<%=m.docname%>', action:'print'},
+        <%}%>,
 
         <% if(m.api && m.api.length >0) {%>
 

package/templates/nuxt/types/schema.ts.eta

@@ -46,8 +46,15 @@ export type SchemaConfig = {
     documentType: string
     documentName: string
     collectionName?: string
-    foreignKeys?:MyForeignKey,
+    foreignKeys?:MyForeignKey
+    printFormats?: SchemaPrintFormat[]
   }
+
+export type SchemaPrintFormat = {
+  formatName: string
+  formatId: string
+  description?: string
+}
   export type MyForeignKey = {
     [collectionname:string]:string[]
   }

package/templates/nuxt/types/simpleappinput.ts.eta

@@ -58,13 +58,11 @@ export type FormActions = {
     [key:string]:string[]    
 }
 
-
 export type FormMenu = {
-    type:string
-    action:string    
-    label:string
+    type?:string
+    action?:string    
+    label?: string | ((...args: any) => string) | undefined
     command? : Function
     event?:FormCrudEvent
     [key:string] : any
 }
-

package/templates/printformats/template.jrxml._eta

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with simpleapp generator  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="<%=it.formatName%>" pageWidth="595" pageHeight="420" orientation="Landscape" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d0a16255-a928-4987-a618-d8b2c6a4728a">
+	<property name="com.jaspersoft.studio.report.description" value="<%=it.description%>"/>
+
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<detail><band splitType="Stretch"/></detail>
+	<noData>
+		<band height="380" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="555" height="380" uuid="0fd432f8-6d4b-49cc-ac6c-1de5b660275b"/>
+				<box>
+					<pen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="29"/>
+				</textElement>
+				<text><![CDATA[this is <%=it.formatName%> (<%=it.formatId%>) printformat, please change it]]></text>
+			</staticText>
+		</band>
+	</noData>
+</jasperReport>

package/templates/project/groups/admin.json.eta

@@ -1,5 +1,6 @@
 {
     "Autoincreament": [
+      "access",
       "create",
       "update",
       "delete",
@@ -7,31 +8,35 @@
       "generateNextNo"
     ],
     "Branch": [
+      "access",
       "create",
       "update",
       "delete",
       "search"
     ],    
     "Organization": [
+      "access",
       "create",
       "update",
       "search",
       "delete"
     ],
     "Permission": [
-      "listUser",
+      "access",
       "search",
       "delete",
       "update",
       "create"
     ],
     "Tenant": [
+      "access",
       "create",
       "update",
       "delete",
       "search"
     ],
     "User": [
+      "access",
       "create",
       "update",
       "search",

package/templates/project/jsonschemas/branch.json._eta

@@ -0,0 +1,113 @@
+{
+  "type": "object",
+  "x-simpleapp-config": {
+    "isolationType": "org",
+    "documentType": "branch",
+    "documentName": "branch",
+    "uniqueKey": "branchCode",
+    "uniqueKeys": [
+      [
+        "branchId"
+      ]
+    ],
+    "documentTitle": "branchName",
+    "additionalAutoCompleteFields": [
+      "branchId"
+    ]
+  },
+  "properties": {
+    "_id": {
+      "type": "string"
+    },
+    "created": {
+      "type": "string"
+    },
+    "updated": {
+      "type": "string"
+    },
+    "createdBy": {
+      "type": "string"
+    },
+    "updatedBy": {
+      "type": "string"
+    },
+    "tenantId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1
+    },
+    "orgId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1
+    },
+    "branchId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1
+    },
+    "organization": {
+      "type": "object",
+      "x-foreignkey": "organization",
+      "properties": {
+        "_id": {
+          "type": "string"
+        },
+        "code": {
+          "type": "string"
+        },
+        "label": {
+          "type": "string"
+        },
+        "orgId": {
+          "type": "integer"
+        }
+      }
+    },
+    "branchCode": {
+      "type": "string",
+      "minLength": 1
+    },
+    "branchName": {
+      "type": "string",
+      "minLength": 1
+    },
+    "street1": {
+      "type": "string"
+    },
+    "street2": {
+      "type": "string"
+    },
+    "street3": {
+      "type": "string"
+    },
+    "street4": {
+      "type": "string"
+    },
+    "city": {
+      "type": "string"
+    },
+    "region": {
+      "type": "string"
+    },
+    "postcode": {
+      "type": "string"
+    },
+    "country": {
+      "type": "string"
+    },
+    "tel": {
+      "type": "string"
+    },
+    "email": {
+      "type": "string"
+    },
+    "active": {
+      "type": "boolean",
+      "default": true
+    },
+    "description": {
+      "type": "string"
+    }
+  }
+}

package/templates/project/jsonschemas/invoice.json._eta

@@ -15,7 +15,11 @@
         "jsonPath": "$.invoiceTotal",
         "formula": "sharelibs.getTotal(data.details)"
       }
-    ]
+    ],
+    "printFormats":[
+      {"formatName":"invoice A4","formatId":"invoice-a4","description":""},
+      {"formatName":"invoice A5","formatId":"invoice-a5","description":""}
+    ],
   },
   "properties": {
     "_id": { "type": "string" },

package/templates/project/jsonschemas/organization.json._eta

@@ -0,0 +1,111 @@
+{
+  "type": "object",
+  "x-simpleapp-config": {
+    "isolationType": "tenant",
+    "documentType": "org",
+    "documentName": "organization",
+    "pageType": "crud",
+    "uniqueKey": "orgCode",
+    "uniqueKeys": [
+      [
+        "orgId"
+      ]
+    ],
+    "documentTitle": "orgName",
+    "additionalAutoCompleteFields": [
+      "orgId"
+    ],
+    "additionalApis":[{
+        "action":"getlogo",
+        "entryPoint":"logo",
+        "requiredRole":[],
+        "method":"get",
+        "schema":"string",
+        "responseType":"String",
+        "description":"obtain avatar base64 jpg image"
+      },{
+        "action":"uploadlogo",
+        "entryPoint":"logo",
+        "requiredRole":[],
+        "method":"post",
+        "schema":"KeyValue",
+        "responseType":"String",
+        "description":"post avatar in base64 jpg image"
+      }]
+  },
+  "required": [
+    "orgId",
+    "orgCode",
+    "orgName"
+  ],
+  "properties": {
+    "_id": {
+      "type": "string"
+    },
+    "created": {
+      "type": "string"
+    },
+    "updated": {
+      "type": "string"
+    },
+    "createdBy": {
+      "type": "string"
+    },
+    "updatedBy": {
+      "type": "string"
+    },
+    "tenantId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1
+    },
+    "orgId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1
+    },
+    "branchId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 0
+    },
+    "orgCode": {
+      "type": "string",
+      "minLength": 1
+    },
+    "orgName": {
+      "type": "string"
+    },
+    "registrationNo": {
+      "type": "string"
+    },
+    "active": {
+      "type": "boolean",
+      "default": true
+    },
+    "description": {
+      "type": "string",
+      "format": "text"
+    },
+    "timeZone": {
+      "type": "string",
+      "examples": [
+        "Asia/Kuala_Lumpur"
+      ]
+    },
+    "offsetMinute": {
+      "type": "number",
+      "default": 0
+    },
+    "currency": {
+      "type": "string",
+      "minimum": 3,
+      "maximum": 3
+    },
+    "country": {
+      "type": "string",
+      "minimum": 2,
+      "maximum": 2
+    }
+  }
+}

package/templates/project/lang/default._json

@@ -1,150 +1,71 @@
-<template>
-  <div v-if="schema" :class="getLayoutClass()">
-    <label v-if="hidelabel"></label>
-    <label v-else :for="uuid" :class="getLabelClass()"
-      >{{ fieldlabel }}
-      <span
-        v-if="props.setting.isrequired && fieldlabel"
-        class="text-danger-600 dark:text-danger-400"
-        >*</span
-      ></label
-    >
-    <!-- <label v-else-if="error" class="simpleapp-input-label text-danger-600 overflow-hidden" :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>        
-        <label v-else  :for="uuid" class="simpleapp-input-label whitespace-nowrap	text-gray-500 truncate">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>         -->
-
-    <!-- <div :uuid="uuid" >{{ modelValue }}</div> -->
-    <!-- <div v-if="typeof modelValue =='object' && typeof modelValue['_id']!='undefined' && typeof modelValue['label']!='undefined' &&  readonly ==true " :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue['label'] }}</div> -->
-    <!-- <div v-else-if="readonly==true" :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue }}</div> -->
-    <!-- <slot v-else name="default" :uuid="uuid" :error="error"></slot> -->
-    <slot name="default" :uuid="uuid" :error="error"></slot>
-
-    <small v-if="error" class="text-danger-600 dark:text-danger-400">{{
-      error
-    }}</small>
-    <small v-else class="input-desc">{{ fielddesc }}</small>
-  </div>
-  <div v-else :class="defaultcssclass">
-    <label class="etext-danger-600 dark:text-danger-400"
-      >wrong path in getField()</label
-    >
-    <div class="text-danger-600 dark:text-danger-400">
-      {{ props.setting.path }}
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import SimpleAppValue from "./SimpleAppValue.vue";
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
- */
-// import {camelCaseToWords} from './helper'
-// import {computed,setBlockTracking,watch} from 'vue'
-
-import { ref } from "vue";
-
-const uuid = randomUUID();
-// const fieldlabel = ref('')
-// const fielddesc = ref('')
-const defaultcssclass = "simpleapp-input-container";
-const fieldcontainerclass = ref(defaultcssclass);
-let instancepath = ref("");
-const props = defineProps<{
-  label?: string;
-  inputType: string;
-  description?: string;
-  instancepath?: string;
-  hidelabel?: boolean;
-  readonly?: boolean;
-  // error?:string,
-  setting: any;
-  resetcount:number
-}>();
-
-const readonly = computed(() => {
-  return props.readonly ?? props.setting.readonly ?? false;
-});
-
-const modelValue = defineModel<any>(); //this model value support all kind of data, string, number, autocomplete and etc
-const readonlyclass = "simpleapp-value-readonly";
-// console.log('props.setting',modelValue.value,props.setting)
-let schema: any;
-
-const getLayoutClass = () =>
-  `simpleapp-input-container flex  ${
-    props.inputType == "checkbox"
-      ? " flex-row gap-4 mt-1 ml-1 "
-      : "flex flex-col "
-  }`;
-
-const getLabelClass = () => {
-  let class1 =
-    "simpleapp-input-label text-left text-gray-500  dark:text-gray-200 ";
-
-  if (!isMobile()) class1 += "whitespace-nowrap truncate";
-  else if (props.inputType == "checkbox") class1 += " ml-1 dark:text-gray-200";
-  else if (props.inputType != "autocomplete" && modelValue.value)
-    class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100";
-  else if (props.inputType == "autocomplete" && modelValue.value?.label)
-    class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100";
-  else if (modelValue.value !== undefined)
-    class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100";
-  else class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100 ";
-  return class1;
-};
-
-const fielddesc = computed(() => {
-  return props.description ?? "";
-});
-
-if (props.setting.fieldsetting && props.setting.fieldsetting.type) {
-  schema = props.setting.fieldsetting;
-  // console.log("schema setting",props.setting,schema)
-  if (props?.instancepath) instancepath.value = props.instancepath;
-  else if (props.setting?.instancepath)
-    instancepath.value = props.setting.instancepath;
-  else instancepath.value = "/unknown";
-
-  const fieldnamearr = instancepath.value.split("/");
-  const fieldname = camelCaseToWords(fieldnamearr[fieldnamearr.length - 1]);
-
-  // if(props.description)fielddesc.value = props.description
-  // else if (schema?.description != 'undefined') fielddesc.value=schema.description
-  // else fielddesc.value=''
-}
-const fieldlabel = computed(() => {
-  if (props.label) {
-    return t(props.label);
-  } else if (schema.title) {
-    return t(schema.title);
-  } else {
-    return t(props.setting.key);
-  }
-});
-const errormsg = computed(() => {
-  props.setting.errors[instancepath.value];
-});
-const error = ref("");
-watch(props.setting.errors, (newvalue, oldvalue) => {
-  //it is array
-  error.value = "";
-  if (newvalue[instancepath.value]) {
-    const errlist: any[] = newvalue[instancepath.value];
-    for (let i = 0; i < errlist.length; i++) {
-      error.value += errlist[i].message + ",";
-    }
-    fieldcontainerclass.value = defaultcssclass + " input-error";
-  } else {
-    error.value = "";
-    fieldcontainerclass.value = defaultcssclass;
-  }
-  // console.log("validation result",props.setting.instancepath,)
-  // error.value = newvalue[props.setting.instancepath].message
-});
-
-watch(()=>props.resetcount,()=>{
-  error.value=''
-})
-</script>
+{  
+    "home":"Home",
+    "welcome": "Welcome",
+    "create": "Create",
+    "close": "Close",
+    "update": "Update",
+    "delete": "Delete",
+    "modify": "Modify",
+    "confirm": "Confirm",
+    "void": "Void",
+    "draft": "Draft",
+    "profile": "Profile",
+    "logout": "logout",
+    "language": "Language",    
+    "theme": "Theme",
+    "welcomeSimpleApp": "Welcome To SimpleApp",
+    "changeHomePageMsg": "{fullName}, it is product front page and by right you shall replace it with something else.",
+    "realman": "Real man code with simpleapp",
+    "new": "New",
+    "keyword": "Keyword",
+    "empty": "Empty",
+    "noDataFound": "No Data Found",
+    "userInfo": "User Information",
+    "currentBranchAccessRights": "Current Branch Access Rights",
+    "yourCompanyName": "Your Company Name",
+    "onlyAppearInDebugMode": "Only Appear In Debug Mode",
+    "pickDocument": "Pick Document",
+    "sample": "Sample",
+    "createYourContentHere": "Create your content here",
+    "setting": "Setting",
+    "mytasks": "My Tasks",
+    "suspend": "Suspend",
+    "submit": "Submit",
+    "decision": "Decision",
+    "simpleApproveMessage": "Approve or reject",
+    "suspendcustomer": "Suspend Customer",
+    "formKeyNotFound": "Formkey not found \"{formKey}\"",
+    "selectAll": "Select All",
+    "branches":"Branches",
+    "accessRights": "Access Rights",
+    "fullName":"Full Name",
+    "type": "Type",
+    "save": "Save",
+    "general": "General",
+    "login":"Login",
+    "sessionExpire": "Session Expire",
+    "reloginMessage": "Session Expire, relogin" ,
+    "backToHome":"Back To Home",
+    "undefined": "Undefined",
+    "no":"No",
+    "edit":"Edit",
+    "select":"Select",
+    "backendServerDownMessage":"Seems there is some connectivity issue, please try again later",
+    "invalidXorg":"Invalid XOrg ",
+    "userNotExistInTenant":"This tenant is not accessible" ,
+    "light":"Light",
+    "dark":"Dark",
+    "redirectToLoginPage":"Redirect To Login Page",
+    "cancel":"Cancel",
+    "deleteRecord":"Delete Record",
+    "deleteThisRecord?":"Delete this Record?",
+    "ok":"OK",
+    "null":"Null",
+    "switchDatabase":"Switch Database",
+    "pickYourDatabase" : "Pick Your Database",
+    "createNewCompany":"Create New Company",
+    "printFormats":"Print Formats",
+    "print":"Print",
+    "printPreview": "Print Preview",
+    "messages":"Messages"
+  }