@researchdatabox/redbox-core 5.0.4-beta.12498 → 5.0.4

package/dist/services/DashboardTypesService.d.ts

@@ -6,7 +6,6 @@ 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';
-import type { DashboardTarget } from '../configmodels/DashboardSettings';
 type DashboardTypeDefinition = {
     name: string;
     description?: string;
@@ -80,24 +79,14 @@ export declare namespace Services {
         deleteDashboardType(brand: BrandingModel, name: string): Observable<{
             deleted: boolean;
         }>;
-        /**
-         * The independent table settings for a workflow stage. There is no profile,
-         * override or built-in fallback: missing settings return null.
-         */
         getDashboardTableConfig(brand: BrandingModel, recordType: string, workflowStage: string): Promise<DashboardTableConfig | null>;
         getRecordTypeDashboardConfig(brand: BrandingModel, recordType: string): Promise<RecordTypeDashboardConfig | null>;
         getDashboardView(name: string): DashboardViewConfig | null;
         getDashboardViewStep(name: string, stepName: string): DashboardViewStepConfig | null;
-        /**
-         * Template key prefix shared with the dashboard client. It identifies the
-         * brand, target and exact settings version, so a page never mixes templates
-         * from different saves.
-         */
-        buildDashboardTemplateKeyPrefix(brandName: string, target: DashboardTarget, settingsFingerprint: string): string[];
-        private extractSettingsTemplates;
-        private extractTargetTemplates;
-        extractDashboardTemplates(brand: BrandingModel, recordType: string, workflowStage: string, settingsFingerprint?: string): Promise<TemplateCompileInput[]>;
-        extractDashboardViewTemplates(brand: BrandingModel, dashboardView: string, stepName: string, settingsFingerprint?: string): Promise<TemplateCompileInput[]>;
+        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[]>;
     }
 }
 declare global {

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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"}

package/dist/services/DashboardTypesService.js

@@ -21,8 +21,7 @@ var Services;
             'extractDashboardTemplates',
             'getDashboardView',
             'getDashboardViewStep',
-            'extractDashboardViewTemplates',
-            'buildDashboardTemplateKeyPrefix'
+            'extractDashboardViewTemplates'
         ];
         dashboardTypes = [];
         defaultTableConfig() {
@@ -118,18 +117,7 @@ var Services;
             }
         }
         async listAssignedDashboardTypeNames(brand) {
-            // Retired overrides may still reference profiles; read the latest legacy row directly.
-            const legacyRows = await AppConfig.find({ branding: brand.id, configKey: 'dashboardTableConfig' });
-            const timestamp = (row) => {
-                const updatedAt = Date.parse(String(row.updatedAt ?? ''));
-                if (!Number.isNaN(updatedAt)) {
-                    return updatedAt;
-                }
-                const createdAt = Date.parse(String(row.createdAt ?? ''));
-                return Number.isNaN(createdAt) ? 0 : createdAt;
-            };
-            const latestLegacyRow = legacyRows.reduce((latest, row) => !latest || timestamp(row) >= timestamp(latest) ? row : latest, undefined);
-            const overrides = (latestLegacyRow?.configData ?? {});
+            const overrides = await AppConfigService.getAppConfigByBrandAndKey(String(brand.id), 'dashboardTableConfig');
             const assigned = new Set();
             for (const recordType of Object.values(overrides.recordTypes ?? {})) {
                 if (recordType.default?.dashboardType) {
@@ -274,13 +262,32 @@ var Services;
                 return { deleted: true };
             })());
         }
