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

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -13,10 +13,13 @@ import {
   NotificationStatus,
   SchemaType,
   FormActions,
+  DynamicObject,
 } from "~/types";
 import { getValidateService } from "~/simpleapp/generate/sharelibs/validate";
-import { SimpleAppCustomFieldClient } from "./SimpleAppCustomFieldClient";
 import { WatchHandle } from "vue";
+import { CustomFieldService } from "../features/customField/services/CustomFieldService";
+import { CustomFieldDataMode } from "../features/customField/types/common";
+import { CustomFieldDataModeEnum } from "../features/customField/enums/common";
 
 // import { useToast, } from 'primevue/usetoast';
 // import type {  ToastMessageOptions } from 'primevue/toast';
@@ -50,8 +53,10 @@ export class SimpleAppClient<
   protected errorlist = ref({});
   protected completeformula = true;
   protected axios;
-  private _customFieldClient = new SimpleAppCustomFieldClient();
+
+  // FLAG::CUSTOM_FIELD
   protected _customFieldWatch: WatchHandle | null = null;
+  private _customFieldService = new CustomFieldService();
 
   constructor(apiobj: TApi, doctype: string, docname: string) {
     this.docapi = apiobj;
@@ -76,25 +81,29 @@ export class SimpleAppClient<
     return false;
   } //if there is readonly attribute in data, will override it at processor and client
   setData = (data: any) => {
-    // this.data.value = data;
-
-    // TODO: Will Cause Docno Format Broken
-    // data.more = this._customFieldClient.formCustomFieldData(
-    //   this.doctype,
-    //   this.schema.properties?.more,
-    //   data.createdBy == "",
-    //   data.more,
-    // );
-
     Object.assign(this.data.value, data);
   };
 
