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

package/templates/basic/miniAppStreamlitSdk/resource-bridge.service.ts.eta

@@ -7,8 +7,8 @@
   const apiName = it.typename.toUpperCase() + 'Api';
   const typeActionName = pascalName + 'Actions';
 
-  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || [];
-  const hasMiniAppWhitelistedApi = miniAppWhitelistApis.length > 0;
+  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || {};
+  const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
 %>
 
 from streamlit_javascript import st_javascript
@@ -22,10 +22,9 @@ import json
 class <%= pascalName %>:
     _resource_name = "<%= it.resourceName %>"
 
-    <% for (let i = 0; i < miniAppWhitelistApis.length; i++) { %>
-      <%
-        const action = miniAppWhitelistApis[i];
-      %>
+    <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+      <% if (value !== true && typeof value !== 'object') { return; } %>
+
 
       <% if(action === 'list') { %>
 
@@ -137,6 +136,22 @@ class <%= pascalName %>:
             resource=self._resource_name, action=action, options=options
         ),
       )
+      <% } else if(action === 'current') { %>
+    
+    def <%= action %>(self, options: Optional[ApiOption] = {}):
+      action = "<%= action %>"
+      request_key = Helper.get_api_key(
+        "request", resource=self._resource_name, action=action, options=options
+      )
+
+      st_javascript(
+        f"window.parent.callApi('{self._resource_name}', '{action}')",
+        key=request_key,
+        on_change=lambda: Helper.set_api_response(
+            resource=self._resource_name, action=action, options=options
+        ),
+      )
+      
       <% } else { %>
         <% const apiSetting = it.apiSettings.find(item => item.action === action); %>
         <% if (apiSetting) { %>
@@ -191,7 +206,7 @@ class <%= pascalName %>:
       )
         <% } %>
       <% } %>
-    <% } %>
+    <% }) %>
 
     def response(self, action: str, options: Optional[ApiOption] = {}):
       return Helper.get_api_response(

package/templates/basic/nuxt/jsonschema.ts.eta

@@ -0,0 +1,7 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+export const <%= it.typename%>JsonSchema = <%~ JSON.stringify(it.jsonschema) %>

package/templates/basic/nuxt/resource-bridge.editable.service.ts.eta

@@ -0,0 +1,40 @@
+/**
+ * This file was automatically generated by simpleapp generator.
+ * you may change it, it won't override
+ * last change 2025-06-18
+ * Author: --
+ */
+
+<% 
+  const upperFirstCase = (value) => {
+    return value.charAt(0).toUpperCase() + value.slice(1);
+  }
+
+  const camelToKebab = (value) => {
+    return value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+  }
+
+  const pascalName = upperFirstCase(it.resourceName);
+  const kebabName = camelToKebab(it.resourceName);
+  const apiName = it.typename.toUpperCase() + 'Api';
+  const typeActionName = 'MiniApp' + pascalName + 'Actions';
+
+  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || {};
+  const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
+%>
+
+import { MiniApp<%= pascalName %>BridgeService } from "../../../services/resources/<%= kebabName %>-bridge.service";
+import type { <%= typeActionName %> } from "../../../services/resources/<%= kebabName %>-bridge.service";
+import { MiniAppBridgeMessageApi } from "../../../types/bridge.type";
+
+export class MiniApp<%= pascalName %>BridgeEditableService extends MiniApp<%= pascalName %>BridgeService {
+  <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+    <% if (value !== true && typeof value !== 'object') { return; } %>
+
+    <% if(action === 'current') { %>
+      protected override async handleCurrent(message: MiniAppBridgeMessageApi<<%= typeActionName %>>): Promise<any> {
+        return {};
+      }
+    <% } %>
+  <% }) %>
+}

package/templates/basic/nuxt/resource-bridge.service.ts.eta

@@ -12,18 +12,18 @@
 
   const pascalName = upperFirstCase(it.resourceName);
   const apiName = it.typename.toUpperCase() + 'Api';
-  const typeActionName = pascalName + 'Actions';
+  const typeActionName = 'MiniApp' + pascalName + 'Actions';
 
-  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || [];
-  const hasMiniAppWhitelistedApi = miniAppWhitelistApis.length > 0;
+  const miniAppWhitelistApis = it.jsonschema['x-simpleapp-config']?.miniApp?.whitelist || {};
+  const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
 %>
 
 import { <%= apiName %> } from "~/simpleapp/generate/openapi";
 import { MiniAppBridgeMessageApi } from "../../types/bridge.type";
 
-const actions = <%~ JSON.stringify(miniAppWhitelistApis, null, 2) %> as const;
+const actions = <%~ JSON.stringify(Object.keys(miniAppWhitelistApis), null, 2) %> as const;
 
