@simitgroup/simpleapp-generator 1.6.6-p-alpha → 1.6.6-r-alpha

package/src/buildinschemas/systemmessage.ts

@@ -1,42 +1,43 @@
-import {SchemaType,RESTMethods,IsolationType} from '../type'
+import { SchemaType, RESTMethods, IsolationType } from '../type';
 
-export const systemmessage:SchemaType =
-{
-    "type": "object",
-    "x-simpleapp-config": {
-      "documentType": "sysmsg",
-      "documentName": "systemmessage",
-      "isolationType": IsolationType.tenant,
-      "documentTitle": "messageTitle",
-      additionalApis:[{
-        "action":"readmsg",
-        "entryPoint":":id/read",
-        "requiredRole":["User"],
-        "responseType":"Systemmessage",
-        "method":RESTMethods.get, 
-        "description":"get message content and mark read"
-      } ]
-    },
-    "properties": {
-      "_id": { "type": "string","format":"uuid" },
-      "created": { "type": "string" },
-      "updated": { "type": "string" },
-      "createdBy": { "type": "string" },
-      "updatedBy": { "type": "string" },
-      "tenantId": { "type": "integer", "default": 1 },
-      "orgId": { "type": "integer", "default": 1 },
-      "branchId": { "type": "integer", "default": 1 },      
-      "uid": { "type": "string","format":"uuid" },
-      "messageType":{"type":"string",minLength:3},
-      "messageTitle": {
-        "type": "string",
-        "minLength": 3
-      },
-      "read": { "type": "boolean", "default": false},    
-      "body": {
-        "type": "string",
-        "format": "html"
+export const systemmessage: SchemaType = {
+  type: 'object',
+  'x-simpleapp-config': {
+    documentType: 'sysmsg',
+    documentName: 'systemmessage',
+    isolationType: IsolationType.tenant,
+    documentTitle: 'messageTitle',
+    additionalApis: [
+      {
+        action: 'readmsg',
+        entryPoint: ':id/read',
+        requiredRole: ['User'],
+        responseType: 'Systemmessage',
+        method: RESTMethods.get,
+        description: 'get message content and mark read'
       }
+    ],
+    resourceName: 'systemMessage'
+  },
+  properties: {
+    _id: { type: 'string', format: 'uuid' },
+    created: { type: 'string' },
+    updated: { type: 'string' },
+    createdBy: { type: 'string' },
+    updatedBy: { type: 'string' },
+    tenantId: { type: 'integer', default: 1 },
+    orgId: { type: 'integer', default: 1 },
+    branchId: { type: 'integer', default: 1 },
+    uid: { type: 'string', format: 'uuid' },
+    messageType: { type: 'string', minLength: 3 },
+    messageTitle: {
+      type: 'string',
+      minLength: 3
+    },
+    read: { type: 'boolean', default: false },
+    body: {
+      type: 'string',
+      format: 'html'
     }
   }
-  
+};

package/src/buildinschemas/tenant.ts

@@ -1,47 +1,48 @@
-import {SchemaType,RESTMethods,IsolationType} from '../type'
+import { SchemaType, RESTMethods, IsolationType } from '../type';
 
-export const tenant:SchemaType ={
-    type: "object",
-    "x-simpleapp-config":{
-        isolationType:IsolationType.none,
-        requiredRoles:["SuperAdmin"],    
-        pageType:'crud',
-        uniqueKey:'tenantId',
-        documentTitle:'tenantName',
-        documentName:'tenant',
-        documentType:'tenant',
-    },        
-    required:["tenantId","tenantName","owner"],
-    properties: {
-        _id:{type:'string'},
-        created:{type:'string'},
-        updated:{type:'string'},
-        createdBy:{type:'string'},
-        updatedBy:{type:'string'},
-        tenantId: {type:'integer',default:1,minimum:0 },
-        orgId: {type:'integer',default:1,minimum:0 },
-        branchId: {type:'integer',default:1,minimum:0 },
-        tenantName: {type: "string", minLength:3},
-        active: {"type": "boolean","examples": [true],default:true},
-        businessType:{type:"string"},
-        clientSetting: {
-            type:"object",
-            properties:{
-                auditTrail:{type:"boolean",default:false},
-                webhook:{type:"boolean",default:false},
-                support:{type:"boolean",default:false}
-            }            
-        },
-        description: {"type": "string"},
-        owner: {
-            type: "object",
-            "x-foreignkey":"user", 
-            required :["_id","label","uid"],
-            properties:{
-                _id: {type:'string'},
-                label: {type:'string'},
-                uid: {type:'string'},
-            }
-        }      
+export const tenant: SchemaType = {
+  type: 'object',
+  'x-simpleapp-config': {
+    isolationType: IsolationType.none,
+    requiredRoles: ['SuperAdmin'],
+    pageType: 'crud',
+    uniqueKey: 'tenantId',
+    documentTitle: 'tenantName',
+    documentName: 'tenant',
+    documentType: 'tenant',
+    resourceName: 'tenant'
+  },
+  required: ['tenantId', 'tenantName', 'owner'],
+  properties: {
+    _id: { type: 'string' },
+    created: { type: 'string' },
+    updated: { type: 'string' },
+    createdBy: { type: 'string' },
+    updatedBy: { type: 'string' },
+    tenantId: { type: 'integer', default: 1, minimum: 0 },
+    orgId: { type: 'integer', default: 1, minimum: 0 },
+    branchId: { type: 'integer', default: 1, minimum: 0 },
+    tenantName: { type: 'string', minLength: 3 },
+    active: { type: 'boolean', examples: [true], default: true },
+    businessType: { type: 'string' },
+    clientSetting: {
+      type: 'object',
+      properties: {
+        auditTrail: { type: 'boolean', default: false },
+        webhook: { type: 'boolean', default: false },
+        support: { type: 'boolean', default: false }
+      }
+    },
+    description: { type: 'string' },
+    owner: {
+      type: 'object',
+      'x-foreignkey': 'user',
+      required: ['_id', 'label', 'uid'],
+      properties: {
+        _id: { type: 'string' },
+        label: { type: 'string' },
+        uid: { type: 'string' }
+      }
     }
-  }
+  }
+};

package/src/buildinschemas/user.ts

@@ -1,63 +1,67 @@
-import {SchemaType,RESTMethods,IsolationType} from '../type'
+import { SchemaType, RESTMethods, IsolationType } from '../type';
 
-export const user:SchemaType ={
-    type: "object",
-    "x-simpleapp-config":{
-        documentType:'user',
-        documentName:'user',        
-        pageType:'crud',
-        loseDataIsolation:true,
-        isolationType:IsolationType.tenant,
-        uniqueKey:'email',        
-        documentTitle:'fullname',
-        requiredRoles:["SuperUser"],    
-        additionalAutoCompleteFields:['uid'],
-        additionalApis:[
-            {"action":"getPermission",
-            "entryPoint":":id/permission",
-            "requiredRole":[],
-            "method":RESTMethods.get,
-            "responseType":"[UserPermission]",
-            "description":"Get user permissoin"
-            },
-            {"action":"updatePermission",
-            "entryPoint":":id/permission",
-            "requiredRole":[],
-            "method":RESTMethods.put,
-            "schema":"[UserPermission]",
-            "description":"set user permissoin"
-            }
-        ]
+export const user: SchemaType = {
+  type: 'object',
+  'x-simpleapp-config': {
+    documentType: 'user',
+    documentName: 'user',
+    pageType: 'crud',
+    loseDataIsolation: true,
+    isolationType: IsolationType.tenant,
+    uniqueKey: 'email',
+    documentTitle: 'fullname',
+    requiredRoles: ['SuperUser'],
+    additionalAutoCompleteFields: ['uid'],
+    additionalApis: [
+      {
+        action: 'getPermission',
+        entryPoint: ':id/permission',
+        requiredRole: [],
+        method: RESTMethods.get,
+        responseType: '[UserPermission]',
+        description: 'Get user permissoin'
       },
-    properties: {
-        _id:{type:'string'},
-        created:{type:'string'},
-        updated:{type:'string'},
-        createdBy:{type:'string'},
-        updatedBy:{type:'string'},
-        tenantId: {type:'integer',default:1,minimum:0 },
-        orgId: {type:'integer',default:1,minimum:0 },
-        branchId: {type:'integer',default:1,minimum:0 },
-        uid: {
-          type: "string", 
-          oneOf:[{"format":"uuid"},{const:""}],
-          description:"sso unique id, such as keycloak sub id, empty during invitation",
-        },
-        fullName: {type: "string",minLength:3},
-        email: {type: "string",minLength:10,format: "email"},
-        mobileNo: {
-          type: "string",
-          anyOf:[
-            {"const":""},
-            {"format": "tel","examples": ["0123456789"]}          
-          ]
-        },
-        active: {type: "boolean",default:true},
-        description: {type:"string"},
-        lastActivity: {type: "string",description:"capture ISO8601 last api call"},
-        completedTours: {
-          type: "array",
-          items: { "type": "string", "examples": ["mainpage"] }
-        }
+      {
+        action: 'updatePermission',
+        entryPoint: ':id/permission',
+        requiredRole: [],
+        method: RESTMethods.put,
+        schema: '[UserPermission]',
+        description: 'set user permissoin'
       }
-}
+    ],
+    resourceName: 'user'
+  },
+  properties: {
+    _id: { type: 'string' },
+    created: { type: 'string' },
+    updated: { type: 'string' },
+    createdBy: { type: 'string' },
+    updatedBy: { type: 'string' },
+    tenantId: { type: 'integer', default: 1, minimum: 0 },
+    orgId: { type: 'integer', default: 1, minimum: 0 },
+    branchId: { type: 'integer', default: 1, minimum: 0 },
+    uid: {
+      type: 'string',
+      oneOf: [{ format: 'uuid' }, { const: '' }],
+      description:
+        'sso unique id, such as keycloak sub id, empty during invitation'
+    },
+    fullName: { type: 'string', minLength: 3 },
+    email: { type: 'string', minLength: 10, format: 'email' },
+    mobileNo: {
+      type: 'string',
+      anyOf: [{ const: '' }, { format: 'tel', examples: ['0123456789'] }]
+    },
+    active: { type: 'boolean', default: true },
+    description: { type: 'string' },
+    lastActivity: {
+      type: 'string',
+      description: 'capture ISO8601 last api call'
+    },
+    completedTours: {
+      type: 'array',
+      items: { type: 'string', examples: ['mainpage'] }
+    }
+  }
+};

package/src/buildinschemas/webhook.ts

@@ -1,65 +1,137 @@
-import {SchemaType,RESTMethods,IsolationType} from '../type'
+import { SchemaType, RESTMethods, IsolationType } from '../type';
 
-export const webhook:SchemaType = {
-    type: "object",
-    "x-simpleapp-config":{
-      documentType:'webhook',
-      documentName:'webhook',
-      isolationType:IsolationType.tenant,      
-      uniqueKey:'title',
-      documentTitle:'title'     
-    },        
-    required:["title","url"],
-    properties: {     
-      _id:{type:'string'},
-      created:{type:'string'},
-      updated:{type:'string'},
-      createdBy:{type:'string'},
-      updatedBy:{type:'string'},
-      tenantId: {type:'integer',default:1,minimum:0 },
-      orgId: {type:'integer',default:1,minimum:0 },
-      branchId: {type:'integer',default:1,minimum:0 },
-      title:{type:"string",minLength:3,},
-      url: {type: "string", format:'uri'},     
-      serverSubscriptionId :{type:"string"},
-      serverSubscriptionSecret :{type:"string"},
-      requestMethod:{
-        type: "string", 
-        enum:['post','get','patch','put','delete','head'],
-      },    
-      authentication:{
-        type:"string",
-        enum:['none','basic'],
-        description:"apikey authentication use none + headers props"
-      },
-      basicAuth:{
-        type:"object",
-        properties:{
-          user:{type:"string"},
-          password:{type:"string"}
+export const webhook: SchemaType = {
+  "type": "object",
+  "x-simpleapp-config": {
+    "documentType": "webhook",
+    "documentName": "webhook",
+    "isolationType":IsolationType.branch,
+    "uniqueKey": "title",
+    "documentTitle": "title",
+    "resourceName": "webhook"
+  },
+  "required": [
+    "title",
+    "url"
+  ],
+  "properties": {
+    "_id": {
+      "type": "string"
+    },
+    "created": {
+      "type": "string"
+    },
+    "updated": {
+      "type": "string"
+    },
+    "createdBy": {
+      "type": "string"
+    },
+    "updatedBy": {
+      "type": "string"
+    },
+    "tenantId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 0
+    },
+    "orgId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 0
+    },
+    "branchId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 0
+    },
+    "title": {
+      "type": "string",
+      "minLength": 3
+    },
+    "url": {
+      "type": "string",
+      "format": "uri"
+    },
+
+    "requestMethod": {
+      "type": "string",
+      "enum": [
+        "post",
+        "get",
+        "patch",
+        "put",
+        "delete",
+        "head"
+      ]
+    },
+    "authentication": {
+      "type": "string",
+      "enum": [
+        "none",
+        "basic"
+      ],
+      "description": "apikey authentication use none + headers props"
+    },
+    "basicAuth": {
+      "type": "object",
+      "properties": {
+        "user": {
+          "type": "string"
+        },
+        "password": {
+          "type": "string"
         }
-      },
-      headers: {
-        type: "array",
-        items:{
-          type:"object",
-          description:"http headers",
-          properties:{
-            name:{type:'string'},
-            value:{type:'string'}
+      }
+    },
+    "headers": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "description": "http headers",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
           }
         }
-      },
-
-      description: {type: "string",format:"text"},
-      body:{type:"string",format:"text",minLength:3},
-      active: {type: "boolean", default:true},
-      eventTypes:{
-        type:"array",
-        minItems:1,
-        items:{
-          type:"string"
-        }}
+      }
+    },
+    "description": {
+      "type": "string",
+      "format": "text"
+    },
+    "body": {
+      "type": "string",
+      "format": "text",
+      "default":"*",
+      "description": "POST,PUT body template"
+    },
+    "active": {
+      "type": "boolean",
+      "default": true
+    },
+    "resourceName": {
+      "type": "string",
+      "minLength": 2
+    },
+    "eventType": {
+      "type": "string",
+      "minLength": 2
+    },
+     "jobType":{
+      "type": "string",
+      "enum":["realtime","roll-back-when-failed"],
+      "description":"temporary support realtime and roll-back-when-failed, 2nd way way throw error and roll back data if webhook failed.)"
+    },
+    "retryAttemps":{
+      "type":"integer",
+      "default":0,
+      "minimum":0,
+      "maximum":5,
+      "description":"retries how many time when webhook failed"
     }
+  }
 }
-

package/src/buildinschemas/webhooklog.ts

@@ -0,0 +1,75 @@
+import { SchemaType, RESTMethods, IsolationType } from '../type';
+
+export const webhooklog: SchemaType = {
+  "type": "object",
+  "x-simpleapp-config": {
+    "documentType": "webhooklog",
+    "documentName": "webhooklog",
+    "isolationType": IsolationType.branch,
+    "uniqueKey": "_id",    
+    "resourceName": "webhooklog"
+  },
+  "required": [
+    "title",
+    "body",
+    "msg"
+  ],
+  "properties": {
+    "_id": {
+      "type": "string"
+    },
+    "created": {
+      "type": "string"
+    },
+    "updated": {
+      "type": "string"
+    },
+    "createdBy": {
+      "type": "string"
+    },
+    "updatedBy": {
+      "type": "string"
+    },
+    "tenantId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 0
+    },
+    "orgId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 0
+    },
+    "branchId": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 0
+    },
+    "title": {
+      "type": "string",
+      "minLength": 3
+    },  
+    "resource": {
+      "type": "string"     
+    },
+    "actionName": {
+      "type": "string"      
+    },
+    "statusCode": {
+      "type": "number"
+    },
+    "status": {
+      "type": "string",
+      "enum":["success","failed"]
+    },
+    "body": {
+      "type": "string",
+      "format":"text",
+      "minLength":3
+    },
+    "msg":{
+      "type":"string"
+    }
+ 
+  }
+}

package/src/framework.ts

@@ -95,7 +95,7 @@ export const prepareNest = (callback: Function) => {
     //@nestjs/graphql @nestjs/apollo graphql apollo-server-express apollo-server-core
     //@nestjs/graphql graphql-tools graphql apollo-server-express
     exec(
-      `cd ${targetfolder};pnpm install --save @nestjs/graphql mustache country-to-currency  graphql-type-json countries-and-timezones @nestjs/apollo @apollo/server graphql @nestjs/event-emitter dayjs bpmn-server@2.1.7 @casl/ability jsonpath yaml lodash @types/lodash nest-keycloak-connect keycloak-connect bpmn-client @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats ajv-errors @nestjs/config`,
+      `cd ${targetfolder};pnpm install --save @nestjs/graphql mustache json-templates country-to-currency  graphql-type-json countries-and-timezones @nestjs/apollo @apollo/server graphql @nestjs/event-emitter dayjs bpmn-server@2.1.7 @casl/ability jsonpath yaml lodash @types/lodash nest-keycloak-connect keycloak-connect bpmn-client @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats ajv-errors @nestjs/config`,
       async (error, stdout, stderr) => {
         // log.info(`dependency installed`)
         if (!error) {
@@ -184,12 +184,12 @@ export const prepareNuxt = (callback: Function) => {
   if (!fs.existsSync(`${targetfolder}/.env`)) {
     //asume no environment. prepare now
     exec(
-      `cd ${targetfolder};pnpm install;pnpm install -D @nuxtjs/apollo@next dayjs-nuxt @nuxtjs/device @nuxtjs/color-mode @types/json-schema @nuxtjs/i18n@next @nuxtjs/tailwindcss @types/jsonpath @sidebase/nuxt-auth @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core prettier @primevue/core primevue tailwindcss-primeui`,
+      `cd ${targetfolder};pnpm install;pnpm install -D @nuxtjs/apollo@next @types/json-templates  dayjs-nuxt @nuxtjs/device @nuxtjs/color-mode @types/json-schema @nuxtjs/i18n@next @nuxtjs/tailwindcss @types/jsonpath @sidebase/nuxt-auth @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core prettier @primevue/core primevue tailwindcss-primeui`,
       (error, stdout, stderr) => {
         //;pnpm install
         console.log(error, stdout, stderr);
-        exec(
-          `cd ${targetfolder};pnpm install --save vue-camera-lib vue-pdf-embed dayjs pusher-js country-code-dateformat chart.js tailwind-merge @iconify-json/heroicons  json-schema @vueuse/core ts-md5 primeicons memory-cache jsonpath pinia @pinia/nuxt @nuxt/kit lodash @types/lodash @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill prettier axios json-schema mitt @primevue/nuxt-module lru-cache vue-advanced-cropper@vue-3`,
+        exec( 
+          `cd ${targetfolder};pnpm install --save json-templates vue-camera-lib vue-pdf-embed dayjs pusher-js country-code-dateformat chart.js tailwind-merge @iconify-json/heroicons  json-schema @vueuse/core ts-md5 primeicons memory-cache jsonpath pinia @pinia/nuxt @nuxt/kit lodash @types/lodash @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill prettier axios json-schema mitt @primevue/nuxt-module lru-cache vue-advanced-cropper@vue-3`,
           (error, stdout, stderr) => {
             console.log(error, stdout, stderr);
 
@@ -288,9 +288,7 @@ export const prettyMiniAppJsSdk = () => {
   );
 };
 export const prettyMiniAppStreamlitSdk = () => {
-  // exec(
-  //   `npx prettier --write ${config.miniAppSdkFolder.streamlit}/simtrain_eco_mini_app_streamlit_sdk/**/* --ignore-path .my-empty-ignore`
-  // );
+  exec(`sh ${config.miniAppSdkFolder.streamlit}/format.sh`);
 };
 
 export const prettyNuxt = () => {
@@ -300,7 +298,7 @@ export const prettyNuxt = () => {
     `cd ${config.frontendFolder};npx prettier --write "./pages/**/*.vue" "./components/**/*.vue" "./generate/*/*.ts" `
   );
   exec(
-    `npx prettier --write ${config.frontendFolder}/simpleapp/generate/clients/*.ts ${config.frontendFolder}/simpleapp/generate/miniApp/**/*.ts`
+    `npx prettier --write ${config.frontendFolder}/simpleapp/generate/clients/*.ts ${config.frontendFolder}/simpleapp/generate/jsonSchemas/*.ts ${config.frontendFolder}/simpleapp/generate/miniApp/**/*.ts`
   );
 };