@researchdatabox/redbox-core 0.0.0-bootstrap.0 → 0.0.1-beta.10173

package/dist/services/DashboardConfigService.js

@@ -0,0 +1,315 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Services = void 0;
+const rxjs_1 = require("rxjs");
+const CoreService_1 = require("../CoreService");
+var Services;
+(function (Services) {
+    class DashboardConfig extends CoreService_1.Services.Core.Service {
+        _exportedMethods = [
+            'bootstrap',
+            'getDashboardConfigInfo',
+            'getDashboardOverrides',
+            'saveDashboardOverrides',
+            'getWorkflowStateDashboardConfig',
+            'saveWorkflowStateDashboardConfig',
+            'getDashboardViewStepConfig',
+            'saveDashboardViewStepConfig',
+            'getEffectiveDashboardType',
+            'getDefaultDashboardTableConfig',
+            'getMergedDashboardTableConfig',
+            'getMergedDashboardViewTableConfig',
+            'getMergedDashboardTypeFormatRules'
+        ];
+        async bootstrap() {
+            sails.log.verbose('DashboardConfigService bootstrapped');
+        }
+        getDefaultDashboardTableConfig() {
+            return {
+                rowConfig: [
+                    {
+                        title: 'Record Title',
+                        variable: 'metadata.title',
+                        template: `<a href='{{rootContext}}/{{branding}}/{{portal}}/record/view/{{oid}}'>{{metadata.title}}</a>
+            <span class="dashboard-controls">
+              {{#if hasEditAccess}}
+                <a href='{{rootContext}}/{{branding}}/{{portal}}/record/edit/{{oid}}' aria-label='{{t "edit-link-label"}}'><i class="fa fa-pencil" aria-hidden="true"></i></a>
+              {{/if}}
+            </span>
+          `,
+                        initialSort: 'desc'
+                    },
+                    {
+                        title: 'header-ci',
+                        variable: 'metadata.contributor_ci.text_full_name',
+                        template: '{{#if metadata.contributor_ci}}{{metadata.contributor_ci.text_full_name}}{{/if}}',
+                        initialSort: 'desc'
+                    },
+                    {
+                        title: 'header-data-manager',
+                        variable: 'metadata.contributor_data_manager.text_full_name',
+                        template: '{{#if metadata.contributor_data_manager}}{{metadata.contributor_data_manager.text_full_name}}{{/if}}',
+                        initialSort: 'desc'
+                    },
+                    {
+                        title: 'header-created',
+                        variable: 'metaMetadata.createdOn',
+                        template: '{{formatDateLocale dateCreated "DATETIME_MED"}}',
+                        initialSort: 'desc'
+                    },
+                    {
+                        title: 'header-modified',
+                        variable: 'metaMetadata.lastSaveDate',
+                        template: '{{formatDateLocale dateModified "DATETIME_MED"}}',
+                        initialSort: 'desc',
+                        defaultSort: true
+                    }
+                ]
+            };
+        }
+        normalizeTableConfig(config) {
+            return _.isEmpty(config) ? this.getDefaultDashboardTableConfig() : _.cloneDeep(config);
+        }
+        normalizeDashboardTypeDefinition(definition) {
+            if (!definition) {
+                return null;
+            }
+            return {
+                name: definition.name,
+                description: definition.description,
+                searchable: definition.searchable ?? true,
+                system: definition.system ?? false,
+                formatRules: _.cloneDeep(definition.formatRules ?? {}),
+                tableConfig: this.normalizeTableConfig(definition.tableConfig)
+            };
+        }
+        normalizeOverrides(overrides) {
+            return {
+                recordTypes: overrides?.recordTypes ?? {},
+                views: overrides?.views ?? {}
+            };
+        }
+        mergeTableConfigs(...configs) {
+            const validConfigs = configs.filter((config) => !_.isEmpty(config));
+            if (validConfigs.length === 0) {
+                return this.getDefaultDashboardTableConfig();
+            }
+            return _.mergeWith({}, ...validConfigs, (_objValue, srcValue) => {
+                if (_.isArray(srcValue)) {
+                    // Dashboard table config arrays are override-only; do not rely on lodash's default index-wise array merge.
+                    return _.cloneDeep(srcValue);
+                }
+                return undefined;
+            });
+        }
+        async getDashboardTypeDefinitionForBrand(brand, dashboardType) {
+            if (typeof DashboardTypesService !== 'undefined' && DashboardTypesService.getDashboardTypeDefinition) {
+                const type = await DashboardTypesService.getDashboardTypeDefinition(brand, dashboardType);
+                if (type) {
+                    return this.normalizeDashboardTypeDefinition({
+                        name: type.name,
+                        description: type.description,
+                        searchable: type.searchable,
+                        system: type.system,
+                        formatRules: type.formatRules,
+                        tableConfig: type.tableConfig
+                    });
+                }
+            }
+            const fallback = await (0, rxjs_1.firstValueFrom)(DashboardTypesService.get(brand, dashboardType));
+            if (!fallback) {
+                return null;
+            }
+            return this.normalizeDashboardTypeDefinition({
+                name: fallback.name,
+                description: fallback.description,
+                searchable: fallback.searchable,
+                system: fallback.system,
+                formatRules: fallback.formatRules,
+                tableConfig: fallback.tableConfig
+            });
+        }
+        async getDashboardConfigInfo(brand) {
+            const recordTypes = await (0, rxjs_1.firstValueFrom)(RecordTypesService.getAll(brand));
+            const recordTypeInfos = [];
+            for (const recType of recordTypes) {
+                const steps = await (0, rxjs_1.firstValueFrom)(WorkflowStepsService.getAllForRecordType(recType));
+                recordTypeInfos.push({
+                    name: String(recType.name ?? ''),
+                    steps: steps.map((s) => s.name || '').filter(Boolean)
+                });
+            }
+            const views = [];
+            if (sails.config.dashboardview) {
+                for (const viewName of Object.keys(sails.config.dashboardview)) {
+                    const viewDef = sails.config.dashboardview[viewName];
+                    views.push({
+                        name: viewName,
+                        steps: viewDef.steps?.map((s) => s.name) || []
+                    });
+                }
+            }
+            const dashboardTypes = typeof DashboardTypesService !== 'undefined' && DashboardTypesService.getAllDashboardTypeDefinitions
+                ? await DashboardTypesService.getAllDashboardTypeDefinitions(brand)
+                : [];
+            return { recordTypes: recordTypeInfos, views, dashboardTypes };
+        }
+        async getDashboardOverrides(brand) {
+            const overrides = await AppConfigService.getAppConfigByBrandAndKey(String(brand.id), 'dashboardTableConfig');
+            if (overrides && typeof overrides === 'object') {
+                return this.normalizeOverrides(overrides);
+            }
+            return this.normalizeOverrides(null);
+        }
+        async saveDashboardOverrides(brand, overrides) {
+            const normalized = this.normalizeOverrides(overrides);
+            await AppConfigService.createOrUpdateConfig(brand, 'dashboardTableConfig', normalized);
+            return normalized;
+        }
+        getWorkflowStateConfig(overrides, recordType, workflowStage) {
+            const recordTypeOverride = overrides.recordTypes?.[recordType];
+            return recordTypeOverride?.steps?.[workflowStage] ?? recordTypeOverride?.default ?? null;
+        }
+        getViewStateConfig(overrides, viewName, stepName) {
+            const viewOverride = overrides.views?.[viewName];
+            return viewOverride?.steps?.[stepName] ?? viewOverride?.default ?? null;
+        }
+        async getWorkflowStateDashboardConfig(brand, recordType, workflowStage) {
+            const overrides = await this.getDashboardOverrides(brand);
+            return this.getWorkflowStateConfig(overrides, recordType, workflowStage);
+        }
+        async saveWorkflowStateDashboardConfig(brand, recordType, workflowStage, config) {
+            if (!config?.dashboardType) {
+                throw new Error('dashboardType is required');
+            }
+            const overrides = await this.getDashboardOverrides(brand);
+            const recordTypeOverride = overrides.recordTypes?.[recordType] ?? {};
+            const steps = { ...(recordTypeOverride.steps ?? {}) };
+            steps[workflowStage] = {
+                dashboardType: config.dashboardType,
+                ...(_.isEmpty(config.tableConfig) ? {} : { tableConfig: this.normalizeTableConfig(config.tableConfig) })
+            };
+            overrides.recordTypes = {
+                ...(overrides.recordTypes ?? {}),
+                [recordType]: {
+                    ...(recordTypeOverride ?? {}),
+                    steps
+                }
+            };
+            await this.saveDashboardOverrides(brand, overrides);
+            return overrides;
+        }
+        async getDashboardViewStepConfig(brand, viewName, stepName) {
+            const overrides = await this.getDashboardOverrides(brand);
+            return this.getViewStateConfig(overrides, viewName, stepName);
+        }
+        async saveDashboardViewStepConfig(brand, viewName, stepName, config) {
+            if (!config?.dashboardType) {
+                throw new Error('dashboardType is required');
+            }
+            const overrides = await this.getDashboardOverrides(brand);
+            const viewOverride = overrides.views?.[viewName] ?? {};
+            const steps = { ...(viewOverride.steps ?? {}) };
+            steps[stepName] = {
+                dashboardType: config.dashboardType,
+                ...(_.isEmpty(config.tableConfig) ? {} : { tableConfig: this.normalizeTableConfig(config.tableConfig) })
+            };
+            overrides.views = {
+                ...(overrides.views ?? {}),
+                [viewName]: {
+                    ...(viewOverride ?? {}),
+                    steps
+                }
+            };
+            await this.saveDashboardOverrides(brand, overrides);
+            return overrides;
+        }
+        async getEffectiveDashboardType(brand, context) {
+            const fallback = context.fallbackDashboardType ?? 'standard';
+            const overrides = await this.getDashboardOverrides(brand);
+            if (context.kind === 'recordType') {
+                const stateConfig = this.getWorkflowStateConfig(overrides, context.recordType, context.workflowStage);
+                return stateConfig?.dashboardType ?? fallback;
+            }
+            const stateConfig = this.getViewStateConfig(overrides, context.viewName, context.stepName);
+            const dashboardView = sails.config.dashboardview?.[context.viewName];
+            return stateConfig?.dashboardType ?? dashboardView?.dashboardType ?? fallback;
+        }
+        async getMergedDashboardTableConfig(brand, recordType, workflowStage, fallbackDashboardType = 'standard') {
+            const recType = await (0, rxjs_1.firstValueFrom)(RecordTypesService.get(brand, recordType));
+            if (!recType) {
+                sails.log.warn(`DashboardConfigService: Record type not found: ${recordType}`);
+                return null;
+            }
+            const workflowStep = await (0, rxjs_1.firstValueFrom)(WorkflowStepsService.get(recType, workflowStage));
+            if (!workflowStep) {
+                sails.log.warn(`DashboardConfigService: Workflow step not found: ${workflowStage} for record type: ${recordType}`);
+                return null;
+            }
+            const overrides = await this.getDashboardOverrides(brand);
+            const effectiveType = await this.getEffectiveDashboardType(brand, {
+                kind: 'recordType',
+                recordType,
+                workflowStage,
+                fallbackDashboardType
+            });
+            const typeDefinition = await this.getDashboardTypeDefinitionForBrand(brand, effectiveType);
+            const inheritedTypeConfig = this.normalizeTableConfig(typeDefinition?.tableConfig);
+            const rawWorkflowConfig = _.get(workflowStep, 'config.dashboard.table');
+            const workflowConfig = _.isEmpty(rawWorkflowConfig) ? null : this.normalizeTableConfig(rawWorkflowConfig);
+            const recordTypeOverride = overrides.recordTypes?.[recordType];
+            const overrideConfig = recordTypeOverride?.steps?.[workflowStage]?.tableConfig
+                ?? recordTypeOverride?.default?.tableConfig
+                ?? null;
+            const mergedConfig = this.mergeTableConfigs(inheritedTypeConfig, workflowConfig, overrideConfig);
+            const formatRules = _.merge({}, typeDefinition?.formatRules ?? {}, workflowConfig?.formatRules ?? {}, overrideConfig?.formatRules ?? {});
+            return {
+                dashboardType: effectiveType,
+                inheritedTypeConfig,
+                workflowConfig,
+                overrideConfig,
+                mergedConfig,
+                formatRules
+            };
+        }
+        async getMergedDashboardViewTableConfig(brand, viewName, stepName, fallbackDashboardType = 'standard') {
+            const viewDef = sails.config.dashboardview?.[viewName];
+            if (!viewDef) {
+                sails.log.warn(`DashboardConfigService: Dashboard view not found: ${viewName}`);
+                return null;
+            }
+            const stepDef = viewDef.steps?.find((s) => s.name === stepName);
+            if (!stepDef) {
+                sails.log.warn(`DashboardConfigService: Dashboard view step not found: ${viewName}/${stepName}`);
+                return null;
+            }
+            const overrides = await this.getDashboardOverrides(brand);
+            const stateConfig = this.getViewStateConfig(overrides, viewName, stepName);
+            const effectiveType = stateConfig?.dashboardType ?? viewDef.dashboardType ?? fallbackDashboardType;
+            const typeDefinition = await this.getDashboardTypeDefinitionForBrand(brand, effectiveType);
+            const inheritedTypeConfig = this.normalizeTableConfig(typeDefinition?.tableConfig);
+            const rawWorkflowConfig = stepDef.dashboardTable;
+            const workflowConfig = _.isEmpty(rawWorkflowConfig) ? null : this.normalizeTableConfig(rawWorkflowConfig);
+            const viewOverride = overrides.views?.[viewName];
+            const overrideConfig = viewOverride?.steps?.[stepName]?.tableConfig
+                ?? viewOverride?.default?.tableConfig
+                ?? null;
+            const mergedConfig = this.mergeTableConfigs(inheritedTypeConfig, workflowConfig, overrideConfig);
+            const formatRules = _.merge({}, typeDefinition?.formatRules ?? {}, viewDef.formatRulesOverride ?? {}, workflowConfig?.formatRules ?? {}, overrideConfig?.formatRules ?? {});
+            return {
+                dashboardType: effectiveType,
+                inheritedTypeConfig,
+                workflowConfig,
+                overrideConfig,
+                mergedConfig,
+                formatRules
+            };
+        }
+        async getMergedDashboardTypeFormatRules(brand, dashboardType) {
+            const typeDefinition = await this.getDashboardTypeDefinitionForBrand(brand, dashboardType);
+            return typeDefinition?.formatRules ?? null;
+        }
+    }
+    Services.DashboardConfig = DashboardConfig;
+})(Services || (exports.Services = Services = {}));
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DashboardConfigService.js","sourceRoot":"","sources":["../../src/services/DashboardConfigService.ts"],"names":[],"mappings":"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"}

