@simitgroup/simpleapp-generator 2.0.0-j-alpha → 2.0.0-l-alpha

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/developer-portal/developer-portal.service.ts.eta

@@ -1,19 +1,21 @@
 import { Injectable } from '@nestjs/common';
-import { Branch, Miniapp, Miniappinstallation } from 'src/simpleapp/generate/types';
+import { MiniApp } from 'src/simple-app/_core/resources/mini-app/mini-app.schema';
+import { MiniAppInstallation } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.schema';
+import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
 import _ from 'lodash';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import { MiniappEnvEnum } from 'src/enums/enums.generate';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniAppEnvEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 
 @Injectable()
 export class DeveloperPortalService {
   constructor(
     @InjectModel('Miniapp')
-    protected miniAppDoc: Model<Miniapp>,
+    protected miniAppDoc: Model<MiniApp>,
 
     @InjectModel('Miniappinstallation')
-    protected miniAppInstallationDoc: Model<Miniappinstallation>,
+    protected miniAppInstallationDoc: Model<MiniAppInstallation>,
 
     @InjectModel('Branch')
     protected branchDoc: Model<Branch>,
@@ -23,7 +25,7 @@ export class DeveloperPortalService {
     // Only dev got development.demoXOrg field
     const miniApp = await this.miniAppDoc.findOne({
       'developerPortal.appId': developerPortalAppId,
-      env: MiniappEnvEnum.DEV,
+      env: MiniAppEnvEnum.DEV,
     });
     if (miniApp && !_.isEmpty(miniApp?.development?.demoXOrg)) {
       return miniApp.development.demoXOrg;
@@ -38,7 +40,7 @@ export class DeveloperPortalService {
     // Only get env === prod one
     const miniAppInstallations = await this.miniAppInstallationDoc.find({
       'miniApp.developerPortalAppId': developerPortalAppId,
-      'miniApp.env': MiniappEnvEnum.PROD,
+      'miniApp.env': MiniAppEnvEnum.PROD,
     });
 
     if (!miniAppInstallations || _.isEmpty(miniAppInstallations)) {

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/developer-portal/dto/developer-portal-create-app.dto.ts.eta

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { ApiProperty } from '@nestjs/swagger';
-import { MiniappAuthor } from 'src/simpleapp/generate/apischemas';
+import { MiniAppAuthor } from 'src/simple-app/_core/resources/mini-app/mini-app.schema';
 
 @ObjectType()
 export class DeveloperPortalCreateAppDto {
@@ -17,6 +17,6 @@ export class DeveloperPortalCreateAppDto {
   version: string;
 
   @Field()
-  @ApiProperty({ type: MiniappAuthor, required: true, default: '' })
-  author: MiniappAuthor;
+  @ApiProperty({ type: MiniAppAuthor, required: true, default: '' })
+  author: MiniAppAuthor;
 }

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-bridge.service.ts.eta

@@ -1,5 +1,5 @@
 import { BadRequestException, Injectable, NotFoundException } 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 _ from 'lodash';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-env-development.service.ts.eta

@@ -1,11 +1,11 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
-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 { MiniAppManagerProcessor } from './mini-app-manager.processor';
 import { DynamicParam,MiniApp ,CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { Model } from 'mongoose';
 import { MiniAppManagerEnvEnum } from './mini-app-manager.enum';
 import _ from 'lodash';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-env-production.service.ts.eta

@@ -1,11 +1,11 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
-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 { MiniAppManagerProcessor } from './mini-app-manager.processor';
 import { DynamicParam,MiniApp ,CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { Model } from 'mongoose';
 import { MiniAppManagerEnvEnum } from './mini-app-manager.enum';
 import _ from 'lodash';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager-policy.service.ts.eta

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import _ from 'lodash';
-import { MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
-import { PolicyService } from 'src/simple-app/.core/features/policy/policy.service';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
+import { PolicyService } from 'src/simple-app/_core/features/policy/policy.service';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniApp } from '../dto';
 import * as licenseTypes from 'src/simple-app/config/license-types';
 @Injectable()

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager.controller.ts.eta

@@ -1,10 +1,10 @@
 import { Body, Controller, Get, Param, Post, Put } from '@nestjs/common';
 import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
 
-import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
-import { Roles } from 'src/simple-app/.core/features/auth/role-guard/roles.decorator';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 
 import * as schemas from '../dto';
 import { MiniAppManagerBridgeService } from './mini-app-manager-bridge.service';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-manager/mini-app-manager.processor.ts.eta

@@ -1,11 +1,11 @@
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import _ from 'lodash';
 import { BadRequestException, NotFoundException } from '@nestjs/common';
 import { MiniAppError } from './mini-app-manager.error';
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
 import { DynamicParam,MiniApp,MiniAppInstallation, CategorizedMiniAppDetail, InstalledMiniAppDetail, MiniAppDetail } from '../dto';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';

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

@@ -1,11 +1,11 @@
 import { BadRequestException, Injectable, NotFoundException } 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 { CategorizedMiniAppDetail, DynamicParam, InstalledMiniAppDetail, MiniApp, MiniAppDetail, MiniAppInstallation } from '../dto';
-import { MiniAppService } from 'src/simple-app/.core/resources/mini-app/mini-app.service';
+import { MiniAppService } from 'src/simple-app/_core/resources/mini-app/mini-app.service';
 
-import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/.core/resources/mini-app/mini-app.enum';
-import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.service';
+import { MiniAppEnvEnum, MiniAppStatusEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
+import { MiniAppInstallationService } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.service';
 import _ from 'lodash';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import { MiniAppError } from './mini-app-manager.error';

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/mini-app-scope/mini-app-scope.guard.ts.eta

@@ -1,9 +1,9 @@
 import { CanActivate, ExecutionContext, Injectable, ForbiddenException, UnauthorizedException, BadRequestException } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MINIAPP_SCOPE_KEY } from './mini-app-scope.decorator';
 import { MiniAppScopeService } from './mini-app-scope.service';
-import { TUserType } from 'src/simpleapp/types';
+import { TUserType } from 'src/simple-app/_core/framework/schemas';
 import { GqlContextType } from '@nestjs/graphql';
 
 @Injectable()

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

@@ -1,8 +1,8 @@
 import { BadRequestException, ForbiddenException, Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import { Miniapp } from 'src/simpleapp/generate/types';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniApp } from 'src/simple-app/_core/resources/mini-app/mini-app.schema';
 import { getEnvironment, getEnvironmentWithApp } from '../utils/mini-app.util';
 import { MiniAppManagerEnvEnum } from '../mini-app-manager/mini-app-manager.enum';
 import { Request } from 'express';
@@ -10,7 +10,7 @@ import _ from 'lodash';
 
 @Injectable()
 export class MiniAppScopeService {
-  constructor(@InjectModel('Miniapp') private readonly miniAppModel: Model<Miniapp>) {}
+  constructor(@InjectModel('Miniapp') private readonly miniAppModel: Model<MiniApp>) {}
 
   /**
    * Find Mini App From Dev To See Is This A Custom Demo Company
@@ -67,7 +67,7 @@ export class MiniAppScopeService {
     }
   }
 
-  assertEnabledFeature(appUser: UserContext, miniApp: Miniapp) {
+  assertEnabledFeature(appUser: UserContext, miniApp: MiniApp) {
     const userType = appUser.getUserType();
 
     if (userType === 'miniApi') {

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/types/miniApp.ts.eta

@@ -1,4 +1,5 @@
-import { Miniapp, Miniappinstallation } from '../../../simpleapp/generate/types';
+import { MiniApp,  } from '@resources/mini-app/mini-app.schema';
+import { MiniAppInstallation,  } from '@resources/mini-app-installation/mini-app-installation.schema';
 
 export type MiniAppDetailPermission = {
   hasMiniAppFeature: boolean;
@@ -7,9 +8,9 @@ export type MiniAppDetailPermission = {
   canUpdateSetting: boolean;
 };
 
-export type MiniAppDetail = Miniapp & {
+export type MiniAppDetail = MiniApp & {
   hasRequiredPlan: boolean;
-  miniAppInstallation?: Miniappinstallation;
+  miniAppInstallation?: MiniAppInstallation;
 };
 
 export type CategorizedMiniAppDetail = {

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/utils/mini-app.util.ts.eta

@@ -1,4 +1,4 @@
-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 { MiniAppManagerEnvEnum } from '../mini-app-manager/mini-app-manager.enum';
 import { MiniApp } from '../dto';
 

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import * as licenseTypes from 'src/simple-app/config/license-types';
 @Injectable()
 export class PolicyService {

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

@@ -1,7 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { ForeignKey } from '../../framework/schemas';
-import { Branch } from 'src/simple-app/.core/resources/branch/branch.schema';
-import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
+import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
+import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
 import { Role } from '../auth/role-guard/roles.enum';
 import { Organization } from '../../resources/organization/organization.schema';
 import { Tenant } from '../../resources/tenant/tenant.schema';

package/templates/nest/src/simple-app/{.core → _core}/features/queue/queue-base/queue-base.producer.ts.eta

@@ -4,8 +4,8 @@ import { InjectModel } from '@nestjs/mongoose';
 import axios from 'axios';
 import { Model } from 'mongoose';
 import { QueuePayload } from '../queue.type';
-import { QueueJob,QueueJobProducerResponse } from 'src/simple-app/.core/resources/queue-job/queue-job.schema';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { QueueJob,QueueJobProducerResponse } from 'src/simple-app/_core/resources/queue-job/queue-job.schema';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 
 export abstract class QueueBaseProducer {
   // protected abstract readonly processor: QueueName;

package/templates/nest/src/simple-app/{.core → _core}/features/queue/queue-user-context/queue-user-context.service.ts.eta

@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-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 { SimpleAppRobotUserService } from '../../user-context/robot-user.service';
 import { MiniAppInstallation } from '../../mini-app/dto';
-import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
-import { User } from 'src/simple-app/.core/resources/user/user.schema';
+import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
+import { User } from 'src/simple-app/_core/resources/user/user.schema';
 
 @Injectable()
 export class QueueUserContext {

package/templates/nest/src/simple-app/{.core → _core}/features/queue/queue.module.ts.eta

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { QueueJobModule } from 'src/simple-app/.core/resources/queue-job/queue-job.module';
+import { QueueJobModule } from 'src/simple-app/_core/resources/queue-job/queue-job.module';
 import { QueueUserContext } from './queue-user-context/queue-user-context.service';
 
 import { MongooseModule } from '@nestjs/mongoose';

package/templates/nest/src/simple-app/{.core → _core}/features/user-context/user.context.ts.eta

@@ -14,17 +14,17 @@ import * as jwt from 'jsonwebtoken';
 import { ClientSession, Model, PipelineStage } from 'mongoose';
 
 // import { Branch, Organization, Permission, Tenant, TenantClientSetting, User, Appintegration, Webhook, Miniappinstallation, TUserType, TMiniApiTokenInfo } from 'src/simpleapp/generate/types';
-import { TUserType, TMiniApiTokenInfo } from 'src/simple-app/.core/framework/schemas';
-import { MiniAppInstallation } from 'src/simple-app/.core/resources/mini-app-installation/mini-app-installation.schema';
+import { TUserType, TMiniApiTokenInfo } from 'src/simple-app/_core/framework/schemas';
+import { MiniAppInstallation } from 'src/simple-app/_core/resources/mini-app-installation/mini-app-installation.schema';
 
-import { Tenant, TenantClientSetting } from 'src/simple-app/.core/resources/tenant/tenant.schema';
-import { Organization } from 'src/simple-app/.core/resources/organization/organization.schema';
-import { Branch } from 'src/simple-app/.core/resources/branch/branch.schema';
+import { Tenant, TenantClientSetting } from 'src/simple-app/_core/resources/tenant/tenant.schema';
+import { Organization } from 'src/simple-app/_core/resources/organization/organization.schema';
+import { Branch } from 'src/simple-app/_core/resources/branch/branch.schema';
 
-import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
-import { User } from 'src/simple-app/.core/resources/user/user.schema';
-import { Webhook } from 'src/simple-app/.core/features/webhook/schemas';
-import { UserContextInfo, ProfileUserBranch, ProfileUserInvites, TenantPermission } from 'src/simple-app/.core/features/profile/profile.schema';
+import { Permission } from 'src/simple-app/_core/resources/permission/permission.schema';
+import { User } from 'src/simple-app/_core/resources/user/user.schema';
+import { Webhook } from 'src/simple-app/_core/features/webhook/schemas';
+import { UserContextInfo, ProfileUserBranch, ProfileUserInvites, TenantPermission } from 'src/simple-app/_core/features/profile/profile.schema';
 import { ModifiedRecords } from '../../framework/schemas';
 import { Role } from '../auth/role-guard/roles.enum';
 import * as rolegroups from '../auth/role-guard/roles.group';

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

@@ -37,8 +37,7 @@ export class RunWebhookService {
     const systemWebhooks = this.systemWebhooks.filter((wh) => wh.resourceName === documentName && wh.eventType === actionName && wh.active);
     let webhooks = [];
     webhooks = webhooks.concat(userWebhooks)
-    webhooks = webhooks.concat(systemWebhooks);
-    console.log("implement webhooks",webhooks)
+    webhooks = webhooks.concat(systemWebhooks);    
     const systemVars = {
       $xOrg: appUser.getXOrg(),
       $accessToken: appUser.getUserToken(),

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[];

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/app.vue.eta

@@ -20,10 +20,14 @@
  * last change 2024-03-17
  * Author: Ks Tan
  */
-
-watch(()=>useRoute().params['xorg'],async (newval,oldvalue)=>{
-  await reloadUserStore()  
+let currentXorg = getCurrentXorg()
+watch(()=>useRoute().fullPath,async (newval,oldvalue)=>{
+   if(getCurrentXorg()!=currentXorg){
+      currentXorg = getCurrentXorg()      
+      await reloadUserStore()  
+   }
   if(getPathPara('xorg','')!=''){
+  
     if(!getUserProfile()?.currentGroup) goTo('pickgroup')
     setGraphqlServer()
   }