-        /**
-         * The independent table settings for a workflow stage. There is no profile,
-         * override or built-in fallback: missing settings return null.
-         */
         async getDashboardTableConfig(brand, recordType, workflowStage) {
-            const runtime = await DashboardConfigService.getRuntimeTargetSettings(brand, { kind: 'workflow', recordType, stage: workflowStage });
-            return runtime ? runtime.settings.tableConfig : null;
+            try {
+                if (typeof DashboardConfigService !== 'undefined' && DashboardConfigService.getMergedDashboardTableConfig) {
+                    const mergedConfig = await DashboardConfigService.getMergedDashboardTableConfig(brand, recordType, workflowStage);
+                    if (mergedConfig) {
+                        sails.log.verbose(`DashboardTypesService: using merged config for ${recordType}/${workflowStage}`);
+                        return mergedConfig.mergedConfig;
+                    }
+                }
+                const recType = await (0, rxjs_1.firstValueFrom)(RecordTypesService.get(brand, recordType));
+                if (!recType) {
+                    sails.log.warn(`Record type not found: ${recordType}`);
+                    return null;
+                }
+                const workflowStep = await (0, rxjs_1.firstValueFrom)(WorkflowStepsService.get(recType, workflowStage));
+                if (!workflowStep) {
+                    sails.log.warn(`Workflow step not found: ${workflowStage} for record type: ${recordType}`);
+                    return null;
+                }
+                const dashboardConfig = _.get(workflowStep, 'config.dashboard.table', {});
+                return this.normalizeTableConfig(dashboardConfig);
+            }
+            catch (error) {
+                sails.log.error(`Error getting dashboard table config for ${recordType}/${workflowStage}:`, error);
+                return null;
+            }
         }
         async getRecordTypeDashboardConfig(brand, recordType) {
             try {
@@ -316,72 +323,132 @@ var Services;
             }
             return dashboardStep;
         }
