@acorex-platform/module-risk-management-client 0.0.30 → 0.0.33

package/fesm2022/acorex-platform-module-risk-management-client.mjs

@@ -5,18 +5,18 @@ import { inject, Injectable, NgModule, input, output, signal, computed, effect,
 import { RootConfig, AXPSafetyRiskPermissionKeys, AXMRiskManagementMenuKeys, RISK_CATALOG_SCOPE_HAZARD, RISK_CATALOG_SCOPE_PPE_ITEMS, RISK_MATRIX_AXIS_PROPERTIES, DEFAULT_RISK_MATRIX_AXIS_MAPPING, DEFAULT_RISK_MATRIX_ORIENTATION, RISK_MATRIX_ORIENTATION_TITLE_KEYS } from '@acorex-platform/module-risk-management-client/contracts';
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex-platform/framework-client/auth';
 import { AXP_MENU_PROVIDER, resolveEntityRowDisplayText, resolveEntityRowDisplayTitle } from '@acorex-platform/framework-client/common';
-import { AXP_MODULE_MANIFEST_PROVIDER, AXP_CATALOG_SCOPE_DEFINITION_PROVIDER, provideLazyProvider } from '@acorex-platform/framework-client/core';
+import { AXP_MODULE_MANIFEST_PROVIDER, AXP_CATALOG_SCOPE_DEFINITION_PROVIDER, provideLazyProvider, ensureRuntimeSurfaceClass } from '@acorex-platform/framework-client/core';
 import { AXP_WIDGETS_EDITOR_CATEGORY, AXPWidgetCoreModule, AXP_WIDGET_DEFINITION_PROVIDER, AXPColumnWidgetComponent, AXPValueWidgetComponent } from '@acorex-platform/framework-client/layout/widget-core';
 import { provideCommandSetups } from '@acorex-platform/framework-client/runtime';
 import { AXPWidgetGroupEnum } from '@acorex-platform/framework-shared/widget-core';
 import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_LABEL_PROPERTY, AXP_READONLY_PROPERTY, AXP_DISABLED_PROPERTY } from '@acorex-platform/framework-client/layout/widgets';
 import * as i2 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
-import { extractValue, AXPWidgetsList } from '@acorex-platform/framework-shared/core';
+import { extractValue, resolveToSurfaceClass, AXPWidgetsList } from '@acorex-platform/framework-shared/core';
 import { AXPSpreadsheetComponent } from '@acorex-platform/framework-client/layout/components';
 import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { isEmpty, defaultTo, get, isEqual, castArray } from 'lodash';
+import { isEmpty, defaultTo, get, isEqual } from 'lodash';
 import { AXPLayoutBuilderService } from '@acorex-platform/framework-client/layout/builder';
 import * as i1$1 from '@acorex/components/button';
 import { AXButtonModule } from '@acorex/components/button';
@@ -394,6 +394,20 @@ function toCanonicalMatrixData(display, orientation) {
     });
     return canonical;
 }
