@policystudio/policy-studio-ui-vue 1.1.17 → 1.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@policystudio/policy-studio-ui-vue",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "description": "Policy Studio UI",
   "main": "src/index.js",
   "author": "Policy Studio Team",

package/src/components/table-results/PsTableResults.vue

@@ -171,38 +171,40 @@
                 v-if="layout != 'comparison'"
                 class="psui-space-x-2 psui-show-childrens-on-hover"
               >
-                <PsTooltip v-if="column.hasProjections && !item.is_disabled && selectedRow != item.id">
+                <PsTooltip v-if="column.hasProjections && !item.is_disabled && selectedRow == item.id && columnSelectedKey == column.key">
                   <template v-slot:trigger>
                     <PsIcon
-                      icon="bar_chart"
+                      icon="close"
                       size="16"
                       class="psui-cursor-pointer"
-                      icon-classes="psui-text-blue-60 psui-opacity-0 psui-leading-none psui-transition"
+                      icon-classes="psui-text-blue-60 psui-leading-none psui-transition"
                       :style="{ display: 'flex' }"
-                      @click.native="onSelectRow(item, column)"
+                      @click.native="onCloseSelectRow(item)"
                     />
                   </template>
                   <template v-slot:content>
-                    Show projections in the chart
+                    Close projections
                   </template>
                 </PsTooltip>
 
-                <PsTooltip v-if="column.hasProjections && !item.is_disabled && selectedRow == item.id && columnSelectedKey == column.key">
+                <PsTooltip v-else>
                   <template v-slot:trigger>
                     <PsIcon
-                      icon="close"
+                      icon="bar_chart"
                       size="16"
                       class="psui-cursor-pointer"
-                      icon-classes="psui-text-blue-60 psui-leading-none psui-transition"
+                      icon-classes="psui-text-blue-60 psui-opacity-0 psui-leading-none psui-transition"
                       :style="{ display: 'flex' }"
-                      @click.native="onCloseSelectRow(item)"
+                      @click.native="onSelectRow(item, column)"
                     />
                   </template>
                   <template v-slot:content>
-                    Close projections
+                    Show projections in the chart
                   </template>
                 </PsTooltip>
 
+                
+
                 <p v-if="formatFunction && !item.is_disabled">
                   {{ formatFunction(column.key, item.data[column.key], item.data) }}
                 </p>
@@ -425,6 +427,13 @@ export default {
   },
   mounted () {
     this.setCollapsedRows()
+    this.$eventBus.$on('resetPolicyImpactItemSelected', (item) => {
+      this.$eventBus.$emit('setPolicyItemSelected', { item, columnSelectedKey: 'forecast_emissions_savings' })
+      this.selectedRow = null
+    })
+  },
+  beforeDestroy() {
+    this.$eventBus.$off('resetPolicyImpactItemSelected')
   },
   methods: {
     setCollapsedRows() {
@@ -516,8 +525,7 @@ export default {
       this.$emit('policy-selected', { item: item, column: column })
     },
     onCloseSelectRow(item) {
-      this.$eventBus.$emit('setPolicyItemSelected', { item, columnSelectedKey: 'forecast_emissions_savings' })
-      this.selectedRow = null
+      this.$eventBus.$emit('resetPolicyImpactItemSelected', item)
     }
   },
 }