@simitgroup/simpleapp-generator 2.0.2-r-alpha → 2.0.2-t-alpha

package/ReleaseNote.md

@@ -1,3 +1,12 @@
+[2.0.2t-alpha]
+
+1. Fix define type on service file
+
+[2.0.2s-alpha]
+
+1. Reduce expired-token issues
+2. Define type on service for readonly
+
 [2.0.2r-alpha]
 
 1. Fix define types on controller fulltextsearch and setStatus

package/package.json

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

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

@@ -72,8 +72,13 @@ export class <%= it.typename %>Service extends SimpleAppService<schema.<%= it.ty
       <%}%>
       <%if(it.jsonschema.properties['documentStatus']){%>
         const docstatus = this.data.documentStatus
-        const statussetting = this.jsonschema['x-simpleapp-config'].allStatus?.find((item)=>item.status==docstatus)
-        if(statussetting && statussetting.readOnly) return true
+        const schemaJson = this.jsonschema as {
+          ['x-simpleapp-config']?: { allStatus?: { status: string; readOnly?: boolean }[] }
+        }
+        const statussetting = schemaJson['x-simpleapp-config']?.allStatus?.find(
+          (item) => item.status === docstatus
+        )
+        if(statussetting?.readOnly) return true
       <%}%>      
       return false            
     } 
@@ -88,7 +93,7 @@ export class <%= it.typename %>Service extends SimpleAppService<schema.<%= it.ty
           // <%~ JSON.stringify(fml) %>
           //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
             jsonpath.apply($data, '<%~ fml.jsonPath %>', function ($item: schema.<%= fml?.paramType || it.typename %>) {
-              return <%~ fml.formula %>
+                return <%~ fml.formula %>
             })
         <%}) %>
       <%} %>

package/templates/nuxt/app.vue.eta

@@ -58,7 +58,7 @@ onMounted(async()=>{
     if(getCurrentXorg()===''){
       navigateTo('/picktenant')
     }else if(!currentgroup){
-      goTo('/pickgroup')
+      goTo('pickgroup')
     }
     setGraphqlServer()
   }else{

package/templates/nuxt/server/api/auth/[...].ts.eta

@@ -75,8 +75,12 @@ export default NuxtAuthHandler({
                 return token;
               }
             
-              const buffer = 60;
+              const buffer = 300;
             
+              if (!token.expiresAt) {
+                return token;
+              }
+
               if (Date.now() < (<number>token.expiresAt - buffer) * 1000) {
                 return token;
               }