@solidxai/core 0.1.10-beta.22 → 0.1.10-beta.23

package/src/controllers/{dashboard-variable.controller.ts → dashboard-user-layout.controller.ts}

@@ -1,9 +1,9 @@
 import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
 import { AnyFilesInterceptor } from "@nestjs/platform-express";
 import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
-import { DashboardVariableService } from '../services/dashboard-variable.service';
-import { CreateDashboardVariableDto } from '../dtos/create-dashboard-variable.dto';
-import { UpdateDashboardVariableDto } from '../dtos/update-dashboard-variable.dto';
+import { DashboardUserLayoutService } from '../services/dashboard-user-layout.service';
+import { CreateDashboardUserLayoutDto } from '../dtos/create-dashboard-user-layout.dto';
+import { UpdateDashboardUserLayoutDto } from '../dtos/update-dashboard-user-layout.dto';
 
 enum ShowSoftDeleted {
   INCLUSIVE = "inclusive",
@@ -11,21 +11,21 @@ enum ShowSoftDeleted {
 }
 
 @ApiTags('Solid Core')
-@Controller('dashboard-variable')
-export class DashboardVariableController {
-  constructor(private readonly service: DashboardVariableService) {}
+@Controller('dashboard-user-layout')
+export class DashboardUserLayoutController {
+  constructor(private readonly service: DashboardUserLayoutService) {}
 
   @ApiBearerAuth("jwt")
   @Post()
   @UseInterceptors(AnyFilesInterceptor())
-  create(@Body() createDto: CreateDashboardVariableDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  create(@Body() createDto: CreateDashboardUserLayoutDto, @UploadedFiles() files: Array<Express.Multer.File>) {
     return this.service.create(createDto, files);
   }
 
   @ApiBearerAuth("jwt")
   @Post('/bulk')
   @UseInterceptors(AnyFilesInterceptor())
-  insertMany(@Body() createDtos: CreateDashboardVariableDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+  insertMany(@Body() createDtos: CreateDashboardUserLayoutDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
     return this.service.insertMany(createDtos, filesArray);
   }
 
@@ -33,14 +33,14 @@ export class DashboardVariableController {
   @ApiBearerAuth("jwt")
   @Put(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateDashboardVariableDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  update(@Param('id') id: number, @Body() updateDto: UpdateDashboardUserLayoutDto, @UploadedFiles() files: Array<Express.Multer.File>) {
     return this.service.update(id, updateDto, files);
   }
 
   @ApiBearerAuth("jwt")
   @Patch(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateDashboardVariableDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateDashboardUserLayoutDto, @UploadedFiles() files: Array<Express.Multer.File>) {
     return this.service.update(id, updateDto, files, true);
   }
 

package/src/controllers/dashboard.controller.ts

@@ -1,99 +1,80 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query, UploadedFiles, UseInterceptors } from '@nestjs/common';
-import { AnyFilesInterceptor } from "@nestjs/platform-express";
-import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
-import { DashboardVariableSelectionDynamicQueryDto } from 'src/dtos/dashboard-variable-selection-dynamic-query.dto';
-import { CreateDashboardDto } from '../dtos/create-dashboard.dto';
-import { UpdateDashboardDto } from '../dtos/update-dashboard.dto';
-import { DashboardService } from '../services/dashboard.service';
+import { Body, Controller, Get, Param, Post, Put, Query } from '@nestjs/common';
+import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
+import { ActiveUser } from 'src/decorators/active-user.decorator';
+import { DashboardVariableOptionsQueryDto } from 'src/dtos/dashboard-variable-options-query.dto';
+import { DashboardBatchDataRequestDto, DashboardSaveLayoutDto, DashboardWidgetDataRequestDto } from 'src/dtos/dashboard-widget-data-request.dto';
+import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
+import { DashboardRuntimeService } from 'src/services/dashboard-runtime.service';
 
-enum ShowSoftDeleted {
-  INCLUSIVE = "inclusive",
-  EXCLUSIVE = "exclusive",
-}
-
-@ApiTags('Solid Core')
 @Controller('dashboard')
+@ApiTags('Solid Core')
 export class DashboardController {
-  constructor(private readonly service: DashboardService) { }
-
-  @ApiBearerAuth("jwt")
-  @Post()
-  @UseInterceptors(AnyFilesInterceptor())
-  create(@Body() createDto: CreateDashboardDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.create(createDto, files);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Post('/bulk')
-  @UseInterceptors(AnyFilesInterceptor())
-  insertMany(@Body() createDtos: CreateDashboardDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
-    return this.service.insertMany(createDtos, filesArray);
-  }
+    constructor(
+        private readonly dashboardRuntimeService: DashboardRuntimeService,
+    ) { }
 
+    @ApiBearerAuth('jwt')
+    @Get(':moduleName/:dashboardName/definition')
+    async getDefinition(
+        @Param('moduleName') moduleName: string,
+        @Param('dashboardName') dashboardName: string,
+    ) {
+        return this.dashboardRuntimeService.getDashboardDefinition(moduleName, dashboardName);
+    }
 
-  @ApiBearerAuth("jwt")
-  @Put(':id')
-  @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateDashboardDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.update(id, updateDto, files);
-  }
+    @ApiBearerAuth('jwt')
+    @Post(':moduleName/:dashboardName/widgets/:widgetName/data')
+    async getWidgetData(
+        @Param('moduleName') moduleName: string,
+        @Param('dashboardName') dashboardName: string,
+        @Param('widgetName') widgetName: string,
+        @Body() request: DashboardWidgetDataRequestDto,
+        @ActiveUser() activeUser: ActiveUserData,
+    ) {
+        return this.dashboardRuntimeService.getWidgetData(moduleName, dashboardName, widgetName, request, activeUser);
+    }
 
-  @ApiBearerAuth("jwt")
-  @Patch(':id')
-  @UseInterceptors(AnyFilesInterceptor())
-  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateDashboardDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.update(id, updateDto, files, true);
-  }
+    @ApiBearerAuth('jwt')
+    @Post(':moduleName/:dashboardName/data')
+    async getDashboardData(
+        @Param('moduleName') moduleName: string,
+        @Param('dashboardName') dashboardName: string,
+        @Body() request: DashboardBatchDataRequestDto,
+        @ActiveUser() activeUser: ActiveUserData,
+    ) {
+        return this.dashboardRuntimeService.getDashboardData(moduleName, dashboardName, request, activeUser);
+    }
 
-  @ApiBearerAuth("jwt")
-  @Post('/bulk-recover')
-  async recoverMany(@Body() ids: number[]) {
-    return this.service.recoverMany(ids);
-  }
+    @ApiBearerAuth('jwt')
+    @Get(':moduleName/:dashboardName/variable-options/:variableName')
+    async getVariableOptions(
+        @Param('moduleName') moduleName: string,
+        @Param('dashboardName') dashboardName: string,
+        @Param('variableName') variableName: string,
+        @Query() query: DashboardVariableOptionsQueryDto,
+    ) {
+        return this.dashboardRuntimeService.getVariableOptions(moduleName, dashboardName, variableName, query);
+    }
 
-  @ApiBearerAuth("jwt")
-  @Get('/recover/:id')
-  async recover(@Param('id') id: number) {
-    return this.service.recover(id);
-  }
-
-  @ApiBearerAuth("jwt")
-  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
-  @ApiQuery({ name: 'limit', required: false, type: Number })
-  @ApiQuery({ name: 'offset', required: false, type: Number })
-  @ApiQuery({ name: 'fields', required: false, type: Array })
-  @ApiQuery({ name: 'sort', required: false, type: Array })
-  @ApiQuery({ name: 'groupBy', required: false, type: Array })
-  @ApiQuery({ name: 'populate', required: false, type: Array })
-  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
-  @ApiQuery({ name: 'filters', required: false, type: Array })
-  @Get()
-  async findMany(@Query() query: any) {
-    return this.service.find(query);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Get('/selection-dynamic-values')
-  async getSelectionDynamicValues(@Query() query: DashboardVariableSelectionDynamicQueryDto) {
-    return this.service.getSelectionDynamicValues(query);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Get(':id')
-  async findOne(@Param('id') id: string, @Query() query: any) {
-    return this.service.findOne(+id, query);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Delete('/bulk')
-  async deleteMany(@Body() ids: number[]) {
-    return this.service.deleteMany(ids);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Delete(':id')
-  async delete(@Param('id') id: number) {
-    return this.service.delete(id);
-  }
+    @ApiBearerAuth('jwt')
+    @Get(':moduleName/:dashboardName/layout')
+    async getLayout(
+        @Param('moduleName') moduleName: string,
+        @Param('dashboardName') dashboardName: string,
+        @ActiveUser() activeUser: ActiveUserData,
+    ) {
+        return this.dashboardRuntimeService.getLayout(moduleName, dashboardName, activeUser);
+    }
 
+    @ApiBearerAuth('jwt')
+    @Put(':moduleName/:dashboardName/layout')
+    async saveLayout(
+        @Param('moduleName') moduleName: string,
+        @Param('dashboardName') dashboardName: string,
+        @Body() body: DashboardSaveLayoutDto,
+        @ActiveUser() activeUser: ActiveUserData,
+    ) {
+        return this.dashboardRuntimeService.saveLayout(moduleName, dashboardName, body, activeUser);
+    }
 }
+

package/src/decorators/dashboard-widget-data-provider.decorator.ts

@@ -0,0 +1,6 @@
+import { SetMetadata } from "@nestjs/common";
+
+export const IS_DASHBOARD_WIDGET_DATA_PROVIDER = "IS_DASHBOARD_WIDGET_DATA_PROVIDER";
+
+export const DashboardWidgetDataProvider = () => SetMetadata(IS_DASHBOARD_WIDGET_DATA_PROVIDER, true);
+

package/src/dtos/create-dashboard-user-layout.dto.ts

@@ -0,0 +1,41 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsInt } from 'class-validator';
+import { IsOptional } from 'class-validator';
+import { IsString, IsNotEmpty } from 'class-validator';
+
+export class CreateDashboardUserLayoutDto {
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    moduleId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    moduleUserKey: string;
+
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    dashboardName: string;
+
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    layoutJson: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    version: number;
+}

package/src/dtos/dashboard-variable-options-query.dto.ts

@@ -0,0 +1,20 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsOptional, IsString } from "class-validator";
+import { PaginationQueryDto } from "src/dtos/pagination-query.dto";
+
+export class DashboardVariableOptionsQueryDto extends PaginationQueryDto {
+    @ApiProperty({ description: "Search query string", type: String, required: false })
+    @IsString()
+    @IsOptional()
+    query?: string;
+
+    @ApiProperty({ description: "Single option value", type: String, required: false })
+    @IsString()
+    @IsOptional()
+    optionValue?: string;
+
+    @ApiProperty({ description: "Form values object serialized as JSON or querystring", required: false })
+    @IsOptional()
+    formValues?: Record<string, any> | string;
+}
+

package/src/dtos/dashboard-widget-data-request.dto.ts

@@ -0,0 +1,34 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsArray, IsObject, IsOptional, IsString } from "class-validator";
+
+export class DashboardWidgetDataRequestDto {
+    @ApiProperty({ description: "Runtime variable values", type: Object, required: false })
+    @IsOptional()
+    @IsObject()
+    variables?: Record<string, any>;
+
+    @ApiProperty({ description: "Optional provider context overrides", type: Object, required: false })
+    @IsOptional()
+    @IsObject()
+    providerContext?: Record<string, any>;
+}
+
+export class DashboardBatchDataRequestDto extends DashboardWidgetDataRequestDto {
+    @ApiProperty({ description: "Subset of widget ids/names to evaluate", type: [String], required: false })
+    @IsOptional()
+    @IsArray()
+    @IsString({ each: true })
+    widgetNames?: string[];
+}
+
+export class DashboardSaveLayoutDto {
+    @ApiProperty({ description: "Grid/layout payload from UI", type: Object })
+    layoutJson: Record<string, any> | any[];
+
+    @ApiProperty({
+        description: "Backward-compatible alias for layoutJson.",
+        type: Object,
+        required: false,
+    })
+    layout?: Record<string, any> | any[];
+}

package/src/dtos/update-dashboard-user-layout.dto.ts

@@ -0,0 +1,45 @@
+import { IsInt,IsOptional, IsString, IsNotEmpty } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdateDashboardUserLayoutDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    moduleId: number;
+
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    moduleUserKey: string;
+
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    dashboardName: string;
+
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    layoutJson: string;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    version: number;
+}

package/src/entities/dashboard-user-layout.entity.ts

@@ -0,0 +1,27 @@
+import { CommonEntity } from 'src/entities/common.entity';
+import { Entity, JoinColumn, ManyToOne, Index, Column } from 'typeorm';
+import { User } from 'src/entities/user.entity';
+import { ModuleMetadata } from 'src/entities/module-metadata.entity'
+
+@Entity('ss_dashboard_user_layout')
+export class DashboardUserLayout extends CommonEntity {
+    @Index()
+    @ManyToOne(() => User, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn()
+    user: User;
+
+    @Index()
+    @ManyToOne(() => ModuleMetadata, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn()
+    module: ModuleMetadata;
+
+    @Index()
+    @Column({ name: "dashboard_name", type: "varchar" })
+    dashboardName: string;
+
+    @Column({ name: "layout_json", type: "text" })
+    layoutJson: string;
+
+    @Column({ type: "integer", nullable: true })
+    version: number;
+}

package/src/helpers/module-metadata-helper.service.ts

@@ -44,19 +44,34 @@ export class ModuleMetadataHelperService {
         const dashModuleName = kebabCase(moduleName);
         const folderPath = path.resolve(process.cwd(), 'module-metadata', dashModuleName);
         const filePath = path.join(folderPath, `${dashModuleName}-metadata.json`);
+
         // Check if filePath exists
         const fileExists = await this.fileService.exists(filePath);
-        // this.logger.debug(`File exists: ${fileExists} at ${filePath}`);
-        if (!fileExists) {
-            // If the module is solid-core, try the fallback path, in case the current root directory is the solid core project
-            if (dashModuleName === SOLID_CORE_MODULE_NAME) {
-                const fallbackPath = path.resolve(process.cwd(), 'src', 'seeders', 'seed-data', `${dashModuleName}-metadata.json`);
+        if (fileExists) {
+            return filePath;
+        }
+
+        // If the module is solid-core, try the fallback path, in case the current root directory is the solid core project
+        if (dashModuleName === SOLID_CORE_MODULE_NAME) {
+            const fallbackPath = path.resolve(process.cwd(), 'src', 'seeders', 'seed-data', `${dashModuleName}-metadata.json`);
+            const fallbackExists = await this.fileService.exists(fallbackPath);
+            if (fallbackExists) {
                 this.logger.debug(`Fallback path: ${fallbackPath}`);
                 return fallbackPath;
             }
+
+            const consumingProjectFallbackPath = path.resolve(process.cwd(), 'node_modules', '@solidxai', 'core', 'src', 'seeders', 'seed-data', `${dashModuleName}-metadata.json`);
+            const consumingProjectFallbackExists = await this.fileService.exists(consumingProjectFallbackPath);
+            if (consumingProjectFallbackExists) {
+                this.logger.debug(`Fallback path: ${consumingProjectFallbackPath}`);
+                return consumingProjectFallbackPath;
+            }
         }
-        return filePath;
+
+        this.logger.error(`Module metadata file not found for module: ${moduleName} at path: ${filePath}`);
+        return '';
     }
+
     async getModuleMetadataFolderPath(moduleName: string): Promise<string> {
         if (!moduleName) {
             return '';

package/src/helpers/solid-registry.ts

@@ -7,7 +7,7 @@ import { CommonEntity } from 'src/entities/common.entity';
 import { Locale } from 'src/entities/locale.entity';
 import { SecurityRule } from 'src/entities/security-rule.entity';
 import { IScheduledJob } from 'src/services/scheduled-jobs/scheduled-job.interface';
-import { IDashboardQuestionDataProvider, IDashboardVariableSelectionProvider, IErrorCodeProvider, ISecurityRuleConfigProvider, ISelectionProvider, ISelectionProviderContext, ISolidDatabaseModule } from "../interfaces";
+import { IDashboardWidgetDataProvider, IErrorCodeProvider, ISecurityRuleConfigProvider, ISelectionProvider, ISelectionProviderContext, ISolidDatabaseModule } from "../interfaces";
 import { ObjectLiteral } from 'typeorm';
 
 type ControllerMetadata = {
@@ -71,6 +71,7 @@ export class SolidRegistry {
   private seeders: Set<InstanceWrapper> = new Set();
   private scheduledJobProviders: Set<InstanceWrapper> = new Set();
   private selectionProviders: Set<InstanceWrapper> = new Set();
+  private dashboardWidgetDataProviders: Set<InstanceWrapper> = new Set();
   private computedFieldProviders: Set<InstanceWrapper> = new Set();
   private solidDatabaseModules: Set<InstanceWrapper> = new Set();
   private controllers: Set<ControllerMetadata> = new Set();
@@ -78,8 +79,6 @@ export class SolidRegistry {
   private securityRules: SecurityRule[] = [];
   private locales: Locale[] = [];
   private computedFieldMetadata: ComputedFieldMetadata[] = [];
-  private dashboardVariableSelectionProviders: Set<InstanceWrapper> = new Set();
-  private dashboardQuestionDataProviders: Set<InstanceWrapper> = new Set();
   private mailProviders: Set<InstanceWrapper> = new Set();
   private whatsappProviders: Set<InstanceWrapper> = new Set();
   private smsProviders: Set<InstanceWrapper> = new Set();
@@ -138,12 +137,8 @@ export class SolidRegistry {
     this.selectionProviders.add(selectionProvider);
   }
 
-  registerDashboardVariableSelectionProvider(dashboardSelectionProvider: InstanceWrapper): void {
-    this.dashboardVariableSelectionProviders.add(dashboardSelectionProvider);
-  }
-
-  registerDashboardQuestionDataProvider(dashboardQuestionDataProvider: InstanceWrapper): void {
-    this.dashboardQuestionDataProviders.add(dashboardQuestionDataProvider);
+  registerDashboardWidgetDataProvider(provider: InstanceWrapper): void {
+    this.dashboardWidgetDataProviders.add(provider);
   }
 
   registerComputedFieldProvider(computedFieldProvider: InstanceWrapper): void {
@@ -232,6 +227,10 @@ export class SolidRegistry {
     return Array.from(this.selectionProviders);
   }
 
+  getDashboardWidgetDataProviders(): Array<InstanceWrapper> {
+    return Array.from(this.dashboardWidgetDataProviders);
+  }
+
   getSelectionProviderInstance<T extends ISelectionProviderContext>(name: string): ISelectionProvider<T> {
     const selectionProviders = this.getSelectionProviders();
 
@@ -243,19 +242,15 @@ export class SolidRegistry {
     }
   }
 
-  getDashboardVariableSelectionProviders(): Array<InstanceWrapper> {
-    return Array.from(this.dashboardVariableSelectionProviders);
-  }
-
-  getDashboardVariableSelectionProviderInstance<T extends ISelectionProviderContext>(name: string): IDashboardVariableSelectionProvider<T> {
-    const dashboardSelectionProviders = this.getDashboardVariableSelectionProviders();
-
-    for (let i = 0; i < dashboardSelectionProviders.length; i++) {
-      const dashboardSelectionProvider = dashboardSelectionProviders[i];
-      if (dashboardSelectionProvider.instance.name() === name) {
-        return dashboardSelectionProvider.instance;
+  getDashboardWidgetDataProviderInstance(name: string): IDashboardWidgetDataProvider | undefined {
+    const providers = this.getDashboardWidgetDataProviders();
+    for (let i = 0; i < providers.length; i++) {
+      const provider = providers[i];
+      if (provider?.instance?.name?.() === name || provider?.name === name) {
+        return provider.instance as IDashboardWidgetDataProvider;
       }
     }
+    return undefined;
   }
 
   getErrorCodeProviders(): Array<InstanceWrapper> {
@@ -271,21 +266,6 @@ export class SolidRegistry {
     return undefined;
   }
 
-  getDashboardQuestionDataProviders(): Array<InstanceWrapper> {
-    return Array.from(this.dashboardQuestionDataProviders)
-  }
-
-  getDashboardQuestionDataProviderInstance<TContext, TData>(name: string): IDashboardQuestionDataProvider<TContext, TData> {
-    const dashboardQuestionDataProviders = this.getDashboardQuestionDataProviders();
-
-    for (let i = 0; i < dashboardQuestionDataProviders.length; i++) {
-      const dasbhoardQuestionDataProvider = dashboardQuestionDataProviders[i];
-      if (dasbhoardQuestionDataProvider.instance.name() === name) {
-        return dasbhoardQuestionDataProvider.instance;
-      }
-    }
-  }
-
   getComputedFieldProviders(): Array<InstanceWrapper> {
     return Array.from(this.computedFieldProviders);
   }
@@ -380,4 +360,3 @@ export class SolidRegistry {
     }
   }
 }
-

package/src/index.ts

@@ -12,6 +12,7 @@ export * from './config/cache.options'
 export * from './decorators/active-user.decorator'
 export * from './decorators/solid-request-context.decorator'
 export * from './decorators/auth.decorator'
+export * from './decorators/dashboard-widget-data-provider.decorator'
 export * from './decorators/computed-field-provider.decorator'
 export * from './decorators/scheduled-job-provider.decorator'
 export * from './decorators/is-not-in-enum.decorator'
@@ -107,6 +108,10 @@ export * from './dtos/update-chatter-message-details.dto'
 export * from './dtos/update-locale.dto'
 export * from './dtos/create-user-activity-history.dto'
 export * from './dtos/update-user-activity-history.dto'
+export * from './dtos/dashboard-variable-options-query.dto'
+export * from './dtos/dashboard-widget-data-request.dto'
+export * from './dtos/create-dashboard-user-layout.dto'
+export * from './dtos/update-dashboard-user-layout.dto'
 
 export * from './entities/action-metadata.entity'
 export * from './entities/common.entity'
@@ -146,13 +151,9 @@ export * from './entities/import-transaction.entity'
 export * from './entities/import-transaction-error-log.entity'
 export * from './entities/locale.entity'
 export * from './entities/user-activity-history.entity'
-export * from './entities/dashboard.entity'
-export * from './entities/dashboard-variable.entity'
-export * from './entities/dashboard-question.entity'
-export * from './entities/dashboard-layout.entity'
-export * from './entities/dashboard-question-sql-dataset-config.entity'
 export * from './entities/ai-interaction.entity'
 export * from './entities/model-sequence.entity'
+export * from './entities/dashboard-user-layout.entity'
 export * from './entities/user-api-key.entity'
 
 export * from './enums/auth-type.enum'
@@ -312,6 +313,8 @@ export * from './services/queues/redis-subscriber.service'
 export * from './services/refresh-token-ids-storage.service'
 export * from './services/role-metadata.service'
 export * from './services/selection-providers/list-of-models-selection-provider.service'
+export * from './services/selection-providers/mq-dashboard-message-broker-variable-options-provider.service'
+export * from './services/selection-providers/mq-dashboard-queue-name-variable-options-provider.service'
 export * from './services/short-url/tiny-url.service'
 export * from './services/sms/Msg91BaseSMSService' //rename
 export * from './services/sms/Msg91OTPService' //rename
@@ -339,10 +342,23 @@ export * from './services/import-transaction.service'
 export * from './services/import-transaction-error-log.service'
 export * from './services/excel.service'
 export * from './services/csv.service'
+export * from './services/dashboard-runtime.service'
 export * from './services/queues/publisher-factory.service'
 export * from './services/queues/database-publisher.service'
 export * from './services/queues/database-subscriber.service'
 export * from './services/ai-interaction.service'
+export * from './services/dashboard-providers/mq-dashboard-total-messages-kpi-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-succeeded-messages-kpi-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-failed-messages-kpi-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-inflight-messages-kpi-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-success-rate-kpi-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-avg-elapsed-kpi-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-messages-over-time-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-stage-distribution-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-queue-wise-failures-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-queue-wise-avg-elapsed-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-latency-trend-provider.service'
+export * from './services/dashboard-providers/mq-dashboard-recent-failures-provider.service'
 
 // Factories
 export * from './factories/mail.factory'