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

package/src/interfaces.ts

@@ -12,10 +12,7 @@ import { CreateRoleMetadataDto } from './dtos/create-role-metadata.dto';
 import { CreateSecurityRuleDto } from './dtos/create-security-rule.dto';
 import { FieldMetadata } from './entities/field-metadata.entity';
 import { Media } from './entities/media.entity';
-import { DashboardQuestion } from './entities/dashboard-question.entity';
 import { ComputedFieldMetadata } from './helpers/solid-registry';
-import { SqlExpression } from './services/question-data-providers/chartjs-sql-data-provider.service';
-import { CreateDashboardDto } from './dtos/create-dashboard.dto';
 import { AiInteraction } from './entities/ai-interaction.entity';
 import { ActiveUserData } from './interfaces/active-user-data.interface';
 import { SecurityRuleConfig } from './dtos/security-rule-config.dto';
@@ -59,7 +56,7 @@ export interface ModuleMetadataConfiguration {
   smsTemplates?: CreateSmsTemplateDto[],
   mediaStorageProviders?: CreateMediaStorageProviderMetadataDto[]
   securityRules?: CreateSecurityRuleDto[],
-  dashboards?: CreateDashboardDto[],
+  dashboards?: any[],
 }
 
 export enum SettingLevel {
@@ -166,27 +163,43 @@ export interface ISelectionProvider<T extends ISelectionProviderContext> {
   values(query: any, ctxt: T): Promise<readonly ISelectionProviderValues[]>;
 }
 
-export interface IDashboardVariableSelectionProvider<T extends ISelectionProviderContext> extends ISelectionProvider<T> {
+export interface IDashboardWidgetDataProviderContext<TVariables = Record<string, any>, TProviderContext = Record<string, any>> {
+  moduleName: string;
+  dashboardName: string;
+  widgetName: string;
+  variables: TVariables;
+  providerContext: TProviderContext;
+  activeUser?: ActiveUserData;
+}
+
+export interface IDashboardWidgetDataResponseEnvelope<TData = any, TUiHints = Record<string, any>> {
+  meta: {
+    providerName: string;
+    generatedAt: string;
+    widgetName: string;
+    durationMs: number;
+    [key: string]: any;
+  };
+  data: TData;
+  uiHints?: TUiHints;
+}
+
+export interface IDashboardWidgetDataProvider<
+  TContext extends IDashboardWidgetDataProviderContext = IDashboardWidgetDataProviderContext,
+  TResponse = any,
+> {
+  help(): string;
+  name(): string;
+  getData(
+    widgetDefinition: Record<string, any>,
+    ctxt: TContext,
+  ): Promise<IDashboardWidgetDataResponseEnvelope<TResponse> | any>;
 }
 
 export interface IMcpToolResponseHandler {
   apply(aiInteraction: AiInteraction);
 }
 
-export interface QuestionSqlDataProviderContext {
-    // questionSqlDatasetConfig: QuestionSqlDatasetConfig;
-    // questionId: number;
-    // question: Question;
-    expressions?: SqlExpression[]
-}
-export interface IDashboardQuestionDataProvider<TContext, TData> {
-  help(): string;
-
-  name(): string;
-
-  getData(question: DashboardQuestion, ctxt?: TContext): Promise<TData[] | TData>;
-}
-
 /**
  * @deprecated Use `IEntityComputedFieldProvider` instead.
  */

package/src/jobs/database/trigger-mcp-client-subscriber-database.service.ts

@@ -2,12 +2,10 @@ import { Injectable, Logger } from '@nestjs/common';
 import { ModelMetadataService } from '../../services/model-metadata.service';
 import { SolidRegistry } from 'src/helpers/solid-registry';
 import { QueueMessage } from 'src/interfaces/mq';
-import { DashboardRepository } from 'src/repository/dashboard.repository';
 import { AiInteractionService } from 'src/services/ai-interaction.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
 import { PollerService } from 'src/services/poller.service';
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
-import { Not } from 'typeorm';
 import { McpResponse, QueuesModuleOptions, TriggerMcpClientOptions } from "../../interfaces";
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { MqMessageService } from '../../services/mq-message.service';
@@ -24,9 +22,7 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
         readonly aiInteractionService: AiInteractionService,
         readonly moduleMetadataService: ModuleMetadataService,
         readonly modelMetadataService: ModelMetadataService,
-        private readonly solidRegistry: SolidRegistry,
-        // private readonly dashboardService: DashboardService
-        private readonly dashboardRepository: DashboardRepository
+        private readonly solidRegistry: SolidRegistry
 
     ) {
         super(mqMessageService, mqMessageQueueService, poller);
@@ -126,22 +122,6 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             populate: ['module']
         });
 
