From 623cd72897c4e9a0a96b3402a6abb0009e43e794 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Sun, 27 Aug 2023 07:39:06 +0530
Subject: [PATCH] fix: Update the order of display of the CSAT ratings (#7805)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../components/widgets/UserAvatarWithName.vue |  4 +-
 .../reports/components/CsatMetrics.vue        | 40 +++++--------------
 .../settings/reports/components/CsatTable.vue |  2 +-
 .../__snapshots__/CSATMetrics.spec.js.snap    |  2 +-
 4 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
index 812a0922e..07e3e5ed6 100644
--- a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
+++ b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex items-center text-left">
+  <div class="flex items-center gap-1.5 text-left">
     <thumbnail
       :src="user.thumbnail"
       :size="size"
@@ -7,7 +7,7 @@
       :status="user.availability_status"
     />
     <h6
-      class="my-0 mx-2 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis text-capitalize"
+      class="my-0 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis text-capitalize"
       :class="textClass"
     >
       {{ user.name }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index 94fd6af97..24bc234b3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="flex flex-wrap mx-0 csat--metrics-container">
+  <div
+    class="flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700"
+  >
     <csat-metric-card
       :label="$t('CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP')"
@@ -18,23 +20,21 @@
     />
     <div
       v-if="metrics.totalResponseCount && !ratingFilterEnabled"
-      class="w-[50%] max-w-[50%] flex-[50%] report-card"
+      class="w-[50%] max-w-[50%] flex-[50%] report-card rtl:[direction:initial]"
     >
       <h3 class="heading text-slate-800 dark:text-slate-100">
-        <div class="emoji--distribution">
+        <div class="flex justify-end flex-row-reverse">
           <div
             v-for="(rating, key, index) in ratingPercentage"
             :key="rating + key + index"
-            class="emoji--distribution-item"
+            class="pl-4"
           >
-            <span class="emoji--distribution-key">{{
-              ratingToEmoji(key)
-            }}</span>
+            <span class="my-0 mx-0.5">{{ ratingToEmoji(key) }}</span>
             <span>{{ formatToPercent(rating) }}</span>
           </div>
         </div>
       </h3>
-      <div class="emoji--distribution-chart">
+      <div class="mt-2">
         <woot-horizontal-bar :collection="chartData" :height="24" />
       </div>
     </div>
@@ -71,9 +71,10 @@ export default {
       return Boolean(this.filters.rating);
     },
     chartData() {
+      const sortedRatings = [...CSAT_RATINGS].sort((a, b) => b.value - a.value);
       return {
         labels: ['Rating'],
-        datasets: CSAT_RATINGS.map(rating => ({
+        datasets: sortedRatings.map(rating => ({
           label: rating.emoji,
           data: [this.ratingPercentage[rating.value]],
           backgroundColor: rating.color,
@@ -96,24 +97,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.csat--metrics-container {
-  @apply bg-white dark:bg-slate-800 rounded p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700;
-}
-
-.emoji--distribution {
-  @apply flex justify-end;
-
-  .emoji--distribution-item {
-    @apply pl-4;
-  }
-}
-
-.emoji--distribution-chart {
-  @apply mt-2;
-}
-
-.emoji--distribution-key {
-  @apply my-0 mx-0.5;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
index aafeaf2fa..56b8ac96c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
@@ -59,7 +59,7 @@ export default {
             if (row.contact) {
               return (
                 <UserAvatarWithName
-                  textClass="text-sm !pl-2 text-slate-800"
+                  textClass="text-sm text-slate-800"
                   size="24px"
                   user={row.contact}
                 />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
index 4f10667c8..9788a1ef7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CsatMetrics.vue computes response count correctly 1`] = `
-<div class="flex flex-wrap mx-0 csat--metrics-container">
+<div class="flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700">
   <csat-metric-card-stub label="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL" value="100" infotext="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP"></csat-metric-card-stub>
   <csat-metric-card-stub label="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL" value="--" infotext="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP" disabled="true"></csat-metric-card-stub>
   <csat-metric-card-stub label="CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL" value="90%" infotext="CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP"></csat-metric-card-stub>