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

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,66 @@
-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.tenant,
+    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' },
+    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' }
+      }
+    },
+    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', minLength: 3 },
+    active: { type: 'boolean', default: true },
+    eventTypes: {
+      type: 'array',
+      minItems: 1,
+      items: {
+        type: 'string'
+      }
     }
-}
-
+  }
+};

package/src/framework.ts

@@ -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`
   );
 };
 

package/src/generate.ts

@@ -230,7 +230,11 @@ const generateSchema = (
     apiSettings: currentmodel.apiSettings ?? [],
     isolationtype: currentmodel.isolationtype,
     hasdocformat: currentmodel.hasdocformat,
-    foreignkeys: currentmodel.foreignkeys ?? {}
+    foreignkeys: currentmodel.foreignkeys ?? {},
+    customField: {
+      isEnable:
+        jsonschemas[docname][X_SIMPLEAPP_CONFIG]?.customField?.isEnable ?? false
+    }
   };
 
   const templatefolder = `${constants.templatedir}/${rendertype}`;
@@ -427,6 +431,18 @@ const generateSchema = (
             validate: (targetfile: string, isexists: boolean) => {
               return true;
             }
+          },
+          'resource-bridge.editable.service.ts.eta': {
+            to: 'simpleapp/generate/miniApp/bridge/services/editable/resources',
+            as: `${_.kebabCase(resourceName)}-bridge.editable.service.ts`,
+            validate: (targetfile: string, isexists: boolean) => !isexists
+          },
+          'jsonschema.ts.eta': {
+            to: 'simpleapp/generate/jsonSchemas',
+            as: `${doctype}.jsonschema.ts`,
+            validate: (targetfile: string, isexists: boolean) => {
+              return true;
+            }
           }
         };
 

package/src/processors/jsonschemabuilder.ts

@@ -177,10 +177,12 @@ const genSchema = async (
 
   if (schematype === 'object' && !_.isEmpty(jsondata) && _.isEmpty(parentObj)) {
     if (!parentObj[FOREIGNKEY_PROPERTY]) {
-      jsondata['more'] = {
-        type: 'object',
-        properties: {}
-      };
+      if (schemaconfigs?.customField?.isEnable) {
+        jsondata['more'] = {
+          type: 'object',
+          properties: {}
+        };
+      }
     }
   }