@simitgroup/simpleapp-generator 2.0.0-x-alpha → 2.0.0-z-alpha

package/templates/nuxt/composables/getUserStore.generate.ts.eta

@@ -12,6 +12,10 @@ export const getUserStore = () => {
   const { $userstore } = useNuxtApp();
   return $userstore;
 };
+export const reloadUserStoreFromMiddleware = async (xorg:string) => {
+  const { $userstore } = useNuxtApp();
+  await $userstore.loadRemoteUserFromXorg(xorg)
+};
 export const reloadUserStore = async () => {
   const { $userstore } = useNuxtApp();
   await $userstore.loadRemoteUserInfo();
@@ -25,17 +29,15 @@ export const isGuideComplete = (guidename: string): boolean => {
   } else return false;
 };
 export const setGuideComplete = async (guidename: string) => {
-  const userstore = useNuxtApp().$userstore;
-  await getProfileApi().runTourComplete(guidename);
-  if (getUserProfile() !== undefined) {
-    if (!Array.isArray(getUserProfile()?.moreProps.completedTours))
-      userstore.moreProps.completedTours = [guidename];
-    else userstore.moreProps.completedTours.push(guidename);
-  }
-};
-export const getCurrentXorg = () => {
-  return useRoute().params.xorg ? String(useRoute().params.xorg) : undefined;
+  // const userstore = useNuxtApp().$userstore;
+  // await getProfileApi().runTourComplete(guidename);
+  // if (getUserProfile() !== undefined) {
+  //   if (!Array.isArray(getUserProfile()?.moreProps.completedTours))
+  //     userstore.moreProps.completedTours = [guidename];
+  //   else userstore.moreProps.completedTours.push(guidename);
+  // }
 };
+export const getCurrentXorg = () => getUserStore().xOrg ?? ''
 export const getPageBaseUrl = (resourcename: string) => {
   return `/${getCurrentXorg()}/${resourcename}`;
 };
@@ -60,19 +62,13 @@ export const getProfileEmail = () => getUserProfile()?.email;
 export const getProfileUid = () => getUserProfile()?.uid;
 export const getProfileFullName = () => getUserProfile()?.fullName;
 