+/**
+ * Reads selected axis ids from a risk-matrix-cell record.
+ * Prefers `*Ids` (multi-lookup convention), then legacy `*Id`, then joined `*List`.
+ */
+function resolveRiskMatrixCellAxisIds(data, axis) {
+    if (data == null || typeof data !== 'object') {
+        return [];
+    }
+    const record = data;
+    const idsField = axis === 'likelihood' ? 'likelihoodIds' : 'severityIds';
+    const legacyField = axis === 'likelihood' ? 'likelihoodId' : 'severityId';
+    const listField = axis === 'likelihood' ? 'likelihoodList' : 'severityList';
+    return normalizeRiskMatrixAxisIds(record[idsField] ?? record[legacyField] ?? record[listField]);
+}
 /** Normalizes lookup axis values (ids or `{ id }` rows) to string ids. */
 function normalizeRiskMatrixAxisIds(value) {
     const items = Array.isArray(value) ? value : value != null ? [value] : [];
@@ -448,19 +462,21 @@ function validateRiskMatrixAxisMapping(mapping) {
 }
 //#endregion
 
-//#region ----   Constants   ----
-/** Default matrix badge colors when {@link color} is not set on a risk rating record. */
+//#region ----- Imports -----
+//#endregion
+//#region ----- Constants -----
+/** Default matrix badge surfaces when {@link color} is not set on a risk rating record. */
 const DEFAULT_RISK_RATING_BADGE_COLORS = {
-    low: 'warning-lighter-surface',
-    medium: 'success-lighter-surface',
+    low: 'success-lighter-surface',
+    medium: 'warning-lighter-surface',
     high: 'danger-lighter-surface',
 };
 //#endregion
-//#region ----   Helpers   ----
+//#region ----- Helpers -----
 function resolveRiskRatingBadgeColor(rating) {
-    const color = rating.color?.trim();
-    if (color) {
-        return color;
+    const fromColor = resolveToSurfaceClass(rating.color);
+    if (fromColor) {
+        return fromColor;
     }
     const code = rating.code?.trim().toUpperCase();
     if (code?.endsWith('0001')) {
@@ -664,7 +680,7 @@ class AXMRiskManagementRiskMatrixComponent {
                 return base;
             }
             const rating = item;
-            const color = resolveRiskRatingBadgeColor(rating);
+            const color = ensureRuntimeSurfaceClass(resolveRiskRatingBadgeColor(rating));
             return color ? { ...base, color } : base;
         });
         if (isEmpty(selectedIds)) {
@@ -719,13 +735,13 @@ class AXMRiskManagementRiskMatrixComponent {
         this.cellChange.emit(event);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMRiskManagementRiskMatrixComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "22.0.8", type: AXMRiskManagementRiskMatrixComponent, isStandalone: true, selector: "axm-risk-matrix", inputs: { axisMapping: { classPropertyName: "axisMapping", publicName: "axisMapping", isSignal: true, isRequired: false, transformFunction: null }, likelihoodIds: { classPropertyName: "likelihoodIds", publicName: "likelihoodIds", isSignal: true, isRequired: false, transformFunction: null }, severityIds: { classPropertyName: "severityIds", publicName: "severityIds", isSignal: true, isRequired: false, transformFunction: null }, matrixOrientation: { classPropertyName: "matrixOrientation", publicName: "matrixOrientation", isSignal: true, isRequired: false, transformFunction: null }, value: { classPropertyName: "value", publicName: "value", isSignal: true, isRequired: false, transformFunction: null }, readonly: { classPropertyName: "readonly", publicName: "readonly", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { valueChange: "valueChange", cellChange: "cellChange" }, host: { classAttribute: "axm-risk-matrix" }, ngImport: i0, template: "<div class=\"__container\">\n  <div class=\"__matrix-section\">\n    @if (isLoading()) {\n      <div class=\"__loading\">\n        <span>{{ '@risk-management:risk-matrix-cells.components.risk-matrix.messages.loading' | translate | async }}</span>\n      </div>\n    } @else {\n      @for (_ of [resolvedMatrixOrientation()]; track _) {\n        <axp-spreadsheet\n          [title]=\"(matrixTitleKey() | translate | async) ?? ''\"\n          [columns]=\"spreadsheetColumns()\"\n          [rowsInput]=\"spreadsheetRows()\"\n          [rowMode]=\"'fixed'\"\n          [readonly]=\"readonly()\"\n          [allowRemoveRows]=\"false\"\n          [rowTitlePath]=\"'_rowTitle'\"\n          [rowDescriptionPath]=\"'_rowDescription'\"\n          (cellChange)=\"handleCellChange($event)\"\n          (spreadsheetChange)=\"handleSpreadsheetChange($event)\"\n        ></axp-spreadsheet>\n      }\n    }\n  </div>\n</div>\n", styles: [".risk-matrix{display:block;height:100%;width:100%}.risk-matrix .__container,.risk-matrix .__matrix-section{display:flex;flex-direction:column}.risk-matrix .__loading,.risk-matrix .__empty-state{display:flex;align-items:center;justify-content:center;padding:calc(var(--spacing, .25rem) * 8);font-size:var(--text-sm, .875rem);line-height:var(--tw-leading, var(--text-sm--line-height, calc(1.25 / .875)));color:rgb(var(--ax-sys-color-on-light-surface))}\n/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: AXPSpreadsheetComponent, selector: "axp-spreadsheet", inputs: ["title", "columns", "rowMode", "rowsInput", "rowsModel", "readonly", "emptyCellPlaceholder", "rowTitlePath", "rowDescriptionPath", "allowAddRows", "allowRemoveRows"], outputs: ["rowsModelChange", "cellChange", "rowChange", "spreadsheetChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }, { kind: "pipe", type: i2.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "22.0.8", type: AXMRiskManagementRiskMatrixComponent, isStandalone: true, selector: "axm-risk-matrix", inputs: { axisMapping: { classPropertyName: "axisMapping", publicName: "axisMapping", isSignal: true, isRequired: false, transformFunction: null }, likelihoodIds: { classPropertyName: "likelihoodIds", publicName: "likelihoodIds", isSignal: true, isRequired: false, transformFunction: null }, severityIds: { classPropertyName: "severityIds", publicName: "severityIds", isSignal: true, isRequired: false, transformFunction: null }, matrixOrientation: { classPropertyName: "matrixOrientation", publicName: "matrixOrientation", isSignal: true, isRequired: false, transformFunction: null }, value: { classPropertyName: "value", publicName: "value", isSignal: true, isRequired: false, transformFunction: null }, readonly: { classPropertyName: "readonly", publicName: "readonly", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { valueChange: "valueChange", cellChange: "cellChange" }, host: { classAttribute: "axm-risk-matrix" }, ngImport: i0, template: "<div class=\"__container\">\n  <div class=\"__matrix-section\">\n    @if (isLoading()) {\n      <div class=\"__loading\">\n        <span>{{ '@risk-management:risk-matrix-cells.components.risk-matrix.messages.loading' | translate | async }}</span>\n      </div>\n    } @else {\n      @for (_ of [resolvedMatrixOrientation()]; track _) {\n        <axp-spreadsheet\n          [title]=\"(matrixTitleKey() | translate | async) ?? ''\"\n          [columns]=\"spreadsheetColumns()\"\n          [rowsInput]=\"spreadsheetRows()\"\n          [rowMode]=\"'fixed'\"\n          [readonly]=\"readonly()\"\n          [allowRemoveRows]=\"false\"\n          [rowTitlePath]=\"'_rowTitle'\"\n          [rowDescriptionPath]=\"'_rowDescription'\"\n          (cellChange)=\"handleCellChange($event)\"\n          (spreadsheetChange)=\"handleSpreadsheetChange($event)\"\n        ></axp-spreadsheet>\n      }\n    }\n  </div>\n</div>\n", styles: [".axm-risk-matrix{--axm-risk-matrix-line: rgb(var(--ax-sys-color-border-surface));display:block;height:100%;width:100%}.axm-risk-matrix .__container,.axm-risk-matrix .__matrix-section{display:flex;flex-direction:column}.axm-risk-matrix .__loading,.axm-risk-matrix .__empty-state{display:flex;align-items:center;justify-content:center;padding:calc(var(--spacing, .25rem) * 8);font-size:var(--text-sm, .875rem);line-height:var(--tw-leading, var(--text-sm--line-height, calc(1.25 / .875)));color:rgb(var(--ax-sys-color-on-lightest-surface))}.axm-risk-matrix .axp-spreadsheet .__spreadsheet-container{border:1px solid var(--axm-risk-matrix-line)}.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__corner-cell,.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__column-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__row-header{background-color:rgb(var(--ax-sys-color-lighter-surface));color:rgb(var(--ax-sys-color-on-lighter-surface))}.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__corner-cell,.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__column-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__row-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell{border:0;border-inline-end:1px solid var(--axm-risk-matrix-line);border-bottom:1px solid var(--axm-risk-matrix-line)}.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__column-header:last-child,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:last-child{border-inline-end:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody tr.__row:last-of-type .__row-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody tr.__row:last-of-type .__cell{border-bottom:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing){padding:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing):before{z-index:1}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value{display:block;height:100%;min-height:100%;padding:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value>*{display:block;height:100%;min-height:100%}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value [class*=-surface],.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value [class*=axp-hex-]{position:absolute;inset:0;z-index:0;display:flex;align-items:center;justify-content:center;width:auto;height:auto;margin:0;border-width:0;border-radius:0;padding:.5rem .75rem;font-size:.875rem;font-weight:500}\n/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: AXPSpreadsheetComponent, selector: "axp-spreadsheet", inputs: ["title", "columns", "rowMode", "rowsInput", "rowsModel", "readonly", "emptyCellPlaceholder", "rowTitlePath", "rowDescriptionPath", "allowAddRows", "allowRemoveRows"], outputs: ["rowsModelChange", "cellChange", "rowChange", "spreadsheetChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }, { kind: "pipe", type: i2.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMRiskManagementRiskMatrixComponent, decorators: [{
             type: Component,
             args: [{ selector: 'axm-risk-matrix', standalone: true, imports: [CommonModule, AXPSpreadsheetComponent, AXTranslationModule], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: {
                         class: 'axm-risk-matrix',
-                    }, template: "<div class=\"__container\">\n  <div class=\"__matrix-section\">\n    @if (isLoading()) {\n      <div class=\"__loading\">\n        <span>{{ '@risk-management:risk-matrix-cells.components.risk-matrix.messages.loading' | translate | async }}</span>\n      </div>\n    } @else {\n      @for (_ of [resolvedMatrixOrientation()]; track _) {\n        <axp-spreadsheet\n          [title]=\"(matrixTitleKey() | translate | async) ?? ''\"\n          [columns]=\"spreadsheetColumns()\"\n          [rowsInput]=\"spreadsheetRows()\"\n          [rowMode]=\"'fixed'\"\n          [readonly]=\"readonly()\"\n          [allowRemoveRows]=\"false\"\n          [rowTitlePath]=\"'_rowTitle'\"\n          [rowDescriptionPath]=\"'_rowDescription'\"\n          (cellChange)=\"handleCellChange($event)\"\n          (spreadsheetChange)=\"handleSpreadsheetChange($event)\"\n        ></axp-spreadsheet>\n      }\n    }\n  </div>\n</div>\n", styles: [".risk-matrix{display:block;height:100%;width:100%}.risk-matrix .__container,.risk-matrix .__matrix-section{display:flex;flex-direction:column}.risk-matrix .__loading,.risk-matrix .__empty-state{display:flex;align-items:center;justify-content:center;padding:calc(var(--spacing, .25rem) * 8);font-size:var(--text-sm, .875rem);line-height:var(--tw-leading, var(--text-sm--line-height, calc(1.25 / .875)));color:rgb(var(--ax-sys-color-on-light-surface))}\n/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */\n"] }]
+                    }, template: "<div class=\"__container\">\n  <div class=\"__matrix-section\">\n    @if (isLoading()) {\n      <div class=\"__loading\">\n        <span>{{ '@risk-management:risk-matrix-cells.components.risk-matrix.messages.loading' | translate | async }}</span>\n      </div>\n    } @else {\n      @for (_ of [resolvedMatrixOrientation()]; track _) {\n        <axp-spreadsheet\n          [title]=\"(matrixTitleKey() | translate | async) ?? ''\"\n          [columns]=\"spreadsheetColumns()\"\n          [rowsInput]=\"spreadsheetRows()\"\n          [rowMode]=\"'fixed'\"\n          [readonly]=\"readonly()\"\n          [allowRemoveRows]=\"false\"\n          [rowTitlePath]=\"'_rowTitle'\"\n          [rowDescriptionPath]=\"'_rowDescription'\"\n          (cellChange)=\"handleCellChange($event)\"\n          (spreadsheetChange)=\"handleSpreadsheetChange($event)\"\n        ></axp-spreadsheet>\n      }\n    }\n  </div>\n</div>\n", styles: [".axm-risk-matrix{--axm-risk-matrix-line: rgb(var(--ax-sys-color-border-surface));display:block;height:100%;width:100%}.axm-risk-matrix .__container,.axm-risk-matrix .__matrix-section{display:flex;flex-direction:column}.axm-risk-matrix .__loading,.axm-risk-matrix .__empty-state{display:flex;align-items:center;justify-content:center;padding:calc(var(--spacing, .25rem) * 8);font-size:var(--text-sm, .875rem);line-height:var(--tw-leading, var(--text-sm--line-height, calc(1.25 / .875)));color:rgb(var(--ax-sys-color-on-lightest-surface))}.axm-risk-matrix .axp-spreadsheet .__spreadsheet-container{border:1px solid var(--axm-risk-matrix-line)}.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__corner-cell,.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__column-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__row-header{background-color:rgb(var(--ax-sys-color-lighter-surface));color:rgb(var(--ax-sys-color-on-lighter-surface))}.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__corner-cell,.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__column-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__row-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell{border:0;border-inline-end:1px solid var(--axm-risk-matrix-line);border-bottom:1px solid var(--axm-risk-matrix-line)}.axm-risk-matrix .axp-spreadsheet .__table .__thead .__header-row .__column-header:last-child,.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:last-child{border-inline-end:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody tr.__row:last-of-type .__row-header,.axm-risk-matrix .axp-spreadsheet .__table .__tbody tr.__row:last-of-type .__cell{border-bottom:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing){padding:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing):before{z-index:1}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value{display:block;height:100%;min-height:100%;padding:0}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value>*{display:block;height:100%;min-height:100%}.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value [class*=-surface],.axm-risk-matrix .axp-spreadsheet .__table .__tbody .__row .__cell:not(.__cell--editing) .__cell-value [class*=axp-hex-]{position:absolute;inset:0;z-index:0;display:flex;align-items:center;justify-content:center;width:auto;height:auto;margin:0;border-width:0;border-radius:0;padding:.5rem .75rem;font-size:.875rem;font-weight:500}\n/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */\n"] }]
         }], ctorParameters: () => [], propDecorators: { axisMapping: [{ type: i0.Input, args: [{ isSignal: true, alias: "axisMapping", required: false }] }], likelihoodIds: [{ type: i0.Input, args: [{ isSignal: true, alias: "likelihoodIds", required: false }] }], severityIds: [{ type: i0.Input, args: [{ isSignal: true, alias: "severityIds", required: false }] }], matrixOrientation: [{ type: i0.Input, args: [{ isSignal: true, alias: "matrixOrientation", required: false }] }], value: [{ type: i0.Input, args: [{ isSignal: true, alias: "value", required: false }] }], readonly: [{ type: i0.Input, args: [{ isSignal: true, alias: "readonly", required: false }] }], valueChange: [{ type: i0.Output, args: ["valueChange"] }], cellChange: [{ type: i0.Output, args: ["cellChange"] }] } });
 
 //#region ----   Imports   ----
@@ -748,7 +764,7 @@ class AXMRiskMatrixViewerService {
         if (isEmpty(matrixValue)) {
             return;
         }
-        const ref = await this.layoutBuilder
+        await this.layoutBuilder
             .create()
             .dialog((dialog) => {
             dialog
@@ -766,13 +782,9 @@ class AXMRiskMatrixViewerService {
                             .customWidget(AXPWidgetsList.Editors.RiskMatrix, { readonly: true });
                     });
                 });
-            })
-                .setActions((actions) => {
-                actions.cancel('@general:actions.close.title');
             });
         })
             .show();
-        ref.close();
     }
     //#endregion
     //#region ----   Utility Methods   ----
