@simitgroup/simpleapp-generator 2.0.2-z-alpha → 2.0.3-b-alpha

package/ReleaseNote.md

@@ -1,5 +1,10 @@
-[2.0.2z-alpha]
-1. Add allow-downloads on miniapp
+[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
 
 [2.0.2y-alpha]
 1. Add utcToLocalOffset function

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.2z-alpha",
+  "version": "2.0.3b-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema.",
   "main": "dist/index.js",
   "scripts": {
@@ -42,8 +42,8 @@
     "simpleapp-generator": "dist/index.js"
   },
   "devDependencies": {
-    "@types/node": "^20.5.2",
+    "@types/node": "^20.19.39",
     "prettier": "^3.0.2",
-    "typescript": "^5.1.6"
+    "typescript": "^5.9.3"
   }
 }

package/templates/basic/nest/controller.ts.eta

@@ -212,6 +212,17 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     return await this._update(appuser,id, data) ;
   }
 
+  @Post('bulk-create')
+  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= it.typename%>_create)
+  @ApiResponse({ status: 201,description: 'success',type: [schemas.<%= it.typename%>] })
+  @ApiResponse({ status: 400, description: 'bad request' })
+  @ApiResponse({ status: 500, description: 'internal error' })
+  @ApiBody({ description: 'Data', type: [schemas.<%= it.typename%>] })
+  @ApiOperation({ operationId: 'runCreateMany' })
+  async createMany(@AppUser() appuser: UserContext, @Body() data: schemas.<%= it.typename%>[]) {
+    return await this._createMany(appuser, data);
+  }
+
   @Patch('bulk-patch')
   @ApiResponse({ status: 200, description: 'success', type: schemas.UpdateManyResponse})
   @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= it.typename%>_update)

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/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/base/simple-app.controller.ts.eta

@@ -29,6 +29,7 @@ type ServiceType = {
   setData: Function;
   getAutoComplete: Function;
   fullTextSearch: Function;
+  createMany: Function;
   patchMany: Function;
 };
 
@@ -94,6 +95,10 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
     return this.service.findIdThenDelete(appuser, id);
   }
 
+  async _createMany(appuser: UserContext, data: TApiSchema[]) {
+    return this.service.createMany(appuser, data) as TApiSchema[];
+  }
+
   async _patchMany(appuser: UserContext, patchManyData: PatchManyRequest<TApiSchema>) {
     return this.service.patchMany(appuser, patchManyData);
   }

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/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,