Merge branch 'fix/#5238/info-popup' into 'develop'

[Issue #5238] Info popup See merge request canopsis/canopsis-pro!3371
capensis · Dec 20, 2023 · 2c2bb35 · 2c2bb35
2 parents a1d15c3 + 5ca24c8
commit 2c2bb35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...sis-next/src/components/widgets/alarm/columns-formatting/alarm-column-cell-popup-body.vue b/...sis-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
@@ -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/...s/widgets/alarm/column-formatting/__snapshots__/alarm-column-cell-popup-body.spec.js.snap b/...s/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,15 +14,15 @@ 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
           class="v-btn__content"
         >
           <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