@@ -918,12 +930,12 @@ class AXMRiskMatrixWidgetEditComponent extends AXPValueWidgetComponent {
         ...(ngDevMode ? [{ debugName: "matrixOrientation" }] : /* istanbul ignore next */ []));
         this.likelihoodIds = computed(() => {
             this.contextService.changeEvent();
-            return this.normalizeAxisIds(get(this.contextService.data(), 'likelihoodId'));
+            return resolveRiskMatrixCellAxisIds(this.contextService.data(), 'likelihood');
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "likelihoodIds" }] : /* istanbul ignore next */ []));
         this.severityIds = computed(() => {
             this.contextService.changeEvent();
-            return this.normalizeAxisIds(get(this.contextService.data(), 'severityId'));
+            return resolveRiskMatrixCellAxisIds(this.contextService.data(), 'severity');
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "severityIds" }] : /* istanbul ignore next */ []));
         this.matrixValue = computed(() => {
@@ -947,9 +959,6 @@ class AXMRiskMatrixWidgetEditComponent extends AXPValueWidgetComponent {
             this.setValue(data);
         }
     }
-    normalizeAxisIds(value) {
-        return normalizeRiskMatrixAxisIds(value);
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMRiskMatrixWidgetEditComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "22.0.8", type: AXMRiskMatrixWidgetEditComponent, isStandalone: true, selector: "axm-risk-matrix-widget-edit", host: { classAttribute: "block w-full" }, usesInheritance: true, ngImport: i0, template: `
     <axm-risk-matrix
@@ -1017,12 +1026,12 @@ class AXMRiskMatrixWidgetViewComponent extends AXPValueWidgetComponent {
         ...(ngDevMode ? [{ debugName: "matrixOrientation" }] : /* istanbul ignore next */ []));
         this.likelihoodIds = computed(() => {
             this.contextService.changeEvent();
-            return this.normalizeAxisIds(get(this.contextService.data(), 'likelihoodId'));
+            return resolveRiskMatrixCellAxisIds(this.contextService.data(), 'likelihood');
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "likelihoodIds" }] : /* istanbul ignore next */ []));
         this.severityIds = computed(() => {
             this.contextService.changeEvent();
-            return this.normalizeAxisIds(get(this.contextService.data(), 'severityId'));
+            return resolveRiskMatrixCellAxisIds(this.contextService.data(), 'severity');
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "severityIds" }] : /* istanbul ignore next */ []));
         this.matrixValue = computed(() => {
@@ -1030,16 +1039,6 @@ class AXMRiskMatrixWidgetViewComponent extends AXPValueWidgetComponent {
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "matrixValue" }] : /* istanbul ignore next */ []));
     }
-    normalizeAxisIds(value) {
-        return castArray(value)
-            .map((item) => {
-            if (item != null && typeof item === 'object' && 'id' in item) {
-                return String(item.id);
-            }
-            return item != null ? String(item) : '';
-        })
-            .filter((id) => id.length > 0);
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMRiskMatrixWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "22.0.8", type: AXMRiskMatrixWidgetViewComponent, isStandalone: true, selector: "axm-risk-matrix-widget-view", host: { classAttribute: "block w-full" }, usesInheritance: true, ngImport: i0, template: `
     <axm-risk-matrix
@@ -1085,5 +1084,5 @@ var riskMatrixWidgetView_component = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { AXMRiskManagementMenuProvider, AXMRiskManagementModule, AXMRiskManagementPermissionDefinitionProvider, AXMRiskManagementRiskMatrixComponent, AXMRiskMatrixViewerService, AXMRiskMatrixWidgetColumnComponent, AXMRiskMatrixWidgetEditComponent, AXMRiskMatrixWidgetViewComponent, isRiskMatrixAxisProperty, isRiskMatrixOrientation, normalizeRiskMatrixAxisIds, pruneMatrixToAxes, resolveRiskMatrixAxisMapping, resolveRiskMatrixAxisMappingFromOrientation, resolveRiskMatrixOrientation, resolveRiskMatrixTitleKey, toCanonicalMatrixData, toDisplayMatrixData, validateRiskMatrixAxisMapping };
+export { AXMRiskManagementMenuProvider, AXMRiskManagementModule, AXMRiskManagementPermissionDefinitionProvider, AXMRiskManagementRiskMatrixComponent, AXMRiskMatrixViewerService, AXMRiskMatrixWidgetColumnComponent, AXMRiskMatrixWidgetEditComponent, AXMRiskMatrixWidgetViewComponent, isRiskMatrixAxisProperty, isRiskMatrixOrientation, normalizeRiskMatrixAxisIds, pruneMatrixToAxes, resolveRiskMatrixAxisMapping, resolveRiskMatrixAxisMappingFromOrientation, resolveRiskMatrixCellAxisIds, resolveRiskMatrixOrientation, resolveRiskMatrixTitleKey, toCanonicalMatrixData, toDisplayMatrixData, validateRiskMatrixAxisMapping };
 //# sourceMappingURL=acorex-platform-module-risk-management-client.mjs.map