-type <%= typeActionName %> = (typeof actions)[number];
+export type <%= typeActionName %> = (typeof actions)[number];
 
 export class MiniApp<%= pascalName %>BridgeService {
   protected api!: <%= apiName %>;
@@ -53,13 +53,14 @@ export class MiniApp<%= pascalName %>BridgeService {
   > {
     <% if(hasMiniAppWhitelistedApi) { %>
       return {
-        <% for (let i = 0; i < miniAppWhitelistApis.length; i++) { %>
+        <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+          <% if (value !== true && typeof value !== 'object') { return; } %>
+
           <%
-            const action = miniAppWhitelistApis[i];
             const handlerName = "handle" + upperFirstCase(action);
           %>
           <%= action %>: this.<%= handlerName %>.bind(this),
-        <% } %>
+        <% }) %>
       };
     <% } else { %>
       throw new Error(`ERR_NOT_SUPPORTED`);
@@ -68,27 +69,25 @@ export class MiniApp<%= pascalName %>BridgeService {
 
   /****************************************** API Action *****************************************/
 
-  <% for (let i = 0; i < miniAppWhitelistApis.length; i++) { %>
-    <%
-      const action = miniAppWhitelistApis[i];
-    %>
+  <% Object.entries(miniAppWhitelistApis).forEach(([action, value]) => { %>
+    <% if (value !== true && typeof value !== 'object') { return; } %>
 
     <% if(action === 'list') { %>
-      private async handleList(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handleList(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         return (await this.api!.runSearch({})).data;
       }
     <% } else if(action === 'detail') { %>
-      private async handleDetail(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handleDetail(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
         return (await this.api!.runFindOne(message.params.resource.id)).data;
       }
     <% } else if(action === 'create') { %>
-      private async handleCreate(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handleCreate(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         if (!message.params.body) throw new Error("ERR_MISSING_BODY");
         return (await this.api!.runCreate(message.params.body as any)).data;
       }
     <% } else if(action === 'update') { %>
-      private async handleUpdate(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handleUpdate(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
         if (!message.params.body) throw new Error("ERR_MISSING_BODY");
 
@@ -101,7 +100,7 @@ export class MiniApp<%= pascalName %>BridgeService {
         ).data;
       }
     <% } else if(action === 'patch') { %>
-      private async handlePatch(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handlePatch(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
         if (!message.params.body) throw new Error("ERR_MISSING_BODY");
 
@@ -114,17 +113,21 @@ export class MiniApp<%= pascalName %>BridgeService {
         ).data;
       }
     <% } else if(action === 'delete') { %>
-      private async handleDelete(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handleDelete(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         if (!message.params.resource.id) throw new Error("ERR_MISSING_ID");
 
         return (await this.api!.runDelete(message.params.resource.id)).data;
       }
     <% } else if(action === 'autoComplete') { %>
-      private async handleAutoComplete(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handleAutoComplete(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         return (await this.api!.autoComplete(message.params.query ?? "", {})).data;
       }
+    <% } else if(action === 'current') { %>
+      protected async handleCurrent(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+        return {};
+      }
     <% } else { %>
-      private async handle<%= upperFirstCase(action) %>(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
+      protected async handle<%= upperFirstCase(action) %>(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
         <% const apiSetting = it.apiSettings.find(item => item.action === action); %>
         <% if (apiSetting) { %>
           const queryParams = message.params?.queryParams;
@@ -158,5 +161,5 @@ export class MiniApp<%= pascalName %>BridgeService {
         <% } %>
       }
     <% } %>
-  <% } %>
+  <% }) %>
 }

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -20,8 +20,9 @@ import {AxiosResponse} from 'axios'
       import * as <%=libs[l].importAs %> from '<%=libs[l].importFrom %>'
   <%}%>
 <%}%>
-// import { JSONSchema7 } from 'json-schema';
 import * as openapi from '../openapi';
+import { CustomFieldDataModeEnum } from "../features/customField/enums/common";
+
 
 export type {
       <%= it.typename%> ,
@@ -57,10 +58,14 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
     const apiobj = getDocumentApi('<%=it.name %>')
     super(apiobj,'<%= it.doctype %>','<%=it.name %>')
     this.event=$event
-    this.listen=$listen    
-    this.setNew();      
-
-    this.processCustomField();  
+    this.listen=$listen
+    
+    <% if(it.customField.isEnable) { %>
+      // FLAG::CUSTOM_FIELD
+      this.prepareCustomFieldJsonSchema(); 
+    <% } %>
+     
+    this.setNew();
   }
 
   override setWatchChange = ()=>{
@@ -72,13 +77,15 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
       }               
     },{deep:true})
 
-    <% if(!['Plugins', 'Plugininstallations', 'Customfield'].includes(capitalizeFirstLetter(it.name))) { %>
+
+    <% if(it.customField.isEnable) { %>
+      // FLAG::CUSTOM_FIELD
       const { $customFieldStore, $appPluginsStore } = useNuxtApp();
       if (!this._customFieldWatch) {
         this._customFieldWatch = watch(
           [() => $customFieldStore.data, () => $appPluginsStore.installedPlugins],
           ([newCustomField, newPlugins], [oldCustomField, oldPlugins]) => {
-            this.processCustomField();
+            this.prepareCustomFieldJsonSchema();
           },
           { immediate: false, deep: true },
         );
@@ -88,8 +95,19 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
   }
 
   override setNew = ()=>{         
-    const newdata = Default<%= it.typename%>(randomUUID())
-    this.setData(newdata)
+    const defaultData = Default<%= it.typename%>(randomUUID())
+    
+    <% if(it.customField.isEnable) { %>
+      // FLAG::CUSTOM_FIELD
+      const data = this.prepareCustomFieldData(
+        CustomFieldDataModeEnum.DEFAULT,
+        defaultData,
+      );
+    <% } else { %>
+      const data = defaultData;
+    <% } %>
+
+    this.setData(data);
     this.setWatchChange()
     return true
   }

package/templates/miniAppJsSdk/src/services/bridge-resource-accessor.service.ts.eta

@@ -21,8 +21,8 @@
     const pascalName = upperFirstCase(resourceName);
     const kebabName = camelToKebab(resourceName);
 
-    const miniAppWhitelistApis = config?.miniApp?.whitelist || [];
-    const hasMiniAppWhitelistedApi = miniAppWhitelistApis.length > 0;
+    const miniAppWhitelistApis = config?.miniApp?.whitelist || {};
+    const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
 
     return {
       resourceName, 

package/templates/miniAppStreamlitSdk/simtrain_eco_mini_app_streamlit_sdk/sdk.py.eta

@@ -19,8 +19,8 @@
     const kebabName = camelToKebab(resourceName);
     const snakeName = camelToSnake(resourceName);
 
-    const miniAppWhitelistApis = config?.miniApp?.whitelist || [];
-    const hasMiniAppWhitelistedApi = miniAppWhitelistApis.length > 0;
+    const miniAppWhitelistApis = config?.miniApp?.whitelist || {};
+    const hasMiniAppWhitelistedApi = Object.keys(miniAppWhitelistApis).length > 0;
 
     return {
       resourceName, 
@@ -34,6 +34,7 @@
 %>
 
 from .services.ui import UI
+from .services.current import Current
 from .services.resources.student import Student
 from .services.init_message_bridge import InitMessageBridge
 from .services.helper import Helper as SimtrainSdkHelper
@@ -58,6 +59,8 @@ class SimtrainEcoMiniAppStreamlitSdk:
 
         self.ui = UI()
 
+        self.current = Current()
+
         self.helper = SimtrainSdkHelper
 
         # ========================== Import Resource ==========================

package/templates/nest/src/simpleapp/generate/commons/middlewares/tenant.middleware.ts.eta

@@ -13,6 +13,7 @@ import { Model } from 'mongoose';
 import { Permission } from '../../types/perm.type';
 import { User } from '../../types/user.type';
 import { Appintegration } from '../../types/appintegration.type';
+import { Webhook } from '../../types/Webhook.type';
 import { UserContext } from '../user.context';
 
 @Injectable()
@@ -27,6 +28,7 @@ export class TenantMiddleware implements NestMiddleware {
     @InjectModel('User') private readonly userModel: Model<User>,
     @InjectModel('Permission') private readonly permModel: Model<Permission>,
     @InjectModel('Appintegration') private readonly appModel: Model<Appintegration>,
+    @InjectModel('Webhook') private readonly webhookModel: Model<Webhook>,
   ) {}
 
   requireXOrg(baseurl: string): boolean {
@@ -53,7 +55,7 @@ export class TenantMiddleware implements NestMiddleware {
 
     if (req.baseUrl == '/graphql') {
       if (tokenStr) {
-        await user.setCurrentUserInfo(tokenStr, xOrg);
+        await user.setCurrentUserInfo(tokenStr, xOrg,this.webhookModel);
       }
       req['sessionuser'] = user;
       next();
@@ -88,7 +90,7 @@ export class TenantMiddleware implements NestMiddleware {
     }
 
     try {
-      await user.setCurrentUserInfo(tokenStr, xOrg);
+      await user.setCurrentUserInfo(tokenStr, xOrg,this.webhookModel);
       if (user.getId() == '' && this.requireXOrg(req.baseUrl)) {
         this.logger.log('Access deny for user:', req.baseUrl);
         return res.status(401).send('Access deny for user');