From 7681b94d824d5db9addaa050004d01c4f59fef39 Mon Sep 17 00:00:00 2001
From: Joana Maia <joana@crowd.dev>
Date: Tue, 15 Nov 2022 18:25:44 +0000
Subject: [PATCH] Fix labels in widget creation

---
 frontend/src/i18n/en.js                         | 11 +++++++++++
 .../cube/_query_builder/DimensionSelect.vue     |  4 ++--
 .../cube/_query_builder/MeasureSelect.vue       | 17 +++++++++++++++--
 .../cube/_query_builder/TimeDimensionSelect.vue |  8 +++++---
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js
index 342c584ffd..631884d6c3 100644
--- a/frontend/src/i18n/en.js
+++ b/frontend/src/i18n/en.js
@@ -504,6 +504,17 @@ const en = {
       Tags: {
         name: '[Tags] Name',
         count: '[Tags] Count'
+      },
+      Identities: {
+        count: '[Identities] Count'
+      },
+      Organizations: {
+        count: '[Organizations] Count',
+        createdat: '[Organizations] Date'
+      },
+      Sentiment: {
+        averageSentiment: '[Sentiment] Average',
+        date: '[Sentiment] Date'
       }
     }
   },
diff --git a/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue
index ca18aaa01b..a6fb6eec35 100644
--- a/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue
+++ b/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue
@@ -104,9 +104,9 @@ export default {
       return !measure
         ? []
         : this.availableDimensions.filter((t) => {
-            return this.measureDimensions[
+            return !!this.measureDimensions[
               measure.name
-            ].includes(t.name)
+            ]?.includes(t.name)
           })
     },
     value: {
diff --git a/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue
index 2a853538b4..1a11b0fe73 100644
--- a/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue
+++ b/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue
@@ -12,13 +12,16 @@
         translatedOptions(measures).map((i) => i.label)
       "
       class="w-full"
-      @change="(m) => setMeasures([m])"
+      @change="onSelectChange"
     >
       <el-option
         v-for="item in translatedOptions(availableMeasures)"
         :key="item.value"
         :label="item.label"
         :value="item.value"
+        :class="{
+          selected: selectedMeasure.includes(item.value)
+        }"
         @mouseleave="onSelectMouseLeave"
       ></el-option>
     </el-select>
@@ -48,8 +51,18 @@ export default {
       default: () => {}
     }
   },
+  data() {
+    return {
+      selectedMeasure: []
+    }
+  },
   methods: {
-    onSelectMouseLeave
+    onSelectMouseLeave,
+
+    onSelectChange(m) {
+      this.selectedMeasure = [m]
+      this.setMeasures([m])
+    }
   }
 }
 </script>
diff --git a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue
index b39d5bccfd..aacc56492d 100644
--- a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue
+++ b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue
@@ -56,7 +56,9 @@ export default {
           'Members.joinedAt',
           'Activities.date'
         ],
-        'Conversations.count': ['Conversations.createdat']
+        'Conversations.count': ['Conversations.createdat'],
+        'Sentiment.averageSentiment': ['Sentiment.date'],
+        'Organizations.count': ['Organizations.createdat']
       }
     }
   },
@@ -66,9 +68,9 @@ export default {
       return !measure
         ? []
         : this.availableTimeDimensions.filter((t) => {
-            return this.measureTimeDimensions[
+            return !!this.measureTimeDimensions[
               measure.name
-            ].includes(t.name)
+            ]?.includes(t.name)
           })
     }
   },