package/dist/services/DashboardTypesService.d.ts

@@ -2,13 +2,32 @@ import { Observable } from 'rxjs';
 import { Services as services } from '../CoreService';
 import { BrandingModel } from '../model/storage/BrandingModel';
 import { DashboardTypeModel } from '../model/storage/DashboardTypeModel';
-import { TemplateCompileInput } from "@researchdatabox/sails-ng-common";
-import type { DashboardTypeDefinition } from '../config/dashboardtype.config';
+import { TemplateCompileInput } from '@researchdatabox/sails-ng-common';
+import type { DashboardViewDefinition, DashboardViewStepDefinition } from '../config/dashboardview.config';
+import type { DashboardTableConfig as WorkflowDashboardTableConfig } from '../config/workflow.config';
+import type { DashboardTypeConfigData } from '../configmodels/DashboardTableOverrideConfig';
+type DashboardTypeDefinition = {
+    name: string;
+    description?: string;
+    formatRules: Record<string, unknown>;
+    tableConfig?: WorkflowDashboardTableConfig;
+    searchable?: boolean;
+    system?: boolean;
+};
+type DashboardTypeInput = {
+    name?: string;
+    description?: string;
+    formatRules?: Record<string, unknown>;
+    tableConfig?: WorkflowDashboardTableConfig;
+    searchable?: boolean;
+    system?: boolean;
+};
+type DashboardTypeCreateInput = DashboardTypeInput & {
+    name: string;
+};
+type DashboardTypeUpdateInput = DashboardTypeInput;
 export declare namespace Services {
-    /**
-     * Dashboard row configuration interface
-     */
-    export interface DashboardRowConfig {
+    interface DashboardRowConfig {
         title: string;
         variable: string;
         template: string;
@@ -16,83 +35,62 @@ export declare namespace Services {
         defaultSort?: boolean;
         secondarySort?: string;
     }
-    /**
-     * Dashboard table configuration interface
-     */
-    export interface DashboardTableConfig {
-        rowConfig?: DashboardRowConfig[];
-        rowRulesConfig?: DashboardRuleSet[];
-        groupRowConfig?: DashboardRowConfig[];
-        groupRowRulesConfig?: DashboardRuleSet[];
-        formatRules?: Record<string, unknown>;
-    }
-    /**
-     * Top-level dashboard configuration interface for a record type
-     * This is configured at the recordtype level (not workflow-specific)
-     */
-    export interface RecordTypeDashboardConfig {
-        /** Whether to show the admin sidebar on the dashboard page */
+    type DashboardTableConfig = WorkflowDashboardTableConfig;
+    interface RecordTypeDashboardConfig {
         showAdminSideBar?: boolean;
     }
-    export interface DashboardRule {
+    interface DashboardRule {
         renderItemTemplate?: string;
         evaluateRulesTemplate?: string;
-        [key: string]: unknown;
+        name?: string;
+        action?: string;
+        mode?: string;
     }
-    export interface DashboardRuleSet {
+    interface DashboardRuleSet {
         ruleSetName: string;
+        applyRuleSet?: boolean;
         rules?: DashboardRule[];
-        [key: string]: unknown;
+        type?: string;
+        separator?: string;
+        mode?: string;
     }
-    type DashboardTypeConfig = DashboardTypeDefinition & {
-        searchFilters?: unknown;
-        searchable?: boolean;
-    };
-    /**
-     * Dashboard Types related functions...
-     */
-    export class DashboardTypes extends services.Core.Service {
+    type DashboardViewConfig = DashboardViewDefinition;
+    type DashboardViewStepConfig = DashboardViewStepDefinition;
+    type DashboardTypeConfig = Omit<DashboardTypeDefinition, 'name'> & DashboardTypeConfigData;
+    class DashboardTypes extends services.Core.Service {
         protected _exportedMethods: string[];
         protected dashboardTypes: DashboardTypeModel[];
+        private defaultTableConfig;
+        private normalizeTableConfig;
+        private isConfiguredSystemDashboardType;
+        private normalizeDashboardTypeRecord;
+        private normalizeDashboardTypeInput;
+        private findDashboardTypeRecord;
+        private addAssignedDashboardTypesFromConfig;
+        private listAssignedDashboardTypeNames;
         bootstrap(defBrand: BrandingModel): Promise<DashboardTypeModel[]>;
         create(brand: BrandingModel, name: string, config: DashboardTypeConfig): Observable<DashboardTypeModel>;
+        createDashboardType(brand: BrandingModel, input: DashboardTypeCreateInput): Observable<DashboardTypeModel>;
         get(brand: BrandingModel, name: string): Observable<DashboardTypeModel | null>;
         getAll(brand: BrandingModel): Observable<DashboardTypeModel[]>;
-        private defaultRowConfig;
-        /**
-         * Get the dashboard table configuration for a specific record type and workflow stage.
-         * Resolves configuration from workflow config, merging with any branding-specific overrides.
-         *
-         * @param brand The branding model
-         * @param recordType The record type name
-         * @param workflowStage The workflow stage name
-         * @returns The dashboard table configuration
-         */
+        getAllDashboardTypeDefinitions(brand: BrandingModel): Promise<DashboardTypeModel[]>;
+        getDashboardTypeDefinition(brand: BrandingModel, name: string): Promise<DashboardTypeModel | null>;
+        updateDashboardType(brand: BrandingModel, name: string, input: DashboardTypeUpdateInput): Observable<DashboardTypeModel>;
+        deleteDashboardType(brand: BrandingModel, name: string): Observable<{
+            deleted: boolean;
+        }>;
         getDashboardTableConfig(brand: BrandingModel, recordType: string, workflowStage: string): Promise<DashboardTableConfig | null>;
-        /**
-         * Get the top-level dashboard configuration for a specific record type.
-         * This configuration is stored at the recordtype level, not the workflow step level.
-         *
-         * @param brand The branding model
-         * @param recordType The record type name
-         * @returns The record type dashboard configuration, or null if not found
-         */
         getRecordTypeDashboardConfig(brand: BrandingModel, recordType: string): Promise<RecordTypeDashboardConfig | null>;
-        /**
-         * Extract templates from dashboard configuration and prepare them for pre-compilation.
-         * Converts dashboard row templates to TemplateCompileInput format for Handlebars pre-compilation.
-         *
-         * @param brand The branding model
-         * @param recordType The record type name
-         * @param workflowStage The workflow stage name
-         * @param dashboardType The dashboard type name (default: standard)
-         * @returns Array of templates ready for compilation
-         */
+        getDashboardView(name: string): DashboardViewConfig | null;
+        getDashboardViewStep(name: string, stepName: string): DashboardViewStepConfig | null;
+        private extractQueryFilterTemplates;
+        private extractDashboardTableTemplates;
         extractDashboardTemplates(brand: BrandingModel, recordType: string, workflowStage: string, dashboardType?: string): Promise<TemplateCompileInput[]>;
+        extractDashboardViewTemplates(brand: BrandingModel, dashboardView: string, stepName: string, dashboardType?: string): Promise<TemplateCompileInput[]>;
     }
-    export {};
 }
 declare global {
     let DashboardTypesService: Services.DashboardTypes;
 }
+export {};
 //# sourceMappingURL=DashboardTypesService.d.ts.map

package/dist/services/DashboardTypesService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardTypesService.d.ts","sourceRoot":"","sources":["../../src/services/DashboardTypesService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DashboardTypesService.d.ts","sourceRoot":"","sources":["../../src/services/DashboardTypesService.ts"],"names":[],"mappings":"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"}