@simitgroup/simpleapp-generator 2.0.3-a-alpha → 2.0.3-c-alpha

package/ReleaseNote.md

@@ -1,3 +1,13 @@
+[2.0.3c-alpha]
+1. Remove profile service default data
+2. Fix simple app intercepter cannot capture correct error message
+3. Add various string utils
+
+[2.0.3b-alpha]
+1. Add dateformat in user context
+2. Add allow downloads
+3. Add getTimezoneOffsetMinutesByTimeZone (minutes to add to local time to get UTC, which flips the sign)
+
 [2.0.3a-alpha]
 1. Add createMany controller for all nestJs resources
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.3a-alpha",
+  "version": "2.0.3c-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema.",
   "main": "dist/index.js",
   "scripts": {

package/templates/nest/src/simple-app/_core/features/profile/profile.schema.ts.eta

@@ -68,6 +68,8 @@ export class UserContextInfo {
   currency: string;
   @ApiProperty({ type: String })
   country: string;
+  @ApiProperty({ type: String })
+  dateFormat?: string;
   @ApiProperty({ type: Number })
   offsetMinute: number;
   @ApiProperty({ type: String })

package/templates/nest/src/simple-app/_core/features/profile/profile.service.ts.eta

@@ -4,27 +4,25 @@
  * Author: Ks Tan
  */
 
+import { BadRequestException, Injectable, Logger } from '@nestjs/common';
 import countrytimezone from 'countries-and-timezones';
-import countryToCurrency, { Currencies, Countries } from 'country-to-currency';
-import { Injectable, Scope, Inject, Logger, BadRequestException, InternalServerErrorException } from '@nestjs/common';
+import countryToCurrency from 'country-to-currency';
 import { UserContext } from '../user-context/user.context';
 // import { RegTenant } from './profile.types';
-import * as mongoose from 'mongoose';
-import { InjectConnection } from '@nestjs/mongoose';
-import { TenantService } from '../../resources/tenant/tenant.service';
-import { OrganizationService } from '../../resources/organization/organization.service';
 import { BranchService } from '../../resources/branch/branch.service';
-import { UserService } from '../../resources/user/user.service';
+import { OrganizationService } from '../../resources/organization/organization.service';
 import { PermissionService } from '../../resources/permission/permission.service';
+import { TenantService } from '../../resources/tenant/tenant.service';
+import { UserService } from '../../resources/user/user.service';
 
-import { Tenant } from '../../resources/tenant/tenant.schema';
-import { Organization } from '../../resources/organization/organization.schema';
 import { Branch } from '../../resources/branch/branch.schema';
-import { User } from '../../resources/user/user.schema';
+import { Organization } from '../../resources/organization/organization.schema';
 import { KeyValue, Permission } from '../../resources/permission/permission.schema';
+import { Tenant } from '../../resources/tenant/tenant.schema';
+import { User } from '../../resources/user/user.schema';
 
-import { UserContextInfo } from './profile.schema';
 import { PhotoService } from 'src/simple-app/features/upload-file/photo/photo.service';
+import { UserContextInfo } from './profile.schema';
 const Base64URL = require('@darkwolf/base64url');
 @Injectable()
 export class ProfileService {
@@ -90,13 +88,12 @@ export class ProfileService {
   async createTenant(appuser: UserContext, tenantName: string, timeZone: string, utcOffset: number, businessType: string, mobileNo: string, interestedInSales?: boolean) {
     // try{
 
-    
     const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0];
     const countryCode = timezonedata['id'];
     const countryName = timezonedata['name'];
     const currencyCode = countryToCurrency[countryCode];
 
-    appuser.startTransaction()
+    appuser.startTransaction();
     const tenantdata: Tenant = {
       tenantId: 1,
       tenantName: tenantName,
@@ -159,13 +156,13 @@ export class ProfileService {
       workEnd: '22:00:00',
       workingHours: [],
       offdays: ['sat', 'sun'],
-      street1: '11, My Street 1',
-      street2: 'My Street 2',
-      postcode: '11111',
-      city: 'My City',
+      street1: '',
+      street2: '',
+      postcode: '',
+      city: '',
       tel: mobileNo,
       email: appuser.getEmail(),
-      region: 'My Region',
+      region: '',
       country: countryName,
       active: true,
       orgId: orgResult.orgId,

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

@@ -352,7 +352,7 @@ export class UserContext extends UserContextInfo {
                 as: 'o',
                 localField: 'orgId',
                 foreignField: 'orgId',
-                pipeline: [{ $project: { orgCode: 1, orgName: 1, offsetMinute: 1, timeZone: 1, currency: 1, country: 1 } }],
+                pipeline: [{ $project: { orgCode: 1, orgName: 1, offsetMinute: 1, timeZone: 1, currency: 1, country: 1, dateFormat: 1 } }],
               },
             },
             {
@@ -542,6 +542,7 @@ export class UserContext extends UserContextInfo {
       this.timeZone = userProfile['timeZone'] ?? '';
       this.currency = userProfile['currency'] ?? '';
       this.country = userProfile['country'] ?? '';
+      this.dateFormat = userProfile['dateFormat'] ?? '';
       this.offsetMinute = userProfile['offsetMinute'] ?? 0;
       this.orgRecordId = userProfile['orgRecordId'] ?? '';
       this.branchRecordId = userProfile['branchRecordId'] ?? '';
@@ -800,6 +801,7 @@ export class UserContext extends UserContextInfo {
       timeZone: this.timeZone,
       currency: this.currency,
       country: this.country,
+      dateFormat: this.dateFormat,
       //offset in minute, malaysia -480
       offsetMinute: this.offsetMinute,
       email: this.email,
@@ -1157,6 +1159,7 @@ export class UserContext extends UserContextInfo {
       this.timeZone = userProfile['timeZone'] ?? '';
       this.currency = userProfile['currency'] ?? '';
       this.country = userProfile['country'] ?? '';
+      this.dateFormat = userProfile['dateFormat'] ?? '';
       this.offsetMinute = userProfile['offsetMinute'] ?? 0;
       this.orgRecordId = userProfile['orgRecordId'] ?? '';
       this.branchRecordId = userProfile['branchRecordId'] ?? '';

package/templates/nest/src/simple-app/_core/framework/simple-app.interceptor.ts.eta

@@ -11,6 +11,7 @@ import type { Response as ExpressResponse } from 'express';
 import { Connection, Model } from 'mongoose';
 import { catchError, map, tap } from 'rxjs/operators';
 import { UserContext } from '../features/user-context/user.context';
+import { getErrorMessage } from '../utils/error';
 import { SimpleAppDbRevertService } from './simple-app-db-revert.service';
 @Injectable()
 export class SimpleAppInterceptor implements NestInterceptor {
@@ -92,7 +93,7 @@ export class SimpleAppInterceptor implements NestInterceptor {
 
         const responseBody = {
           // eslint-disable-next-line
-          message: err.message,
+          message: getErrorMessage(err).message ?? err.message,
           timestamp: new Date().toISOString(),
           path: url,
           // eslint-disable-next-line

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

@@ -1,4 +1,27 @@
-export const camelToKebab = (value) => value.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+export const camelToKebab = (value: string) => value.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
 
-export const escapeRegExp = (value: string): string =>
-  value.replace(/[\\^$.*+?()\[\]{}|]/g, '\\$&');
+export const isValidEmail = (value: unknown): value is string => typeof value === 'string' && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value);
+
+export const nameFromEmail = (email: string): string => {
+  return email.split('@')[0];
+};
+
+export const escapeRegExp = (value: string): string => value.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
+
+export function paddedUniqueCodeGenerator(usedCodes: Set<string>, prefix = 'LVL', padSize = 3) {
+  let index = 1;
+
+  const format = (n: number) => `${prefix}_${String(n).padStart(padSize, '0')}`;
+
+  return () => {
+    let code: string;
+
+    do {
+      code = format(index++);
+    } while (usedCodes.has(code));
+
+    usedCodes.add(code);
+
+    return code;
+  };
+}

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

@@ -4,6 +4,11 @@
  * last change 2024-04-13
  * Author: Ks Tan
  */
+import { DateTime } from "luxon";
+import {
+  dayjsDateFormatToPrimeVue,
+  getDefaultDateFormatForCountryCode,
+} from "~/simpleapp/generate/share-libs";
 import { DurationType } from "~/types";
 
 const convertToDate = (date: Date | string) => {
@@ -13,20 +18,24 @@ const convertToDate = (date: Date | string) => {
 //after review
 export const today = () => useDayjs()().format("YYYY-MM-DD");
 
+export const formatDateByOrgFormat = (date: Date | string) =>
+  useDayjs()(date).format(getDateFormat());
+
+export const formatDateTimeByOrgFormat = (date: Date | string) =>
+  useDayjs()(date).format(getDateTimeFormat());
+
 /**
  * convert date object or ISO8601 date become local datetime string
  * @param date date|string
  * @returns local shortform date-time
  */
-export const dateRenderToDateTimeStr = (date: Date | string) =>
-  convertToDate(date).toLocaleString().replace(",", " ").slice(0, -3);
+export const dateRenderToDateTimeStr = (date: Date | string) => formatDateTimeByOrgFormat(date);
 /**
  * convert date object or ISO datestring become local date string
  * @param date date|string
  * @returns local short form date
  */
-export const dateRenderToDateStr = (date: Date | string) =>
-  convertToDate(date).toLocaleDateString().replace(",", " ");
+export const dateRenderToDateStr = (date: Date | string) => formatDateByOrgFormat(date);
 /**
  * convert date object or ISO datestring become time string (without seconds)
  * @param date date|string
@@ -116,14 +125,17 @@ export const toUTCDate = (date: string | Date) => useDayjs().utc(date).format(ge
 export const toUTCDateTime = (date: string | Date) =>
   useDayjs().utc(date).format(getDateTimeFormat());
 export const toUTCTime = (date: string | Date) => useDayjs().utc(date).format("HH:mm");
-export const getDateFormat = (): string => "DD-MM-YYYY";
-export const getDateTimeFormat = (): string => "DD-MM-YYYY HH:mm";
+export const getDateFormat = (): string => {
+  const profile = getUserProfile();
+  const orgDateFormat = profile?.orgInfo?.dateFormat?.trim();
+  if (orgDateFormat) return orgDateFormat;
+  return getDefaultDateFormatForCountryCode(profile?.country);
+};
+
+export const getDateTimeFormat = (): string => `${getDateFormat()} HH:mm`;
 export const calculateHourDifferent = (date1: Date, date2: Date) =>
   (date1.getTime() - date2.getTime()) / 60 / 60 / 1000;
-export const getPrimevueCalendarDateFormat = () => {
-  const country = <string>getUserProfile()?.country;
-  return "dd/mm/yy";
-};
+export const getPrimevueCalendarDateFormat = () => dayjsDateFormatToPrimeVue(getDateFormat());
 
 export const addTime = (date: Date | string, duration: number, unit: DurationType) =>
   getDayJs()(date).add(duration, "hour").toDate();
@@ -131,3 +143,14 @@ export const addTime = (date: Date | string, duration: number, unit: DurationTyp
 export const utcToLocalOffset = (utcTime: string, timeZoneOffset: number) => {
   return useDayjs().utc(utcTime).utcOffset(Number(timeZoneOffset));
 };
+
+export const getOffsetMinutesTimeZone = (timeZone: string, date: Date = new Date()): number => {
+  try {
+    // Keep JS Date.getTimezoneOffset sign convention:
+    // UTC+7 => -420, UTC-5 => 300
+    const luxonOffset = DateTime.fromJSDate(date).setZone(timeZone).offset;
+    return luxonOffset * -1;
+  } catch {
+    return new Date().getTimezoneOffset();
+  }
+};

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

@@ -4,42 +4,53 @@
  * last change 2024-02-24
  * Author: Ks Tan
  */
-import {getAllDocuments} from '~/simpleapp/generate/commons/documents'
-import { FormCrudEvent,SimpleAppDocumentType } from '~/types'
-export const getDocument = (docname:SimpleAppDocumentType) =>{
-        return getAllDocuments().find((item)=>item.docName==docname)   //?.docClass
-}
+import { getAllDocuments } from "~/simpleapp/generate/commons/documents";
+import { FormCrudEvent, SimpleAppDocumentType } from "~/types";
+export const getDocument = (docname: SimpleAppDocumentType | string) => {
+  const normalizedDocName = `${docname ?? ""}`.trim().toLowerCase();
+  if (!normalizedDocName) return undefined;
+
+  return getAllDocuments().find((item) => item.docName?.toLowerCase() == normalizedDocName); //?.docClass
+};
 
 // (appuser: UserContext, filter: any) => Promise<void>;
-export const onScreenAddDocument = <T>(docname:SimpleAppDocumentType,paras?:T,after?:(eventType:FormCrudEvent, data:T,visible:Ref<boolean>)=>Promise<void>)=>{
-        useNuxtApp().$event('ViewRecord',{
-            documentName: docname,
-            eventId:randomUUID(),
-            _id:'new',
-            paras:paras,
-            document: getDocument(docname)?.docClass,
-            viewer: getDocument(docname)?.viewer,    
-            after: (eventType:FormCrudEvent, data: any,visible:Ref<boolean>) => {
-                //do nothing
-                if(after)after(eventType,data as T,visible)
-            },
-            label:t(docname)
-        
-          })
-    }
-    export const onScreenEditDocument = <T>(docname:SimpleAppDocumentType,_id:string,after?:(eventType:FormCrudEvent, data:T,visible:Ref<boolean>)=>Promise<void>,autoclose:number=1)=>{
-        
-        useNuxtApp().$event('ViewRecord',{
-            documentName: docname,
-            eventId:randomUUID(),
-            _id:_id,
-            autoclose:autoclose,
-            document: getDocument(docname)?.docClass,
-            viewer: getDocument(docname)?.viewer,    
-            after: async (eventType:FormCrudEvent, data: any,visible:Ref<boolean>) => {
-                //do nothing
-                 if(after)after(eventType,data as T,visible)
-            },
-            label:t(docname)        
-          })
-    }
+export const onScreenAddDocument = <T>(
+  docname: SimpleAppDocumentType,
+  paras?: T,
+  after?: (eventType: FormCrudEvent, data: T, visible: Ref<boolean>) => Promise<void>,
+) => {
+  useNuxtApp().$event("ViewRecord", {
+    documentName: docname,
+    eventId: randomUUID(),
+    _id: "new",
+    paras: paras,
+    document: getDocument(docname)?.docClass,
+    viewer: getDocument(docname)?.viewer,
+    after: (eventType: FormCrudEvent, data: any, visible: Ref<boolean>) => {
+      //do nothing
+      if (after) after(eventType, data as T, visible);
+    },
+    label: t(docname),
+  });
+};
+
+export const onScreenEditDocument = <T>(
+  docname: SimpleAppDocumentType,
+  _id: string,
+  after?: (eventType: FormCrudEvent, data: T, visible: Ref<boolean>) => Promise<void>,
+  autoclose: number = 1,
+) => {
+  useNuxtApp().$event("ViewRecord", {
+    documentName: docname,
+    eventId: randomUUID(),
+    _id: _id,
+    autoclose: autoclose,
+    document: getDocument(docname)?.docClass,
+    viewer: getDocument(docname)?.viewer,
+    after: async (eventType: FormCrudEvent, data: any, visible: Ref<boolean>) => {
+      //do nothing
+      if (after) after(eventType, data as T, visible);
+    },
+    label: t(docname),
+  });
+};

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

@@ -36,6 +36,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       timeZone: ref(""),
       currency: ref(""),
       country: ref(""),
+      dateFormat: ref(""),
       offsetMinute: ref(0),
       tenantInfo: ref<Tenant>({} as Tenant),
       orgInfo: ref<Organization>({} as Organization),
@@ -105,6 +106,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
             this.timeZone = res.timeZone;
             this.currency = res.currency;
             this.country = res.country;
+            this.dateFormat = res.dateFormat ?? "";
             this.offsetMinute = res.offsetMinute;
             this.tenantInfo = res?.tenantInfo;
             this.orgInfo = res?.orgInfo;
@@ -313,6 +315,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           currency: this.currency,
           timeZone: this.timeZone,
           country: this.country,
+          dateFormat: this.dateFormat,
           offsetMinute: this.offsetMinute,
           tenantInfo: this.tenantInfo,
           orgInfo: this.orgInfo,

package/templates/nuxt/simpleapp/generate/features/miniApp/app/components/MiniAppPageIframe.vue.eta

@@ -11,7 +11,7 @@
         )
       "
       :title="pageInfo.title || t('miniAppLang.content')"
-      sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-presentation allow-modals"
+      sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-presentation allow-modals allow-downloads"
       allow="clipboard-write"
       referrerpolicy="origin"
       loading="lazy"