@solidstarters/solid-core 1.2.24 → 1.2.26

package/src/services/field-metadata.service.ts

@@ -36,7 +36,7 @@ export class FieldMetadataService {
         // Update the inverse field in the db
         const savedInverseField = await this.updateInverseFieldInDb(field, fieldRepository, modelRepository);
         // Update the inverse field in the file
-        this.updateRelationInverseFieldInFile(savedInverseField, field.relationModelSingularName, field.model.module.name);
+        this.updateRelationInverseFieldInFile(savedInverseField, field.relationCoModelSingularName, field.model.module.name);
     }
 
     private async updateInverseFieldInDb(field: FieldMetadata, fieldRepository: Repository<FieldMetadata>, modelRepository: Repository<ModelMetadata>): Promise<FieldMetadata> {
@@ -48,7 +48,7 @@ export class FieldMetadataService {
         // const {id, createdAt, updatedAt, deletedAt, ...fieldKeys} = field;
         switch (field.relationType) {
             case RelationType.manyToOne: {
-                const fieldName = field.relationModelFieldName || `${modelName}s`;
+                const fieldName = field.relationCoModelFieldName || `${modelName}s`;
                 const inverseField: FieldMetadata = {
                     ...field,
                     name: fieldName,
@@ -57,11 +57,11 @@ export class FieldMetadataService {
                     type: SolidFieldType.relation,
                     isSystem: field.isSystem,
                     relationType: RelationType.oneToMany,
-                    relationModelSingularName: modelName,
+                    relationCoModelSingularName: modelName,
                     relationCreateInverse: true,
                     relationCascade: field.relationCascade,
                     relationModelModuleName: moduleName,
-                    relationModelFieldName: field.name,
+                    relationCoModelFieldName: field.name,
                     required: false,
                     unique: false,
                     index: false,
@@ -70,8 +70,6 @@ export class FieldMetadataService {
                     model: relationModel,
                     columnName:null,
                     relationJoinTableName: null,
-                    relationJoinColumnName: null,
-                    joinColumnName: null,
                     id : null,
                 }
 
@@ -80,7 +78,7 @@ export class FieldMetadataService {
                 return savedField;
             }
             case RelationType.oneToMany: {
-                const fieldName = field.relationModelFieldName || `${modelName}`;
+                const fieldName = field.relationCoModelFieldName || `${modelName}`;
                 const inverseField: FieldMetadata = {
                     ...field,
                     name: fieldName,
@@ -89,11 +87,11 @@ export class FieldMetadataService {
                     type: SolidFieldType.relation,
                     isSystem: field.isSystem,
                     relationType: RelationType.manyToOne,
-                    relationModelSingularName: modelName,
+                    relationCoModelSingularName: modelName,
                     relationCreateInverse: true,
                     relationCascade: null,
                     relationModelModuleName: moduleName,
-                    relationModelFieldName: field.name,
+                    relationCoModelFieldName: field.name,
                     required: false,
                     unique: false,
                     index: false,
@@ -102,8 +100,6 @@ export class FieldMetadataService {
                     model: relationModel,
                     columnName:null,
                     relationJoinTableName: null,
-                    relationJoinColumnName: null,
-                    joinColumnName: null,
                     id : null,
                 }
 
@@ -112,7 +108,7 @@ export class FieldMetadataService {
                 return savedField;
             }
             case RelationType.manyTomany: {
-                const fieldName = field.relationModelFieldName;
+                const fieldName = field.relationCoModelFieldName;
                 // Logic to create a manyToMany inverse field definition
                 const inverseFieldManyToMany: FieldMetadata = {
                     ...field,
@@ -122,11 +118,11 @@ export class FieldMetadataService {
                     type: SolidFieldType.relation,
                     isSystem: field.isSystem,
                     relationType: RelationType.manyTomany,
-                    relationModelSingularName: modelName,
+                    relationCoModelSingularName: modelName,
                     relationCreateInverse: true,
                     relationCascade: null,
                     relationModelModuleName: moduleName,
-                    relationModelFieldName: field.name,
+                    relationCoModelFieldName: field.name,
                     required: false,
                     unique: false,
                     index: false,
@@ -135,8 +131,6 @@ export class FieldMetadataService {
                     model: relationModel,
                     columnName:null,
                     relationJoinTableName: null,
-                    relationJoinColumnName: null,
-                    joinColumnName: null,
                     isRelationManyToManyOwner: false,
                     id : null,
                 }
@@ -151,7 +145,7 @@ export class FieldMetadataService {
     private async getRelationModel(modelRepository: Repository<ModelMetadata>, field: FieldMetadata, moduleName: string) {
         return await modelRepository.findOne({
             where: {
-                singularName: field.relationModelSingularName,
+                singularName: field.relationCoModelSingularName,
                 module: {
                     name: field.relationModelModuleName ?? moduleName
                 }
@@ -740,9 +734,10 @@ export class FieldMetadataService {
                     "ormType",
                     "isSystem",
                     "relationType",
-                    "relationModelFieldName",
+                    "relationCoModelFieldName",
                     "relationCreateInverse",
-                    "relationModelSingularName",
+                    "relationCoModelSingularName",
+                    "relationCoModelColumnName",
                     "relationModelModuleName",
                     "required",
                     "unique",
@@ -752,8 +747,6 @@ export class FieldMetadataService {
                     "encryptionType",
                     "decryptWhen",
                     "columnName",
-                    "relationJoinColumnName",
-                    "joinColumnName",
                     "relationJoinTableName",
                     "isRelationManyToManyOwner",
                 ];

package/src/services/media.service.ts

@@ -10,6 +10,9 @@ import { CrudHelperService } from "./crud-helper.service";
 import { FileService } from "src/services/file.service";
 import { ConfigService } from "@nestjs/config";
 import { MediaStorageProviderType } from "../dtos/create-media-storage-provider-metadata.dto";
+import { FileStorageProvider } from "./mediaStorageProviders/file-storage-provider";
+import { FileS3StorageProvider } from "./mediaStorageProviders/file-s3-storage-provider";
+import { getMediaStorageProvider } from "./mediaStorageProviders";
 
 @Injectable()
 export class MediaService {
@@ -32,8 +35,8 @@ export class MediaService {
     async findMany(basicFilterDto: BasicFilterDto) {
         const alias = 'media';
         // Extract the required keys from the input query
-        let { limit, offset} = basicFilterDto;
- 
+        let { limit, offset } = basicFilterDto;
+
         // Create above query on pincode table using query builder
         var qb: SelectQueryBuilder<Media> = this.mediaRepo.createQueryBuilder(alias)
         qb = await this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
@@ -174,8 +177,35 @@ export class MediaService {
     }
 
     async remove(id: number) {
-        const lov = await this.findOne(id);
-        return this.mediaRepo.remove(lov);
+        // const lov = await this.findOne(id);
+        const media = await this.mediaRepo.findOne({
+            where: {
+                id: id,
+            },
+            relations: ['mediaStorageProviderMetadata', 'fieldMetadata', 'fieldMetadata.model','fieldMetadata.mediaStorageProvider'],
+        });
+        const modelEntity = await this.modelMetadataRepo.findOne({
+            where: {
+                id: media.entityId,
+            }
+        }
+        );
+        // if (media.mediaStorageProviderMetadata.type === 'filesystem') {
+        //     const fileStorageProvider = new FileStorageProvider(this.configService, this.fileService, this);
+
+        //     await fileStorageProvider.delete(media, media.fieldMetadata);
+
+        // } else if (media.mediaStorageProviderMetadata.type === 'aws-s3') {
+        //     const fileStorageProvider = new FileS3StorageProvider(this.configService, this.fileService, this);
+        //     await fileStorageProvider.delete(media, media.fieldMetadata);
+
+        // } else {
+        // }
+        const storageProviderType = media.mediaStorageProviderMetadata.type as MediaStorageProviderType;
+        const storageProvider = getMediaStorageProvider(this.configService, this.fileService, this, storageProviderType);
+        await storageProvider.delete(modelEntity, media.fieldMetadata);
+
+        return this.mediaRepo.remove(media);
     }
 
     async delete(id: number) {
@@ -215,7 +245,7 @@ export class MediaService {
     // }
 
     async findByEntityIdAndFieldIdAndModelMetadataId(entityId: number, fieldMetadataId: number, modelMetadataId: number, relations = {}) {
-        return this.mediaRepo.find({
+        return await this.mediaRepo.find({
             where: {
                 modelMetadata: {
                     id: modelMetadataId

package/src/services/mediaStorageProviders/file-s3-storage-provider.ts

@@ -51,6 +51,9 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
                 entityId: entity.id,
                 modelMetadataId: mediaFieldMetadata.model.id,
                 relativeUri: awsFileUrl,
+                mimeType: file.mimetype,
+                fileSize: file.size,
+                originalFileName: file.originalname,
                 mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,
                 fieldMetadataId: mediaFieldMetadata.id
             }) as unknown as Media;
@@ -64,7 +67,7 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
         if (!(entity instanceof CommonEntity)) {
             throw new Error("Entity must be an instance of CommonEntity"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
-        const existingMedia = await this.mediaService.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
+        const existingMedia = await this.mediaService.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id,['mediaStorageProviderMetadata']);
         this.mediaService.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
         existingMedia.forEach(media => {
             this.fileService.deleteFromS3(media.relativeUri, mediaFieldMetadata.mediaStorageProvider.bucketName); //TODO

package/src/services/mediaStorageProviders/file-storage-provider.ts

@@ -25,7 +25,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
         const media = await this.mediaService.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
         // Add the full URL to the media
         media.forEach(m => {
-            m['_full_url'] = this.getFullFilePath(m.relativeUri);
+            m['_full_url'] = `${process.env.BASE_URL}/${this.getFullFilePath(m.relativeUri)}`;
         });
         return media;
     }
@@ -46,6 +46,9 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
                 entityId: entity.id,
                 modelMetadataId: mediaFieldMetadata.model.id,
                 relativeUri: this.getFileName(file),
+                mimeType: file.mimetype,
+                fileSize: file.size,
+                originalFileName: file.originalname,
                 mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,
                 fieldMetadataId: mediaFieldMetadata.id
             }) as unknown as Media;
@@ -59,7 +62,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
         if (!(entity instanceof CommonEntity)) {
             throw new Error("Entity must be an instance of CommonEntity"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
-        const existingMedia = await this.mediaService.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
+        const existingMedia = await this.mediaService.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id,['mediaStorageProviderMetadata']);
         this.mediaService.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
         existingMedia.forEach(media => {
             this.fileService.deleteFile(this.getFullFilePath(media.relativeUri));
@@ -67,7 +70,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     private getFullFilePath(fileName: string): string {
-        return `${process.env.BASE_URL}/${this.configService.get('app-builder.fileStorageDir')}/${fileName}`;
+        return `${this.configService.get('app-builder.fileStorageDir')}/${fileName}`;
     }
 
     private getFileName(file: Express.Multer.File): string {

package/src/services/menu-item-metadata.service.ts

@@ -148,9 +148,15 @@ export class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {
   // Recursive function to build the tree
   private buildMenuTree(rootItems: MenuItemMetadata[], allMenuItems: MenuItemMetadata[], activeUser: ActiveUserData): any[] {
     const menuItemsData = rootItems.map(rootItem => {
-
+      const allowedMenuItems =allMenuItems.filter(i => {
+        if(!i.parentMenuItem){
+          return true
+        }else{
+          const hasPermission = hasReadPermissionOnModel(activeUser, i.action.model.singularName);
+          return  hasReadPermissionOnModel(activeUser, i.action.model.singularName)
+        }}); 
       // Get immediate children of the current loop variable menuItem.
-      const children = allMenuItems.filter(item => item.parentMenuItem && item.parentMenuItem.id === rootItem.id);
+      const children = allowedMenuItems.filter(item => item.parentMenuItem && item.parentMenuItem.id === rootItem.id);
 
       // TODO: We should specify path only if there are no more children present. 
       // For now adding path everywhere. 

package/src/services/model-metadata.service.ts

@@ -902,6 +902,7 @@ export class ModelMetadataService {
         dataSource: model.dataSource,
         table: model.tableName,
         fields: fieldsForRefresh,
+        modelEnableSoftDelete: model.enableSoftDelete
       },
       dryRun
     );

package/src/services/role-metadata.service.ts

@@ -99,8 +99,8 @@ export class RoleMetadataService extends CRUDService<RoleMetadata> {
     return await this._addPermissionsToRole(roleName, permissionNames);
   }
 
-  async addPermissionToRole(roleName: string, permissionName: string) {
-    return await this._addPermissionsToRole(roleName, [permissionName]);
+  async addPermissionToRole(roleName: string, permissionName: string[]) {
+    return await this._addPermissionsToRole(roleName, permissionName);
   }
 
   private async _addPermissionsToRole(roleName: string, permissionNames: string[]): Promise<RoleMetadata> {

package/src/services/user.service.ts

@@ -75,6 +75,21 @@ export class UserService extends CRUDService<User> {
     // return entity;
   }
 
+  async updateUser(id: any, updateDto, files) {
+    const user = await this.repo.findOne({
+      where: { id: id },
+      relations: {
+        roles: true
+      }
+    });
+    if (!user) {
+      throw new Error(`User not found.`);
+    }
+    const roles  = updateDto.roles ? updateDto.roles :[]; 
+    await this.addRolesToUser(user.username, roles);
+    await this.update(id, updateDto, files, true);
+  }
+
   async addRoleToUser(username: string, roleName: string): Promise<User> {
     // Find the role, find the user and populate the many 2 many table.
     const user = await this.repo.findOne({

package/src/services/view-metadata.service.ts

@@ -86,11 +86,11 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
       const field = fields[i];
 
       // For fields of type relation & relationType many-to-one
-      // We fetch metadata regarding the relationModelSingularName
+      // We fetch metadata regarding the relationCoModelSingularName
       if (field.type === 'relation') {
         const relationModel = await this.modelMetadataRepo.find({
           where: {
-            singularName: field.relationModelSingularName
+            singularName: field.relationCoModelSingularName
           },
           relations: {
             userKeyField: true