@solidxai/core 0.1.10-beta.9 → 0.1.10

package/dist/services/mediaStorageProviders/file-storage-provider.js

@@ -49,6 +49,7 @@ const config_1 = require("@nestjs/config");
 const media_repository_1 = require("../../repository/media.repository");
 const file_1 = require("../file");
 const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 const setting_service_1 = require("../setting.service");
 const default_settings_provider_service_1 = require("../settings/default-settings-provider.service");
 let FileStorageProvider = FileStorageProvider_1 = class FileStorageProvider {
@@ -93,11 +94,14 @@ let FileStorageProvider = FileStorageProvider_1 = class FileStorageProvider {
         for (const pair of streamPairs) {
             const stream = pair[0];
             const fileName = pair[1];
-            await this.fileService.writeStream(this.getFullFilePath(fileName), stream);
+            const fullPath = this.getFullFilePath(fileName);
+            await this.fileService.writeStream(fullPath, stream);
+            const { size: fileSize } = await fs.promises.stat(fullPath);
             const mediaEntity = await this.mediaRepository.createMedia({
                 entityId: entity.id,
                 modelMetadataId: mediaFieldMetadata.model.id,
                 relativeUri: fileName,
+                fileSize,
                 mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,
                 fieldMetadataId: mediaFieldMetadata.id
             });
@@ -113,6 +117,12 @@ let FileStorageProvider = FileStorageProvider_1 = class FileStorageProvider {
             await this.fileService.delete(this.getFullFilePath(media.relativeUri));
         }
     }
+    async deleteByMediaRecord(media) {
+        if (!media?.relativeUri) {
+            return;
+        }
+        await this.fileService.delete(this.getFullFilePath(media.relativeUri));
+    }
     getFullFilePath(fileName) {
         const base = this.settingService.getConfigValue("fileStorageDir")
             || default_settings_provider_service_1.DEFAULT_MEDIA_FILE_STORAGE_DIR;

package/dist/services/mediaStorageProviders/file-storage-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-storage-provider.js","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-storage-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { ConfigService } from \"@nestjs/config\";\nimport { CommonEntity } from \"src/entities/common.entity\";\nimport { FieldMetadata } from \"src/entities/field-metadata.entity\";\nimport { Media } from \"src/entities/media.entity\";\nimport { MediaStorageProvider } from \"src/interfaces\";\nimport { MediaRepository } from \"src/repository/media.repository\";\nimport { DiskFileService } from \"src/services/file\";\nimport { Readable } from \"stream\";\nimport * as path from \"path\";\nimport { SettingService } from \"../setting.service\";\nimport { DEFAULT_MEDIA_FILE_STORAGE_DIR } from \"src/services/settings/default-settings-provider.service\";\nimport type { SolidCoreSetting } from \"src/services/settings/default-settings-provider.service\";\n\n@Injectable()\nexport class FileStorageProvider<T> implements MediaStorageProvider<T> {\n    private logger = new Logger(FileStorageProvider.name);\n\n    constructor(\n        // @Inject(appBuilderConfig.KEY)\n        // private readonly appBuilderConfiguration: ConfigType<typeof appBuilderConfig>,\n        private readonly configService: ConfigService,\n        readonly fileService: DiskFileService,\n        readonly mediaRepository: MediaRepository,\n        private readonly settingService: SettingService\n\n    ) { }\n\n    async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        //@ts-ignore\n        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        // Add the full URL to the media\n        // media.forEach(m => {\n        // });\n        for (const m of media) {\n            m['_full_url'] = `${this.settingService.getConfigValue<SolidCoreSetting>(\"baseUrl\")}/${this.getFullFilePath(m.relativeUri)}`;\n        }\n\n\n        return media;\n    }\n\n    async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        for (const file of files) {\n            // Store the file in the configured file storage directory\n            const fileStoragePath = this.getFullFilePath(this.getFileName(file));\n            await this.fileService.copy(file.path, fileStoragePath);\n            await this.fileService.delete(file.path);\n\n            // Create an entry in the media table\n            const mediaEntity = await this.mediaRepository.createMedia({\n                //@ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: this.getFileName(file),\n                mimeType: file.mimetype,\n                fileSize: file.size,\n                originalFileName: file.originalname,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        for (const pair of streamPairs) {\n            const stream = pair[0];\n            const fileName = pair[1];\n            await this.fileService.writeStream(this.getFullFilePath(fileName), stream);\n            const mediaEntity = await this.mediaRepository.createMedia({\n                //@ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: fileName,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        //@ts-ignore\n        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        //@ts-ignore\n        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);\n\n        for (const media of existingMedia) {\n            await this.fileService.delete(this.getFullFilePath(media.relativeUri));\n        }\n        // existingMedia.forEach(media => {\n        // });\n    }\n\n    private getFullFilePath(fileName: string): string {\n        const base = this.settingService.getConfigValue<SolidCoreSetting>(\"fileStorageDir\")\n            || DEFAULT_MEDIA_FILE_STORAGE_DIR;\n        if (path.isAbsolute(fileName) || fileName.startsWith(`${base}/`)) {\n            return fileName;\n        }\n        return `${base}/${fileName}`;\n    }\n\n    private getFileName(file: Express.Multer.File): string {\n        return `${file.filename}-${file.originalname}`;\n    }\n}"]}
+{"version":3,"file":"file-storage-provider.js","sourceRoot":"","sources":["../../../src/services/mediaStorageProviders/file-storage-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from \"@nestjs/common\";\nimport { ConfigService } from \"@nestjs/config\";\nimport { CommonEntity } from \"src/entities/common.entity\";\nimport { FieldMetadata } from \"src/entities/field-metadata.entity\";\nimport { Media } from \"src/entities/media.entity\";\nimport { MediaStorageProvider } from \"src/interfaces\";\nimport { MediaRepository } from \"src/repository/media.repository\";\nimport { DiskFileService } from \"src/services/file\";\nimport { Readable } from \"stream\";\nimport * as path from \"path\";\nimport * as fs from \"fs\";\nimport { SettingService } from \"../setting.service\";\nimport { DEFAULT_MEDIA_FILE_STORAGE_DIR } from \"src/services/settings/default-settings-provider.service\";\nimport type { SolidCoreSetting } from \"src/services/settings/default-settings-provider.service\";\n\n@Injectable()\nexport class FileStorageProvider<T> implements MediaStorageProvider<T> {\n    private logger = new Logger(FileStorageProvider.name);\n\n    constructor(\n        // @Inject(appBuilderConfig.KEY)\n        // private readonly appBuilderConfiguration: ConfigType<typeof appBuilderConfig>,\n        private readonly configService: ConfigService,\n        readonly fileService: DiskFileService,\n        readonly mediaRepository: MediaRepository,\n        private readonly settingService: SettingService\n\n    ) { }\n\n    async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        //@ts-ignore\n        const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        // Add the full URL to the media\n        // media.forEach(m => {\n        // });\n        for (const m of media) {\n            m['_full_url'] = `${this.settingService.getConfigValue<SolidCoreSetting>(\"baseUrl\")}/${this.getFullFilePath(m.relativeUri)}`;\n        }\n\n\n        return media;\n    }\n\n    async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        for (const file of files) {\n            // Store the file in the configured file storage directory\n            const fileStoragePath = this.getFullFilePath(this.getFileName(file));\n            await this.fileService.copy(file.path, fileStoragePath);\n            await this.fileService.delete(file.path);\n\n            // Create an entry in the media table\n            const mediaEntity = await this.mediaRepository.createMedia({\n                //@ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: this.getFileName(file),\n                mimeType: file.mimetype,\n                fileSize: file.size,\n                originalFileName: file.originalname,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            result.push(mediaEntity);\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        const result: Media[] = [];\n        for (const pair of streamPairs) {\n            const stream = pair[0];\n            const fileName = pair[1];\n            const fullPath = this.getFullFilePath(fileName);\n            await this.fileService.writeStream(fullPath, stream);\n            const { size: fileSize } = await fs.promises.stat(fullPath);\n            const mediaEntity = await this.mediaRepository.createMedia({\n                //@ts-ignore\n                entityId: entity.id,\n                modelMetadataId: mediaFieldMetadata.model.id,\n                relativeUri: fileName,\n                fileSize,\n                mediaStorageProviderMetadataId: mediaFieldMetadata.mediaStorageProvider.id,\n                fieldMetadataId: mediaFieldMetadata.id\n            }) as unknown as Media;\n            this.logger.debug(`Stored media with`, mediaEntity);\n        };\n        return result;\n    }\n\n    async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {\n        // if (!(entity instanceof CommonEntity)) {\n        //     throw new Error(\"Entity must be an instance of CommonEntity\"); //FIXME This needs to be handled through generics. e.g T extends CommonEntity\n        // }\n        //@ts-ignore\n        const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);\n        //@ts-ignore\n        this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);\n\n        for (const media of existingMedia) {\n            await this.fileService.delete(this.getFullFilePath(media.relativeUri));\n        }\n        // existingMedia.forEach(media => {\n        // });\n    }\n\n    async deleteByMediaRecord(media: Media): Promise<void> {\n        if (!media?.relativeUri) {\n            return;\n        }\n        await this.fileService.delete(this.getFullFilePath(media.relativeUri));\n    }\n\n    private getFullFilePath(fileName: string): string {\n        const base = this.settingService.getConfigValue<SolidCoreSetting>(\"fileStorageDir\")\n            || DEFAULT_MEDIA_FILE_STORAGE_DIR;\n        if (path.isAbsolute(fileName) || fileName.startsWith(`${base}/`)) {\n            return fileName;\n        }\n        return `${base}/${fileName}`;\n    }\n\n    private getFileName(file: Express.Multer.File): string {\n        return `${file.filename}-${file.originalname}`;\n    }\n}\n"]}

package/dist/services/model-metadata.service.d.ts

@@ -1,24 +1,26 @@
 import { DataSource, EntityManager, Repository } from 'typeorm';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { ModelMetadata } from '../entities/model-metadata.entity';
+import { NavigationDto } from '../dtos/navigation.dto';
 import { ModuleMetadataHelperService } from '../helpers/module-metadata-helper.service';
 import { FieldMetadataRepository } from '../repository/field-metadata.repository';
 import { ModelMetadataRepository } from '../repository/model-metadata.repository';
 import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { UpdateModelMetaDataDto } from '../dtos/update-model-metadata.dto';
+import { CommandService } from '../helpers/command.service';
 import { SchematicService } from '../helpers/schematic.service';
 import { CodeGenerationOptions } from '../interfaces';
 import { CrudHelperService } from './crud-helper.service';
 import { FieldMetadataService } from './field-metadata.service';
 import { MediaStorageProviderMetadataService } from './media-storage-provider-metadata.service';
 import { RoleMetadataService } from './role-metadata.service';
-import { NavigationDto } from '../dtos/navigation.dto';
 import { SolidIntrospectService } from './solid-introspect.service';
 import { SolidTsMorphService } from './solid-ts-morph.service';
 export declare class ModelMetadataService {
     private readonly modelMetadataRepo;
     private readonly fieldMetadataRepo;
     private readonly schematicService;
+    private readonly commandService;
     private readonly dataSource;
     private readonly crudHelperService;
     private readonly mediaStorageProviderMetadataService;
@@ -28,29 +30,9 @@ export declare class ModelMetadataService {
     readonly introspectService: SolidIntrospectService;
     private readonly solidTsMorphService;
     private logger;
-    constructor(modelMetadataRepo: ModelMetadataRepository, fieldMetadataRepo: FieldMetadataRepository, schematicService: SchematicService, dataSource: DataSource, crudHelperService: CrudHelperService, mediaStorageProviderMetadataService: MediaStorageProviderMetadataService, fieldMetadataService: FieldMetadataService, roleService: RoleMetadataService, moduleMetadataHelperService: ModuleMetadataHelperService, introspectService: SolidIntrospectService, solidTsMorphService: SolidTsMorphService);
-    find(basicFilterDto: BasicFilterDto): Promise<{
-        meta: {
-            totalRecords: number;
-            currentPage: number;
-            nextPage: number;
-            prevPage: number;
-            totalPages: number;
-            perPage: number;
-        };
-        records: ModelMetadata[];
-    }>;
-    findMany(basicFilterDto: BasicFilterDto): Promise<{
-        meta: {
-            totalRecords: number;
-            currentPage: number;
-            nextPage: number;
-            prevPage: number;
-            totalPages: number;
-            perPage: number;
-        };
-        records: ModelMetadata[];
-    }>;
+    constructor(modelMetadataRepo: ModelMetadataRepository, fieldMetadataRepo: FieldMetadataRepository, schematicService: SchematicService, commandService: CommandService, dataSource: DataSource, crudHelperService: CrudHelperService, mediaStorageProviderMetadataService: MediaStorageProviderMetadataService, fieldMetadataService: FieldMetadataService, roleService: RoleMetadataService, moduleMetadataHelperService: ModuleMetadataHelperService, introspectService: SolidIntrospectService, solidTsMorphService: SolidTsMorphService);
+    find(basicFilterDto: BasicFilterDto): Promise<any>;
+    findMany(basicFilterDto: BasicFilterDto): Promise<any>;
     findOne(id: any, query?: any): Promise<ModelMetadata>;
     findOneBySingularName(singularName: string, relations?: {}): Promise<ModelMetadata>;
     findOneByUserKey(singularName: string, relations?: {}): Promise<ModelMetadata>;
@@ -66,6 +48,12 @@ export declare class ModelMetadataService {
     deleteMany(ids: number[]): Promise<any>;
     remove(id: number): Promise<ModelMetadata>;
     cleanupOnDelete(modelEntityId: number): Promise<void>;
+    private cleanupAssociatedViewsActionsAndMenus;
+    private cleanupAssociatedImports;
+    private cleanupAssociatedPermissions;
+    private clearModelReferencesBeforeDelete;
+    private findMenusForActionIds;
+    generateCodeViaCtl(modelId: number): Promise<string>;
     handleGenerateCode(options: CodeGenerationOptions): Promise<any>;
     private generateCodeForInverseModels;
     generateVAMConfig(modelId: number): Promise<void>;
@@ -98,16 +86,16 @@ export declare class ModelMetadataService {
             limit: number;
         };
         meta: {
-            totalRecords: number;
-            perPage: number;
-            currentPage: number;
-            totalPages: number;
-            currentIndexInPage: number;
-            currentIndexGlobal: number;
+            totalRecords: any;
+            perPage: any;
+            currentPage: any;
+            totalPages: any;
+            currentIndexInPage: any;
+            currentIndexGlobal: any;
             hasPrev: boolean;
             hasNext: boolean;
-            prevPage: number;
-            nextPage: number;
+            prevPage: any;
+            nextPage: any;
         };
     }>;
 }

package/dist/services/model-metadata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/model-metadata.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/model-metadata.service.ts"],"names":[],"mappings":"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"}

package/dist/services/model-metadata.service.js

@@ -54,7 +54,6 @@ const typeorm_2 = require("typeorm");
 const model_metadata_entity_1 = require("../entities/model-metadata.entity");
 const module_metadata_entity_1 = require("../entities/module-metadata.entity");
 const lodash_1 = require("lodash");
-const string_helper_1 = require("../helpers/string.helper");
 const error_messages_1 = require("../constants/error-messages");
 const disallow_in_production_decorator_1 = require("../decorators/disallow-in-production.decorator");
 const create_field_metadata_dto_1 = require("../dtos/create-field-metadata.dto");
@@ -63,9 +62,15 @@ const field_metadata_repository_1 = require("../repository/field-metadata.reposi
 const model_metadata_repository_1 = require("../repository/model-metadata.repository");
 const action_metadata_entity_1 = require("../entities/action-metadata.entity");
 const field_metadata_entity_1 = require("../entities/field-metadata.entity");
+const import_transaction_error_log_entity_1 = require("../entities/import-transaction-error-log.entity");
+const import_transaction_entity_1 = require("../entities/import-transaction.entity");
 const menu_item_metadata_entity_1 = require("../entities/menu-item-metadata.entity");
+const user_view_metadata_entity_1 = require("../entities/user-view-metadata.entity");
+const permission_metadata_entity_1 = require("../entities/permission-metadata.entity");
 const view_metadata_entity_1 = require("../entities/view-metadata.entity");
+const command_service_1 = require("../helpers/command.service");
 const schematic_service_1 = require("../helpers/schematic.service");
+const string_helper_1 = require("../helpers/string.helper");
 const crud_helper_service_1 = require("./crud-helper.service");
 const field_metadata_service_1 = require("./field-metadata.service");
 const media_storage_provider_metadata_service_1 = require("./media-storage-provider-metadata.service");
@@ -73,10 +78,11 @@ const role_metadata_service_1 = require("./role-metadata.service");
 const solid_introspect_service_1 = require("./solid-introspect.service");
 const solid_ts_morph_service_1 = require("./solid-ts-morph.service");
 let ModelMetadataService = class ModelMetadataService {
-    constructor(modelMetadataRepo, fieldMetadataRepo, schematicService, dataSource, crudHelperService, mediaStorageProviderMetadataService, fieldMetadataService, roleService, moduleMetadataHelperService, introspectService, solidTsMorphService) {
+    constructor(modelMetadataRepo, fieldMetadataRepo, schematicService, commandService, dataSource, crudHelperService, mediaStorageProviderMetadataService, fieldMetadataService, roleService, moduleMetadataHelperService, introspectService, solidTsMorphService) {
         this.modelMetadataRepo = modelMetadataRepo;
         this.fieldMetadataRepo = fieldMetadataRepo;
         this.schematicService = schematicService;
+        this.commandService = commandService;
         this.dataSource = dataSource;
         this.crudHelperService = crudHelperService;
         this.mediaStorageProviderMetadataService = mediaStorageProviderMetadataService;
@@ -92,26 +98,15 @@ let ModelMetadataService = class ModelMetadataService {
     }
     async findMany(basicFilterDto) {
         const alias = 'modelMetadata';
-        let { limit, offset } = basicFilterDto;
-        var qb = await this.modelMetadataRepo.createSecurityRuleAwareQueryBuilder(alias);
-        qb = await this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
-        const [entities, count] = await qb.getManyAndCount();
-        const currentPage = Math.floor(offset / limit) + 1;
-        const totalPages = Math.ceil(count / limit);
-        const nextPage = currentPage < totalPages ? currentPage + 1 : null;
-        const prevPage = currentPage > 1 ? currentPage - 1 : null;
-        const r = {
-            meta: {
-                totalRecords: count,
-                currentPage: currentPage,
-                nextPage: nextPage,
-                prevPage: prevPage,
-                totalPages: totalPages,
-                perPage: +limit,
-            },
-            records: entities
-        };
-        return r;
+        const { limit, offset } = basicFilterDto;
+        const qb = await this.modelMetadataRepo.createSecurityRuleAwareQueryBuilder(alias);
+        if (basicFilterDto.groupBy?.length) {
+            const groupFilterQb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias, undefined, undefined, undefined, crud_helper_service_1.FilterCombinator.AND, false, false);
+            return this.crudHelperService.executeGroupPipeline(groupFilterQb, basicFilterDto, alias, () => this.modelMetadataRepo.createSecurityRuleAwareQueryBuilder(alias));
+        }
+        const filteredQb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
+        const [entities, count] = await filteredQb.getManyAndCount();
+        return this.crudHelperService.pagedResponse(offset, limit, count, entities);
     }
     async findOne(id, query) {
         const entity = await this.modelMetadataRepo.findOne({
@@ -256,8 +251,7 @@ let ModelMetadataService = class ModelMetadataService {
                 tableName: model.tableName,
                 userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
                 isChild: model?.isChild,
-                isLegacyTable: model?.isLegacyTable,
-                isLegacyTableWithId: model?.isLegacyTableWithId,
+                legacyTableType: model?.legacyTableType,
                 parentModelUserKey: model?.parentModel?.singularName,
                 enableAuditTracking: model?.enableAuditTracking,
                 enableSoftDelete: model?.enableSoftDelete,
@@ -470,7 +464,7 @@ let ModelMetadataService = class ModelMetadataService {
             where: {
                 id: modelEntityId,
             },
-            relations: ['module']
+            relations: ['module', 'fields']
         });
         if (!modelEntity) {
             this.logger.log(`Invalid modelEntityId: ${modelEntityId} unable to resolve model metadata`);
@@ -510,21 +504,67 @@ let ModelMetadataService = class ModelMetadataService {
                     this.logger.log(`Deleted file: ${fileToDelete}`);
                 }
                 catch (error) {
+                    if (error?.code === 'ENOENT') {
+                        this.logger.warn(`File already absent, skipping delete: ${fileToDelete}`);
+                        continue;
+                    }
                     this.logger.error(`Error deleting file: ${fileToDelete}`, error);
                 }
             }
         }
-        await this.dataSource.query(`CALL cleanup_model_metadata($1, $2)`, [modelEntity.singularName, true]);
+        const { removedActionNames, removedMenuNames, removedViewNames } = await this.cleanupAssociatedViewsActionsAndMenus(modelEntity.id);
+        await this.cleanupAssociatedImports(modelEntity.id);
+        await this.cleanupAssociatedPermissions(modelEntity.singularName);
+        await this.clearModelReferencesBeforeDelete(modelEntity);
         const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(modelEntity.module?.name);
         const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
         if (metaData) {
+            const moduleMetadata = metaData?.moduleMetadata ?? metaData;
+            const removedActionNameSet = new Set(removedActionNames);
+            const removedMenuNameSet = new Set(removedMenuNames);
+            const removedViewNameSet = new Set(removedViewNames);
             const existingModelIndex = metaData.moduleMetadata.models.findIndex((existingModel) => existingModel.singularName === modelEntity.singularName);
             if (existingModelIndex !== -1) {
                 metaData.moduleMetadata.models.splice(existingModelIndex, 1);
             }
-            metaData.moduleMetadata.menus = metaData.moduleMetadata?.menus?.filter((menu) => menu.modelUserKey !== modelEntity.singularName);
-            metaData.moduleMetadata.actions = metaData.moduleMetadata?.actions?.filter((action) => action.modelUserKey !== modelEntity.singularName);
-            metaData.moduleMetadata.views = metaData.moduleMetadata?.views?.filter((view) => view.modelUserKey !== modelEntity.singularName);
+            const existingViews = Array.isArray(moduleMetadata?.views) ? moduleMetadata.views : [];
+            moduleMetadata.views = existingViews.filter((view) => {
+                const shouldRemove = view?.modelUserKey === modelEntity.singularName || removedViewNameSet.has(view?.name);
+                if (shouldRemove && view?.name) {
+                    removedViewNameSet.add(view.name);
+                }
+                return !shouldRemove;
+            });
+            const existingActions = Array.isArray(moduleMetadata?.actions) ? moduleMetadata.actions : [];
+            moduleMetadata.actions = existingActions.filter((action) => {
+                const shouldRemove = action?.modelUserKey === modelEntity.singularName ||
+                    removedActionNameSet.has(action?.name) ||
+                    removedViewNameSet.has(action?.viewUserKey);
+                if (shouldRemove && action?.name) {
+                    removedActionNameSet.add(action.name);
+                }
+                return !shouldRemove;
+            });
+            let pendingMenus = Array.isArray(moduleMetadata?.menus) ? [...moduleMetadata.menus] : [];
+            let menuRemovedOnPass = true;
+            while (menuRemovedOnPass) {
+                menuRemovedOnPass = false;
+                pendingMenus = pendingMenus.filter((menu) => {
+                    const shouldRemove = menu?.modelUserKey === modelEntity.singularName ||
+                        removedMenuNameSet.has(menu?.name) ||
+                        removedActionNameSet.has(menu?.actionUserKey) ||
+                        removedMenuNameSet.has(menu?.parentMenuItemUserKey);
+                    if (shouldRemove) {
+                        if (menu?.name) {
+                            removedMenuNameSet.add(menu.name);
+                        }
+                        menuRemovedOnPass = true;
+                        return false;
+                    }
+                    return true;
+                });
+            }
+            moduleMetadata.menus = pendingMenus;
             const updatedContent = JSON.stringify(metaData, null, 2);
             await fs.writeFile(filePath, updatedContent);
         }
@@ -544,6 +584,195 @@ let ModelMetadataService = class ModelMetadataService {
             }
         }
     }
+    async cleanupAssociatedViewsActionsAndMenus(modelId) {
+        const viewRepo = this.dataSource.getRepository(view_metadata_entity_1.ViewMetadata);
+        const actionRepo = this.dataSource.getRepository(action_metadata_entity_1.ActionMetadata);
+        const menuRepo = this.dataSource.getRepository(menu_item_metadata_entity_1.MenuItemMetadata);
+        const userViewRepo = this.dataSource.getRepository(user_view_metadata_entity_1.UserViewMetadata);
+        const views = await viewRepo.find({
+            where: {
+                model: { id: modelId },
+            },
+        });
+        const viewIds = views.map((view) => view.id);
+        const removedViewNames = views.map((view) => view.name).filter(Boolean);
+        const actions = await actionRepo.find({
+            where: [
+                {
+                    model: { id: modelId },
+                },
+                ...(viewIds.length > 0
+                    ? [
+                        {
+                            view: { id: (0, typeorm_2.In)(viewIds) },
+                        },
+                    ]
+                    : []),
+            ],
+            relations: ['view'],
+        });
+        const uniqueActions = Array.from(new Map(actions.map((action) => [action.id, action])).values());
+        const actionIds = uniqueActions.map((action) => action.id);
+        const removedActionNames = uniqueActions.map((action) => action.name).filter(Boolean);
+        const menus = await this.findMenusForActionIds(actionIds);
+        const removedMenuNames = menus.map((menu) => menu.name).filter(Boolean);
+        if (menus.length > 0) {
+            const menuIds = menus.map((menu) => menu.id).filter(Boolean);
+            for (const menu of menus) {
+                if (menu.roles?.length) {
+                    await this.dataSource
+                        .createQueryBuilder()
+                        .relation(menu_item_metadata_entity_1.MenuItemMetadata, 'roles')
+                        .of(menu.id)
+                        .remove(menu.roles.map((role) => role.id));
+                }
+            }
+            if (menuIds.length > 0) {
+                await menuRepo
+                    .createQueryBuilder()
+                    .update(menu_item_metadata_entity_1.MenuItemMetadata)
+                    .set({ parentMenuItem: null })
+                    .where('id IN (:...menuIds)', { menuIds })
+                    .execute();
+                await menuRepo
+                    .createQueryBuilder()
+                    .delete()
+                    .from(menu_item_metadata_entity_1.MenuItemMetadata)
+                    .where('id IN (:...menuIds)', { menuIds })
+                    .execute();
+            }
+            this.logger.log(`Deleted ${menus.length} menu metadata record(s) for model id ${modelId}`);
+        }
+        if (uniqueActions.length > 0) {
+            await actionRepo.remove(uniqueActions);
+            this.logger.log(`Deleted ${uniqueActions.length} action metadata record(s) for model id ${modelId}`);
+        }
+        if (viewIds.length > 0) {
+            const userViews = await userViewRepo.find({
+                where: {
+                    viewMetadata: { id: (0, typeorm_2.In)(viewIds) },
+                },
+                relations: ['viewMetadata'],
+            });
+            if (userViews.length > 0) {
+                await userViewRepo.remove(userViews);
+                this.logger.log(`Deleted ${userViews.length} user view metadata record(s) for model id ${modelId}`);
+            }
+            await viewRepo.remove(views);
+            this.logger.log(`Deleted ${views.length} view metadata record(s) for model id ${modelId}`);
+        }
+        return {
+            removedActionNames,
+            removedMenuNames,
+            removedViewNames,
+        };
+    }
+    async cleanupAssociatedImports(modelId) {
+        const importTransactionRepo = this.dataSource.getRepository(import_transaction_entity_1.ImportTransaction);
+        const importTransactionErrorLogRepo = this.dataSource.getRepository(import_transaction_error_log_entity_1.ImportTransactionErrorLog);
+        const importTransactions = await importTransactionRepo.find({
+            where: {
+                modelMetadata: { id: modelId },
+            },
+        });
+        if (importTransactions.length === 0) {
+            return;
+        }
+        const importTransactionIds = importTransactions.map((transaction) => transaction.id);
+        const importTransactionErrorLogs = await importTransactionErrorLogRepo.find({
+            where: {
+                importTransaction: { id: (0, typeorm_2.In)(importTransactionIds) },
+            },
+            relations: ['importTransaction'],
+        });
+        if (importTransactionErrorLogs.length > 0) {
+            await importTransactionErrorLogRepo.remove(importTransactionErrorLogs);
+            this.logger.log(`Deleted ${importTransactionErrorLogs.length} import transaction error log record(s) for model id ${modelId}`);
+        }
+        await importTransactionRepo.remove(importTransactions);
+        this.logger.log(`Deleted ${importTransactions.length} import transaction record(s) for model id ${modelId}`);
+    }
+    async cleanupAssociatedPermissions(modelSingularName) {
+        const permissionsRepo = this.dataSource.getRepository(permission_metadata_entity_1.PermissionMetadata);
+        const controllerName = `${(0, string_helper_1.classify)(modelSingularName)}Controller`;
+        const permissions = await permissionsRepo
+            .createQueryBuilder('permission')
+            .leftJoinAndSelect('permission.roles', 'role')
+            .where('permission.name LIKE :pattern', { pattern: `${controllerName}.%` })
+            .getMany();
+        if (permissions.length === 0) {
+            return;
+        }
+        for (const permission of permissions) {
+            if (permission.roles?.length) {
+                await this.dataSource
+                    .createQueryBuilder()
+                    .relation(permission_metadata_entity_1.PermissionMetadata, 'roles')
+                    .of(permission.id)
+                    .remove(permission.roles.map((role) => role.id));
+            }
+        }
+        await permissionsRepo.remove(permissions);
+        this.logger.log(`Deleted ${permissions.length} permission metadata record(s) for model '${modelSingularName}'`);
+    }
+    async clearModelReferencesBeforeDelete(modelEntity) {
+        const modelRepo = this.dataSource.getRepository(model_metadata_entity_1.ModelMetadata);
+        const fieldIds = (modelEntity.fields ?? []).map((field) => field.id).filter(Boolean);
+        if (fieldIds.length > 0) {
+            await modelRepo
+                .createQueryBuilder()
+                .update(model_metadata_entity_1.ModelMetadata)
+                .set({ userKeyField: null })
+                .where('user_key_field_id IN (:...fieldIds)', { fieldIds })
+                .execute();
+        }
+        await modelRepo
+            .createQueryBuilder()
+            .update(model_metadata_entity_1.ModelMetadata)
+            .set({ parentModel: null })
+            .where('parent_model_id = :modelId', { modelId: modelEntity.id })
+            .execute();
+    }
+    async findMenusForActionIds(actionIds) {
+        if (!actionIds?.length) {
+            return [];
+        }
+        const menuRepo = this.dataSource.getRepository(menu_item_metadata_entity_1.MenuItemMetadata);
+        const menusById = new Map();
+        const rootMenus = await menuRepo.find({
+            where: {
+                action: { id: (0, typeorm_2.In)(actionIds) },
+            },
+            relations: ['roles', 'action', 'parentMenuItem'],
+        });
+        rootMenus.forEach((menu) => menusById.set(menu.id, menu));
+        let parentIds = rootMenus.map((menu) => menu.id);
+        while (parentIds.length > 0) {
+            const childMenus = await menuRepo.find({
+                where: {
+                    parentMenuItem: { id: (0, typeorm_2.In)(parentIds) },
+                },
+                relations: ['roles', 'action', 'parentMenuItem'],
+            });
+            const nextParentIds = [];
+            for (const childMenu of childMenus) {
+                if (!menusById.has(childMenu.id)) {
+                    menusById.set(childMenu.id, childMenu);
+                    nextParentIds.push(childMenu.id);
+                }
+            }
+            parentIds = nextParentIds;
+        }
+        return Array.from(menusById.values());
+    }
+    async generateCodeViaCtl(modelId) {
+        const model = await this.findOne(modelId);
+        return this.commandService.executeCommandWithArgs({
+            command: 'npx',
+            args: ['@solidxai/solidctl@latest', 'generate', 'model', `--name=${model.singularName}`],
+            cwd: path.join(process.cwd(), '..'),
+        });
+    }
     async handleGenerateCode(options) {
         const affectedModelIds = [], refreshModelCodeOutputLines = [], removeFieldCodeOutputLines = [];
         const { model, removeFieldCodeOuput, refreshModelCodeOutput } = await this.generateCode(options);
@@ -958,11 +1187,11 @@ let ModelMetadataService = class ModelMetadataService {
         const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
         const fieldsForRemoval = model.fields.filter((field) => options.fieldIdsForRemoval.includes(+field.id));
         const removeOutput = await this.executeRemoveFieldsCommand(model, fieldsForRemoval, options.dryRun);
-        fieldsForRemoval.forEach((field) => {
+        for (const field of fieldsForRemoval) {
             if (field.isMarkedForRemoval) {
-                this.fieldMetadataService.delete(field.id);
+                await this.fieldMetadataService.delete(field.id);
             }
-        });
+        }
         const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
         const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
         const existingModelIndex = metaData.moduleMetadata.models.findIndex((existingModel) => existingModel.singularName === model.singularName);
@@ -986,17 +1215,10 @@ let ModelMetadataService = class ModelMetadataService {
             populate: ["module", "fields", "parentModel", "parentModel.module"]
         };
         const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
-        let fieldsForRefresh = model.fields.filter((field) => !field.isMarkedForRemoval);
-        if (options.fieldIdsForRefresh && options.fieldIdsForRefresh.length > 0) {
-            fieldsForRefresh = fieldsForRefresh.filter((field) => options.fieldIdsForRefresh.includes(+field.id));
-        }
-        else if (options.fieldNamesForRefresh && options.fieldNamesForRefresh.length > 0) {
-            fieldsForRefresh = fieldsForRefresh.filter((field) => options.fieldNamesForRefresh.includes(field.name));
-        }
-        const refreshOuput = await this.executeRefreshModelCommand(model, fieldsForRefresh, options.dryRun);
+        const refreshOuput = await this.executeRefreshModelCommand(model, options.dryRun);
         return `${refreshOuput}`;
     }
-    async executeRefreshModelCommand(model, fieldsForRefresh, dryRun = false) {
+    async executeRefreshModelCommand(model, dryRun = false) {
         const output = await this.schematicService.executeSchematicCommand(schematic_service_1.REFRESH_MODEL_COMMAND, {
             module: model.module.name,
             model: model.singularName,
@@ -1168,6 +1390,12 @@ __decorate([
     __metadata("design:paramtypes", [Number]),
     __metadata("design:returntype", Promise)
 ], ModelMetadataService.prototype, "remove", null);
+__decorate([
+    (0, disallow_in_production_decorator_1.DisallowInProduction)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", Promise)
+], ModelMetadataService.prototype, "generateCodeViaCtl", null);
 __decorate([
     (0, disallow_in_production_decorator_1.DisallowInProduction)(),
     __metadata("design:type", Function),
@@ -1177,10 +1405,11 @@ __decorate([
 exports.ModelMetadataService = ModelMetadataService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)((0, common_1.forwardRef)(() => model_metadata_repository_1.ModelMetadataRepository))),
-    __param(3, (0, typeorm_1.InjectDataSource)()),
+    __param(4, (0, typeorm_1.InjectDataSource)()),
     __metadata("design:paramtypes", [model_metadata_repository_1.ModelMetadataRepository,
         field_metadata_repository_1.FieldMetadataRepository,
         schematic_service_1.SchematicService,
+        command_service_1.CommandService,
         typeorm_2.DataSource,
         crud_helper_service_1.CrudHelperService,
         media_storage_provider_metadata_service_1.MediaStorageProviderMetadataService,