@solidxai/core 0.1.10-beta.9 → 0.1.10

package/dist/testing/steps/ui/manual.step.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"manual.step.js","sourceRoot":"","sources":["../../../../src/testing/steps/ui/manual.step.ts"],"names":[],"mappings":";;AAwBA,kDAuDC;AA/ED,qDAAyD;AACzD,+CAAgE;AAgBhE,SAAS,WAAW,CAAC,GAAgB,EAAE,EAAU;IAC/C,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC;AACrB,CAAC;AAED,SAAgB,mBAAmB,CAAC,QAAsB;IACxD,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAgB,EAAE,IAAY,EAAE,EAAE;QAC7E,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAuB,CAAC;QAC5D,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,8BAA8B,CAAC;QAC9E,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,4BAA4B,CAAC;QAC1E,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;QACxC,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,IAAI,CAAC;QAEtD,IAAI,GAAG,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;QAC/F,CAAC;QACD,IAAI,CAAC,oBAAK,CAAC,KAAK,IAAI,CAAC,qBAAM,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5B,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpB,MAAM,EAAE,GAAG,IAAA,0BAAe,EAAC,EAAE,KAAK,EAAL,oBAAK,EAAE,MAAM,EAAN,qBAAM,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;gBAAS,CAAC;YACT,EAAE,CAAC,KAAK,EAAE,CAAC;QACb,CAAC;QAED,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,eAAe,EAAE;gBACtD,KAAK,EAAE,SAAS;gBAChB,OAAO,EAAE,SAAS;aACnB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,UAAU,CACnB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,WAAW,CAAC,gBAAgB,EACxD,EAAE,OAAO,EAAE,SAAS,EAAE,CACvB,CAAC;QACJ,CAAC;QAED,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,UAAU,CACnB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,EACxE,EAAE,OAAO,EAAE,SAAS,EAAE,CACvB,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { createInterface } from \"node:readline/promises\";\nimport { stdin as input, stdout as output } from \"node:process\";\n\nimport type { TestContext } from \"../../contracts/runtime-context.types\";\nimport type { OpStep } from \"../../contracts/testing-metadata.types\";\nimport { StepRegistry } from \"../../core/step-registry\";\n\ntype WaitForManualInput = {\n  message?: string;\n  prompt?: string;\n  waitForSelector?: string;\n  waitForUrlContains?: string;\n  waitForUrlEquals?: string;\n  timeoutMs?: number;\n  bringToFront?: boolean;\n};\n\nfunction requirePage(ctx: TestContext, op: string) {\n  if (!ctx.ui || !ctx.ui.page) {\n    throw new Error(`Missing UI page on context for op \"${op}\"`);\n  }\n  return ctx.ui.page;\n}\n\nexport function registerManualSteps(registry: StepRegistry): void {\n  registry.register(\"ui.waitForManual\", async (ctx: TestContext, step: OpStep) => {\n    const page = requirePage(ctx, \"ui.waitForManual\");\n    const inputConfig = (step.with ?? {}) as WaitForManualInput;\n    const message = inputConfig.message?.trim() || \"Manual interaction required.\";\n    const prompt = inputConfig.prompt?.trim() || \"Press Enter to continue...\";\n    const timeoutMs = inputConfig.timeoutMs;\n    const bringToFront = inputConfig.bringToFront ?? true;\n\n    if (ctx.ui?.isHeadless()) {\n      throw new Error('Op \"ui.waitForManual\" requires headed mode. Re-run with --headless false.');\n    }\n    if (!input.isTTY || !output.isTTY) {\n      throw new Error('Op \"ui.waitForManual\" requires an interactive terminal (TTY).');\n    }\n\n    if (bringToFront) {\n      await page.bringToFront();\n    }\n\n    console.log(\"\");\n    console.log(\"════════ Manual Interaction Required ════════\");\n    console.log(message);\n    console.log(`Scenario: ${ctx.scenarioId}`);\n    console.log(`Current URL: ${page.url()}`);\n    console.log(prompt);\n\n    const rl = createInterface({ input, output });\n    try {\n      await rl.question(\"\");\n    } finally {\n      rl.close();\n    }\n\n    if (inputConfig.waitForSelector) {\n      await page.waitForSelector(inputConfig.waitForSelector, {\n        state: \"visible\",\n        timeout: timeoutMs,\n      });\n    }\n\n    if (inputConfig.waitForUrlEquals) {\n      await page.waitForURL(\n        (url) => url.toString() === inputConfig.waitForUrlEquals,\n        { timeout: timeoutMs },\n      );\n    }\n\n    if (inputConfig.waitForUrlContains) {\n      await page.waitForURL(\n        (url) => url.toString().includes(String(inputConfig.waitForUrlContains)),\n        { timeout: timeoutMs },\n      );\n    }\n  });\n}\n"]}

