@solidxai/core 0.1.6-beta.2 → 0.1.6-beta.5

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

@@ -225,6 +225,7 @@ export class ModelMetadataService {
     let userKeyField = null;
     const listViewLayout = [];
     const formViewLayout = [];
+    const treeViewLayout = [];
 
     for (let k = 0; k < fieldsMetadata.length; k++) {
       const fieldMetadata = fieldsMetadata[k];
@@ -245,6 +246,7 @@ export class ModelMetadataService {
       }
       listViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}` } })
       formViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}` } })
+      treeViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}` } })
 
     }
 
@@ -818,6 +820,7 @@ export class ModelMetadataService {
       const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
       const listViewLayoutFields = [{ type: "field", attrs: { name: `id` } }];
+      const treeViewLayoutFields = [{ type: "field", attrs: { name: `id` } }];
       const formViewLayoutFields = [];
 
       for (let i = 0; i < model.fields.length; i++) {
@@ -825,8 +828,9 @@ export class ModelMetadataService {
         if (field.isSystem) continue;
         listViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
         formViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
+        treeViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
       }
-      this.populateVAMConfigInFileInternal(formViewLayoutFields, model, listViewLayoutFields, metaData);
+      this.populateVAMConfigInFileInternal(formViewLayoutFields, model, listViewLayoutFields, treeViewLayoutFields, metaData);
       // Write the updated object back to the file
       const updatedContent = JSON.stringify(metaData, null, 2);
       await fs.writeFile(filePath, updatedContent);
@@ -839,7 +843,7 @@ export class ModelMetadataService {
   }
 
   // Populate the View, Actions and Menus in the config file
-  private populateVAMConfigInFileInternal(formViewLayoutFields: any[], model: ModelMetadata, listViewLayoutFields: { type: string; attrs: { name: string; }; }[], metaData: any) {
+  private populateVAMConfigInFileInternal(formViewLayoutFields: any[], model: ModelMetadata, listViewLayoutFields: { type: string; attrs: { name: string; }; }[], treeViewLayoutFields: { type: string; attrs: { name: string; }; }[], metaData: any) {
     const column1Fields = [];
     const column2Fields = [];
 
@@ -852,7 +856,9 @@ export class ModelMetadataService {
       }
     }
     const actionName = `${model.singularName}-list-action`;
-    const viewName = `${model.singularName}-list-view`;
+    const treeViewActionName = `${model.singularName}-tree-view-action`;
+    const listViewName = `${model.singularName}-list-view`;
+    const treeViewName = `${model.singularName}-tree-view`;
     const formViewName = `${model.singularName}-form-view`;
     const menuName = `${model.singularName}-menu-item`;
 
@@ -865,7 +871,21 @@ export class ModelMetadataService {
       customComponent: ``,
       customIsModal: true,
       serverEndpoint: "",
-      viewUserKey: viewName,
+      viewUserKey: listViewName,
+      moduleUserKey: `${model.module.name}`,
+      modelUserKey: `${model.singularName}`
+    };
+
+    const treeViewAction = {
+      displayName: `${model.displayName} Tree View Action`,
+      name: treeViewActionName,
+      type: "solid",
+      domain: "",
+      context: "",
+      customComponent: ``,
+      customIsModal: true,
+      serverEndpoint: "",
+      viewUserKey: treeViewName,
       moduleUserKey: `${model.module.name}`,
       modelUserKey: `${model.singularName}`
     };
@@ -877,11 +897,11 @@ export class ModelMetadataService {
       actionUserKey: actionName,
       moduleUserKey: `${model.module.name}`,
       parentMenuItemUserKey: "",
-      iconName : ""
+      iconName: ""
     };
 
     const modelListview = {
-      name: viewName,
+      name: listViewName,
       displayName: `${model.displayName}`,
       type: "list",
       context: "{}",
@@ -905,6 +925,31 @@ export class ModelMetadataService {
       }
     };
 
+    const modelTreeview = {
+      name: treeViewName,
+      displayName: `${model.displayName}`,
+      type: "tree",
+      context: "{}",
+      moduleUserKey: `${model.module.name}`,
+      modelUserKey: `${model.singularName}`,
+      layout: {
+        type: "tree",
+        attrs: {
+          pagination: true,
+          pageSizeOptions: [
+            10,
+            25,
+            50
+          ],
+          enableGlobalSearch: true,
+          create: true,
+          edit: true,
+          delete: true
+        },
+        children: treeViewLayoutFields
+      }
+    };
+
 
     const modelFormView = {
       name: formViewName,
@@ -954,10 +999,18 @@ export class ModelMetadataService {
       metaData.actions.push(action);
     }
 
-    if (notExists(metaData.views, viewName)) {
+    if (notExists(metaData.actions, treeViewActionName)) {
+      metaData.actions.push(treeViewAction);
+    }
+
+    if (notExists(metaData.views, listViewName)) {
       metaData.views.push(modelListview);
     }
 
+    if (notExists(metaData.views, treeViewName)) {
+      metaData.views.push(modelTreeview);
+    }
+
     if (notExists(metaData.views, formViewName)) {
       metaData.views.push(modelFormView);
     }
@@ -979,6 +1032,14 @@ export class ModelMetadataService {
       }
     }));
 
+    const treeViewLayout = jsonFieldsList.map(field => ({
+      type: "field",
+      attrs: {
+        name: `${field.name}`,
+        isSearchable: true,
+      }
+    }));
+
     const formViewLayout = jsonFieldsList.map(field => ({
       type: "field",
       attrs: {
@@ -1019,6 +1080,26 @@ export class ModelMetadataService {
           children: listViewLayout
         }, null, 3)
       },
+      {
+        name: `${model.singularName}-tree-view`,
+        displayName: `${model.displayName}`,
+        type: 'tree',
+        context: "{}",
+        module: resolvedModule,
+        model: model,
+        layout: JSON.stringify({
+          type: "tree",
+          attrs: {
+            pagination: true,
+            pageSizeOptions: [10, 25, 50],
+            enableGlobalSearch: true,
+            create: true,
+            edit: true,
+            delete: true
+          },
+          children: treeViewLayout
+        }, null, 3)
+      },
       {
         name: `${model.singularName}-form-view`,
         displayName: `${model.displayName}`,
@@ -1067,6 +1148,7 @@ export class ModelMetadataService {
     }
 
     let view = await viewRepo.findOne({ where: { name: `${model.singularName}-list-view` } });
+    let treeView = await viewRepo.findOne({ where: { name: `${model.singularName}-tree-view` } });
 
     const actionData = {
       displayName: `${model.displayName} List Action`,
@@ -1082,13 +1164,33 @@ export class ModelMetadataService {
       model: model
     };
 
+    const treeViewActionData = {
+      displayName: `${model.displayName} Tree View Action`,
+      name: `${model.singularName}-tree-view-action`,
+      type: "solid",
+      domain: "",
+      context: "",
+      customComponent: ``,
+      customIsModal: true,
+      serverEndpoint: "",
+      view: treeView,
+      module: resolvedModule,
+      model: model
+    };
+
     let existingAction = await actionRepo.findOne({ where: { name: actionData.name } });
+    let existingTreeViewAction = await actionRepo.findOne({ where: { name: treeViewActionData.name } });
 
     if (!existingAction) {
       const createdAction = actionRepo.create(actionData);
       existingAction = await actionRepo.save(createdAction);
     }
 
+    if (!existingTreeViewAction) {
+      const createdTreeViewAction = actionRepo.create(treeViewActionData);
+      existingTreeViewAction = await actionRepo.save(createdTreeViewAction);
+    }
+
     const adminRole = await this.roleService.findRoleByName('Admin');
 
     const menuData = {

package/src/services/question-data-providers/chartjs-sql-data-provider.service.ts

@@ -1,16 +1,11 @@
 import { Injectable, Logger } from "@nestjs/common";
 import { DashboardQuestionDataProvider } from "src/decorators/dashboard-question-data-provider.decorator";
 import { DashboardQuestion } from "src/entities/dashboard-question.entity";
-import { IDashboardQuestionDataProvider } from "src/interfaces";
+import { IDashboardQuestionDataProvider, QuestionSqlDataProviderContext } from "src/interfaces";
 import { EntityManager } from "typeorm";
 import { SqlExpressionResolverService } from "../sql-expression-resolver.service";
 import { getKpi, getLabels } from "./helpers";
 
-export interface QuestionSqlDataProviderContext {
-    // questionSqlDatasetConfig: QuestionSqlDatasetConfig;
-    // questionId: number;
-    // question: Question;
-}
 
 export enum SqlExpressionOperator {
     EQUALS = '$equals',
@@ -49,7 +44,8 @@ export class ChartJsSqlDataProvider implements IDashboardQuestionDataProvider<Qu
         return "ChartJsSqlDataProvider";
     }
 
-    async getData(question: DashboardQuestion, expressions?: SqlExpression[], context?: QuestionSqlDataProviderContext): Promise<any> {
+    async getData(question: DashboardQuestion, context?: QuestionSqlDataProviderContext): Promise<any> {
+        const expressions: SqlExpression[] = context?.expressions || [];
         // TODO: put some validation to check if the results of each SQL in each dataset returns the same number of rows 
 
         // This is what we have to return.

package/src/services/question-data-providers/prime-react-datatable-sql-data-provider.service.ts

@@ -1,19 +1,13 @@
 import { Injectable } from "@nestjs/common";
 import { DashboardQuestionDataProvider } from "src/decorators/dashboard-question-data-provider.decorator";
 import { DashboardQuestion } from "src/entities/dashboard-question.entity";
-import { IDashboardQuestionDataProvider } from "src/interfaces";
+import { IDashboardQuestionDataProvider, QuestionSqlDataProviderContext } from "src/interfaces";
 import { EntityManager } from "typeorm";
 import { SqlExpressionResolverService } from "../sql-expression-resolver.service";
 import { Logger } from '@nestjs/common';
 import { SqlExpression } from "./chartjs-sql-data-provider.service";
 import { getKpi } from "./helpers";
 
-export interface QuestionSqlDataProviderContext {
-    // questionSqlDatasetConfig: QuestionSqlDatasetConfig;
-    // questionId: number;
-    // question: Question;
-}
-
 @DashboardQuestionDataProvider()
 @Injectable()
 export class PrimeReactDatatableSqlDataProvider implements IDashboardQuestionDataProvider<QuestionSqlDataProviderContext, any> {
@@ -29,7 +23,9 @@ export class PrimeReactDatatableSqlDataProvider implements IDashboardQuestionDat
         return "PrimeReactDatatableSqlDataProvider";
     }
 
-    async getData(question: DashboardQuestion, expressions?: SqlExpression[], context?: QuestionSqlDataProviderContext): Promise<any> {
+    async getData(question: DashboardQuestion, context?: QuestionSqlDataProviderContext): Promise<any> {
+        const expressions: SqlExpression[] = context?.expressions || [];
+
         // TODO: put some validation to check if the results of each SQL in each dataset returns the same number of rows 
 
         // Check the expected response for prime react data tables to understand what is going on here...

package/src/services/question-data-providers/prime-react-meter-group-sql-data-provider.service.ts

@@ -1,19 +1,13 @@
 import { Injectable } from "@nestjs/common";
 import { DashboardQuestionDataProvider } from "src/decorators/dashboard-question-data-provider.decorator";
 import { DashboardQuestion } from "src/entities/dashboard-question.entity";
-import { IDashboardQuestionDataProvider } from "src/interfaces";
+import { IDashboardQuestionDataProvider, QuestionSqlDataProviderContext } from "src/interfaces";
 import { EntityManager } from "typeorm";
 import { SqlExpressionResolverService } from "../sql-expression-resolver.service";
 import { Logger } from '@nestjs/common';
 import { SqlExpression } from "./chartjs-sql-data-provider.service";
 import { getKpi } from "./helpers";
 
-export interface QuestionSqlDataProviderContext {
-    // questionSqlDatasetConfig: QuestionSqlDatasetConfig;
-    // questionId: number;
-    // question: Question;
-}
-
 @DashboardQuestionDataProvider()
 @Injectable()
 export class PrimeReactMeterGroupSqlDataProvider implements IDashboardQuestionDataProvider<QuestionSqlDataProviderContext, any> {
@@ -58,7 +52,9 @@ export class PrimeReactMeterGroupSqlDataProvider implements IDashboardQuestionDa
         return colors;
     }
 
-    async getData(question: DashboardQuestion, expressions?: SqlExpression[], context?: QuestionSqlDataProviderContext): Promise<any> {
+    async getData(question: DashboardQuestion, context?: QuestionSqlDataProviderContext): Promise<any> {
+        const expressions: SqlExpression[] = context?.expressions || [];
+
         // TODO: put some validation to check if the results of each SQL in each dataset returns the same number of rows 
 
         // This is what we have to return.

package/src/services/queues/database-subscriber.service.ts

@@ -7,7 +7,7 @@ import { PollerService } from '../poller.service';
 import { buildNamespacedQueueName } from './common';
 
 export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscriber<T> {
-    private readonly logger = new Logger(DatabaseSubscriber.name);
+    private _loggerInstance?: Logger;
     private readonly url: string;
     private readonly serviceRole: string;
 
@@ -23,6 +23,17 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
         // this.logger.debug(`DatabaseSubscriber instance created with options: ${JSON.stringify(this.options())}`);
     }
 
+    protected get loggerContext(): string {
+        return this.constructor.name;
+    }
+
+    protected get logger(): Logger {
+        if (!this._loggerInstance) {
+            this._loggerInstance = new Logger(this.loggerContext);
+        }
+        return this._loggerInstance;
+    }
+
     abstract subscribe(message: QueueMessage<T>);
 
     abstract options(): QueuesModuleOptions;

package/src/services/queues/publisher-factory.service.ts

@@ -23,14 +23,16 @@ export class PublisherFactory<T> {
         // Register all ISolidDatabaseModules implementations
         let actualPublisherToUse = this.solidIntrospectionService.getProvider(resolvedPublisherName);
         if (!actualPublisherToUse) {
+            // Relaxed extra check in place to make sure we do not have to refactor old publishers or publishers named without the ____RabbitMq or ____Database convention
+            actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);
 
             // Extra check in place to make sure we do not have to refactor old publishers which have been created earlier. 
-            if (defaultBrokerToUse === 'rabbitmq') {
-                actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);
-                if (!actualPublisherToUse) {
-                    throw new Error(`Unable to locate publisher with name ${resolvedPublisherName}`);
-                }
-            }
+            // if (defaultBrokerToUse === 'rabbitmq') {
+            //     actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);
+            // }
+        }
+        if (!actualPublisherToUse) {
+            throw new Error(`Unable to locate publisher with name ${resolvedPublisherName}`);
         }
 
         // type safe

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -8,7 +8,7 @@ import { buildNamespacedQueueName } from './common';
 
 
 export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscriber<T> { // TODO This can be made a generic type for better type visibility
-    private readonly logger = new Logger(RabbitMqSubscriber.name);
+    private _loggerInstance?: Logger;
     private readonly url: string;
     private readonly serviceRole: string;
     private connection: amqp.Connection | null = null;
@@ -30,6 +30,17 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
 
+    protected get loggerContext(): string {
+        return this.constructor.name;
+    }
+
+    protected get logger(): Logger {
+        if (!this._loggerInstance) {
+            this._loggerInstance = new Logger(this.loggerContext);
+        }
+        return this._loggerInstance;
+    }
+
     abstract subscribe(message: QueueMessage<T>);
 
     abstract options(): QueuesModuleOptions;

package/src/services/selection-providers/list-of-dashboard-question-providers-selection-provider.service.ts

@@ -3,6 +3,7 @@ import { SelectionProvider } from "src/decorators/selection-provider.decorator";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { IDashboardQuestionDataProvider, IDashboardVariableSelectionProvider, ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "../../interfaces";
 import { SQL_DYNAMIC_PROVIDER_NAME } from "../dashboard.service";
+import { CHARTJS_SQL_DATA_PROVIDER_NAME, INBUILT_SQL_DATA_PROVIDERS, PRIME_REACT_DATATABLE_SQL_DATA_PROVIDER_NAME, PRIME_REACT_METER_GROUP_SQL_DATA_PROVIDER_NAME } from "../dashboard-question.service";
 
 
 @SelectionProvider()
@@ -34,7 +35,9 @@ export class ListOfDashboardQuestionProvidersSelectionProvider implements ISelec
     async values(query: string, ctxt: ISelectionProviderContext): Promise<readonly ISelectionProviderValues[]> {
         const dashboardSelectionProviders = this.solidRegistry.getDashboardQuestionDataProviders()
         //Exclude the SQL dynamic provider from the list, (since although it is a dashboard selection provider, it is not a valid option for the user to select)
-        return dashboardSelectionProviders.map(i => {
+        return dashboardSelectionProviders
+        .filter(provider => !INBUILT_SQL_DATA_PROVIDERS.includes(provider.name())) 
+        .map(i => {
             return { label: i.name, value: i.name };
         });
     }

package/src/transformers/typeorm/local-date-time-transformer.ts

@@ -20,59 +20,67 @@ function dateToUtcComponentString(d: Date): string {
     const ss = pad(d.getUTCSeconds());
     const ms = pad(d.getUTCMilliseconds(), 3);
 
-    // A “naive” timestamp string representing the DB wall-clock components
+    // A "naive" timestamp string representing the DB wall-clock components
     return `${yyyy}-${mm}-${dd} ${hh}:${mi}:${ss}.${ms}`;
 }
 
-export const LocalDateTimeTransformer: ValueTransformer & { utc: ValueTransformer } = {
-    // DB → Entity
-    from(value: Date | string | null | undefined): Date | null | undefined {
+function getWallClockConfig(): { tz: string; wallTimeMode: boolean } {
+    return {
+        tz: process.env.SOLIDX_WALL_TIME_TIMEZONE || process.env.SOLIDX_TIMEZONE || "UTC",
+        wallTimeMode: (process.env.SOLIDX_TIME_STORED_AS_WALL_TIME || "").toLowerCase() === "true",
+    };
+}
+
+/**
+ * Returns a dayjs instance positioned at the wall-clock time for the given Date.
+ * - Wall-clock mode ON:  dayjs in the configured timezone (components = wall-clock components)
+ * - Wall-clock mode OFF: dayjs in UTC
+ * Counterpart to serializeDate — use this to format/display a date value correctly.
+ */
+export function parseDate(date: Date): dayjs.Dayjs {
+    const { tz, wallTimeMode } = getWallClockConfig();
+    if (!wallTimeMode) return dayjs.utc(date);
+    return dayjs(date).tz(tz);
+}
 
-        const SOLIDX_WALL_TIME_TZ = process.env.SOLIDX_WALL_TIME_TIMEZONE || process.env.SOLIDX_TIMEZONE || "UTC";
-        const SOLIDX_TIME_STORED_AS_WALL_TIME = (process.env.SOLIDX_TIME_STORED_AS_WALL_TIME || "").toLowerCase() === "true";
+/**
+ * Converts a Date to a string for storage in plain text columns (e.g. audit values).
+ * - Wall-clock mode ON:  "YYYY-MM-DD HH:mm:ss.SSS" in the configured timezone (no Z suffix)
+ * - Wall-clock mode OFF: ISO 8601 UTC string with Z suffix
+ * The presence/absence of the Z suffix lets consumers distinguish the two cases.
+ */
+export function serializeDate(date: Date): string {
+    const { wallTimeMode } = getWallClockConfig();
+    if (!wallTimeMode) return date.toISOString();
+    return parseDate(date).format("YYYY-MM-DD HH:mm:ss.SSS");
+}
 
-        // critical... super important to return undefined here 
+export const LocalDateTimeTransformer: ValueTransformer = {
+    // DB -> Entity
+    from(value: Date | string | null | undefined): Date | null | undefined {
+        // critical... super important to return undefined here
         if (value === undefined) return undefined;
         if (value === null) return null;
 
-        if (!SOLIDX_TIME_STORED_AS_WALL_TIME) {
+        const { tz, wallTimeMode } = getWallClockConfig();
+
+        if (!wallTimeMode) {
             return dayjs(value).toDate();
         }
 
         const naive = value instanceof Date ? dateToUtcComponentString(value) : String(value);
-        return dayjs.tz(naive, SOLIDX_WALL_TIME_TZ).utc().toDate();
+        return dayjs.tz(naive, tz).utc().toDate();
     },
 
-    // Entity → DB
+    // Entity -> DB
     to(value: Date | null | undefined): Date | null | undefined {
-
-        const SOLIDX_WALL_TIME_TZ = process.env.SOLIDX_WALL_TIME_TIMEZONE || process.env.SOLIDX_TIMEZONE || "UTC";
-        const SOLIDX_TIME_STORED_AS_WALL_TIME = (process.env.SOLIDX_TIME_STORED_AS_WALL_TIME || "").toLowerCase() === "true";
-
-        // critical... super important to return undefined here 
+        // critical... super important to return undefined here
         if (value === undefined) return undefined;
         if (value === null) return null;
 
-        if (!SOLIDX_TIME_STORED_AS_WALL_TIME) {
-            return dayjs(value).toDate();
-        }
-
-        const wallTimeStr = dayjs(value).tz(SOLIDX_WALL_TIME_TZ).format("YYYY-MM-DD HH:mm:ss.SSS");
+        const wallTimeStr = serializeDate(value);
         return dayjs.utc(wallTimeStr).toDate();
     },
 
-    utc: {
-        from(value: Date | string | null | undefined): Date | null | undefined {
-            if (value === undefined) return undefined;
-            if (value === null) return null;
-            return dayjs(value).toDate();
-        },
-        to(value: Date | null | undefined): Date | null | undefined {
-            if (value === undefined) return undefined;
-            if (value === null) return null;
-            return dayjs(value).toDate();
-        }
-    }
 };
 
-export const UtcDateTimeTransformer = LocalDateTimeTransformer.utc;