From 5ca24c8312c131468233d870a88930a8076fff9f Mon Sep 17 00:00:00 2001
From: Vladimir Erokhov <vladimir.erokhov@noveogroup.com>
Date: Wed, 20 Dec 2023 17:13:25 +0600
Subject: [PATCH] fix(#5238): Finished issue

---
 .../columns-formatting/alarm-column-cell-popup-body.vue     | 2 +-
 .../src/canopsis-next/src/mixins/widget/columns/alarm.js    | 2 +-
 .../__snapshots__/alarm-column-cell-popup-body.spec.js.snap | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/community/sources/webcore/src/canopsis-next/src/components/widgets/alarm/columns-formatting/alarm-column-cell-popup-body.vue b/community/sources/webcore/src/canopsis-next/src/components/widgets/alarm/columns-formatting/alarm-column-cell-popup-body.vue
index 7dbbfc5568..fd623e5261 100644
--- a/community/sources/webcore/src/canopsis-next/src/components/widgets/alarm/columns-formatting/alarm-column-cell-popup-body.vue
+++ b/community/sources/webcore/src/canopsis-next/src/components/widgets/alarm/columns-formatting/alarm-column-cell-popup-body.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  v-card(dark)
+  v-card
     v-card-title.primary.pa-2.white--text
       v-layout(justify-space-between, align-center)
         h4 {{ $t('alarm.infoPopup') }}
diff --git a/community/sources/webcore/src/canopsis-next/src/mixins/widget/columns/alarm.js b/community/sources/webcore/src/canopsis-next/src/mixins/widget/columns/alarm.js
index 1ca3632e66..312863b97d 100644
--- a/community/sources/webcore/src/canopsis-next/src/mixins/widget/columns/alarm.js
+++ b/community/sources/webcore/src/canopsis-next/src/mixins/widget/columns/alarm.js
@@ -36,7 +36,7 @@ export const widgetColumnsAlarmMixin = {
       return (this.columns ?? []).map(column => ({
         ...column,
 
-        popupTemplate: this.infoPopupsMap[column.value],
+        popupTemplate: this.infoPopupsMap[column.value] ?? this.infoPopupsMap[`alarm.${column.value}`],
         filter: this.$i18n.locale && this.getColumnFilter(column.value),
         getComponent: getAlarmsListWidgetColumnComponentGetter(column),
         colorIndicatorEnabled: Object.values(COLOR_INDICATOR_TYPES).includes(column.colorIndicator),
diff --git a/community/sources/webcore/src/canopsis-next/tests/unit/components/widgets/alarm/column-formatting/__snapshots__/alarm-column-cell-popup-body.spec.js.snap b/community/sources/webcore/src/canopsis-next/tests/unit/components/widgets/alarm/column-formatting/__snapshots__/alarm-column-cell-popup-body.spec.js.snap
index a43173073d..dcbc908fc2 100644
--- a/community/sources/webcore/src/canopsis-next/tests/unit/components/widgets/alarm/column-formatting/__snapshots__/alarm-column-cell-popup-body.spec.js.snap
+++ b/community/sources/webcore/src/canopsis-next/tests/unit/components/widgets/alarm/column-formatting/__snapshots__/alarm-column-cell-popup-body.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`alarm-column-cell-popup-body Renders \`alarm-column-cell-popup-body\` with full alarm 1`] = `
 <div
-  class="v-card v-sheet theme--dark"
+  class="v-card v-sheet theme--light"
 >
   <div
     class="v-card__title primary pa-2 white--text"
@@ -14,7 +14,7 @@ exports[`alarm-column-cell-popup-body Renders \`alarm-column-cell-popup-body\` w
         Info popup
       </h4>
       <button
-        class="ma-0 ml-3 v-btn v-btn--icon v-btn--small theme--dark white"
+        class="ma-0 ml-3 v-btn v-btn--icon v-btn--small theme--light white"
         type="button"
       >
         <div
@@ -22,7 +22,7 @@ exports[`alarm-column-cell-popup-body Renders \`alarm-column-cell-popup-body\` w
         >
           <i
             aria-hidden="true"
-            class="v-icon material-icons theme--dark error--text"
+            class="v-icon material-icons theme--light error--text"
             style="font-size: 16px;"
           >
             close