-        /**
-         * Template key prefix shared with the dashboard client. It identifies the
-         * brand, target and exact settings version, so a page never mixes templates
-         * from different saves.
-         */
-        buildDashboardTemplateKeyPrefix(brandName, target, settingsFingerprint) {
-            return target.kind === 'workflow'
-                ? [brandName, 'workflow', target.recordType, target.stage, settingsFingerprint.slice(0, 16)]
-                : [brandName, 'view', target.view, target.step, settingsFingerprint.slice(0, 16)];
+        async extractQueryFilterTemplates(brand, queryRecordType, dashboardType, templateKeyPrefix) {
+            const entries = [];
+            try {
+                const dashboardTypeModel = typeof DashboardConfigService !== 'undefined' && DashboardConfigService.getMergedDashboardTypeFormatRules
+                    ? await DashboardConfigService.getMergedDashboardTypeFormatRules(brand, dashboardType)
+                    : (await (0, rxjs_1.firstValueFrom)(this.get(brand, dashboardType)))?.formatRules;
+                const queryFilters = _.get(dashboardTypeModel, `queryFilters.${queryRecordType}`);
+                if (_.isArray(queryFilters)) {
+                    for (let i = 0; i < queryFilters.length; i++) {
+                        const queryFilter = queryFilters[i];
+                        if (_.isArray(queryFilter.filterFields)) {
+                            for (let j = 0; j < queryFilter.filterFields.length; j++) {
+                                const filterField = queryFilter.filterFields[j];
+                                if (filterField.template) {
+                                    entries.push({
+                                        key: [...templateKeyPrefix, dashboardType, 'filters', i.toString(), 'fields', j.toString(), 'template'],
+                                        kind: 'handlebars',
+                                        value: filterField.template
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                sails.log.warn(`Could not load dashboard type ${dashboardType} for template extraction`, e);
+            }
+            return entries;
         }
-        extractSettingsTemplates(prefix, settings) {
+        extractDashboardTableTemplates(configKeyPrefix, dashboardConfig) {
             const entries = [];
-            const table = settings.tableConfig;
-            // Empty column lists stay empty; no built-in columns are substituted.
-            table.rowConfig.forEach((row, i) => {
+            if (!dashboardConfig) {
+                return entries;
+            }
+            const rowConfig = (!_.isEmpty(dashboardConfig.rowConfig)) ? dashboardConfig.rowConfig : this.defaultTableConfig().rowConfig;
+            for (let i = 0; i < rowConfig.length; i++) {
+                const row = rowConfig[i];
                 if (row.template) {
-                    entries.push({ key: [...prefix, 'rowConfig', i.toString(), row.variable], kind: 'handlebars', value: row.template });
+                    entries.push({
+                        key: [...configKeyPrefix, 'rowConfig', i.toString(), row.variable],
+                        kind: 'handlebars',
+                        value: row.template
+                    });
                 }
-            });
-            table.groupRowConfig.forEach((row, i) => {
+            }
+            const groupRowConfig = dashboardConfig.groupRowConfig || [];
+            for (let i = 0; i < groupRowConfig.length; i++) {
+                const row = groupRowConfig[i];
                 if (row.template) {
-                    entries.push({ key: [...prefix, 'groupRowConfig', i.toString(), row.variable], kind: 'handlebars', value: row.template });
-                }
-            });
-            const addRules = (sets, kind) => {
-                for (const ruleSet of sets) {
-                    (ruleSet.rules || []).forEach((rule, ruleIdx) => {
-                        if (rule.renderItemTemplate) {
-                            entries.push({ key: [...prefix, kind, ruleSet.ruleSetName, ruleIdx.toString(), 'render'], kind: 'handlebars', value: rule.renderItemTemplate });
-                        }
-                        if (rule.evaluateRulesTemplate) {
-                            entries.push({ key: [...prefix, kind, ruleSet.ruleSetName, ruleIdx.toString(), 'evaluate'], kind: 'handlebars', value: rule.evaluateRulesTemplate });
-                        }
+                    entries.push({
+                        key: [...configKeyPrefix, 'groupRowConfig', i.toString(), row.variable],
+                        kind: 'handlebars',
+                        value: row.template
                     });
                 }
-            };
-            addRules(table.rowRulesConfig, 'rowRules');
-            addRules(table.groupRowRulesConfig, 'groupRowRules');
-            for (const [recordTypeKey, queryFilters] of Object.entries(table.formatRules.queryFilters ?? {})) {
-                (queryFilters || []).forEach((queryFilter, i) => {
-                    (queryFilter.filterFields || []).forEach((filterField, j) => {
-                        if (filterField.template) {
-                            entries.push({ key: [...prefix, 'filters', recordTypeKey, i.toString(), 'fields', j.toString(), 'template'], kind: 'handlebars', value: filterField.template });
-                        }
-                    });
-                });
             }
-            return entries;
-        }
-        async extractTargetTemplates(brand, target, settingsFingerprint) {
-            const runtime = await DashboardConfigService.getRuntimeTargetSettings(brand, target, settingsFingerprint);
-            if (!runtime) {
-                return [];
+            const rowRulesConfig = dashboardConfig.rowRulesConfig || [];
+            for (let ruleSetIdx = 0; ruleSetIdx < rowRulesConfig.length; ruleSetIdx++) {
+                const ruleSet = rowRulesConfig[ruleSetIdx];
+                const rules = ruleSet.rules || [];
+                for (let ruleIdx = 0; ruleIdx < rules.length; ruleIdx++) {
+                    const rule = rules[ruleIdx];
+                    if (rule.renderItemTemplate) {
+                        entries.push({
+                            key: [...configKeyPrefix, 'rowRules', ruleSet.ruleSetName, ruleIdx.toString(), 'render'],
+                            kind: 'handlebars',
+                            value: rule.renderItemTemplate
+                        });
+                    }
+                    if (rule.evaluateRulesTemplate) {
+                        entries.push({
+                            key: [...configKeyPrefix, 'rowRules', ruleSet.ruleSetName, ruleIdx.toString(), 'evaluate'],
+                            kind: 'handlebars',
+                            value: rule.evaluateRulesTemplate
+                        });
+                    }
+                }
+            }
+            const groupRowRulesConfig = dashboardConfig.groupRowRulesConfig || [];
+            for (let ruleSetIdx = 0; ruleSetIdx < groupRowRulesConfig.length; ruleSetIdx++) {
+                const ruleSet = groupRowRulesConfig[ruleSetIdx];
+                const rules = ruleSet.rules || [];
+                for (let ruleIdx = 0; ruleIdx < rules.length; ruleIdx++) {
+                    const rule = rules[ruleIdx];
+                    if (rule.renderItemTemplate) {
+                        entries.push({
+                            key: [...configKeyPrefix, 'groupRowRules', ruleSet.ruleSetName, ruleIdx.toString(), 'render'],
+                            kind: 'handlebars',
+                            value: rule.renderItemTemplate
+                        });
+                    }
+                    if (rule.evaluateRulesTemplate) {
+                        entries.push({
+                            key: [...configKeyPrefix, 'groupRowRules', ruleSet.ruleSetName, ruleIdx.toString(), 'evaluate'],
+                            kind: 'handlebars',
+                            value: rule.evaluateRulesTemplate
+                        });
+                    }
+                }
             }
-            return this.extractSettingsTemplates(this.buildDashboardTemplateKeyPrefix(brand.name, target, runtime.fingerprint), runtime.settings);
+            return entries;
         }
-        async extractDashboardTemplates(brand, recordType, workflowStage, settingsFingerprint) {
-            return this.extractTargetTemplates(brand, { kind: 'workflow', recordType, stage: workflowStage }, settingsFingerprint);
+        async extractDashboardTemplates(brand, recordType, workflowStage, dashboardType = 'standard') {
+            const dashboardConfig = await this.getDashboardTableConfig(brand, recordType, workflowStage);
+            const entries = this.extractDashboardTableTemplates([recordType, workflowStage], dashboardConfig);
+            entries.push(...await this.extractQueryFilterTemplates(brand, recordType, dashboardType, [recordType]));
+            return entries;
         }
-        async extractDashboardViewTemplates(brand, dashboardView, stepName, settingsFingerprint) {
-            if (!this.getDashboardViewStep(dashboardView, stepName)) {
+        async extractDashboardViewTemplates(brand, dashboardView, stepName, dashboardType) {
+            const dashboardViewConfig = this.getDashboardView(dashboardView);
+            const dashboardStepConfig = this.getDashboardViewStep(dashboardView, stepName);
+            if (!dashboardViewConfig || !dashboardStepConfig) {
                 return [];
             }
-            return this.extractTargetTemplates(brand, { kind: 'view', view: dashboardView, step: stepName }, settingsFingerprint);
+            const resolvedDashboardType = dashboardType || dashboardViewConfig.dashboardType;
+            let mergedTableConfig = dashboardStepConfig.dashboardTable ?? null;
+            if (typeof DashboardConfigService !== 'undefined' && DashboardConfigService.getMergedDashboardViewTableConfig) {
+                const mergedConfig = await DashboardConfigService.getMergedDashboardViewTableConfig(brand, dashboardView, stepName);
+                mergedTableConfig = mergedConfig?.mergedConfig ?? mergedTableConfig;
+            }
+            const entries = this.extractDashboardTableTemplates([dashboardView, stepName], mergedTableConfig);
+            entries.push(...await this.extractQueryFilterTemplates(brand, dashboardStepConfig.sourceRecordType, resolvedDashboardType, [dashboardView]));
+            return entries;
         }
     }
     Services.DashboardTypes = DashboardTypes;
 })(Services || (exports.Services = Services = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DashboardTypesService.js","sourceRoot":"","sources":["../../src/services/DashboardTypesService.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DashboardTypesService.js","sourceRoot":"","sources":["../../src/services/DashboardTypesService.ts"],"names":[],"mappings":"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"}

package/dist/services/DoiService.d.ts

@@ -28,7 +28,7 @@ export declare namespace Services {
          * that record's integration status; without it, the audit is filed under the DOI.
          */
         changeDoiState(brand: BrandingModel, doi: string, event: string, oid?: string): Promise<boolean>;
-        publishDoiTrigger(oid: string, record: DoiRecordModel, options: Record<string, unknown>, user?: Record<string, unknown>): Promise<unknown>;
+        publishDoiTrigger(oid: string, record: DoiRecordModel, options: Record<string, unknown>): Promise<unknown>;
         publishDoiTriggerSync(oid: string, record: DoiRecordModel, options: Record<string, unknown>): Promise<DoiRecordModel>;
         updateDoiTriggerSync(oid: string, record: DoiRecordModel, options: Record<string, unknown>): Promise<DoiRecordModel>;
         addDoiDataToRecord(oid: string, record: DoiRecordModel, doi: string, options?: Record<string, unknown>): Promise<DoiRecordModel>;

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

@@ -1 +1 @@
-{"version":3,"file":"DoiService.d.ts","sourceRoot":"","sources":["../../src/services/DoiService.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAEV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAiBhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGzE,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;AACrC,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC/C,YAAY,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAAC;CAC/C,CAAC;AAkDF,yBAAiB,QAAQ,CAAC;IACxB,MAAa,GAAI,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC5C,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAW3C;QAEF,OAAO,CAAC,UAAU,CAAU;QAE5B,OAAO,CAAC,SAAS;gBAOH,aAAa;QAI3B,OAAO,CAAC,cAAc;QAiCtB,OAAO,CAAC,aAAa;QAYrB,OAAO,CAAC,8BAA8B;QA0B/B,uBAAuB,CAAC,MAAM,CAAC,EAAE,cAAc;QAOzC,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,0BAA0B,CAAC;QAsExG,oFAAoF;gBACtE,YAAY;QAoG1B,uFAAuF;QAC1E,UAAU,CACrB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,KAAK,SAAY,EACjB,MAAM,GAAE,SAAoB,EAC5B,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QAmBZ,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QAmC3E;;;WAGG;QACU,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QAuChG,iBAAiB,CAC5B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACjC,OAAO,CAAC,OAAO,CAAC;QA+CN,qBAAqB,CAChC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,cAAc,CAAC;QAsBb,oBAAoB,CAC/B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,cAAc,CAAC;QAmBb,kBAAkB,CAC7B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,OAAO,CAAC,cAAc,CAAC;QAuC1B,OAAO,CAAC,8BAA8B;QA8BtC,OAAO,CAAC,8BAA8B;QA8BtC,OAAO,CAAC,oBAAoB;QAY5B,OAAO,CAAC,yBAAyB;QA+BjC,OAAO,CAAC,qBAAqB;QAkC7B,OAAO,CAAC,yBAAyB;QAgBjC,OAAO,CAAC,gBAAgB;QAKxB,OAAO,CAAC,yBAAyB;QAwBjC,OAAO,CAAC,qBAAqB;KAG9B;CACF"}
+{"version":3,"file":"DoiService.d.ts","sourceRoot":"","sources":["../../src/services/DoiService.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAEV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAahC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEzE,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;AACrC,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC/C,YAAY,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAAC;CAC/C,CAAC;AAkDF,yBAAiB,QAAQ,CAAC;IACxB,MAAa,GAAI,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC5C,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAW3C;QAEF,OAAO,CAAC,UAAU,CAAU;QAE5B,OAAO,CAAC,SAAS;gBAOH,aAAa;QAI3B,OAAO,CAAC,cAAc;QA4BtB,OAAO,CAAC,aAAa;QAYrB,OAAO,CAAC,8BAA8B;QA0B/B,uBAAuB,CAAC,MAAM,CAAC,EAAE,cAAc;QAOzC,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,0BAA0B,CAAC;QAoExG,oFAAoF;gBACtE,YAAY;QAsE1B,uFAAuF;QAC1E,UAAU,CACrB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,KAAK,SAAY,EACjB,MAAM,GAAE,SAAoB,EAC5B,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QAgBZ,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QA8B3E;;;WAGG;QACU,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QAoChG,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;QA8B1G,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;QAsBrH,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;QAmBpH,kBAAkB,CAC7B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,OAAO,CAAC,cAAc,CAAC;QAkC1B,OAAO,CAAC,8BAA8B;QA6BtC,OAAO,CAAC,8BAA8B;QA6BtC,OAAO,CAAC,oBAAoB;QAY5B,OAAO,CAAC,yBAAyB;QA+BjC,OAAO,CAAC,qBAAqB;QAmC7B,OAAO,CAAC,yBAAyB;QAgBjC,OAAO,CAAC,gBAAgB;QAKxB,OAAO,CAAC,yBAAyB;QAoBjC,OAAO,CAAC,qBAAqB;KAG9B;CACF"}