From cf1a8c4b17386b107ce2500d7a2a0901207feaa7 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 29 Mar 2024 13:59:16 +0530
Subject: [PATCH] feat: add labels

---
 .../conversationCardComponents/CardLabels.vue         |  5 +++++
 .../dashboard/mixins/conversation/labelMixin.js       |  4 ++++
 .../routes/dashboard/settings/reports/SLAReports.vue  |  1 -
 .../settings/reports/components/SLA/SLAReportItem.vue | 11 +++++++++--
 .../settings/reports/components/SLA/SLATable.vue      |  3 ++-
 .../api/v1/accounts/applied_slas/index.json.jbuilder  |  8 +++++---
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
index a2e72caed..9ddcfc469 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
@@ -45,6 +45,11 @@ export default {
       type: Number,
       required: true,
     },
+    conversationLabels: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
diff --git a/app/javascript/dashboard/mixins/conversation/labelMixin.js b/app/javascript/dashboard/mixins/conversation/labelMixin.js
index 622bd3519..a749e5f63 100644
--- a/app/javascript/dashboard/mixins/conversation/labelMixin.js
+++ b/app/javascript/dashboard/mixins/conversation/labelMixin.js
@@ -4,6 +4,10 @@ export default {
   computed: {
     ...mapGetters({ accountLabels: 'labels/getLabels' }),
     savedLabels() {
+      // If conversationLabels is passed as prop, use it
+      if (this.conversationLabels)
+        return this.conversationLabels.split(',').map(item => item.trim());
+      // Otherwise, get labels from store
       return this.$store.getters['conversationLabels/getConversationLabels'](
         this.conversationId
       );
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue
index d64000986..727974c34 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue
@@ -8,7 +8,6 @@
       :sla-reports="slaReports"
       :current-page="Number(slaMeta.currentPage)"
       :total-count="Number(slaMeta.count)"
-      :page-size="3"
       @page-change="onPageChange"
     />
   </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportItem.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportItem.vue
index 4bb9ef5bf..d1ea4fc6d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportItem.vue
@@ -9,6 +9,10 @@ defineProps({
     type: Number,
     required: true,
   },
+  conversation: {
+    type: Object,
+    required: true,
+  },
 });
 </script>
 
@@ -24,8 +28,11 @@ defineProps({
     <div
       class="flex items-center col-span-6 px-0 py-2 text-sm tracking-[0.5] text-slate-700 dark:text-slate-100 rtl:text-right"
     >
-      #{{ conversationId }} with John Doe
-      <card-labels :conversation-id="148" />
+      #{{ conversationId }} with {{ conversation.contact.name }}
+      <card-labels
+        :conversation-id="conversationId"
+        :conversation-labels="conversation.labels"
+      />
     </div>
     <div
       class="flex items-center col-span-2 px-0 py-2 text-sm tracking-[0.5] text-slate-700 dark:text-slate-100 rtl:text-right"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLATable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLATable.vue
index d2485da5d..0522a4d6d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLATable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLATable.vue
@@ -30,7 +30,8 @@
         v-for="sla in slaReports"
         :key="sla.id"
         :sla-name="sla.sla_policy.name"
-        :conversation-id="sla.conversation.id"
+        :conversation="sla.conversation"
+        :conversation-id="sla.conversation_id"
       />
     </div>
     <table-footer
diff --git a/enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder
index cdfc87fc4..79daa3a6e 100644
--- a/enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder
@@ -1,5 +1,3 @@
-
-
 json.payload do
   json.array! @applied_slas do |applied_sla|
     json.id applied_sla.id
@@ -9,7 +7,11 @@ json.payload do
     json.created_at applied_sla.created_at
     json.updated_at applied_sla.updated_at
     json.conversation do
-      json.partial! 'api/v1/models/conversation', conversation: applied_sla.conversation
+      json.contact do
+        json.name applied_sla.conversation.contact.name
+      end
+      json.labels applied_sla.conversation.cached_label_list
+      json.assignee applied_sla.conversation.assignee
     end
     json.sla_events applied_sla.sla_events do |sla_event|
       json.partial! 'api/v1/models/sla_event', formats: [:json], sla_event: sla_event