@simitgroup/simpleapp-generator 2.0.1-r-alpha → 2.0.1-s-alpha

package/ReleaseNote.md

@@ -1,3 +1,8 @@
+[2.0.1s-alpha]
+
+1. Fix cron set xorg failed. undefined-undefined-undefined
+2. Fix findInstalledMiniAppCode
+
 [2.0.1r-alpha]
 
 1. Add findIdThenUnsetField

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.1r-alpha",
+  "version": "2.0.1s-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/nest/src/simple-app/_core/features/user-context/robot-user.service.ts.eta

@@ -21,12 +21,12 @@ export class SimpleAppRobotUserService {
   logger = new Logger();
 
   constructor(
-  @InjectModel('User') private readonly userModel: Model<User>,
-  @InjectModel('Permission') private readonly permModel: Model<Permission>,
-  // @InjectModel('Appintegration') private readonly appmodel: Model<Appintegration>;
-  @InjectModel('MiniAppInstallation') private readonly miniAppInstallationModel: Model<MiniAppInstallation>,
-  @InjectModel('Environment') private envModel: Model<Environment>,
-) {
+    @InjectModel('User') private readonly userModel: Model<User>,
+    @InjectModel('Permission') private readonly permModel: Model<Permission>,
+    // @InjectModel('Appintegration') private readonly appmodel: Model<Appintegration>;
+    @InjectModel('MiniAppInstallation') private readonly miniAppInstallationModel: Model<MiniAppInstallation>,
+    @InjectModel('Environment') private envModel: Model<Environment>,
+  ) {
     this.init();
     // console.log('init SimpleAppRobotUserService');
   }
@@ -94,10 +94,10 @@ export class SimpleAppRobotUserService {
 
   async createDumyAppUser(userContext: BaseUserContext) {
     const envs = await this.envModel.find();
-    
-    const appUser = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel,envs[0]);
+
+    const appUser = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel, envs[0]);
     const user = userContext;
-    const xorg = appUser.generateXOrg(user.tenantId, user.orgId, user.branchId);
+    const xorg = appUser.generateXOrg(user.tenantId ?? 0, user.orgId ?? 0, user.branchId ?? 0);
 
     await appUser.setAsStaticUser(user.uid ?? '00000000-0000-0000-0000-000000000000', user.uname ?? 'robot', user.fullName ?? 'Robot', user.email ?? 'robot@a.org', xorg);
     appUser.setTimeZone(user.timeZone ?? this.defaultTimeZone);
@@ -110,7 +110,7 @@ export class SimpleAppRobotUserService {
     const envs = await this.envModel.find();
     // console.log('prepareAppUserprepareAppUser');
     // this.appmodel,
-    const appuser = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel,envs[0]);
+    const appuser = new UserContext(this.userModel, this.permModel, this.miniAppInstallationModel, envs[0]);
     await appuser.setAsStaticUser('00000000-0000-0000-0000-000000000000', 'robot', 'Robot', 'robot@a.org', Base64URL.encodeText('0-0-0'));
 
     const tenantId = data?.tenantId ?? 0;

package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta

@@ -1069,7 +1069,7 @@ export class UserContext extends UserContextInfo {
       orgId: this.orgId,
       branchId: this.branchId,
     });
-    return miniAppInstallation.miniApp;
+    return miniAppInstallation ? miniAppInstallation.miniApp : null;
   }
 
   async setUserProfileFromDB() {