@simitgroup/simpleapp-generator 2.0.3-d-alpha → 2.0.3-f-alpha

package/ReleaseNote.md

@@ -1,3 +1,10 @@
+[2.0.3f-alpha]
+1. Migrate license imports to shared package
+2. Replace useDayjs with dayjs
+
+[2.0.3e-alpha]
+1. Fix eslint error
+
 [2.0.3d-alpha]
 1. Fix generator no generate sub level enum
 2. Fix schema no use enum

package/package.json

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

package/templates/nest/src/simple-app/_core/features/mini-app/mini-app-manager/mini-app-manager-env-development.service.ts.eta

@@ -4,10 +4,9 @@ import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniAppManagerProcessor } from './mini-app-manager.processor';
-import { DynamicParam,MiniApp ,CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
+import { DynamicParam, MiniApp, CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
+import { MiniAppAccessVisibilityEnum, MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { Model } from 'mongoose';
-import { MiniAppManagerEnvEnum } from './mini-app-manager.enum';
 import _ from 'lodash';
 
 @Injectable()
@@ -70,14 +69,13 @@ export class MiniAppManagerEnvDevelopmentService extends MiniAppManagerProcessor
     // Validate Original Code Instead Of Processed One, Because Will Check End With ('_dev')
     this.assertMiniAppCodePattern(dto.code);
 
-    const env = MiniAppManagerEnvEnum.DEV;
     const miniAppCode = dto.code + '_dev';
     await this.assertMiniAppCodeUnique(appUser, miniAppCode);
 
     const payload: MiniApp = {
       code: miniAppCode,
       name: dto.name,
-      env: env,
+      env: MiniAppEnvEnum.DEV,
       version: dto.version,
       description: '',
       logo: '',
@@ -86,7 +84,7 @@ export class MiniAppManagerEnvDevelopmentService extends MiniAppManagerProcessor
       status: MiniAppStatusEnum.DRAFT,
       author: dto.author,
       access: {
-        visibility: 'private',
+        visibility: MiniAppAccessVisibilityEnum.PRIVATE,
         allowEmails: [dto.author.email],
         requiredPlans: [],
       },
@@ -121,7 +119,7 @@ export class MiniAppManagerEnvDevelopmentService extends MiniAppManagerProcessor
       pricing: dto.pricing,
       author: dto.author,
       access: {
-        visibility: 'private',
+        visibility: MiniAppAccessVisibilityEnum.PRIVATE,
         allowEmails: [dto.author.email],
         requiredPlans: [],
       },
@@ -133,7 +131,7 @@ export class MiniAppManagerEnvDevelopmentService extends MiniAppManagerProcessor
   }
 
   protected assertEnvironment(appUser: UserContext, miniApp: MiniApp) {
-    if (miniApp.env !== MiniAppManagerEnvEnum.DEV) {
+    if (miniApp.env !== MiniAppEnvEnum.DEV) {
       throw new BadRequestException('Cannot process production app in dev env');
     }
   }

package/templates/nest/src/simple-app/_core/features/mini-app/mini-app-manager/mini-app-manager-env-production.service.ts.eta

@@ -4,10 +4,9 @@ import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniAppManagerProcessor } from './mini-app-manager.processor';
-import { DynamicParam,MiniApp ,CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
+import { DynamicParam, MiniApp, CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
 import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { Model } from 'mongoose';
-import { MiniAppManagerEnvEnum } from './mini-app-manager.enum';
 import _ from 'lodash';
 
 @Injectable()
@@ -70,11 +69,10 @@ export class MiniAppManagerEnvProductionService extends MiniAppManagerProcessor
     this.assertMiniAppCodePattern(dto.code);
     await this.assertMiniAppCodeUnique(appUser, dto.code);
 
-    const env = MiniAppManagerEnvEnum.PROD;
     const payload = {
       code: dto.code,
       name: dto.name,
-      env: env,
+      env: MiniAppEnvEnum.PROD,
       version: dto.version,
       description: dto.description,
       logo: dto.logo,
@@ -112,7 +110,7 @@ export class MiniAppManagerEnvProductionService extends MiniAppManagerProcessor
   }
 
   protected assertEnvironment(appUser: UserContext, miniApp: MiniApp) {
-    if (miniApp.env !== MiniAppManagerEnvEnum.PROD) {
+    if (miniApp.env !== MiniAppEnvEnum.PROD) {
       if (!_.isEmpty(miniApp?.development?.demoXOrg)) {
         if (miniApp.development.demoXOrg === appUser.getXOrg()) {
           return true;

package/templates/nest/src/simple-app/_core/features/mini-app/mini-app-manager/mini-app-manager-policy.service.ts.eta

@@ -5,7 +5,7 @@ import { PolicyService } from 'src/simple-app/_core/features/policy/policy.servi
 import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
 import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniApp } from '../dto';
-import licenseTypes,{BaseLicense} from 'src/simple-app/config/license-types';
+import { licenses as licenseTypes, BaseLicense } from '@simtrain/shared/license';
 @Injectable()
 export class MiniAppManagerPolicyService {
   readonly _RELEASED_STATUSES = [MiniAppStatusEnum.PUBLISHED];
@@ -33,7 +33,7 @@ export class MiniAppManagerPolicyService {
     // const requiredPlans = miniApp.access.requiredPlans ?? [];
 
     if (licenseTypes[currentLicense]) {
-      const licenseSetting:BaseLicense = licenseTypes[currentLicense]
+      const licenseSetting: BaseLicense = licenseTypes[currentLicense];
       return licenseSetting?.feature?.miniApp ?? false;
     } else {
       return false;

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

@@ -1,8 +1,7 @@
 import { Injectable } from '@nestjs/common';
+import { BaseLicense, HasType, licenses as licenseTypes } from '@simtrain/shared/license';
 import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
 import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
-import licenseTypes,{BaseLicense} from 'src/simple-app/config/license-types';
-import { HasType } from 'src/simple-app/config/license-types/license.type';
 @Injectable()
 export class PolicyService {
   private readonly _HIGH_PRIVILEGE_ROLES = [Role.SuperAdmin, Role.SuperUser, Role.TenantOwner];
@@ -27,8 +26,8 @@ export class PolicyService {
   hasFeature(appUser: UserContext, feature: string): boolean {
     const appLicense = appUser.tenantInfo?.license ?? 'free';
     // const allowedPlans = this._FEATURES[feature];
-    const licenseSetting:BaseLicense = licenseTypes[appLicense]    
-    const allowed = licenseSetting.has(HasType.feature,feature) ?? false;
+    const licenseSetting: BaseLicense = licenseTypes[appLicense];
+    const allowed = licenseSetting.has(HasType.feature, feature) ?? false;
     return allowed;
   }
 

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

@@ -4,6 +4,7 @@
  * last change 2024-04-13
  * Author: Ks Tan
  */
+import dayjs from 'dayjs'
 import { DateTime } from "luxon";
 import {
   dayjsDateFormatToPrimeVue,
@@ -16,13 +17,13 @@ const convertToDate = (date: Date | string) => {
 };
 
 //after review
-export const today = () => useDayjs()().format("YYYY-MM-DD");
+export const today = () => dayjs().format("YYYY-MM-DD");
 
 export const formatDateByOrgFormat = (date: Date | string) =>
-  useDayjs()(date).format(getDateFormat());
+  dayjs(date).format(getDateFormat());
 
 export const formatDateTimeByOrgFormat = (date: Date | string) =>
-  useDayjs()(date).format(getDateTimeFormat());
+  dayjs(date).format(getDateTimeFormat());
 
 /**
  * convert date object or ISO8601 date become local datetime string
@@ -65,44 +66,44 @@ export const stringToDate = (datestr: string) => new Date(datestr);
  */
 export const dateToISOString = (date: Date | string) =>
   convertToDate(date).toISOString().split(".")[0] + "Z";
-//useDayjs()(date).toISOString().split('.')[0]+"Z"
+//dayjs(date).toISOString().split('.')[0]+"Z"
 /**
  * convert date object to date string (YYYY-MM-DD)
  * @param date :Date
  * @returns date return string in YYYY-MM-DD
  */
-export const dateToString = (date: Date | string) => useDayjs()(date).format("YYYY-MM-DD");
+export const dateToString = (date: Date | string) => dayjs(date).format("YYYY-MM-DD");
 /**
  * convert date object to time string (HH:mm:ss)
  * @param date
  * @returns timestring
  */
-export const dateToTimeString = (date: Date) => useDayjs()(date).format("HH:mm:ss");
+export const dateToTimeString = (date: Date) => dayjs(date).format("HH:mm:ss");
 /**
  * get 3 char day name sun/mon/tue in lower case
  * @param date : Date|string date obj or iso8601 date
  * @returns string
  */
 export const getDayNameInWeek = (date: Date | string) =>
-  useDayjs()(date).format("ddd").toLowerCase();
+  dayjs(date).format("ddd").toLowerCase();
 /**
  * get last date of the specific date
  * @param dates: Date|string
  * @returns string
  */
 export const lastDateOfMonth = (date: Date | string) =>
-  useDayjs()(date).endOf("month").format("YYYY-MM-DD");
+  dayjs(date).endOf("month").format("YYYY-MM-DD");
 
 //before reevaluate
 
-export const setDateLocale = (localename: string) => useDayjs().locale(localename);
+export const setDateLocale = (localename: string) => dayjs.locale(localename);
 export const dateExists = (date: Date, listDate: Date[]) => {
   const existsrecord = listDate.find((item) => {
     return date.getTime() === item.getTime();
   });
   return existsrecord === undefined ? false : true;
 };
-export const getDayJs = () => useDayjs();
+export const getDayJs = () => dayjs;
 
 export const dateToISOWithoutConvert = (date: Date) => {
   const timestamp = date.getTime() - date.getTimezoneOffset() * 60000;
@@ -116,15 +117,15 @@ export const convertIsoToDateToWithoutConvert = (datestr: string) => {
 };
 
 export const dateToDateTimeString = (date: Date) =>
-  useDayjs().utc(date).format("YYYY-MM-DD HH:mm:ss");
-export const toLocalDate = (date: string | Date) => useDayjs()(date).format(getDateFormat());
+  dayjs.utc(date).format("YYYY-MM-DD HH:mm:ss");
+export const toLocalDate = (date: string | Date) => dayjs(date).format(getDateFormat());
 export const toLocalDateTime = (date: string | Date) =>
-  useDayjs().utc(date).format(getDateTimeFormat());
+  dayjs.utc(date).format(getDateTimeFormat());
 
-export const toUTCDate = (date: string | Date) => useDayjs().utc(date).format(getDateFormat());
+export const toUTCDate = (date: string | Date) => dayjs.utc(date).format(getDateFormat());
 export const toUTCDateTime = (date: string | Date) =>
-  useDayjs().utc(date).format(getDateTimeFormat());
-export const toUTCTime = (date: string | Date) => useDayjs().utc(date).format("HH:mm");
+  dayjs.utc(date).format(getDateTimeFormat());
+export const toUTCTime = (date: string | Date) => dayjs.utc(date).format("HH:mm");
 export const getDateFormat = (): string => {
   const profile = getUserProfile();
   const orgDateFormat = profile?.orgInfo?.dateFormat?.trim();
@@ -141,7 +142,7 @@ export const addTime = (date: Date | string, duration: number, unit: DurationTyp
   getDayJs()(date).add(duration, "hour").toDate();
 
 export const utcToLocalOffset = (utcTime: string, timeZoneOffset: number) => {
-  return useDayjs().utc(utcTime).utcOffset(Number(timeZoneOffset));
+  return dayjs.utc(utcTime).utcOffset(Number(timeZoneOffset));
 };
 
 export const getOffsetMinutesTimeZone = (timeZone: string, date: Date = new Date()): number => {

package/templates/nest/src/simple-app/config/license-types/index.ts._eta

@@ -1 +0,0 @@
-export const license1 = {id:"app"}