@simitgroup/simpleapp-generator 2.0.2-k-alpha → 2.0.2-m-alpha

package/ReleaseNote.md

@@ -1,3 +1,13 @@
+[2.0.2m-alpha]
+
+1. Change date format follow DD/MM/YYYY instead of user laptop
+2. Define isBillingUser, isInternalUser and isDevSupport for easy to called role
+3. Add escapeRegExp for search student list
+
+[2.0.2l-alpha]
+
+1. Add direct debit mini api scope
+
 [2.0.2k-alpha]
 
 1. add permission devbilling can access tenant invoice page

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.2-k-alpha",
-  "description": "frontend nuxtjs and backend nests code generator using jsonschema",
+  "version": "2.0.2m-alpha",
+  "description": "frontend nuxtjs and backend nests code generator using jsonschema.",
   "main": "dist/index.js",
   "scripts": {
     "generate": "ts-node src/index.ts -c ./sampleconfig.json; pnpm exec prettier ./backend  --write;pnpm exec prettier ./frontend  --write",

package/templates/miniApi/src/constants/api-scopes.ts.eta

@@ -117,6 +117,33 @@ const scopes = {
       description: "Check online payment status",
     },
   },
+  
+  directDebit: {
+    createDda: {
+      method: "post",
+      description: "Create direct debit authorization",
+    },
+    cancelDda: {
+      method: "post",
+      description: "Cancel direct debit authorization",
+    },
+    enquiryDdaByDdaRefNo: {
+      method: "get",
+      description: "Enquiry direct debit authorization by ref no",
+    },
+    createDdi: {
+      method: "post",
+      description: "Create direct debit instruction",
+    },
+    cancelDdi: {
+      method: "post",
+      description: "Cancel direct debit instruction",
+    },
+    enquiryDdiByDdiOrderNo: {
+      method: "get",
+      description: "Enquiry direct debit instruction by order no",
+    },
+  },
 };
 
 export default scopes;

package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta

@@ -578,15 +578,9 @@ export class UserContext extends UserContextInfo {
         }
       }
 