-export const refreshOrgLogo = async () => {
-  const logodata = await useNuxtApp().$OrganizationDoc().getApi().runGetlogo();
-  orgLogo = logodata.data;
-};
-export const getOrgLogo = () => orgLogo;
-export const setOrgLogo = (str: string) => (orgLogo = str);
-export const getCurrentBranch = () => {
-  const branchId = getUserStore().branchId;
-  const branchinfo = getUserStore().branches.find(
-    (item) => item.branch.branchId == branchId,
-  );
-  return branchinfo;
-};
+// export const refreshOrgLogo = async () => {
+//   const logodata = await useNuxtApp().$OrganizationDoc().getApi().runGetlogo();
+//   orgLogo = logodata.data;
+// };
+// export const getOrgLogo = () => orgLogo;
+// export const setOrgLogo = (str: string) => (orgLogo = str);
+export const getCurrentBranch = () => getUserProfile().branchInfo;
 
 export const getMySimpleAppUserPicker = () => {
   return {

package/templates/nuxt/middleware/30.acl.global.ts._eta

@@ -0,0 +1,139 @@
+import { RouteLocationNormalizedGeneric } from 'vue-router';
+import { getUserProfile } from './../composables/getUserStore.generate';
+
+export default defineNuxtRouteMiddleware(async (to, from) => {
+  console.log(to.path)
+  const userProfile = getUserProfile()
+  const xorg = <string>to.params['xorg'] ?? 'MC0wLTA'
+  useNuxtApp().$userstore.xOrg=xorg
+  if(!userProfile?._id){
+    // console.error("middleware detect no user id, reload under xorg",xorg)    
+    await reloadUserStoreFromMiddleware(xorg)
+    // console.log("after reload",userProfile)
+  }else if(userProfile.branchId===0 && xorg !='MC0wLTA'){
+    // console.error("middleware detect wrong xorg reload profile for",xorg)
+    await reloadUserStoreFromMiddleware(xorg)
+    // console.log("after reload",userProfile)
+  }else{
+    // console.log("use exists, use back the user store")
+  }
+  
+  
+
+  const currentgroup = useCookie('currentGroup').value
+  if(currentgroup && userProfile.groups.includes(currentgroup)){
+    //use back ground
+  }else if(userProfile.groups.length>0){
+    goTo('pickgroup')
+  }
+    // if (!currentgroup)goTo('pickgroup')
+
+  // console.log("userProfile1",userProfile)
+  // console.log(xorg)
+
+  const { status } = useAuth();   
+  const metas = Object.keys(to.meta)
+
+  if(status.value=='unauthenticated'){
+    if(to.meta.auth===false){
+      return true
+    }else{
+        navigateTo('/login')
+    }    
+  }
+
+  const license = useLicense().getLicense()
+  console.log("metas check",metas)
+  if(metas.length == 0){
+    throw createError({
+        statusCode: 404,
+        statusMessage: 'pageDoesNotExists',
+        message: 'pageDoesNotExistsMsg',
+        fatal: true,
+      });    
+  }
+  if(to.meta['licenseWeight'] === undefined){
+    throw createError({
+        statusCode: 403,
+        statusMessage: 'undefinePageMetaLicenseWeight',
+        message: 'undefinePageMetaLicenseWeightMsg',
+        fatal: true,
+      });    
+  }
+  
+  if(to.meta['requiredGroups']===undefined || !Array.isArray(to.meta['requiredGroups'])){
+    throw createError({
+        statusCode: 403,
+        statusMessage: 'undefinePageMetaRequiredGroups',
+        message: 'undefinePageMetaRequiredGroupsMsg',
+        fatal: true,
+      });    
+  }
+
+  if(to.meta['licenseWeight'] && <number>to.meta['licenseWeight']> license.licenseWeight){
+    throw createError({
+        statusCode: 403,
+        statusMessage: 'upgradeSoftwareLicenseRequired',
+        message: 'upgradeSoftwareLicenseRequiredMsg',
+        fatal: true,
+      });    
+  }
+
+  
+  if(to.meta['requiredGroups']){
+    
+    const requiredGroups:string[] = to.meta['requiredGroups']
+    const userGroups = userProfile.groups
+    let allowAccess = false
+    if(['','/'].includes(to.path)) allowAccess= true
+
+    for(const g of requiredGroups){
+      
+      if(userGroups.includes(g)){
+        allowAccess = true
+      }
+      if(userProfile.roles.includes(g)){
+        allowAccess = true
+      }
+      
+    }
+    if(!allowAccess){
+      throw createError({
+            statusCode: 403,
+            statusMessage: 'insufficientPriviledge',
+            message: 'insufficientPriviledgeMsg',
+            fatal: true,
+      }); 
+    }
+  }
+  console.log("middleware check isexpired",useLicense().isExpired())
+  if(!useLicense().isExpired()) {
+    return true
+  }else if(allowAccessExpired(to)){
+    return true
+  }else{
+    throw createError({
+            statusCode: 402,
+            statusMessage: 'systemExpired',
+            message:'systemExpiredMsg',                        
+            fatal: true,
+        }); 
+    }
+  })
+
+
+  const allowAccessExpired = (to:RouteLocationNormalizedGeneric)=>{
+    const userProfile = getUserProfile()
+    let allowPass = false
+    const isSuperAdmin = userProfile.groups.includes('superadmin')    
+    if(isSuperAdmin){
+      allowPass=true
+    }
+    const allowedPath = ['/billing','/pickgroup']
+    for(const p of allowedPath){
+      console.log("to.path.includes",to.path,p)
+      if(to.path.includes(p))allowPass = true
+    }
+
+    return allowPass
+  }

package/templates/nuxt/pages/[xorg]/profile.vue.eta

@@ -10,6 +10,9 @@
  */
 import profile from "../profile.vue";
 definePageMeta({
-//  menuPath:'setting/profile'
-})
+   menuPath:'setting/profile',
+  licenseWeight: 0,
+  requiredGroups: ["everyone",]
+
+});
 </script>

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -53,12 +53,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     }),
 
     actions: {
-      async loadRemoteUserInfo() {
-        // console.log('loadRemoteUserInfo')
-
+      async loadRemoteUserFromXorg(xorg:string) {
         const { $axios, $miniAppStore, $customFieldStore } = useNuxtApp();
-        const route = useRoute();
-        let xorg = this.getCurrentXorg();
+        
         let apiurl = "";
         if (!xorg) {
           apiurl = `${useRuntimeConfig().public.appUrl}/api`;
@@ -76,7 +73,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
               return;
             }
             const res = tmp.data
-            
+            this.xOrg= xorg
             this._id = res._id;
             this.uName = res.uName;
             this.sessionId = res.sessionId;
@@ -103,7 +100,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
             this.groups = res.groups;
             this.roles = res.roles;
             this.time = res.time;
-            this.xOrg = res.xOrg;
+            
             this.invites = res.invites;
             this.moreProps = res.moreProps;
             // this.package = res.moreProps.package;
@@ -122,15 +119,14 @@ export default defineNuxtPlugin(async (nuxtApp) => {
             return Promise.reject(err);
           });
       },
+      async loadRemoteUserInfo() {
+        const route = useRoute();
+        let xorg = this.getCurrentXorg();
+        await this.loadRemoteUserFromXorg(xorg)
+        
+      },
       getCurrentXorg() {
-        const xorg = useRoute().params.xorg
-        let result = ''
-        if(typeof xorg == 'string'){
-          result = xorg
-        }else{
-          result =''
-        }
-        return result
+        return this.xOrg
       },
       async pingSession(): Promise<string> {
         let xorg = this.getCurrentXorg();

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

@@ -20,6 +20,7 @@ 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 { cloneDeep, isEmpty } from "lodash";
 
 // import { useToast, } from 'primevue/usetoast';
 // import type {  ToastMessageOptions } from 'primevue/toast';
@@ -68,7 +69,8 @@ export class SimpleAppClient<
   getDocType = () => this.doctype;
   getDocName = (capFirst: boolean = false) =>
     capFirst ? upperFirst(this.docname) : this.docname;
-  getResourceName = ()=>upperFirst(this.schema["x-simpleapp-config"]?.resourceName??'');
+  getResourceName = () =>
+    upperFirst(this.schema["x-simpleapp-config"]?.resourceName ?? "");
   setNew = () => {};
   isNew = () => this.data.value?.created == "";
   setSchema = (schema: SchemaType) => (this.schema = schema);
@@ -85,7 +87,51 @@ export class SimpleAppClient<
     Object.assign(this.data.value, data);
   };
 
+  /**
+   * Adjust built in standard field validation rules
+   */
+  private prepareSchemaPatches() {
+    const patches = this._customFieldService.prepareSchemaPatches(this.docname);
+    if (patches && !isEmpty(patches)) {
+      const schema = this.applySchemaPatch(patches);
+      this.schema = schema;
+    }
+  }
+
+  private applySchemaPatch(patches: { [key: string]: string | number }) {
+    const allowedPatchAttributes = ["required", "minLength", "maxLength"];
+    const schema = cloneDeep(this.schema);
+    for (const [path, value] of Object.entries(patches)) {
+      const keys = path.split(".");
+      let target: any = schema;
+
+      // Traverse into nested path (e.g. properties.studentGroup.properties._id)
+      for (let i = 0; i < keys.length - 1; i++) {
+        const key = keys[i];
+        if (!(key in target)) target[key] = {};
+        target = target[key];
+      }
+
+      const attributeName = keys[keys.length - 1];
+      if (allowedPatchAttributes.includes(attributeName)) {
+        if (attributeName === "required" && Array.isArray(value)) {
+          target.required = Array.from(
+            new Set([...(target.required ?? []), ...value]),
+          );
+        } else {
+          target[attributeName] = value;
+        }
+      } else {
+        console.error("Found invalid schema patch: ", path, value);
+      }
+    }
+
+    return schema;
+  }
+
   prepareCustomFieldJsonSchema() {
+    this.prepareSchemaPatches();
+
     const resp = this._customFieldService.prepareCustomFieldJsonSchema(
       this.docname,
     );

package/templates/nuxt/simpleapp/generate/features/customField/services/CustomFieldService.ts.eta

@@ -1,11 +1,11 @@
-import _ from 'lodash';
+import _ from "lodash";
 import {
   CustomFieldDataMode,
   CustomFieldMoreSchema,
-  CustomFieldMoreSchemaGroup
-} from '../types/common';
-import { CustomFieldDataModeEnum } from '../enums/common';
-import { DynamicObject, SimpleAppJSONSchema7Definition } from '~/types';
+  CustomFieldMoreSchemaGroup,
+} from "../types/common";
+import { CustomFieldDataModeEnum } from "../enums/common";
+import { DynamicObject, SimpleAppJSONSchema7Definition } from "~/types";
 
 export class CustomFieldService {
   // =============================== Prepare Schema Function ===============================
@@ -18,16 +18,20 @@ export class CustomFieldService {
     }
 
     const schema: CustomFieldMoreSchema = {
-      type: 'object',
+      type: "object",
       properties: {
         ...customFieldFromDB,
-        ...customFieldFromMiniApp
-      }
+        ...customFieldFromMiniApp,
+      },
     };
 
     return schema;
   }
 
+  prepareSchemaPatches(collectionName: string) {
+    return this.findSchemaPatchFromMiniApp(collectionName);
+  }
+
   private findCustomFieldSchemaFromDB(collectionName: string) {
     const { $customFieldStore } = useNuxtApp();
     if (!$customFieldStore.data || _.isEmpty($customFieldStore.data)) {
@@ -48,9 +52,9 @@ export class CustomFieldService {
 
     const schema: CustomFieldMoreSchemaGroup = {
       default: {
-        title: 'Custom Field',
-        ...customField.form.jsonSchema
-      }
+        title: "Custom Field",
+        ...customField.form.jsonSchema,
+      },
     };
 
     return schema;
@@ -76,12 +80,32 @@ export class CustomFieldService {
     return schema;
   }
 
+  private findSchemaPatchFromMiniApp(collectionName: string) {
+    const { $miniAppStore } = useNuxtApp();
+
+    const miniAppForms = $miniAppStore.getForm(collectionName);
+    if (!miniAppForms || miniAppForms.length <= 0) {
+      return {};
+    }
+
+    for (let i = 0; i < miniAppForms.length; i++) {
+      const miniAppItem = miniAppForms[i];
+      const { patches } = miniAppItem;
+
+      if (patches && !_.isEmpty(patches)) {
+        return patches;
+      }
+    }
+
+    return {};
+  }
+
   // ================================ Prepare Data Function ================================
   prepareCustomFieldData<T extends DynamicObject>(
     collectionName: string,
     mode: CustomFieldDataMode,
     customSchema: CustomFieldMoreSchema | undefined,
-    resourceData: T | undefined
+    resourceData: T | undefined,
   ): T | undefined {
     if (
       !customSchema ||
@@ -103,18 +127,18 @@ export class CustomFieldService {
 
         return this.prepareCustomFieldWithExistingData(
           customSchema,
-          resourceData
+          resourceData,
         );
         break;
     }
   }
 
   private prepareCustomFieldWithDefaultData<T extends DynamicObject>(
-    customSchema: CustomFieldMoreSchema
+    customSchema: CustomFieldMoreSchema,
   ) {
     const data: DynamicObject = {};
     for (const [groupName, groupItem] of Object.entries(
-      customSchema.properties
+      customSchema.properties,
     )) {
       const defaultData = this.generateDefaultData(groupItem);
 
@@ -126,16 +150,16 @@ export class CustomFieldService {
 
   private prepareCustomFieldWithExistingData<T extends DynamicObject>(
     customSchema: CustomFieldMoreSchema,
-    resourceData: T
+    resourceData: T,
   ) {
     const data: DynamicObject = {};
     for (const [groupName, groupItem] of Object.entries(
-      customSchema.properties
+      customSchema.properties,
     )) {
       const defaultData = this.generateDefaultData(groupItem);
       const mergedData = this.mergeWithDefault(
         defaultData,
-        resourceData?.[groupName]
+        resourceData?.[groupName],
       );
 
       data[groupName] = mergedData;
@@ -146,13 +170,13 @@ export class CustomFieldService {
 
   private generateDefaultData(schema: SimpleAppJSONSchema7Definition): any {
     if (!_.isObject(schema)) {
-      return '';
+      return "";
     }
 
-    if (schema.type === 'object') {
+    if (schema.type === "object") {
       const result: any = {};
 
-      if (schema?.['x-foreignkey']) {
+      if (schema?.["x-foreignkey"]) {
         return undefined;
       }
 
@@ -163,31 +187,33 @@ export class CustomFieldService {
       return result;
     }
 
-    if (schema.type === 'array') {
+    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 as SimpleAppJSONSchema7Definition)
+          this.generateDefaultData(
+            itemSchema as SimpleAppJSONSchema7Definition,
+          ),
         );
       }
       return arr;
     }
 
-    if (typeof schema.default !== 'undefined') {
+    if (typeof schema.default !== "undefined") {
       return schema.default;
     }
 
     // handle primitive types fallback
     switch (schema.type) {
-      case 'string':
-        return '';
-      case 'number':
-      case 'integer':
+      case "string":
+        return "";
+      case "number":
+      case "integer":
         return 0;
-      case 'boolean':
+      case "boolean":
         return false;
       default:
         return null;
@@ -196,7 +222,7 @@ export class CustomFieldService {
 
   private mergeWithDefault<T extends DynamicObject>(
     defaultData: T,
-    collectionData: T | undefined
+    collectionData: T | undefined,
   ) {
     if (Array.isArray(defaultData)) {
       if (Array.isArray(collectionData)) {
@@ -213,17 +239,17 @@ export class CustomFieldService {
         // return defaultData;
         return [];
       }
-    } else if (typeof defaultData === 'object' && defaultData !== null) {
+    } else if (typeof defaultData === "object" && defaultData !== null) {
       const result: any = {};
       for (const key of Object.keys(defaultData)) {
         result[key] = this.mergeWithDefault(
           defaultData[key],
-          collectionData?.[key]
+          collectionData?.[key],
         );
       }
       return result;
     } else {
-      return typeof collectionData !== 'undefined'
+      return typeof collectionData !== "undefined"
         ? collectionData
         : defaultData;
     }

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

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

package/templates/nuxt/middleware/30.acl.global.ts.eta

@@ -1,48 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
- */
-import { getUserProfile } from './../composables/getUserStore.generate';
-import  {MenuData} from '~/types'
-export default defineNuxtRouteMiddleware((to, from) => {      
-  // const userprofile = getUserProfile()
-  //skip auto then simply allow
-  if(!to.meta.auth){
-    return true
-  }else if(to.path=='/relogin'){
-    return true
-  }else if( getPublicResource(String(to.params['xorg'])).filter((item:MenuData)=>to.fullPath === item.url)){        
-    return true
-  }// no permission control needed yet    
-    else if(!to.params['xorg']){
-      
-      return true  //no permission needed
-    }else{
-      
-      const resourcename = to.fullPath.split('/')[2]
-      
-      if(resourcename===undefined){//home page
-        
-        // return true  //no permission needed
-        //if(userprofile.group==''){
-        //  console.error("no access right to current xorg")
-        //  return navigateTo('/')
-        //}else{
-          return true
-        //}
-        
-      }else{        
-        const {$userstore} = useNuxtApp()  
-        if($userstore.haveAccess(resourcename)){                    
-          return true
-        }else{
-       //   congetWorkflowApisole.error("access deny, redirect to '/'")
-          return navigateTo('/')
-          // abortNavigation()
-        }
-      }    
-    }
-  
-  })