package/dist/winston.logger.d.ts

@@ -1,6 +1,11 @@
 import { Logger as TypeORMLogger, QueryRunner } from 'typeorm';
 import { Logger } from 'winston';
 import * as winston from 'winston';
+export declare const createWinstonLoggerConfig: () => {
+    level: string;
+    format: winston.Logform.Format;
+    transports: (winston.transports.ConsoleTransportInstance | winston.transports.FileTransportInstance)[];
+};
 export declare const WinstonLoggerConfig: {
     level: string;
     format: winston.Logform.Format;

package/dist/winston.logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"winston.logger.d.ts","sourceRoot":"","sources":["../src/winston.logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,eAAO,MAAM,mBAAmB;;;;CAgC/B,CAAC;AAEF,qBAAa,oBAAqB,YAAW,aAAa;IACT,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAE5E,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAM5E,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAIhG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAI9F,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAIhE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAI9D,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;CAGpE"}
+{"version":3,"file":"winston.logger.d.ts","sourceRoot":"","sources":["../src/winston.logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,eAAO,MAAM,yBAAyB;;;;CA4BpC,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;CAA8B,CAAC;AAE/D,qBAAa,oBAAqB,YAAW,aAAa;IACT,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAE5E,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAM5E,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAIhG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAI9F,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAIhE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI;IAI9D,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;CAGpE"}

package/dist/winston.logger.js

@@ -45,14 +45,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WinstonTypeORMLogger = exports.WinstonLoggerConfig = void 0;
+exports.WinstonTypeORMLogger = exports.WinstonLoggerConfig = exports.createWinstonLoggerConfig = void 0;
 const winston_1 = require("winston");
 const common_1 = require("@nestjs/common");
 const nest_winston_1 = require("nest-winston");
 const winston = __importStar(require("winston"));
 const disallow_in_production_decorator_1 = require("./decorators/disallow-in-production.decorator");
-exports.WinstonLoggerConfig = {
-    level: process.env.LOG_LEVEL || (process.env.ENV === disallow_in_production_decorator_1.Environment.Production ? 'info' : 'debug'),
+const createWinstonLoggerConfig = () => ({
+    level: process.env.LOG_LEVEL || (process.env.ENV === disallow_in_production_decorator_1.Environment.Production ? 'warn' : 'info'),
     format: winston.format.combine(winston.format.timestamp(), winston.format.errors({ stack: true }), winston.format.printf(({ level, message, timestamp }) => {
         if (!message) {
             return `[${timestamp}] ${level.toUpperCase()}: (No message provided)`;
@@ -73,7 +73,9 @@ exports.WinstonLoggerConfig = {
             level: 'error',
         }),
     ],
-};
+});
+exports.createWinstonLoggerConfig = createWinstonLoggerConfig;
+exports.WinstonLoggerConfig = (0, exports.createWinstonLoggerConfig)();
 let WinstonTypeORMLogger = class WinstonTypeORMLogger {
     constructor(logger) {
         this.logger = logger;

package/dist/winston.logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"winston.logger.js","sourceRoot":"","sources":["../src/winston.logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAAiC;AACjC,2CAAwC;AACxC,+CAAuD;AACvD,iDAAmC;AACnC,oGAA4E;AAE/D,QAAA,mBAAmB,GAAG;IAC/B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,8CAAW,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/F,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAC1B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAC1B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,IAAI,SAAS,KAAK,KAAK,CAAC,WAAW,EAAE,yBAAyB,CAAC;QAC1E,CAAC;QACD,OAAO,IAAI,SAAS,KAAK,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;IAC/D,CAAC,CAAC,CACL;IACD,UAAU,EAAE;QACR,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;YAC3B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAG1B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE;gBACpD,OAAO,IAAI,SAAS,KAAK,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;YAC/D,CAAC,CAAC,CACL;SACJ,CAAC;QACF,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,sBAAsB;SAEnC,CAAC;QACF,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,OAAO;SAEjB,CAAC;KACL;CACJ,CAAC;AAEF,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YAA8D,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAI,CAAC;IAEjF,QAAQ,CAAC,KAAa,EAAE,UAAkB,EAAE,WAAyB;QACjE,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,KAAK,gBAAgB,UAAU,EAAE,CAAC,CAAC;QAClE,CAAC;IACL,CAAC;IAED,aAAa,CAAC,KAAa,EAAE,KAAa,EAAE,UAAkB,EAAE,WAAyB;QACrF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,KAAK,aAAa,KAAK,kBAAkB,UAAU,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,YAAY,CAAC,IAAY,EAAE,KAAa,EAAE,UAAkB,EAAE,WAAyB;QACnF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,eAAe,KAAK,kBAAkB,UAAU,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED,cAAc,CAAC,OAAe,EAAE,WAAyB;QACrD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,OAAO,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,YAAY,CAAC,OAAe,EAAE,WAAyB;QACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,GAAG,CAAC,KAAwC,EAAE,OAAY;QACtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACJ,CAAA;AA5BY,oDAAoB;+BAApB,oBAAoB;IAChB,WAAA,IAAA,eAAM,EAAC,sCAAuB,CAAC,CAAA;qCAA0B,gBAAM;GADnE,oBAAoB,CA4BhC","sourcesContent":["\nimport { Logger as TypeORMLogger, QueryRunner } from 'typeorm';\nimport { Logger } from 'winston';\nimport { Inject } from '@nestjs/common';\nimport { WINSTON_MODULE_PROVIDER } from 'nest-winston';\nimport * as winston from 'winston';\nimport { Environment } from './decorators/disallow-in-production.decorator';\n\nexport const WinstonLoggerConfig = {\n    level: process.env.LOG_LEVEL || (process.env.ENV === Environment.Production ? 'info' : 'debug'),\n    format: winston.format.combine(\n        winston.format.timestamp(),\n        winston.format.errors({ stack: true }),\n        winston.format.printf(({ level, message, timestamp }) => {\n            if (!message) {\n                return `[${timestamp}] ${level.toUpperCase()}: (No message provided)`;\n            }\n            return `[${timestamp}] ${level.toUpperCase()}: ${message}`;\n        }),\n    ),\n    transports: [\n        new winston.transports.Console({\n            format: winston.format.combine(\n                // winston.format.colorize(),\n                // winston.format.timestamp(),\n                winston.format.printf(({ level, message, timestamp }) => {\n                    return `[${timestamp}] ${level.toUpperCase()}: ${message}`;\n                }),\n            ),\n        }),\n        new winston.transports.File({\n            filename: 'logs/application.log',\n            // format: winston.format.json(),\n        }),\n        new winston.transports.File({\n            filename: 'logs/error.log',\n            level: 'error',\n            // format: winston.format.json(),\n        }),\n    ],\n};\n\nexport class WinstonTypeORMLogger implements TypeORMLogger {\n    constructor(@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger) { }\n\n    logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        if (Boolean(process.env.DEFAULT_DATABASE_LOGGING)) {\n            this.logger.info(`Query: ${query} Parameters: ${parameters}`);\n        }\n    }\n\n    logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        this.logger.error(`Query failed: ${error} | Query: ${query} | Parameters: ${parameters}`);\n    }\n\n    logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        this.logger.warn(`Slow query: ${time}ms | Query: ${query} | Parameters: ${parameters}`);\n    }\n\n    logSchemaBuild(message: string, queryRunner?: QueryRunner): void {\n        this.logger.info(`Schema Build: ${message}`);\n    }\n\n    logMigration(message: string, queryRunner?: QueryRunner): void {\n        this.logger.info(`Migration: ${message}`);\n    }\n\n    log(level: 'log' | 'info' | 'warn' | 'error', message: any): void {\n        this.logger[level](message);\n    }\n}"]}
+{"version":3,"file":"winston.logger.js","sourceRoot":"","sources":["../src/winston.logger.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { Logger as TypeORMLogger, QueryRunner } from 'typeorm';\nimport { Logger } from 'winston';\nimport { Inject } from '@nestjs/common';\nimport { WINSTON_MODULE_PROVIDER } from 'nest-winston';\nimport * as winston from 'winston';\nimport { Environment } from './decorators/disallow-in-production.decorator';\n\nexport const createWinstonLoggerConfig = () => ({\n    level: process.env.LOG_LEVEL || (process.env.ENV === Environment.Production ? 'warn' : 'info'),\n    format: winston.format.combine(\n        winston.format.timestamp(),\n        winston.format.errors({ stack: true }),\n        winston.format.printf(({ level, message, timestamp }) => {\n            if (!message) {\n                return `[${timestamp}] ${level.toUpperCase()}: (No message provided)`;\n            }\n            return `[${timestamp}] ${level.toUpperCase()}: ${message}`;\n        }),\n    ),\n    transports: [\n        new winston.transports.Console({\n            format: winston.format.combine(\n                winston.format.printf(({ level, message, timestamp }) => {\n                    return `[${timestamp}] ${level.toUpperCase()}: ${message}`;\n                }),\n            ),\n        }),\n        new winston.transports.File({\n            filename: 'logs/application.log',\n        }),\n        new winston.transports.File({\n            filename: 'logs/error.log',\n            level: 'error',\n        }),\n    ],\n});\n\nexport const WinstonLoggerConfig = createWinstonLoggerConfig();\n\nexport class WinstonTypeORMLogger implements TypeORMLogger {\n    constructor(@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger) { }\n\n    logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        if (Boolean(process.env.DEFAULT_DATABASE_LOGGING)) {\n            this.logger.info(`Query: ${query} Parameters: ${parameters}`);\n        }\n    }\n\n    logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        this.logger.error(`Query failed: ${error} | Query: ${query} | Parameters: ${parameters}`);\n    }\n\n    logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        this.logger.warn(`Slow query: ${time}ms | Query: ${query} | Parameters: ${parameters}`);\n    }\n\n    logSchemaBuild(message: string, queryRunner?: QueryRunner): void {\n        this.logger.info(`Schema Build: ${message}`);\n    }\n\n    logMigration(message: string, queryRunner?: QueryRunner): void {\n        this.logger.info(`Migration: ${message}`);\n    }\n\n    log(level: 'log' | 'info' | 'warn' | 'error', message: any): void {\n        this.logger[level](message);\n    }\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core",
-  "version": "0.1.10-beta.9",
+  "version": "0.1.10",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,6 +40,7 @@
     "@nestjs/throttler": "^6.4.0",
     "@types/passport-apple": "^2.0.3",
     "amqplib": "^0.10.4",
+    "archiver": "^5.3.2",
     "axios": "^1.7.0",
     "bcrypt": "^5.1.1",
     "bson": "^6.10.1",
@@ -70,6 +71,7 @@
     "passport-local": "^1.0.0",
     "passport-microsoft": "^2.1.0",
     "pg": "^8.11.3",
+    "playwright": ">=1.0.0",
     "pluralize": "^8.0.0",
     "puppeteer": "^23.2.0",
     "qs": "^6.12.0",
@@ -81,11 +83,7 @@
     "uuid": "^9.0.1",
     "xlsx": "^0.18.5"
   },
-  "peerDependenciesMeta": {
-    "playwright": {
-      "optional": true
-    }
-  },
+  "peerDependenciesMeta": {},
   "peerDependencies": {
     "@nestjs/axios": "^3.0.2",
     "@nestjs/cache-manager": "^2.2.2",
@@ -106,7 +104,6 @@
     "nest-commander": "^3.12.5",
     "nest-winston": "^1.9.7",
     "nestjs-cls": "^5.4.3",
-    "playwright": ">=1.0.0",
     "reflect-metadata": "^0.2.2",
     "typeorm": "^0.3.20",
     "typeorm-naming-strategies": "^4.1.0",
@@ -133,7 +130,7 @@
     "@nestjs/testing": "^10.0.0",
     "@nestjs/typeorm": "^10.0.1",
     "@nestjs/websockets": "^10.0.0",
-    "@solidxai/code-builder": "^0.0.2",
+    "@solidxai/code-builder": "^0.1.8",
     "@types/express": "^4.17.17",
     "@types/hapi__joi": "^17.1.12",
     "@types/jest": "^29.5.2",

package/src/commands/info.command.ts

@@ -53,8 +53,6 @@ export class InfoCommand extends CommandRunner {
             selectionProviders: this.getWrapperNames(this.solidRegistry.getSelectionProviders()),
             computedFieldProviders: this.getWrapperNames(this.solidRegistry.getComputedFieldProviders()),
             solidDatabaseModules: this.getWrapperNames(this.solidRegistry.getSolidDatabaseModules()),
-            dashboardVariableSelectionProviders: this.getWrapperNames(this.solidRegistry.getDashboardVariableSelectionProviders()),
-            dashboardQuestionDataProviders: this.getWrapperNames(this.solidRegistry.getDashboardQuestionDataProviders()),
             mailProviders: this.getWrapperNames(this.solidRegistry.getMailProviders()),
             whatsappProviders: this.getWrapperNames(this.solidRegistry.getWhatsappProviders()),
             smsProviders: this.getWrapperNames(this.solidRegistry.getSmsProviders()),

package/src/commands/refresh-model.command.ts

@@ -1,14 +1,10 @@
-import { BadRequestException, forwardRef, Inject, Logger } from '@nestjs/common';
+import { forwardRef, Inject, Logger } from '@nestjs/common';
 import { Command, CommandRunner, Option } from 'nest-commander';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { CommandError } from './helper';
-import { In } from 'typeorm';
 
 interface CommandOptions {
-  name?: string;
-  id?: number;
-  fieldIds?: number[];
-  fieldNames?: string[];
+  name: string;
   dryRun?: boolean;
 }
 
@@ -33,34 +29,20 @@ export class RefreshModelCommand extends CommandRunner {
     }
 
     const codeGenerationOptions = {
-      modelId: options.id,
       modelUserKey: options.name,
       dryRun: options.dryRun,
-      fieldIdsForRefresh: options.fieldIds,
-      fieldNamesForRefresh: options.fieldNames,
     };
     await this.modelMetadataService.handleGenerateCode(codeGenerationOptions);
   }
 
-  // Accept the model ID as an argument
   @Option({
-    flags: '-i, --id [model ID]',
-    description: 'Model ID from the ss_model_metadata table',
-  })
-  parseId(val: string): number {
-    return +val;
-  }
-
-  // Accept the module name as an argument
-  @Option({
-    flags: '-n, --name [model name]',
-    description: 'Model Name from the ss_model_metadata table',
+    flags: '-n, --name <model name>',
+    description: 'Model name (singularName) from the ss_model_metadata table',
   })
   parseName(val: string): string {
     return val;
   }
 
-  // Accept dry run as an argument
   @Option({
     flags: '-d, --dryRun [dry run]',
     description: 'Dry run the command',
@@ -70,36 +52,9 @@ export class RefreshModelCommand extends CommandRunner {
     return (val === 'false') ? false : true;
   }
 
-  // Accept field IDs as an argument
-  @Option({
-    flags: '-fids, --fieldIds [Array of field IDs]',
-    description: 'Json array of Field IDs from the ss_field_metadata table',
-  })
-  parseFieldIds(val: string): number[] {
-    //Check if the value is a json array
-    if (!val.startsWith('[') || !val.endsWith(']')) {
-      throw new BadRequestException('Field IDs should be a json array');
-    }
-    return JSON.parse(val).map((id: string) => parseInt(id));
-  }
-
-  // Accept field Names as an argument
-  @Option({
-    flags: '-fnames, --fieldNames [Array of field Names]',
-    description: 'Json array of Field Names from the ss_field_metadata table',
-  })
-  parseFieldNames(val: string): string[] {
-    //Check if the value is a json array
-    if (!val.startsWith('[') || !val.endsWith(']')) {
-      throw new BadRequestException('Field Names should be a json array');
-    }
-    return JSON.parse(val).map((name: string) => name.toString());
-  }
-
-  // Validate the options passed
   private validate(options: CommandOptions): CommandError[] {
-    if (!options.id && !options.name) {
-      return [new CommandError('Model ID or Model Name is required')];
+    if (!options.name) {
+      return [new CommandError('Model Name is required')];
     }
     return [];
   }

package/src/commands/refresh-module.command.ts

@@ -4,7 +4,6 @@ import { ModuleMetadataService } from '../services/module-metadata.service';
 import { CommandError } from './helper';
 
 interface CommandOptions {
-  id: number;
   name: string;
   dryRun: boolean;
 }
@@ -28,7 +27,6 @@ export class RefreshModuleCommand extends CommandRunner {
       return;
     }
     const codeGenerationOptions = {
-      moduleId: options.id,
       moduleUserKey: options.name,
       dryRun: options.dryRun,
     };
@@ -36,16 +34,7 @@ export class RefreshModuleCommand extends CommandRunner {
   }
 
   @Option({
-    flags: '-i, --id [module ID]',
-    description: 'Module ID from the ss_module_metadata table',
-  })
-  parseId(val: string): number {
-    return +val;
-  }
-
-  // Accept the module name as an argument
-  @Option({
-    flags: '-n, --name [module name]',
+    flags: '-n, --name <module name>',
     description: 'Module Name from the ss_module_metadata table',
   })
   parseName(val: string): string {
@@ -61,11 +50,9 @@ export class RefreshModuleCommand extends CommandRunner {
     return (val === 'false') ? false : true;
   }
 
-
-  // Validate the options passed
   validate(options: CommandOptions): CommandError[] {
-    if (!options.id && !options.name) {
-      return [new CommandError('Module ID or Module Name is required')];
+    if (!options.name) {
+      return [new CommandError('Module Name is required')];
     }
     return [];
   }

package/src/commands/test-data.command.ts

@@ -7,6 +7,7 @@ interface TestDataCommandOptions {
   modulesToTest?: string;
   setup?: boolean;
   teardown?: boolean;
+  unlink?: boolean;
 }
 
 @SubCommand({
@@ -25,17 +26,18 @@ export class TestDataCommand extends CommandRunner {
       const load = Boolean(options?.load);
       const setup = Boolean(options?.setup);
       const teardown = Boolean(options?.teardown);
+      const unlink = Boolean(options?.unlink);
 
-      const selectedModes = [load, setup, teardown].filter(Boolean).length;
+      const selectedModes = [load, setup, teardown, unlink].filter(Boolean).length;
       if (selectedModes > 1) {
-        this.logger.error('Please specify only one of --load, --setup, or --teardown.');
-        console.log('Please specify only one of --load, --setup, or --teardown.');
+        this.logger.error('Please specify only one of --load, --setup, --teardown, or --unlink.');
+        console.log('Please specify only one of --load, --setup, --teardown, or --unlink.');
         return;
       }
 
-      if (!load && !setup && !teardown) {
-        this.logger.error('Please specify one of --load, --setup, or --teardown.');
-        console.log('Please specify one of --load, --setup, or --teardown.');
+      if (!load && !setup && !teardown && !unlink) {
+        this.logger.error('Please specify one of --load, --setup, --teardown, or --unlink.');
+        console.log('Please specify one of --load, --setup, --teardown, or --unlink.');
         return;
       }
 
@@ -65,6 +67,19 @@ export class TestDataCommand extends CommandRunner {
         await this.testDataService.setupTestData(modulesToTest ?? undefined);
         return;
       }
+
+      if (unlink) {
+        const modulesToTest = options?.modulesToTest ? options.modulesToTest.split(',').map((m) => m.trim()).filter(Boolean) : null;
+        if (modulesToTest?.length) {
+          this.logger.log(`Test data unlink for modules: ${modulesToTest.join(', ')}`);
+          console.log(`Test data unlink for modules: ${modulesToTest.join(', ')}`);
+        } else {
+          this.logger.log('Test data unlink for all modules.');
+          console.log('Test data unlink for all modules.');
+        }
+        await this.testDataService.removeTestData(modulesToTest ?? undefined);
+        return;
+      }
     } catch (err: any) {
       const message = err?.message ?? String(err);
       this.logger.error(message);
@@ -109,4 +124,12 @@ export class TestDataCommand extends CommandRunner {
     return val;
   }
 
+  @Option({
+    flags: '--unlink',
+    description: 'Delete test data from testing.data sections in reverse order',
+  })
+  parseUnlink(): boolean {
+    return true;
+  }
+
 }

package/src/constants/error-messages.ts

@@ -28,6 +28,7 @@ export const ERROR_MESSAGES = {
     ACCESS_DENIED: 'Access denied',
     INVALID_USER_PROFILE: 'Invalid user profile',
     GOOGLE_OAUTH_PROFILE_FETCH_FAILED: 'Failed to fetch user profile from Google OAuth service',
+    MICROSOFT_ACTIVE_DIRECTORY_OAUTH_PROFILE_FETCH_FAILED: 'Failed to fetch user profile from Microsoft Active Directory OAuth service',
     LOGOUT_FAILED: 'Logout failed due to an unexpected error.',
 
     INVALID_CREDENTIALS: 'Invalid credentials',
@@ -130,4 +131,4 @@ export const ERROR_MESSAGES = {
       `You do not have permission to import ${model ?? 'these'} records.`,
     } as Record<string, (model?: string) => string>,
 
-};
+};

package/src/controllers/chatter-message.controller.ts

@@ -5,6 +5,7 @@ import { ChatterMessageService } from '../services/chatter-message.service';
 import { CreateChatterMessageDto } from '../dtos/create-chatter-message.dto';
 import { UpdateChatterMessageDto } from '../dtos/update-chatter-message.dto';
 import { PostChatterMessageDto } from '../dtos/post-chatter-message.dto';
+import { UpdateChatterNoteMessageDto } from '../dtos/update-chatter-note-message.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { Public } from 'src/decorators/public.decorator';
@@ -127,4 +128,15 @@ export class ChatterMessageController {
   async markCompleted(@Param('id') id: string) {
     return this.service.markCompleted(+id);
   }
+
+  @ApiBearerAuth("jwt")
+  @Patch(':id/note')
+  @UseInterceptors(AnyFilesInterceptor())
+  async updateCustomNoteMessage(
+    @Param('id') id: string,
+    @Body() updateDto: UpdateChatterNoteMessageDto,
+    @UploadedFiles() files: Array<Express.Multer.File>,
+  ) {
+    return this.service.updateCustomNoteMessage(+id, updateDto, files);
+  }
 }

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);
+    }
 }
+