-      // Tenant permissions for DevSupport role
-      if (this.roles.includes(Role.DevSupport)) {
-        const tenantRoles = [
-          Role.Tenant_access,
-          Role.Tenant_search,
-          Role.Tenant_create,
-          Role.Tenant_update,
-          Role.Tenant_delete,
-        ];
+      // Tenant permissions for DevSupport and DevBilling roles
+      const tenantRoles = [Role.Tenant_access, Role.Tenant_search, Role.Tenant_create, Role.Tenant_update, Role.Tenant_delete];
+      if (this.roles.includes(Role.DevSupport) || this.roles.includes(Role.DevBilling)) {
         for (let r = 0; r < tenantRoles.length; r++) {
           if (!this.roles.includes(tenantRoles[r])) {
             this.roles.push(tenantRoles[r]);
@@ -614,6 +608,20 @@ export class UserContext extends UserContextInfo {
         }
       }
 
+      // Grant Admin role to DevSupport and DevBilling for e-invoice
+      if (this.roles.includes(Role.DevSupport) || this.roles.includes(Role.DevBilling)) {
+        if (!this.roles.includes(Role.Admin)) {
+          this.roles.push(Role.Admin);
+        }
+      }
+
+      // Grant Billing role to DevBilling for tenant billing operations
+      if (this.roles.includes(Role.DevBilling)) {
+        if (!this.roles.includes(Role.Billing)) {
+          this.roles.push(Role.Billing);
+        }
+      }
+
       this.moreProps = this.setMoreProps(userProfile);
       // this.package = userProfile['package'];
       // this.appintegration = await this.setAppIntegration();
@@ -1159,6 +1167,40 @@ export class UserContext extends UserContextInfo {
         }
       }
 
+      if (this.roles.includes(Role.DevSupport)) {
+        const tenantRoles = [
+          Role.Tenant_access,
+          Role.Tenant_search,
+          Role.Tenant_create,
+          Role.Tenant_update,
+          Role.Tenant_delete,
+        ];
+        for (let r = 0; r < tenantRoles.length; r++) {
+          if (!this.roles.includes(tenantRoles[r])) {
+            this.roles.push(tenantRoles[r]);
+          }
+        }
+      }
+
+      if (this.roles.includes(Role.DevBilling)) {
+        const tenantInvoiceRoles = [
+          Role.TenantInvoice_access,
+          Role.TenantInvoice_search,
+          Role.TenantInvoice_create,
+          Role.TenantInvoice_update,
+          Role.TenantInvoice_delete,
+          Role.TenantInvoice_draft,
+          Role.TenantInvoice_void,
+          Role.TenantInvoice_confirm,
+          Role.TenantInvoice_print,
+        ];
+        for (let r = 0; r < tenantInvoiceRoles.length; r++) {
+          if (!this.roles.includes(tenantInvoiceRoles[r])) {
+            this.roles.push(tenantInvoiceRoles[r]);
+          }
+        }
+      }
+
       this.moreProps = this.setMoreProps(userProfile);
     } else {
       this.logger.debug(`User ${this.uid} not exists in tenant (${this.tenantId})`);

package/templates/nest/src/simple-app/_core/utils/string-utils.ts.eta

@@ -1 +1,4 @@
-export const camelToKebab = (value) => value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase()
+export const camelToKebab = (value) => value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase()
+
+export const escapeRegExp = (value: string): string =>
+  value.replace(/[\\^$.*+?()\[\]{}|]/g, '\\$&');

package/templates/nuxt/app.vue.eta

@@ -9,6 +9,8 @@
     <EventDocumentViewer></EventDocumentViewer>      
     <EventDecision/>
     <EventNotification/>
+    <SubscriptionExpirationWarning/>
+    <SubscriptionFreeBanner/>
     <NuxtPage/>
   </NuxtLayout>
 </template>
@@ -29,9 +31,9 @@ watch(()=>useRoute().fullPath,async (newval,oldvalue)=>{
   if(getPathPara('xorg','')!=''){
   
     if(getCurrentXorg()===''){
-      navigateTo('/picktenant')
+      goTo('/picktenant')
     }else if(!getUserProfile()?.currentGroup){
-      goTo('pickgroup')
+      navigateTo('pickgroup')
     }
     setGraphqlServer()
   }  
@@ -54,9 +56,9 @@ onMounted(async()=>{
     const currentgroup = useCookie('currentGroup').value
     //if no xorg, no enforce pick group
     if(getCurrentXorg()===''){
-      navigateTo('/picktenant')
+      goTo('/picktenant')
     }else if(!currentgroup){
-      goTo('/pickgroup')
+      navigateTo('/pickgroup')
     }
     setGraphqlServer()
   }else{

package/templates/nuxt/components/simpleApp/SimpleAppAutocomplete.vue.eta

@@ -160,6 +160,7 @@
                 getDocument(setting.fieldsetting['x-foreignkey']).viewer,
               )
             "
+            :paras="props.paras"
             @after="
               async (eventType: FormCrudEvent, data: any, result: any) =>
                 await afterRenderMobileForm(eventType, data)
@@ -206,6 +207,7 @@ const props = withDefaults(
     componentProps?: AutoCompleteProps;
     autocompleteFilter?: any;
     pt?: any;
+    paras?: any;
   }>(),
   {
     allowAddNew: true,
@@ -358,6 +360,7 @@ const openViewer = (readonly: boolean) => {
       readonly: readonly,
       viewer: getDocument(docname)?.viewer,
       documentName: docname,
+      paras: props.paras,
 
       //after create, auto copy value into auto complete
       after: async (eventType: FormCrudEvent, data: any) => {

package/templates/nuxt/components/simpleApp/SimpleAppInput.vue.eta

@@ -179,6 +179,7 @@
       :readonly="isReadonly"
       :placeholder="placeholder"
       :autocomplete-filter="autocompleteFilter"
+      :paras="paras"
       @change="onChange"
     >
       <template #header>
@@ -419,13 +420,14 @@ const props = withDefaults(
     setting: any;
     type?: string;
     instancepath?: string;
-    options?: string[];
+    options?: string[] | Array<{ value: string; label: string }>;
     hidelabel?: boolean;
     readonly?: boolean;
     autofocus?: boolean;
     pt?: any;
     placeholder?: string;
     autocompleteFilter?: any;
+    paras?: any;
     componentProps?:
       | InputNumberProps
       | InputSwitchProps

package/templates/nuxt/composables/date.generate.ts.eta

@@ -16,24 +16,24 @@ export const today = () => useDayjs()().format('YYYY-MM-DD')
 /**
  * convert date object or ISO8601 date become local datetime string
  * @param date date|string
- * @returns local shortform date-time
+ * @returns local shortform date-time (DD/MM/YYYY HH:mm)
  */
 export const dateRenderToDateTimeStr = (date:Date|string) => 
-  convertToDate(date).toLocaleString().replace(',', ' ').slice(0,-3)
+  useDayjs()(date).format('DD/MM/YYYY HH:mm')
 /**
  * convert date object or ISO datestring become local date string
  * @param date date|string
- * @returns local short form date
+ * @returns local short form date (DD/MM/YYYY)
  */
 export const dateRenderToDateStr = (date:Date|string) => 
-  convertToDate(date).toLocaleDateString().replace(',', ' ')
+  useDayjs()(date).format('DD/MM/YYYY')
 /**
  * convert date object or ISO datestring become time string (without seconds)
  * @param date date|string
  * @returns 
  */
 export const dateRenderToTimeStr = (date:Date|string) => 
-  convertToDate(date).toLocaleTimeString().slice(0,-3)
+  useDayjs()(date).format('HH:mm')
 
 
 /**

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -327,6 +327,17 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       isExecutive() {
         return this.currentGroup == "executive";
       },
+      isBillingUser() {
+        const roles = this.roles;
+        return roles.includes("tenantowner") || roles.includes("billing") || roles.includes("superadmin") || roles.includes("devbilling") || roles.includes("devsupport");
+      },
+      isInternalUser() {
+        const roles = this.roles;
+        return roles.includes("superadmin") || roles.includes("devbilling") || roles.includes("devsupport");
+      },
+      isDevSupport() {
+        return this.roles.includes("devsupport");
+      },
     },
   });