@solidstarters/solid-core 1.2.193 → 1.2.201

package/src/services/import-transaction.service.ts

@@ -1,4 +1,4 @@
-import { BadRequestException, ForbiddenException, Injectable, Logger } from '@nestjs/common';
+import { BadRequestException, ForbiddenException, forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { EntityManager } from 'typeorm';
@@ -94,6 +94,7 @@ interface ImportRecordsResult {
 @Injectable()
 export class ImportTransactionService extends CRUDService<ImportTransaction> {
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,
@@ -305,9 +306,12 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
       : userPermissions[permissionKey] === true;
 
     if (!hasPermission) {
-      throw new ForbiddenException(
-        `Missing permission: ${permissionKey}`
-      );
+      const action = permissionKey.split('.').pop()!;
+      const message = ERROR_MESSAGES.PERMISSION_MESSAGES[action]?.(modelName) ?? 'You are not allowed to perform this action.';
+      throw new ForbiddenException({
+        message,
+        errorCode: 'permission-denied',
+      });
     }
 
     // Get the import file media object from the import transaction

package/src/services/list-of-values.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { EntityManager } from 'typeorm';
@@ -12,11 +12,10 @@ import { ModuleMetadataService } from 'src/services/module-metadata.service';
 
 
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
-import { ListOfValuesRepository } from 'src/repository/list-of-values.repository';
-import { ListOfValues } from '../entities/list-of-values.entity';
-import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { ModuleMetadataHelperService } from 'src/helpers/module-metadata-helper.service';
 import { ListOfValuesMapper } from 'src/mappers/list-of-values-mapper';
+import { ListOfValuesRepository } from 'src/repository/list-of-values.repository';
+import { ListOfValues } from '../entities/list-of-values.entity';
 
 
 @Injectable()
@@ -25,6 +24,7 @@ export class ListOfValuesService extends CRUDService<ListOfValues> {
   // moduleMetadataHelperService: any;
   // listOfValuesMapper: any;
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,

package/src/services/locale.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
+import { forwardRef, Inject, Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { EntityManager } from 'typeorm';
@@ -16,6 +16,7 @@ import { RequestContextService } from './request-context.service';
 @Injectable()
 export class LocaleService extends CRUDService<Locale> implements OnApplicationBootstrap{
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,

package/src/services/mail/smtp-email.service.ts

@@ -153,7 +153,7 @@ export class SMTPEMailService implements IMail {
             attachments: attachmentsList,
         });
         // this.logger.debug(`Sending email to ${to} with subject ${subject} and body ${body}`);
-        this.logger.debug(`Sending email to ${to} with subject ${subject}`);
+        // this.logger.debug(`Sending email to ${to} with subject ${subject}`);
 
         return r;
     }

package/src/services/media.service.ts

@@ -1,7 +1,7 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
+import { forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { EntityManager, Repository } from 'typeorm';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { EntityManager, In } from 'typeorm';
 
 import { ConfigService } from '@nestjs/config';
 import { CrudHelperService } from 'src/services/crud-helper.service';
@@ -11,23 +11,21 @@ import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
 
 
+import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { BasicFilterDto } from 'src/dtos/basic-filters.dto';
 import { MediaStorageProviderType } from 'src/dtos/create-media-storage-provider-metadata.dto';
-import { FieldMetadata } from 'src/entities/field-metadata.entity';
-import { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';
 import { Media } from 'src/entities/media.entity';
-import { ModelMetadata } from 'src/entities/model-metadata.entity';
-import { getMediaStorageProvider } from "./mediaStorageProviders";
-import { BasicFilterDto } from 'src/dtos/basic-filters.dto';
-import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
+import { MediaStorageProviderMetadataRepository } from 'src/repository/media-storage-provider-metadata.repository';
 import { MediaRepository } from 'src/repository/media.repository';
 import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
-import { MediaStorageProviderMetadataRepository } from 'src/repository/media-storage-provider-metadata.repository';
-import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
+import { getMediaStorageProvider } from "./mediaStorageProviders";
 
 
 @Injectable()
 export class MediaService extends CRUDService<Media> {
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,
@@ -45,6 +43,7 @@ export class MediaService extends CRUDService<Media> {
     // private readonly mediaStorageProviderMetadataRepo: Repository<MediaStorageProviderMetadata>,
     // @InjectRepository(FieldMetadata)
     // private readonly fieldMetadataRepo: Repository<FieldMetadata>,
+    @Inject(forwardRef(() => ModelMetadataRepository))
     private readonly modelMetadataRepo: ModelMetadataRepository,
     private readonly mediaStorageProviderMetadataRepo: MediaStorageProviderMetadataRepository,
     private readonly fieldMetadataRepo: FieldMetadataRepository,

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

@@ -2,6 +2,8 @@ import { Inject, Injectable, Logger } from "@nestjs/common";
 import { ConfigService, ConfigType } from "@nestjs/config";
 import { CommonEntity } from "src/entities/common.entity";
 import { FieldMetadata } from "src/entities/field-metadata.entity";
+import { LegacyCommonEntity } from "src/entities/legacy-common.entity";
+import { LegacyCommonWithIdEntity } from "src/entities/legacy-common-with-id.entity";
 import { Media } from "src/entities/media.entity";
 import { MediaStorageProvider } from "src/interfaces";
 import { FileService } from "src/services/file.service";
@@ -28,9 +30,13 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {
-        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 isSupportedEntity = entity instanceof CommonEntity
+            || entity instanceof LegacyCommonEntity
+            || entity instanceof LegacyCommonWithIdEntity;
+        if (!isSupportedEntity) {
+            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntity or LegacyCommonWithIdEntity"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
+        // @ts-ignore
         const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
 
         // TODO: Check if the mediaStorageProvider (s3 in this case) is configured with a public bucket or not. 
@@ -56,8 +62,11 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {
-        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 isSupportedEntity = entity instanceof CommonEntity
+            || entity instanceof LegacyCommonEntity
+            || entity instanceof LegacyCommonWithIdEntity;
+        if (!isSupportedEntity) {
+            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntity or LegacyCommonWithIdEntity"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
         const result: Media[] = [];
         for (const file of files) {
@@ -73,6 +82,7 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
 
             // Create an entry in the media table
             const mediaEntity = await this.mediaRepository.createMedia({
+                // @ts-ignore
                 entityId: entity.id,
                 modelMetadataId: mediaFieldMetadata.model.id,
                 relativeUri: awsFileUrl,
@@ -89,10 +99,15 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {
-        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 isSupportedEntity = entity instanceof CommonEntity
+            || entity instanceof LegacyCommonEntity
+            || entity instanceof LegacyCommonWithIdEntity;
+        if (!isSupportedEntity) {
+            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntity or LegacyCommonWithIdEntity"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
+        // @ts-ignore
         const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
+        // @ts-ignore
         this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
         existingMedia.forEach(media => {
             this.fileService.deleteFromS3(media.relativeUri, mediaFieldMetadata.mediaStorageProvider.bucketName); //TODO
@@ -108,4 +123,4 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
     private getFileName(file: Express.Multer.File): string {
         return `${file.filename}-${file.originalname}`;
     }
-}
+}

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

@@ -22,9 +22,10 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
     ) { }
 
     async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {
-        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
-        }
+        // 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
+        // }
+        //@ts-ignore
         const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
         // Add the full URL to the media
         media.forEach(m => {
@@ -34,9 +35,9 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {
-        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
-        }
+        // 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 result: Media[] = [];
         for (const file of files) {
             // Store the file in the configured file storage directory
@@ -46,7 +47,8 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
 
             // Create an entry in the media table
             const mediaEntity = await this.mediaRepository.createMedia({
-                entityId: entity.id,
+                //@ts-ignore
+                entityId: entity.id, 
                 modelMetadataId: mediaFieldMetadata.model.id,
                 relativeUri: this.getFileName(file),
                 mimeType: file.mimetype,
@@ -62,15 +64,16 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     async storeStreams(streamPairs: [Readable, string][], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {
-        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
-        }
+        // 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 result: Media[] = [];
         for (const pair of streamPairs) {
             const stream = pair[0];
             const fileName = pair[1];
             this.fileService.writeStreamToFile(stream, this.getFullFilePath(fileName));
             const mediaEntity = await this.mediaRepository.createMedia({
+                //@ts-ignore
                 entityId: entity.id,
                 modelMetadataId: mediaFieldMetadata.model.id,
                 relativeUri: fileName,
@@ -83,10 +86,12 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {
-        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
-        }
+        // 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
+        // }
+        //@ts-ignore
         const existingMedia = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
+        //@ts-ignore
         this.mediaRepository.deleteByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id);
         existingMedia.forEach(media => {
             this.fileService.deleteFile(this.getFullFilePath(media.relativeUri));

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

@@ -1,7 +1,7 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { EntityManager, In, Repository } from 'typeorm';
 import { CRUDService } from 'src/services/crud.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
@@ -16,10 +16,12 @@ import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import { ModuleMetadata } from '../entities/module-metadata.entity';
 import { dasherize } from '@angular-devkit/core/src/utils/strings';
 import { MenuItemMetadataRepository } from 'src/repository/menu-item-metadata.repository';
+import { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
 
 @Injectable()
 export class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
     readonly configService: ConfigService,
@@ -31,6 +33,7 @@ export class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {
     // @InjectRepository(MenuItemMetadata, 'default')
     // readonly repo: Repository<MenuItemMetadata>,
     readonly repo: MenuItemMetadataRepository,
+    readonly savedFiltersRepo: SavedFiltersRepository,
     readonly moduleRef: ModuleRef
 
   ) {
@@ -92,7 +95,7 @@ export class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {
       .leftJoinAndSelect('menuItem.parentMenuItem', 'parentMenuItem')
       .leftJoinAndSelect('menuItem.action', 'action')
       .leftJoinAndSelect('action.model', 'model') // Join the model relation of action
-      .leftJoinAndSelect('action.view', 'view') // Join the model relation of action
+      .leftJoinAndSelect('action.view', 'view') // Join the view relation of action
       .leftJoinAndSelect('menuItem.roles', 'roles')
       .where('roles.name IN (:...roleNames)', { roleNames: activeUser.roles })
       .addOrderBy('module.menuSequenceNumber', 'ASC')
@@ -120,73 +123,105 @@ export class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {
     // 3. Then for each module, do a recursive compilation of children based on parentMenuItem, while doing this use the relation - action to get hold of the path. 
     const menu: any[] = [];
 
-    modulesToMenuItemsMap.forEach((menuItems, moduleName) => {
-      const rootMenuItems = menuItems.filter(item => !item.parentMenuItem);
+    // modulesToMenuItemsMap.forEach((menuItems, moduleName) => {
+    //   const rootMenuItems = menuItems.filter(item => !item.parentMenuItem);
+    //   const moduleMetadata = modulesMap.get(moduleName);
+
+    //   const moduleMenu = {
+    //     title: moduleMetadata.displayName,
+    //     // No need for path the module level.
+    //     // path: ``,
+    //     key: moduleName.toLowerCase().replace(/\s+/g, '-'),
+    //     // TODO: We need to add the module icon as part of the metadata so it can be brought here. 
+    //     // icon: `/images/menu/${moduleName.toLowerCase().replace(/\s+/g, '-')}.svg`,
+    //     children: this.buildMenuTree(rootMenuItems, menuItems, activeUser),
+    //     icon: moduleMetadata.menuIconUrl,
+    //   };
+
+    //   menu.push(moduleMenu);
+    // });
+    for (const [moduleName, menuItemsForModule] of modulesToMenuItemsMap.entries()) {
+      const rootMenuItems = menuItemsForModule.filter(item => !item.parentMenuItem);
       const moduleMetadata = modulesMap.get(moduleName);
 
       const moduleMenu = {
         title: moduleMetadata.displayName,
-        // No need for path the module level.
-        // path: ``,
         key: moduleName.toLowerCase().replace(/\s+/g, '-'),
-        // TODO: We need to add the module icon as part of the metadata so it can be brought here. 
-        // icon: `/images/menu/${moduleName.toLowerCase().replace(/\s+/g, '-')}.svg`,
-        children: this.buildMenuTree(rootMenuItems, menuItems, activeUser),
+        children: await this.buildMenuTree(rootMenuItems, menuItemsForModule, activeUser), // ✅ await here
         icon: moduleMetadata.menuIconUrl,
       };
 
       menu.push(moduleMenu);
-    });
+    }
+
 
     return menu.filter(m => m.children.length > 0);
   }
 
   // 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 {
-          return this.crudHelperService.hasReadPermissionOnModel(activeUser, i.action.model.singularName)
+  private async buildMenuTree(rootItems: MenuItemMetadata[], allMenuItems: MenuItemMetadata[], activeUser: ActiveUserData): Promise<any[]> {
+    const menuItemsData = await Promise.all(
+      rootItems.map(async rootItem => {
+        const allowedMenuItems = allMenuItems.filter(i => {
+          if (!i.parentMenuItem) {
+            return true
+          } else {
+            if(i.action.type === 'custom'){
+              return true;
+            }
+            return this.crudHelperService.hasReadPermissionOnModel(activeUser, i.action.model.singularName)
+          }
+        });
+        // Get immediate children of the current loop variable menuItem.
+        const children = allowedMenuItems.filter(item => item.parentMenuItem && item.parentMenuItem.id === rootItem.id);
+        const menuItemId = rootItem?.id ?? "";
+        const menuItemName = rootItem?.name ?? "";
+        const actionId = rootItem?.action?.id ?? "";
+        const actionName = rootItem?.action?.name ?? "";
+        // TODO: We should specify path only if there are no more children present. 
+        // For now adding path everywhere. 
+        let path = '';
+
+        const layout = rootItem?.action?.view && rootItem?.action?.view?.layout ? JSON.parse(rootItem?.action?.view?.layout) : null
+        let savedFilterId = null;
+        if (layout && layout?.attrs?.defaultSavedFilter) {
+          const savedFilter = await this.savedFiltersRepo.findOne({
+            where: {
+              name: layout?.attrs?.defaultSavedFilter,
+              isPrivate: false
+            },
+          });
+          if (savedFilter) {
+            savedFilterId = savedFilter.id
+          }
         }
-      });
-      // Get immediate children of the current loop variable menuItem.
-      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. 
-      let path = '';
-
-      if (rootItem.action && rootItem.action.type === 'custom') {
-        path = rootItem.action.customComponent;
-      }
-      if (rootItem.action && rootItem.action.type === 'solid') {
-        if (this.crudHelperService.hasReadPermissionOnModel(activeUser, rootItem.action.model.singularName)) {
-
-
-          // TODO: Here we are assuming that we will always take the user to collection view of a model. 
-          // We can make provision to take them other views also in the future. 
-          // path = `/admin/core/${rootItem.module.name}/${rootItem.action.model.singularName}/${rootItem.action.view.name}`;
-          path = `/admin/core/${rootItem.module.name}/${dasherize(rootItem.action?.model?.singularName ?? 'unknown')}/${rootItem.action?.view?.type ?? 'list'}`;
-
+        if (rootItem.action && rootItem.action.type === 'custom') {
+          path = `${rootItem.action.customComponent}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;
+        }
+        if (rootItem.action && rootItem.action.type === 'solid') {
+          if (this.crudHelperService.hasReadPermissionOnModel(activeUser, rootItem.action.model.singularName)) {
+            // TODO: Here we are assuming that we will always take the user to collection view of a model. 
+            // We can make provision to take them other views also in the future. 
+            // path = `/admin/core/${rootItem.module.name}/${rootItem.action.model.singularName}/${rootItem.action.view.name}`;
+            path = `/admin/core/${rootItem.module.name}/${dasherize(rootItem.action?.model?.singularName ?? 'unknown')}/${rootItem.action?.view?.type ?? 'list'}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;
+
+          }
         }
-      }
 
-      // We are not checking for empty path coz, this is required for parent menu items.
-      const data = {
-        title: rootItem.displayName || rootItem.name,
-        path: path,
-        key: rootItem.name.toLowerCase().replace(/\s+/g, '-'),
-        icon: rootItem.iconName,
-        // iconVariant : rootItem.iconVariant
-      }
-      if (children.length > 0) {
-        data["children"] = this.buildMenuTree(children, allMenuItems, activeUser);
-      }
-      return data;
+        // We are not checking for empty path coz, this is required for parent menu items.
+        const data = {
+          title: rootItem.displayName || rootItem.name,
+          path: path,
+          key: rootItem.name.toLowerCase().replace(/\s+/g, '-'),
+          icon: rootItem.iconName,
+          // iconVariant : rootItem.iconVariant
+        }
+        if (children.length > 0) {
+          data["children"] = await this.buildMenuTree(children, allMenuItems, activeUser);
+        }
+        return data;
 
-    });
+      }));
     return menuItemsData.filter(mi => mi && mi)
   }
 

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

@@ -1,4 +1,4 @@
-import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';
+import { BadRequestException, forwardRef, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
 import { DataSource, EntityManager, In, Repository, SelectQueryBuilder } from 'typeorm';
@@ -39,6 +39,7 @@ export class ModelMetadataService {
     // private readonly modelMetadataRepo: Repository<ModelMetadata>,
     // @InjectRepository(FieldMetadata)
     // private readonly fieldMetadataRepo: Repository<FieldMetadata>,
+    @Inject(forwardRef(() => ModelMetadataRepository))
     private readonly modelMetadataRepo: ModelMetadataRepository,
     private readonly fieldMetadataRepo: FieldMetadataRepository,
     private readonly schematicService: SchematicService,
@@ -270,6 +271,8 @@ export class ModelMetadataService {
         tableName: model.tableName,
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
         isChild: model?.isChild,
+        isLegacyTable: model?.isLegacyTable,
+        isLegacyTableWithId: model?.isLegacyTableWithId,
         parentModelUserKey: model?.parentModel?.singularName,
         enableAuditTracking: model?.enableAuditTracking,
         enableSoftDelete: model?.enableSoftDelete,
@@ -608,57 +611,62 @@ export class ModelMetadataService {
       }
     }
 
+    await this.dataSource.query(
+      `CALL cleanup_model_metadata($1, $2)`,
+      [modelEntity.singularName, true],
+    );
+
     // Delete the permissions, menu, actions & views related to this model.
-    const controllerName = `${classify(modelEntity.singularName)}Controller`;
-    const permissionNames = [
-      `${controllerName}.delete`,
-      `${controllerName}.deleteMany`,
-      `${controllerName}.findOne`,
-      `${controllerName}.findMany`,
-      `${controllerName}.recover`,
-      `${controllerName}.recoverMany`,
-      `${controllerName}.partialUpdate`,
-      `${controllerName}.update`,
-      `${controllerName}.insertMany`,
-      `${controllerName}.create`,
-    ];
-    const permissionsRepo = this.dataSource.getRepository(PermissionMetadata);
-    const permissionsToDelete = await permissionsRepo.find({
-      where: { name: In(permissionNames) },
-      relations: ['roles'],
-    });
+    // const controllerName = `${classify(modelEntity.singularName)}Controller`;
+    // const permissionNames = [
+    //   `${controllerName}.delete`,
+    //   `${controllerName}.deleteMany`,
+    //   `${controllerName}.findOne`,
+    //   `${controllerName}.findMany`,
+    //   `${controllerName}.recover`,
+    //   `${controllerName}.recoverMany`,
+    //   `${controllerName}.partialUpdate`,
+    //   `${controllerName}.update`,
+    //   `${controllerName}.insertMany`,
+    //   `${controllerName}.create`,
+    // ];
+    // const permissionsRepo = this.dataSource.getRepository(PermissionMetadata);
+    // const permissionsToDelete = await permissionsRepo.find({
+    //   where: { name: In(permissionNames) },
+    //   relations: ['roles'],
+    // });
 
     // Remove role associations first
-    for (const permission of permissionsToDelete) {
-      if (permission.roles?.length) {
-        await this.dataSource
-          .createQueryBuilder()
-          .relation(PermissionMetadata, 'roles')
-          .of(permission) // permission instance or its ID
-          .remove(permission.roles); // remove all linked roles
-      }
-    }
+    // for (const permission of permissionsToDelete) {
+    //   if (permission.roles?.length) {
+    //     await this.dataSource
+    //       .createQueryBuilder()
+    //       .relation(PermissionMetadata, 'roles')
+    //       .of(permission) // permission instance or its ID
+    //       .remove(permission.roles); // remove all linked roles
+    //   }
+    // }
 
-    await permissionsRepo.remove(permissionsToDelete);
+    // await permissionsRepo.remove(permissionsToDelete);
 
     // Delete actions
-    const actionRepo = this.dataSource.getRepository(ActionMetadata);
-    const action = await actionRepo.findOne({ where: { model: { id: modelEntity.id } } });
-    await actionRepo.delete({ model: { id: modelEntity.id } });
-
-    // Delete menu items
-    const menuItemRepo = this.dataSource.getRepository(MenuItemMetadata);
-    if (action) {
-      const menuItems = await menuItemRepo.find({ where: { action: { id: action.id } } });
-      for (let i = 0; i < menuItems.length; i++) {
-        const menuItem = menuItems[i];
-        await menuItemRepo.remove(menuItem);
-      }
-    }
+    // const actionRepo = this.dataSource.getRepository(ActionMetadata);
+    // const action = await actionRepo.findOne({ where: { model: { id: modelEntity.id } } });
+    // await actionRepo.delete({ model: { id: modelEntity.id } });
+
+    // // Delete menu items
+    // const menuItemRepo = this.dataSource.getRepository(MenuItemMetadata);
+    // if (action) {
+    //   const menuItems = await menuItemRepo.find({ where: { action: { id: action.id } } });
+    //   for (let i = 0; i < menuItems.length; i++) {
+    //     const menuItem = menuItems[i];
+    //     await menuItemRepo.remove(menuItem);
+    //   }
+    // }
 
     // Delete view 
-    const viewRepo = this.dataSource.getRepository(ViewMetadata);
-    await viewRepo.delete({ model: { id: modelEntity.id } })
+    // const viewRepo = this.dataSource.getRepository(ViewMetadata);
+    // await viewRepo.delete({ model: { id: modelEntity.id } })
 
     // <moduleName>-metadata.json | Remove references to this model in the model metadata, menu, action & view sections. | Automatic
     const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(modelEntity.module?.name);
@@ -1174,14 +1182,24 @@ export class ModelMetadataService {
     };
     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 a list of field ids or field names is passed for refresh, use these fields only
+    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 fieldsForRefresh = model.fields.filter((field) => !field.isMarkedForRemoval);
+
     //Execute the schematic command to refresh the model
-    const refreshOuput = await this.executeRefreshModelCommand(model, options.dryRun);
+    const refreshOuput = await this.executeRefreshModelCommand(model, fieldsForRefresh, options.dryRun);
 
     return `${refreshOuput}`;
   }
 
-  private async executeRefreshModelCommand(model: ModelMetadata, dryRun: boolean = false): Promise<string> {
-    const fieldsForRefresh = model.fields.filter((field) => !field.isMarkedForRemoval);
+  private async executeRefreshModelCommand(model: ModelMetadata, fieldsForRefresh: FieldMetadata[], dryRun: boolean = false): Promise<string> {
+    // const fieldsForRefresh = model.fields.filter((field) => !field.isMarkedForRemoval);
     const output = await this.schematicService.executeSchematicCommand(
       REFRESH_MODEL_COMMAND,
       {
@@ -1195,6 +1213,9 @@ export class ModelMetadataService {
         parentModel: model.parentModel?.singularName,
         parentModule: model.parentModel?.module?.name,
         draftPublishWorkflowEnabled: model.draftPublishWorkflow,
+        isLegacyTable: model.isLegacyTable,
+        isLegacyTableWithId: model.isLegacyTableWithId,
+        dataSourceType: model.dataSourceType,
       },
       dryRun
     );