-        // Get the list of dashboards
-        // TODO: Ideally we should fetch dashboard like below, but used below approach to avoid below CLS issues for now.
-        // Cannot set the key "filter". No CLS context available, please make sure that a ClsMiddleware/Guard/Interceptor has set up the context, or wrap any calls that depend on CLS with "ClsService#run"
-        // const { records: existingDashboards } = await this.dashboardService.find({
-        //     fields
-        // })
-        const existingDashboards = await this.dashboardRepository.find(
-            {
-                where: {
-                    module: {
-                        name: Not('solid-core')
-                    }
-                },
-            }
-        );
-
         const existingControllerAndTheirMethods = this.solidRegistry.getControllers();
 
 
@@ -164,14 +144,6 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             ].join('\n'))
             .join('\n\n');
 
-        const dashboardsSection = (existingDashboards ?? [])
-            .map(d => [
-                `### ${d.displayName}`,
-                `- name: ${d.name}`,
-                `- description: ${d.description ?? ""}`,
-            ].join('\n'))
-            .join('\n\n');
-
         const computationProvidersSection = (existingComputationProviders ?? [])
             .map(m => [
                 `### ${m.instance.name()}`,
@@ -213,11 +185,6 @@ You need to pull out the singularName for the model from the user prompt to matc
 
 ${modelsSection}
 
-## LIST OF EXISTING DASHBOARDS
-Use the below list of dashboards to infer which dashboard the user is referring to.
-
-${dashboardsSection}
-
 ## LIST OF EXISTING COMPUTED FIELD PROVIDERS
 Use the below list of computed field providers to infer which provider the user is referring to.
 

package/src/repositories/dashboard-user-layout.repository.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { SecurityRuleRepository } from 'src/repository/security-rule.repository';
+import { SolidBaseRepository } from 'src/repository/solid-base.repository' ;
+import { RequestContextService } from 'src/services/request-context.service';
+import { DataSource } from 'typeorm';
+import { InjectDataSource } from '@nestjs/typeorm';
+import { DashboardUserLayout } from '../entities/dashboard-user-layout.entity';
+
+@Injectable()
+export class DashboardUserLayoutRepository extends SolidBaseRepository<DashboardUserLayout> {
+    constructor(
+        @InjectDataSource("default")
+        readonly dataSource: DataSource,
+        readonly requestContextService: RequestContextService,
+        readonly securityRuleRepository: SecurityRuleRepository,
+    ) {
+        super(DashboardUserLayout, dataSource, requestContextService, securityRuleRepository);
+    }
+}

package/src/seeders/module-metadata-seeder.service.ts

@@ -3,12 +3,10 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { v4 as uuidv4 } from 'uuid';
 
-import { CreateDashboardDto } from 'src/dtos/create-dashboard.dto';
 import { CreateEmailTemplateDto } from 'src/dtos/create-email-template.dto';
 import { CreateListOfValuesDto } from 'src/dtos/create-list-of-values.dto';
 import { CreateSecurityRuleDto } from 'src/dtos/create-security-rule.dto';
 import { CreateSmsTemplateDto } from 'src/dtos/create-sms-template.dto';
-import { DashboardRepository } from 'src/repository/dashboard.repository';
 import { SecurityRuleRepository } from 'src/repository/security-rule.repository';
 import { AuthenticationService } from 'src/services/authentication.service';
 import { EmailTemplateService } from 'src/services/email-template.service';
@@ -52,7 +50,6 @@ import { SavedFilters } from 'src/entities/saved-filters.entity';
 import { ScheduledJob } from 'src/entities/scheduled-job.entity';
 import { SecurityRule } from 'src/entities/security-rule.entity';
 import { ListOfValues } from 'src/entities/list-of-values.entity';
-import { Dashboard } from 'src/entities/dashboard.entity';
 import { FieldMetadata } from 'src/entities/field-metadata.entity';
 import { ModelMetadata } from 'src/entities/model-metadata.entity';
 import { PermissionMetadata } from 'src/entities/permission-metadata.entity';
@@ -88,7 +85,6 @@ export class ModuleMetadataSeederService {
         private readonly settingsRepo: SettingRepository,
         readonly securityRuleRepo: SecurityRuleRepository,
         readonly systemFieldsSeederService: SystemFieldsSeederService,
-        readonly dashboardRepo: DashboardRepository,
         readonly scheduledJobRepository: ScheduledJobRepository,
         readonly savedFiltersRepo: SavedFiltersRepository,
         readonly dataSource: DataSource,
@@ -207,11 +203,6 @@ export class ModuleMetadataSeederService {
                 const lovCounts = await this.seedListOfValues(moduleMetadata, overallMetadata);
                 console.log(`${this.formatSeedResult(moduleMetadata.name, 'List Of Values', lovCounts)}`);
 
-                currentStep = 'seedDashboards';
-                this.logger.log(`Seeding Dashboards`);
-                const dashboardCounts = await this.seedDashboards(moduleMetadata, overallMetadata);
-                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Dashboards', dashboardCounts)}`);
-
                 currentStep = 'seedScheduledJobs';
                 this.logger.log(`Seeding Scheduled Jobs`);
                 const scheduledJobCounts = await this.seedScheduledJobs(moduleMetadata, overallMetadata);
@@ -271,15 +262,6 @@ export class ModuleMetadataSeederService {
         return { pruned, upserted: savedFilters?.length ?? 0 };
     }
 
-    private async seedDashboards(moduleMetadata: CreateModuleMetadataDto, overallMetadata: any): Promise<{ pruned: number; upserted: number }> {
-        this.logger.debug(`[Start] Processing dashboards for ${moduleMetadata.name}`);
-        const dashboards: CreateDashboardDto[] = overallMetadata.dashboards;
-        const pruned = this.enablePruning ? await this.pruneDashboards(dashboards, moduleMetadata.name) : 0;
-        await this.handleSeedDashboards(dashboards);
-        this.logger.debug(`[End] Processing dashboards for ${moduleMetadata.name}`);
-        return { pruned, upserted: dashboards?.length ?? 0 };
-    }
-
     private async seedListOfValues(moduleMetadata: CreateModuleMetadataDto, overallMetadata: any): Promise<{ pruned: number; upserted: number }> {
         this.logger.debug(`[Start] Processing List Of Values for ${moduleMetadata.name}`);
         const listOfValues: CreateListOfValuesDto[] = overallMetadata.listOfValues;
@@ -923,16 +905,6 @@ export class ModuleMetadataSeederService {
         }
     }
 
-    private async handleSeedDashboards(dashboardDtos: CreateDashboardDto[]) {
-        if (!dashboardDtos || dashboardDtos.length === 0) {
-            this.logger.debug(`No dashboards found to seed`);
-            return;
-        }
-        for (const dto of dashboardDtos) {
-            await this.dashboardRepo.upsertWithDto(dto);
-        }
-    }
-
     private async handleSeedScheduledJobs(createScheduledJobDto: CreateScheduledJobDto[]) {
         if (!createScheduledJobDto || createScheduledJobDto.length === 0) {
             this.logger.debug(`No scheduled jobs found to seed`);
@@ -1189,45 +1161,6 @@ export class ModuleMetadataSeederService {
         return 0;
     }
 
-    private async pruneDashboards(dashboardsDto: CreateDashboardDto[] | undefined, moduleName?: string): Promise<number> {
-        if (!moduleName) {
-            this.logger.warn(`Skipping dashboards prune: missing module name in metadata.`);
-            return 0;
-        }
-        const dashboards = dashboardsDto ?? [];
-
-        const module = await this.moduleMetadataService.findOneByUserKey(moduleName);
-        if (!module) {
-            this.logger.warn(`Skipping dashboards prune: module not found for ${moduleName}.`);
-            return 0;
-        }
-
-        const dashboardNames = [...new Set(dashboards.map(dto => dto.name).filter(Boolean))];
-        const repo = this.dataSource.getRepository(Dashboard);
-        const idsToDeleteQuery = repo
-            .createQueryBuilder('db')
-            .select('db.id', 'id')
-            .innerJoin('db.module', 'module')
-            .where('module.id = :moduleId', { moduleId: module.id });
-
-        if (dashboardNames.length > 0) {
-            idsToDeleteQuery.andWhere('db.name NOT IN (:...dashboardNames)', { dashboardNames });
-        }
-
-        const rows = await idsToDeleteQuery.getRawMany();
-        const ids = rows.map((row) => row.id);
-        if (ids.length > 0) {
-            const result = await repo
-                .createQueryBuilder()
-                .delete()
-                .from(Dashboard)
-                .whereInIds(ids)
-                .execute();
-            return result.affected ?? 0;
-        }
-        return 0;
-    }
-
     private async pruneMenus(menusDto: any[] | undefined, moduleName?: string): Promise<number> {
         if (!moduleName) {
             this.logger.warn(`Skipping menus prune: missing module name in metadata.`);