Merge branch 'master' of https://github.com/glific/glific-frontend in…

…to feature/export-tickets
glific · Nov 6, 2023 · 1816c42 · 1816c42
2 parents 6072c1a + 57930d5
commit 1816c42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git 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 {
@@ -86,6 +85,7 @@
   color: #93a29b;
   line-height: 1.25;
   margin: 0;
+  word-break: break-all;
 }
 
 .Filters {

diff --git a/src/containers/Ticket/TicketList/TicketList.tsx b/src/containers/Ticket/TicketList/TicketList.tsx
@@ -15,9 +15,9 @@ import { DialogBox } from 'components/UI/DialogBox/DialogBox';
 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) => <div className={styles.TableText}>{id}</div>;
 const getBody = (body: any) => <div className={styles.TableText}>{body}</div>;
 const getInsertedAt = (insertedAt: string) => (
   <div className={styles.TableText}>{moment(insertedAt).format('DD-MM-YYYY hh:mm')}</div>
@@ -40,7 +40,8 @@ const getStatus = (status: string) => {
 
 const getUser = (user: any) => <div className={styles.TableText}>{user?.name}</div>;
 
-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),
@@ -49,6 +50,7 @@ const getColumns = ({ body, status, insertedAt, user, contact }: any) => ({
 });
 
 const columnStyles = [
+  styles.Id,
   styles.Created,
   styles.Label,
   styles.Issue,
@@ -112,6 +114,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
@@ -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"
 }