@simitgroup/simpleapp-generator 2.0.1-l-alpha → 2.0.1-m-alpha

package/ReleaseNote.md

@@ -1,3 +1,9 @@
+[2.0.1m-alpha]
+1. remove s from environment collection name 
+2. return maintenanceMessage when system under maintenance
+3. fix maintenanceMode cannot set in api
+4. 
+
 [2.0.1l-alpha]
 1. documentevent collection remove 's'
 

package/package.json

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

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

@@ -63,19 +63,19 @@ export class MaintenanceService {
     }
   }
   async runGetEnvironment(appUser: UserContext) {
-    const res = await this.sysEnvdoc.findOne();
+    const res = await this.sysEnvdoc.findOne();    
     return res;
   }
   async runUpdateEnvironment(appUser: UserContext, data: Environment) {
     const finalData: Environment = {
-      systemEnable: data.systemEnable === undefined ? data.systemEnable : true,
+      systemEnable: data.systemEnable !== undefined ? data.systemEnable : true,
       stopUntil: data.stopUntil ?? '',
       maintenanceMessage: data.maintenanceMessage ?? '',
       adminEmails: data.adminEmails.map((item) => item.replace(' ', '')) ?? [],
       billingEmails: data.billingEmails.map((item) => item.replace(' ', '')) ?? [],
       supportEmails: data.supportEmails.map((item) => item.replace(' ', '')) ?? [],
-      taxRate: data.taxRate ?? 0.00,
-      taxName: data.taxName?? '',
+      taxRate: data.taxRate ?? 0.0,
+      taxName: data.taxName ?? '',
       updated: new Date().toISOString(),
       updatedBy: appUser.getUid(),
     };

package/templates/nest/src/simple-app/_core/features/maintenance/schemas/environment.ts.eta

@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
-@Schema()
+@Schema({ collection: 'environment' })
 export class Environment {
   @Prop()
   @ApiProperty({ type: Boolean })

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

@@ -50,6 +50,11 @@ export class SimpleAppMiddleware implements NestMiddleware {
     return true;
   }
 
+  getMaintenanceMessage (env:Environment){
+    return {
+          message: env.maintenanceMessage
+        }
+  } 
   async use(req: Request, res: Response, next: NextFunction) {
     if (req.baseUrl == '/oauth2-redirect.html') {
       next();
@@ -66,7 +71,7 @@ export class SimpleAppMiddleware implements NestMiddleware {
     tokenStr = tokenStr.replace('Bearer ', '');
     const xOrg = req.get('x-org') ?? this.defaultXOrg;
 
-    const user = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel,envs[0]);
+    const user = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel, envs[0]);
 
     if (req.baseUrl == '/graphql') {
       if (tokenStr) {
@@ -74,7 +79,7 @@ export class SimpleAppMiddleware implements NestMiddleware {
       }
 
       if (maintenanceMode && !user.isRealmAdmin()) {
-        throw new ServiceUnavailableException('System in maintenance mode');
+        throw new ServiceUnavailableException(this.getMaintenanceMessage(envs[0]));
       }
 
       req['sessionuser'] = user;
@@ -91,7 +96,7 @@ export class SimpleAppMiddleware implements NestMiddleware {
 
         req['sessionuser'] = user;
         if (maintenanceMode) {
-          throw new ServiceUnavailableException('System in maintenance mode');
+          throw new ServiceUnavailableException(this.getMaintenanceMessage(envs[0]));
         }
         next();
         return;
@@ -131,7 +136,7 @@ export class SimpleAppMiddleware implements NestMiddleware {
       await user.setCurrentUserInfo(tokenStr, xOrg, this.webhookModel);
 
       if (maintenanceMode && !user.isRealmAdmin()) {
-        throw new ServiceUnavailableException('System in maintenance mode');
+        throw new ServiceUnavailableException(this.getMaintenanceMessage(envs[0]));
       }
 
       user.detectMiniAppSdkRequest(req);

package/templates/nuxt/plugins/10.simpleapp-event.ts.eta

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2025-10-25
  * Author: Ks Tan
  */
 import DialogService from 'primevue/dialogservice';
@@ -34,15 +34,40 @@ export default defineNuxtPlugin( async(nuxtApp) => {
         // console.log("error catch",error)
 
         if(error?.code && error.code == 'ERR_BAD_REQUEST'){
-          // console.log("error.code",error.response.status, error)
           if(error.response && error.response.status==403){
             console.warn("error status 403, redirect to external link /" )
             navigateTo('/',{external:true})
           }else{
             console.error("axios ERR_BAD_REQUEST",error)
+            let errorMsg=''
+            let errorCode=0
+            let moreMsg = ''
+            if(error.response?.data?.data?.message){
+              errorCode = error.response.data.data.status
+              moreMsg = error.response.data.data.message
+              errorMsg = error.response.data.data.name
+            }else if(error.response?.data){
+              errorCode = error.response.data.statusCode
+              moreMsg = error.response.data.statusMessage
+              errorMsg = error.response.data.message
+            }else{
+              errorCode = error.status
+              moreMsg = error.message
+              errorMsg = error.name
+            }
+
+            const errorData = {
+              statusCode:errorCode,
+              statusMessage:errorMsg,
+              message: moreMsg ,
+              fatal:true
+            }
+
+            // console.log(error.response)
+            throw createError(errorData)  
           }          
         }        
-        else if(error.code){        
+        else if(error.code){          
           throw createError({
             statusCode:error.code,
             statusMessage:error.message,

package/templates/nuxt/plugins/18.simpleapp-custom-field-store.ts.eta

@@ -1,3 +1,4 @@
+import { AxiosInstance } from "axios";
 import { ShallowRef } from "vue";
 import { Customfield, CUSTOMFIELDApi } from "~/simpleapp/generate/openapi";
 
@@ -18,7 +19,8 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     actions: {
       async fetchList() {
         const config = getAxiosConfig();
-        const api = new CUSTOMFIELDApi(config);
+        const axiosObj:AxiosInstance =  useNuxtApp().$axios                
+        const api = new CUSTOMFIELDApi(config,config.basePath,axiosObj);
         const resp = await api.runSearch({
           filter: {},
           fields: ["_id", "collectionName", "form", "list"],

package/templates/nuxt/plugins/19.simpleapp-mini-app-store.ts.eta

@@ -1,3 +1,4 @@
+import { AxiosInstance } from 'axios';
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
@@ -61,7 +62,9 @@ export default defineNuxtPlugin(async () => {
       },
       getMiniAppManager : ()=>{
         const config = getAxiosConfig();
-        const miniAppManager = new MINIAPPMANAGERApi(config);
+        
+        const axiosObj:AxiosInstance =  useNuxtApp().$axios         
+        const miniAppManager = new MINIAPPMANAGERApi(config,config.basePath,axiosObj);
         return miniAppManager
       },
       showMiniAppMoreMenuButton: (state) => {

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

@@ -147,10 +147,11 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           }
         }
         const { $axios } = useNuxtApp();
-        try {
+        try {          
           const pingresult = await new PROFILEApi(
             undefined,
             apiurl,
+            axios
           ).getSession();
           if (pingresult.status < 300) return Promise.resolve("ok");
           else return Promise.reject("relogin");