-  async processCustomField() {
-    // const resp = this._customFieldClient.formCustomFieldJsonSchema(
-    //   this.doctype,
-    // );
-    // this.schema.properties.more = resp;
-    // this.setData(this.data.value);
+  prepareCustomFieldJsonSchema() {
+    const resp = this._customFieldService.prepareCustomFieldJsonSchema(
+      this.docname,
+    );
+    this.schema.properties.more = resp;
+  }
+
+  prepareCustomFieldData<T extends DynamicObject>(
+    mode: CustomFieldDataMode,
+    data: T,
+  ) {
+    const customFieldData = this._customFieldService.prepareCustomFieldData(
+      this.docname,
+      mode,
+      this.schema.properties?.more,
+      data.more,
+    );
+
+    (data as any).more = customFieldData;
+    return data;
   }
 
   async getById(id?: string) {
@@ -103,10 +112,11 @@ export class SimpleAppClient<
     return await this.docapi
       .runFindOne(id, this.axios)
       .then((res: AxiosResponse) => {
-        // if(this.event){this.event('info:getById',res.data)}
-        // this.data.value = {} as TData;
-        // Object.assign(this.data.value, res.data);
-        this.setData(res.data);
+        const dataWithCustomField = this.prepareCustomFieldData(
+          CustomFieldDataModeEnum.EXISTING,
+          res.data,
+        );
+        this.setData(dataWithCustomField);
         this.setWatchChange();
         setTimeout(() => {
           this.ready = true;

package/templates/nuxt/simpleapp/generate/jsonSchemas/index.ts.eta

@@ -0,0 +1,11 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+ 
+<%for(let i=0; i<it.modules.length;i++){ %>
+<% const d = it.modules[i] %>      
+export * from './<%= d['doctype']%>.jsonschema'      
+<%}%>

package/templates/nuxt/simpleapp/generate/miniApp/bridge/constants/common.constant.ts.eta

@@ -7,6 +7,7 @@
 
 export enum MINI_APP_BRIDGE_MESSAGES {
   NAVIGATE = "NAVIGATE",
+  NAVIGATE_CURRENT_MINI_APP = "NAVIGATE_CURRENT_MINI_APP",
   OPEN_ON_SCREEN_RESOURCE_FORM = "OPEN_ON_SCREEN_RESOURCE_FORM",
   API = "API",
   API_RESPONSE = "API_RESPONSE",

package/templates/nuxt/simpleapp/generate/miniApp/bridge/constants/resource.constant.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/nuxt/simpleapp/generate/miniApp/bridge/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, 
@@ -40,7 +40,7 @@ import { MiniAppResourceMap } from "../types/resource-mapper.type";
     const { pascalName, kebabName, hasMiniAppWhitelistedApi } = getMiniAppInfo(it.modules[i]);
   %>
   <% if(hasMiniAppWhitelistedApi) { %>
-    import { MiniApp<%= pascalName %>BridgeService } from "../services/resources/<%= kebabName %>-bridge.service";
+    import { MiniApp<%= pascalName %>BridgeEditableService } from "./editable/resources/<%= kebabName %>-bridge.editable.service";
   <% } %>
 <% } %>
 
@@ -54,7 +54,7 @@ export class MiniAppBridgeResourceAccessor {
     <% if(hasMiniAppWhitelistedApi) { %>
       get <%= resourceName %>() {
         if (!this.instances.<%= resourceName %>) {
-          this.instances.<%= resourceName %> = new MiniApp<%= pascalName %>BridgeService();
+          this.instances.<%= resourceName %> = new MiniApp<%= pascalName %>BridgeEditableService();
         }
         return this.instances.<%= resourceName %>;
       }

package/templates/nuxt/simpleapp/generate/miniApp/bridge/services/bridge.service.ts.eta

@@ -4,11 +4,12 @@
  * last change 2025-06-18
  * Author: --
  */
- 
+
 import { SimpleAppDocumentType } from "~/types";
 import {
   MiniAppBridgeMessageApi,
   MiniAppBridgeMessageNavigate,
+  MiniAppBridgeMessageNavigateCurrentMiniApp,
   MiniAppBridgeMessageOpenOnScreenResourceForm,
 } from "../types/bridge.type";
 import { AxiosError } from "axios";
@@ -24,6 +25,24 @@ export class MiniAppBridgeService extends MiniAppBridgeResourceAccessor {
     goTo(message.params.target, message.params.id, message.params.query);
   }
 
+  handleBridgeNavigateCurrentMiniApp(
+    message: MiniAppBridgeMessageNavigateCurrentMiniApp,
+    pluginCode: string,
+  ) {
+    const target = message.params.target;
+    const { $appPluginsStore } = useNuxtApp();
+    let targetUrl = "";
+    if (target === "setting") {
+      targetUrl = $appPluginsStore.getPluginSettingPath(pluginCode);
+    } else {
+      targetUrl = $appPluginsStore.getPluginPageUrlPath(pluginCode, "");
+      targetUrl = targetUrl.replace(/^\/|\/$/g, "");
+      targetUrl = `${targetUrl}/${message.params.target}`;
+    }
+
+    goTo(targetUrl, undefined, message.params.query);
+  }
+
   handleBridgeOpenOnScreenResourceForm(
     message: MiniAppBridgeMessageOpenOnScreenResourceForm,
   ) {

package/templates/nuxt/simpleapp/generate/miniApp/bridge/types/bridge.type.ts.eta

@@ -16,6 +16,7 @@ export type MiniAppResource = {
 
 export type MiniAppBridgeMessage<TAction> =
   | MiniAppBridgeMessageNavigate
+  | MiniAppBridgeMessageNavigateCurrentMiniApp
   | MiniAppBridgeMessageOpenOnScreenResourceForm
   | MiniAppBridgeMessageApi<TAction>
   | MiniAppBridgeMessageInitResponse;
@@ -29,6 +30,14 @@ export type MiniAppBridgeMessageNavigate = {
   };
 };
 
+export type MiniAppBridgeMessageNavigateCurrentMiniApp = {
+  type: typeof MINI_APP_BRIDGE_MESSAGES.NAVIGATE_CURRENT_MINI_APP;
+  params: {
+    target: string;
+    query?: string;
+  };
+};
+
 export type MiniAppBridgeMessageOpenOnScreenResourceForm = {
   type: typeof MINI_APP_BRIDGE_MESSAGES.OPEN_ON_SCREEN_RESOURCE_FORM;
   params: {

package/templates/nuxt/simpleapp/generate/miniApp/bridge/types/resource-mapper.type.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/project/build.sh.eta

@@ -19,11 +19,6 @@ elif [ $type == 'updatebackend' ]; then
     cp -a ./sharelibs backend/src/simpleapp/generate
 elif [ $type == 'updateMiniAppJsSdk' ]; then
     simpleapp-generator -c config.json -g updateMiniAppJsSdk
-    mkdir -p ./miniAppSdk/js/src/constants
-    mkdir -p ./miniAppSdk/js/src/types
-    cp -a ./frontend/simpleapp/generate/miniApp/bridge/constants/* ./miniAppSdk/js/src/constants
-    cp -a ./frontend/simpleapp/generate/miniApp/bridge/types/* ./miniAppSdk/js/src/types
-    cp -a miniAppSdk/js/src/* ../sdk/simtrain-eco-js-sdk/src
 elif [ $type == 'updateMiniAppStreamlitSdk' ]; then
     simpleapp-generator -c config.json -g updateMiniAppStreamlitSdk
 fi

package/templates/nest/src/simpleapp/apischemas/customfield.ts.eta

@@ -1,21 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * Author: Ks Tan
- */
-
-import { Field, ObjectType } from '@nestjs/graphql';
-import { ApiProperty } from '@nestjs/swagger';
-import { Customfield } from '../generate/apischemas';
-
-@ObjectType()
-export class CompleteCustomFieldResource {
-  @Field()
-  @ApiProperty({ type: 'string', required: true })
-  resourceName: string;
-
-  @Field(() => Customfield)
-  @ApiProperty({ type: () => Customfield, required: false })
-  data: Customfield;
-}

package/templates/nuxt/simpleapp/generate/clients/SimpleAppCustomFieldClient.ts.eta

@@ -1,188 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2025-06-09
- */
-import _ from "lodash";
-import {
-  CustomFieldJsonSchemaMoreSchema,
-  CustomFieldJsonSchemaMoreSchemaGroup,
-  DynamicObject,
-  SimpleAppJSONSchema7Definition,
-} from "~/types";
-
-export class SimpleAppCustomFieldClient {
-  constructor() {}
-
-  formCustomFieldJsonSchema(collectionName: string) {
-    const customFieldFromDB = this._findCustomFieldSchemaFromDB(collectionName);
-    const customFieldFromPlugin =
-      this._findCustomFieldSchemaFromPlugin(collectionName);
-
-    if (customFieldFromDB && !_.isEmpty(customFieldFromDB)) {
-    }
-
-    const schema: CustomFieldJsonSchemaMoreSchema = {
-      type: "object",
-      properties: {
-        ...customFieldFromDB,
-        ...customFieldFromPlugin,
-      },
-    };
-
-    return schema;
-  }
-
-  private _findCustomFieldSchemaFromDB(collectionName: string) {
-    const { $customFieldStore } = useNuxtApp();
-    if (!$customFieldStore.data || _.isEmpty($customFieldStore.data)) {
-      return {};
-    }
-
-    const customField = $customFieldStore.findByCollectionName(collectionName);
-    if (!customField) {
-      return {};
-    }
-
-    const schema: CustomFieldJsonSchemaMoreSchemaGroup = {
-      default: {
-        title: "Custom Field",
-        ...customField.form.schema,
-      },
-    };
-
-    return schema;
-  }
-
-  private _findCustomFieldSchemaFromPlugin(collectionName: string) {
-    const schema: CustomFieldJsonSchemaMoreSchemaGroup = {};
-
-    const { $appPluginsStore } = useNuxtApp();
-
-    const pluginForms = $appPluginsStore.getForm(collectionName);
-    if (!pluginForms || pluginForms.length <= 0) {
-      return schema;
-    }
-
-    for (let i = 0; i < pluginForms.length; i++) {
-      const pluginItem = pluginForms[i];
-      const { pluginCode, jsonSchema } = pluginItem;
-
-      schema[pluginCode] = jsonSchema as SimpleAppJSONSchema7Definition;
-    }
-
-    return schema;
-  }
-
-  formCustomFieldData(
-    collectionName: string,
-    moreSchema: CustomFieldJsonSchemaMoreSchema | undefined,
-    isNew: boolean,
-    resourceData: any | undefined,
-  ) {
-    if (!moreSchema || !moreSchema?.properties) {
-      return resourceData;
-    }
-
-    if (collectionName !== "religion") {
-      return resourceData;
-    }
-
-    const data: DynamicObject = {};
-
-    if (!isNew) {
-      for (const [groupName, groupItem] of Object.entries(
-        moreSchema.properties,
-      )) {
-        const defaultData = this.generateDefaultData(groupItem);
-        const mergedData = this.mergeWithDefault(
-          defaultData,
-          resourceData?.[groupName],
-        );
-
-        data[groupName] = mergedData;
-      }
-    } else {
-      for (const [groupName, groupItem] of Object.entries(
-        moreSchema.properties,
-      )) {
-        const defaultData = this.generateDefaultData(groupItem);
-
-        data[groupName] = defaultData;
-      }
-    }
-
-    return data;
-  }
-
-  generateDefaultData(schema: any): any {
-    if (schema.type === "object") {
-      const result: any = {};
-      if (schema?.["x-foreignkey"]) {
-        return undefined;
-      }
-
-      const properties = schema.properties || {};
-      for (const key of Object.keys(properties)) {
-        result[key] = this.generateDefaultData(properties[key]);
-      }
-      return result;
-    }
-
-    if (schema.type === "array") {
-      const itemSchema = schema.items;
-      const minItems = schema.minItems || 0;
-      const arr = [];
-      const itemsCount = minItems > 0 ? 1 : 0;
-      for (let i = 0; i < itemsCount; i++) {
-        arr.push(this.generateDefaultData(itemSchema));
-      }
-      return arr;
-    }
-
-    if (typeof schema.default !== "undefined") {
-      return schema.default;
-    }
-
-    // handle primitive types fallback
-    switch (schema.type) {
-      case "string":
-        return "";
-      case "number":
-      case "integer":
-        return 0;
-      case "boolean":
-        return false;
-      default:
-        return null;
-    }
-  }
-
-  mergeWithDefault(defaultData: any, dbData: any): any {
-    if (Array.isArray(defaultData)) {
-      if (Array.isArray(dbData)) {
-        if (_.isEmpty(dbData)) {
-          return [];
-        }
-        // Merge each item
-        const mergedArray = dbData.map((dbItem, index) => {
-          const defaultItem = defaultData[index] ?? defaultData[0]; // use first default if index out of bound
-          return this.mergeWithDefault(defaultItem, dbItem);
-        });
-        return mergedArray;
-      } else {
-        // return defaultData;
-        return [];
-      }
-    } else if (typeof defaultData === "object" && defaultData !== null) {
-      const result: any = {};
-      for (const key of Object.keys(defaultData)) {
-        result[key] = this.mergeWithDefault(defaultData[key], dbData?.[key]);
-      }
-      return result;
-    } else {
-      // primitive value
-      return typeof dbData !== "undefined" ? dbData : defaultData;
-    }
-  }
-}