From a95ee92bea61ae088513126d9664c80bb7c51934 Mon Sep 17 00:00:00 2001 From: mdshamoon Date: Thu, 2 Nov 2023 09:25:58 +0530 Subject: [PATCH 1/2] added ticket ids --- src/containers/Ticket/TicketList/TicketList.module.css | 5 ++--- src/containers/Ticket/TicketList/TicketList.tsx | 7 +++++-- src/i18n/en/en.json | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/containers/Ticket/TicketList/TicketList.module.css b/src/containers/Ticket/TicketList/TicketList.module.css index ca7f9bb54..dab7ae8fb 100644 --- a/src/containers/Ticket/TicketList/TicketList.module.css +++ b/src/containers/Ticket/TicketList/TicketList.module.css @@ -31,9 +31,8 @@ font-size: 16px; } -.EndDate { - min-width: 110px; - width: 15%; +.Id { + width: 100px; } .Created { diff --git a/src/containers/Ticket/TicketList/TicketList.tsx b/src/containers/Ticket/TicketList/TicketList.tsx index fd8298c12..1101d8306 100644 --- a/src/containers/Ticket/TicketList/TicketList.tsx +++ b/src/containers/Ticket/TicketList/TicketList.tsx @@ -12,9 +12,9 @@ import { List } from 'containers/List/List'; import Ticket from 'containers/Ticket/Ticket'; import { Dropdown } from 'components/UI/Form/Dropdown/Dropdown'; import { getUserSession } from 'services/AuthService'; - import styles from './TicketList.module.css'; +const getId = (id: any) =>
{id}
; const getBody = (body: any) =>
{body}
; const getInsertedAt = (insertedAt: string) => (
{moment(insertedAt).format('DD-MM-YYYY hh:mm')}
@@ -37,7 +37,8 @@ const getStatus = (status: string) => { const getUser = (user: any) =>
{user?.name}
; -const getColumns = ({ body, status, insertedAt, user, contact }: any) => ({ +const getColumns = ({ id, body, status, insertedAt, user, contact }: any) => ({ + ticketId: getId(id), insertedAt: getInsertedAt(insertedAt), body: getBody(body), contact: getUser(contact), @@ -46,6 +47,7 @@ const getColumns = ({ body, status, insertedAt, user, contact }: any) => ({ }); const columnStyles = [ + styles.Id, styles.Created, styles.Label, styles.Issue, @@ -94,6 +96,7 @@ export const TicketList = () => { } const columnNames: any = [ + { name: 'id', label: t('ID') }, { name: 'inserted_at', label: t('Created at'), sort: true, order: 'desc' }, { name: 'body', label: t('Issue') }, { label: t('Opened by') }, diff --git a/src/i18n/en/en.json b/src/i18n/en/en.json index 191dc79b6..359f15221 100644 --- a/src/i18n/en/en.json +++ b/src/i18n/en/en.json @@ -433,5 +433,6 @@ "Request header": "Request header", "Request JSON": "Request JSON", "Response JSON": "Response JSON", - "Webhook Logs": "Webhook Logs" + "Webhook Logs": "Webhook Logs", + "ID": "ID" } From c8771a5351240887254d4b58ba04811b3633c38f Mon Sep 17 00:00:00 2001 From: mdshamoon Date: Thu, 2 Nov 2023 12:21:01 +0530 Subject: [PATCH 2/2] word break added --- src/containers/Ticket/TicketList/TicketList.module.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/containers/Ticket/TicketList/TicketList.module.css b/src/containers/Ticket/TicketList/TicketList.module.css index dab7ae8fb..539daf1d2 100644 --- a/src/containers/Ticket/TicketList/TicketList.module.css +++ b/src/containers/Ticket/TicketList/TicketList.module.css @@ -85,6 +85,7 @@ color: #93a29b; line-height: 1.25; margin: 0; + word-break: break-all; } .Filters {