diff --git a/app/javascript/dashboard/api/slaReports.js b/app/javascript/dashboard/api/slaReports.js index c187c58a3..36a3a895c 100644 --- a/app/javascript/dashboard/api/slaReports.js +++ b/app/javascript/dashboard/api/slaReports.js @@ -13,6 +13,7 @@ class SLAReportsAPI extends ApiClient { inbox_id, team_id, sla_policy_id, + label_list, page, } = {}) { return axios.get(this.url, { @@ -23,6 +24,7 @@ class SLAReportsAPI extends ApiClient { inbox_id, team_id, sla_policy_id, + label_list, page, }, }); @@ -54,6 +56,7 @@ class SLAReportsAPI extends ApiClient { assigned_agent_id, inbox_id, team_id, + label_list, sla_policy_id, } = {}) { return axios.get(`${this.url}/metrics`, { @@ -62,6 +65,7 @@ class SLAReportsAPI extends ApiClient { until: to, assigned_agent_id, inbox_id, + label_list, team_id, sla_policy_id, }, diff --git a/app/javascript/dashboard/api/specs/slaReports.spec.js b/app/javascript/dashboard/api/specs/slaReports.spec.js index 51ac8bfe4..e69f527b2 100644 --- a/app/javascript/dashboard/api/specs/slaReports.spec.js +++ b/app/javascript/dashboard/api/specs/slaReports.spec.js @@ -35,6 +35,7 @@ describe('#SLAReports API', () => { inbox_id: 1, team_id: 1, sla_policy_id: 1, + label_list: ['label1'], }); expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/applied_slas', { params: { @@ -45,6 +46,7 @@ describe('#SLAReports API', () => { inbox_id: 1, team_id: 1, sla_policy_id: 1, + label_list: ['label1'], }, }); }); @@ -56,6 +58,7 @@ describe('#SLAReports API', () => { inbox_id: 1, team_id: 1, sla_policy_id: 1, + label_list: ['label1'], }); expect(axiosMock.get).toHaveBeenCalledWith( '/api/v1/applied_slas/metrics', @@ -67,6 +70,7 @@ describe('#SLAReports API', () => { inbox_id: 1, team_id: 1, sla_policy_id: 1, + label_list: ['label1'], }, } ); diff --git a/app/javascript/dashboard/assets/scss/_date-picker.scss b/app/javascript/dashboard/assets/scss/_date-picker.scss index 2132d5fd5..60c24b421 100644 --- a/app/javascript/dashboard/assets/scss/_date-picker.scss +++ b/app/javascript/dashboard/assets/scss/_date-picker.scss @@ -1,6 +1,13 @@ @import '~vue2-datepicker/scss/index'; .date-picker { + // To be removed one SLA reports date picker is created + &.small { + .mx-input { + @apply h-8 text-sm; + } + } + &.no-margin { .mx-input { @apply mb-0; diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss index 9170715e0..99b006045 100644 --- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss +++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss @@ -153,6 +153,29 @@ } .multiselect-wrap--small { + // To be removed one SLA reports date picker is created + &.tiny { + .multiselect.no-margin { + @apply min-h-[32px]; + } + + .multiselect__select { + @apply min-h-[32px] h-8; + + &::before { + @apply top-[60%]; + } + } + + .multiselect__tags { + @apply min-h-[32px] max-h-[32px]; + + .multiselect__single { + @apply pt-1 pb-1; + } + } + } + .multiselect__tags, .multiselect__input, .multiselect { diff --git a/app/javascript/dashboard/components/widgets/TableFooterPagination.vue b/app/javascript/dashboard/components/widgets/TableFooterPagination.vue index c048b2eb7..38ebdc69c 100644 --- a/app/javascript/dashboard/components/widgets/TableFooterPagination.vue +++ b/app/javascript/dashboard/components/widgets/TableFooterPagination.vue @@ -82,7 +82,7 @@ + diff --git a/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue b/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue index 0b457cb9a..479e2794f 100644 --- a/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue +++ b/app/javascript/dashboard/components/widgets/conversation/components/SLAPopoverCard.vue @@ -1,45 +1,85 @@ diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js index b8014ce6c..fe28c9d88 100644 --- a/app/javascript/dashboard/constants/globals.js +++ b/app/javascript/dashboard/constants/globals.js @@ -59,5 +59,10 @@ export default { TYPE: 'type', SORT_ORDER: 'sort_order', }, + SLA_MISS_TYPES: { + FRT: 'frt', + NRT: 'nrt', + RT: 'rt', + }, }; export const DEFAULT_REDIRECT_URL = '/app/'; diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json index 42aa7b4a4..d6ea8f83d 100644 --- a/app/javascript/dashboard/i18n/locale/en/conversation.json +++ b/app/javascript/dashboard/i18n/locale/en/conversation.json @@ -71,12 +71,6 @@ "RT": "RT {status}", "MISSED": "missed", "DUE": "due" - }, - "SLA_POPOVER": { - "FRT": "First Response Time", - "NRT": "Next Response Time", - "RT": "Resolution Time", - "MISSED": "missed on" } }, "RESOLVE_DROPDOWN": { diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json index 7a4bf60ad..172e5501d 100644 --- a/app/javascript/dashboard/i18n/locale/en/report.json +++ b/app/javascript/dashboard/i18n/locale/en/report.json @@ -138,7 +138,11 @@ "groupBy": "Year" } ], - "BUSINESS_HOURS": "Business Hours" + "BUSINESS_HOURS": "Business Hours", + "FILTER_ACTIONS": { + "CLEAR_FILTER": "Clear filter", + "EMPTY_LIST": "No results found" + } }, "AGENT_REPORTS": { "HEADER": "Agents Overview", @@ -512,6 +516,26 @@ "LOADING": "Loading SLA data...", "DOWNLOAD_SLA_REPORTS": "Download SLA reports", "DOWNLOAD_FAILED": "Failed to download SLA Reports", + "DROPDOWN": { + "ADD_FIlTER": "Add filter", + "CLEAR_ALL": "Clear all", + "CLEAR_FILTER": "Clear filter", + "EMPTY_LIST": "No results found", + "NO_FILTER": "No filters available", + "SEARCH": "Search filter", + "INPUT_PLACEHOLDER": { + "SLA": "SLA name", + "AGENTS": "Agent name", + "INBOXES": "Inbox name", + "LABELS": "Label name", + "TEAMS": "Team name" + }, + "SLA": "SLA Policy", + "INBOXES": "Inbox", + "AGENTS": "Agent", + "LABELS": "Label", + "TEAMS": "Team" + }, "METRICS": { "HIT_RATE": { "LABEL": "Hit Rate", diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json index d47e89c05..ce6e3d17e 100644 --- a/app/javascript/dashboard/i18n/locale/en/sla.json +++ b/app/javascript/dashboard/i18n/locale/en/sla.json @@ -83,6 +83,14 @@ "YES": "Yes, Delete ", "NO": "No, Keep " } + }, + "EVENTS": { + "TITLE": "SLA Misses", + "FRT": "First response time", + "NRT": "Next response time", + "RT": "Resolution time", + "SHOW_MORE": "{count} more", + "HIDE": "Hide {count} rows" } } -} \ No newline at end of file +} diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue index 9fe790c97..3c12a4527 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/reports/SLAReports.vue @@ -1,5 +1,5 @@