@simitgroup/simpleapp-generator 2.0.0-i-alpha → 2.0.0-k-alpha

package/templates/nest/src/simple-app/{.core → _core}/features/webhook/run-webhook.service.ts.eta

@@ -1,5 +1,8 @@
 import { BadRequestException, Injectable, Inject, InternalServerErrorException, Logger, NotFoundException } from '@nestjs/common';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+import { Model } from 'mongoose';
+import { InjectModel } from '@nestjs/mongoose';
+
 import { UserContext } from '../user-context/user.context';
 import { Webhook, WebhookLog } from './schemas';
 import { alldocuments } from '../document-no-format/document.dict';
@@ -8,38 +11,39 @@ import { alldocuments } from '../document-no-format/document.dict';
 export class RunWebhookService {
   @Inject(EventEmitter2)
   protected eventEmitter: EventEmitter2;
-  protected systemWebhooks : Webhook[] = []
+  protected systemWebhooks: Webhook[] = [];
   protected logger = new Logger();
   protected maxRetries = 5;
-  public constructor() {}
-  public addWebhook = (wh:Webhook)=> this.systemWebhooks.push(wh)
+  public constructor(
+    @InjectModel('WebhookLog') private webHookLogModel: Model<WebhookLog>
+    ) {}
+  public addWebhook = (wh: Webhook) => this.systemWebhooks.push(wh);
 
   /**
    * trigger
    */
-  async run(appuser: UserContext, documentName: string, actionName: string, data: any) {
-    if (process.env.WEBHOOK_ONOFF && process.env.WEBHOOK_ONOFF.toLowerCase() == 'on') {
-      return await this.runRealtimeWebhook(appuser, documentName, actionName, data);
-    }
-    else {
+  async run(appUser: UserContext, documentName: string, actionName: string, data: any) {
+    if (process.env.WEBHOOK_ONOFF && process.env.WEBHOOK_ONOFF.toLowerCase() == 'on') {      
+      return await this.runRealtimeWebhook(appUser, documentName, actionName, data);
+    } else {
       this.logger.warn(`Webhook off, not run for ${documentName}:${actionName}`);
     }
   }
 
-  async runRealtimeWebhook(appuser: UserContext, documentName: string, actionName: string, data: any) {
+  async runRealtimeWebhook(appUser: UserContext, documentName: string, actionName: string, data: any) {
     this.logger.debug(`Run webhook ${documentName}, ${actionName}`);
-
-    const userWebhooks = appuser.getWebHooks().filter((wh) => wh.resourceName == documentName && wh.eventType == actionName && wh.active);
-    const systemWebhooks = this.systemWebhooks.filter((wh) => wh.resourceName == documentName && wh.eventType == actionName && wh.active);    
-    const webhooks = []
-    webhooks.concat(userWebhooks).concat(systemWebhooks)    
-
+    
+    const userWebhooks = appUser.getWebHooks().filter((wh) => wh.resourceName === documentName && wh.eventType === actionName && wh.active);
+    const systemWebhooks = this.systemWebhooks.filter((wh) => wh.resourceName === documentName && wh.eventType === actionName && wh.active);
+    let webhooks = [];
+    webhooks = webhooks.concat(userWebhooks)
+    webhooks = webhooks.concat(systemWebhooks);    
     const systemVars = {
-      $xOrg: appuser.getXOrg(),
-      $accessToken: appuser.getUserToken(),
-      $fullName: appuser.getFullname(),
-      $email: appuser.getEmail(),
-      $uid: appuser.getUid(),
+      $xOrg: appUser.getXOrg(),
+      $accessToken: appUser.getUserToken(),
+      $fullName: appUser.getFullname(),
+      $email: appUser.getEmail(),
+      $uid: appUser.getUid(),
       $resourceName: documentName,
       $actionName: actionName,
       $url: process.env.APP_URL ?? 'http://localhost:8080',
@@ -90,7 +94,7 @@ export class RunWebhookService {
       // console.log("options",options)
 
       if (['POST', 'PUT', 'PATCH'].includes(options.method)) {
-        options.body = this.prepareBody(appuser, webhook, data, systemVars);
+        options.body = this.prepareBody(appUser, webhook, data, systemVars);
       }
 
       while (tries > 0) {
@@ -107,16 +111,16 @@ export class RunWebhookService {
           msg = `Try: ${tryno}/${maxtries} ${documentName}:${actionName}, ${reqMethod} ${webhookUrl}, ${statusCode},${req.statusText}`;
           if (statusCode >= 200 && statusCode <= 300) {
             //success, continue next webhook
-            this.addLog(appuser, documentName, webhook, actionName, data, options, 'success', statusCode, msg);
+            await this.addLog(appUser, documentName, webhook, actionName, data, options, 'success', statusCode, msg);
             break;
           } else {
             //common error like 404
-            this.addLog(appuser, documentName, webhook, actionName, data, options, 'failed', statusCode, msg);
+            await this.addLog(appUser, documentName, webhook, actionName, data, options, 'failed', statusCode, msg);
           }
         } catch (e) {
           // exception, usually server not accessible. use error 500
           msg = `Try: ${tryno}/${maxtries}, error ${documentName}:${actionName}  (${webhook._id}) ${e} at ${webhookUrl}`;
-          this.addLog(appuser, documentName, webhook, actionName, data, options, 'failed', 500, msg);
+          await this.addLog(appUser, documentName, webhook, actionName, data, options, 'failed', 500, msg);
         }
 
         //finish tries, throw error
@@ -129,7 +133,7 @@ export class RunWebhookService {
     return true;
   }
 
-  addLog(appuser: UserContext, documentName: string, webhook: Webhook, actionName: string, data: any, options, status: string, statusCode: number, msg: string) {
+  async addLog(appUser: UserContext, documentName: string, webhook: Webhook, actionName: string, data: any, options, status: string, statusCode: number, msg: string) {
     if (status == 'success') {
       this.logger.debug(msg);
     } else {
@@ -140,14 +144,14 @@ export class RunWebhookService {
 
     const whlog: WebhookLog = {
       _id: crypto.randomUUID(),
-      tenantId: appuser.getTenantId(),
-      orgId: appuser.getOrgId(),
-      branchId: appuser.getBranchId(),
+      tenantId: appUser.getTenantId(),
+      orgId: appUser.getOrgId(),
+      branchId: appUser.getBranchId(),
       webHookId: webhook._id,
       created: new Date().toISOString(),
-      createdBy: appuser.getUid(),
+      createdBy: appUser.getUid(),
       updated: new Date().toISOString(),
-      updatedBy: appuser.getUid(),
+      updatedBy: appUser.getUid(),
       title: `${webhook.requestMethod} ${webhook.url}`,
       dataId: data._id,
       resource: documentName,
@@ -157,10 +161,11 @@ export class RunWebhookService {
       body: body,
       msg: msg,
     };
-
-    this.eventEmitter.emit('webhooklog.add', appuser, whlog);
+    
+    const doc = new this.webHookLogModel(whlog)
+    await doc.save({ session:appUser.getDBSession() })
   }
-  prepareBody(appuser: UserContext, webhook: Webhook, data: any, systemVars: any) {
+  prepareBody(appUser: UserContext, webhook: Webhook, data: any, systemVars: any) {
     const cleandata = JSON.parse(JSON.stringify(data));
 
     if (webhook.body?.trim() == '*') {

package/templates/nest/src/simple-app/{.core → _core}/framework/base/simple-app.service.ts.eta

@@ -18,7 +18,7 @@ import { FilterQuery, Model, PipelineStage, mongo } from 'mongoose';
 import { foreignkeys } from '../../features/foreign-key/foreignkeys.dict';
 import { CustomException } from '../custom-exception';
 
-import { camelToKebab } from 'src/simple-app/.core/utils/string-utils';
+import { camelToKebab } from 'src/simple-app/_core/utils/string-utils';
 import { SimpleAppDocumentNoFormatService } from '../../features/document-no-format/document-no-format.service';
 import { UserContext } from '../../features/user-context/user.context';
 import { RunWebhookService } from '../../features/webhook/run-webhook.service';

package/templates/nest/src/simple-app/{.core → _core}/framework/json-schemas.dict.ts.eta

@@ -3,9 +3,9 @@ for(let i=0; i<it.modules.length;i++){
    const m= it.modules[i] 
    if(getSystemResources().includes(m.docname.toLowerCase())){
 %> 
-export * from 'src/simple-app/.core/resources/<%=camelToKebab(m.typename)%>/<%=camelToKebab(m.typename)%>.jsonschema' 
+export * from 'src/simple-app/_core/resources/<%=camelToKebab(m.typename)%>/<%=camelToKebab(m.typename)%>.jsonschema' 
 <%}else{%>      
-export * from 'src/simple-app/.resources/<%=camelToKebab(m.typename)%>/<%=camelToKebab(m.typename)%>.jsonschema' 
+export * from 'src/simple-app/_resources/<%=camelToKebab(m.typename)%>/<%=camelToKebab(m.typename)%>.jsonschema' 
   <%}%>
 <%}%>      
 

package/templates/nest/src/simple-app/{.core → _core}/framework/schemas/simple-app.schema.ts.eta

@@ -1,7 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Field, ObjectType, ID } from '@nestjs/graphql';
 import { JSONSchema7, JSONSchema7Type, JSONSchema7Version, JSONSchema7TypeName, JSONSchema7Definition } from 'json-schema';
-import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
+import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
 
 export class ModifiedCollection {
   [key: string]: string[];
@@ -121,13 +121,13 @@ export class SchemaConfig {
 export class ForeignKey {
   @Field()
   @ApiProperty({ type: () => String })
-  _id?: String;
+  _id?: string;
   @Field()
   @ApiProperty({ type: () => String })
-  code?: String;
+  code?: string;
   @Field()
   @ApiProperty({ type: () => String })
-  label?: String;
+  label?: string;
   [key: string]: any;
 }
 export class MyForeignKey {

package/templates/nest/src/simple-app/{.core → _core}/framework/simple-app.middleware.ts.eta

@@ -15,7 +15,7 @@ import { User } from '../resources/user/user.schema';
 // import { Miniappinstallation } from '../../resources/';
 import { Webhook } from '../features/webhook/schemas';
 // import { Appintegration } from '../../types/appintegration.type';
-import { MiniAppInstallation } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.schema';
+import { MiniAppInstallation } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.schema';
 import { UserContext } from '../features/user-context/user.context';
 import { ApiKeyService } from '../features/auth/api-key/api-key.service';
 import { HEADER_X_API_KEY, HEADER_X_API_SECRET } from '../features/auth/api-key/api-key.type';

package/templates/nest/src/simple-app/events/branch-event/branch-event.module.ts._eta

@@ -6,10 +6,10 @@
  */
 import { Module } from '@nestjs/common';
 
-import { BranchModule } from 'src/simple-app/.core/resources/branch/branch.module';
-import { AutoIncreamentModule } from 'src/simple-app/.core/features/auto-increament/auto-increament.module';
+import { BranchModule } from 'src/simple-app/_core/resources/branch/branch.module';
+import { AutoIncreamentModule } from 'src/simple-app/_core/features/auto-increament/auto-increament.module';
 import { BranchEventService } from './branch-event.service';
-import { DocumentNoFormatModule } from 'src/simple-app/.core/features/document-no-format/document-no-format.module';
+import { DocumentNoFormatModule } from 'src/simple-app/_core/features/document-no-format/document-no-format.module';
 
 @Module({
   imports: [DocumentNoFormatModule,BranchModule,AutoIncreamentModule],

package/templates/nest/src/simple-app/events/branch-event/branch-event.service.ts._eta

@@ -1,12 +1,12 @@
 import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { Branch } from './branch-event.type';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
-import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/.core/features/event/interface';
-import { BranchService } from 'src/simple-app/.core/resources/branch/branch.service';
-import { CreatePayload } from 'src/simple-app/.core/features/event/event.type';
-import { AutoIncreamentService } from 'src/simple-app/.core/features/auto-increament/auto-increament.service';
-import { DocumentNoFormatService } from 'src/simple-app/.core/features/document-no-format/document-no-format.service';
+import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/_core/features/event/interface';
+import { BranchService } from 'src/simple-app/_core/resources/branch/branch.service';
+import { CreatePayload } from 'src/simple-app/_core/features/event/event.type';
+import { AutoIncreamentService } from 'src/simple-app/_core/features/auto-increament/auto-increament.service';
+import { DocumentNoFormatService } from 'src/simple-app/_core/features/document-no-format/document-no-format.service';
 import { GenerateLogoService } from 'src/simple-app/features/generate-image/generate-logo/generate-logo-service';
 
 @Injectable()

package/templates/nest/src/simple-app/events/branch-event/branch-event.type.ts._eta

@@ -4,4 +4,4 @@
  * last change 2024-04-02
  * Author: Ks Tan
  */
-export * from '../../.core/resources/branch/branch.schema';
+export * from '../../_core/resources/branch/branch.schema';

package/templates/nest/src/simple-app/events/organization-event/organization-event.module.ts._eta

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { OrganizationModule } from 'src/simple-app/.core/resources/organization/organization.module';
-import { AutoIncreamentModule } from 'src/simple-app/.core/features/auto-increament/auto-increament.module';
+import { OrganizationModule } from 'src/simple-app/_core/resources/organization/organization.module';
+import { AutoIncreamentModule } from 'src/simple-app/_core/features/auto-increament/auto-increament.module';
 import { OrganizationEventService } from './organization-event.service';
 import { GenerateLogoModule } from 'src/simple-app/features/generate-image/generate-logo/generate-log-module';
 @Module({

package/templates/nest/src/simple-app/events/organization-event/organization-event.service.ts._eta

@@ -1,13 +1,13 @@
 import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { Organization } from './organization-event.type';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
-import { EventBeforeCreate, EventAfterCreate, EventBeforeUpdate } from 'src/simple-app/.core/features/event/interface';
-import { OrganizationService } from 'src/simple-app/.core/resources/organization/organization.service';
-import { CreatePayload, UpdatePayload } from 'src/simple-app/.core/features/event/event.type';
-import { AutoIncreamentService } from 'src/simple-app/.core/features/auto-increament/auto-increament.service';
+import { EventBeforeCreate, EventAfterCreate, EventBeforeUpdate } from 'src/simple-app/_core/features/event/interface';
+import { OrganizationService } from 'src/simple-app/_core/resources/organization/organization.service';
+import { CreatePayload, UpdatePayload } from 'src/simple-app/_core/features/event/event.type';
+import { AutoIncreamentService } from 'src/simple-app/_core/features/auto-increament/auto-increament.service';
 import { GenerateLogoService } from 'src/simple-app/features/generate-image/generate-logo/generate-logo-service';
-import { getCountriesForTimezone, getCurrencyCode } from 'src/simple-app/.core/utils/locale-tool';
+import { getCountriesForTimezone, getCurrencyCode } from 'src/simple-app/_core/utils/locale-tool';
 
 
 @Injectable()

package/templates/nest/src/simple-app/events/organization-event/organization-event.type.ts._eta

@@ -1 +1 @@
-export * from '../../.core/resources/organization/organization.schema';
+export * from '../../_core/resources/organization/organization.schema';

package/templates/nest/src/simple-app/events/permission-event/permission-event.module.ts.eta

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
 import { PermissionEventService } from './permission-event.service';
-import { PermissionModule } from 'src/simple-app/.core/resources/permission/permission.module';
+import { PermissionModule } from 'src/simple-app/_core/resources/permission/permission.module';
 @Module({
   imports: [PermissionModule],
   controllers: [],

package/templates/nest/src/simple-app/events/permission-event/permission-event.service.ts.eta

@@ -1,10 +1,10 @@
 import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { Permission } from './permission-event.type';
 import { OnEvent } from '@nestjs/event-emitter';
-import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/.core/features/event/interface';
-import { PermissionService } from 'src/simple-app/.core/resources/permission/permission.service';
-import { CreatePayload } from 'src/simple-app/.core/features/event/event.type';
+import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/_core/features/event/interface';
+import { PermissionService } from 'src/simple-app/_core/resources/permission/permission.service';
+import { CreatePayload } from 'src/simple-app/_core/features/event/event.type';
 
 @Injectable()
 export class PermissionEventService implements EventBeforeCreate<Permission>, EventAfterCreate<Permission> {

package/templates/nest/src/simple-app/events/permission-event/permission-event.type.ts.eta

@@ -1 +1 @@
-export * from '../../.core/resources/permission/permission.schema';
+export * from '../../_core/resources/permission/permission.schema';

package/templates/nest/src/simple-app/events/readme.md.eta

@@ -19,12 +19,12 @@
 ```ts
 //student.event.ts
 import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import * as schema from 'src/simple-app/.resources/student/student.schema'
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import * as schema from 'src/simple-app/_resources/student/student.schema'
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
 
-import { EventBeforeCreate } from 'src/simple-app/.core/features/event/interface';
-import { CreatePayLoad } from 'src/simple-app/.core/features/event/event.type';
+import { EventBeforeCreate } from 'src/simple-app/_core/features/event/interface';
+import { CreatePayLoad } from 'src/simple-app/_core/features/event/event.type';
 @Injectable()
 export class StudentEvent implements EventBeforeUpdate<Student>{
   constructor() {}

package/templates/nest/src/simple-app/events/tenant-event/tenant-event.module.ts_eta

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { TenantModule } from 'src/simple-app/.core/resources/tenant/tenant.module';
-import { AutoIncreamentModule } from 'src/simple-app/.core/features/auto-increament/auto-increament.module';
+import { TenantModule } from 'src/simple-app/_core/resources/tenant/tenant.module';
+import { AutoIncreamentModule } from 'src/simple-app/_core/features/auto-increament/auto-increament.module';
 import { TenantEventService } from './tenant-event.service';
 @Module({
   imports: [TenantModule, AutoIncreamentModule],

package/templates/nest/src/simple-app/events/tenant-event/tenant-event.service.ts_eta

@@ -1,11 +1,11 @@
 import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { Tenant } from './tenant-event.type';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
-import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/.core/features/event/interface';
-import { TenantService } from 'src/simple-app/.core/resources/tenant/tenant.service';
-import { CreatePayLoad } from 'src/simple-app/.core/features/event/event.type';
-import { AutoIncreamentService } from 'src/simple-app/.core/features/auto-increament/auto-increament.service';
+import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/_core/features/event/interface';
+import { TenantService } from 'src/simple-app/_core/resources/tenant/tenant.service';
+import { CreatePayLoad } from 'src/simple-app/_core/features/event/event.type';
+import { AutoIncreamentService } from 'src/simple-app/_core/features/auto-increament/auto-increament.service';
 
 @Injectable()
 export class TenantEventService implements EventBeforeCreate<Tenant>, EventAfterCreate<Tenant> {

package/templates/nest/src/simple-app/events/tenant-event/tenant-event.type.ts_eta

@@ -1 +1 @@
-export * from '../../.core/resources/tenant/tenant.schema';
+export * from '../../_core/resources/tenant/tenant.schema';

package/templates/nest/src/simple-app/features/print/print.service.ts.eta

@@ -6,7 +6,7 @@
  */
 
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import * as api from './api';
 
 @Injectable()

package/templates/nest/src/simple-app/simple-app.module.ts.eta

@@ -5,8 +5,8 @@
  * Author: Ks Tan
  */
 import { Module } from '@nestjs/common';
-import {SimpleAppCoreModule} from './.core/simple-app-core.module'
-import {SimpleAppResourcesModule} from './.resources/resources.module'
+import {SimpleAppCoreModule} from './_core/simple-app-core.module'
+import {SimpleAppResourcesModule} from './_resources/resources.module'
 import {SimpleAppEventsModule} from './events/events.module'
 import {SimpleAppFeaturesModule} from './features/features.module'
 

package/templates/nuxt/plugins/19.simpleapp-mini-app-store.ts.eta

@@ -273,7 +273,7 @@ export default defineNuxtPlugin(async () => {
         };
       },
 
-      shouldShowPageOnMenu(page: MiniappIntegrationCustomPagePages) {
+      shouldShowPageOnMenu(page: MiniAppIntegrationCustomPagePages) {
         return page.isHideOnMenu === true ? false : true;
       },
 

package/templates/nuxt/simpleapp/generate/features/miniApp/app/components/MiniAppPageIframe.vue.eta

@@ -4,9 +4,11 @@
       v-if="iframeSource !== ''"
       :ref="(el) => (iframeRef = el as HTMLIFrameElement)"
       :src="
-        generateIframeSource(iframeSource, {
-          miniAppInstallationId: miniAppInstallationId,
-        })
+        copyQueryToIframeSource(
+          generateIframeSource(iframeSource, {
+            miniAppInstallationId: miniAppInstallationId,
+          }),
+        )
       "
       :title="pageInfo.title || t('miniAppLang.content')"
       sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-presentation allow-modals"
@@ -25,17 +27,19 @@
 <script setup lang="ts">
 import {
   MiniAppDetail,
-  MiniappIntegrationCustomPagePages,
+  MiniAppIntegrationCustomPagePages,
 } from "~/simpleapp/generate/openapi";
 
 const props = defineProps<{
   miniApp: MiniAppDetail;
-  pageInfo: MiniappIntegrationCustomPagePages;
+  pageInfo: MiniAppIntegrationCustomPagePages;
   miniAppCode: string;
   miniAppInstallationId: string;
   developerPortalAppId: string;
 }>();
 
+const route = useRoute();
+
 const _xOrg = getPathPara("xorg", "");
 const hasError = ref(false);
 
@@ -53,6 +57,26 @@ function generateIframeSource(template: string, options: Option = {}) {
   });
 }
 
+function copyQueryToIframeSource(url: string): string {
+  const query = route.query;
+  const searchParams = new URLSearchParams();
+
+  Object.entries(query).forEach(([key, value]) => {
+    if (Array.isArray(value)) {
+      value.forEach((v) => {
+        if (v != null) searchParams.append(key, v);
+      });
+    } else if (value != null) {
+      searchParams.append(key, value);
+    }
+  });
+
+  const hasQuery = url.includes("?");
+  const queryString = searchParams.toString();
+
+  return queryString ? url + (hasQuery ? "&" : "?") + queryString : url;
+}
+
 const { iframeRef, onIframeLoad } = useMiniAppBridge(
   props.miniAppInstallationId,
   props.pageInfo,

package/templates/nuxt/types/others.ts.eta

@@ -18,8 +18,8 @@ export type NameValue = {
 };
 
 export type ForeignKey = {
-  _id: string;
-  label: string;
+  _id?: string;
+  label?: string;
   code?: string;
   [key: string]: any;
 };

package/templates/nest/src/simple-app/.core/features/cron/cron-system/schemas/index.ts.eta

@@ -1,2 +0,0 @@
-export {ApiEvent} from 'src/simple-app/.core/features/log/schemas';
-export {QueueJob} from 'src/simple-app/.resources/queue-job/queue-job.schema';