From 03c28d03b68d926dd91a433c7b9366a153f94bae Mon Sep 17 00:00:00 2001 From: rapoler Date: Fri, 2 Aug 2024 15:24:58 +0530 Subject: [PATCH 1/2] added Requested Date column to the table --- .../src/components/GlobalNav/SpaceSelector.js | 1 + .../src/pages/spaces/components/SpaceList.js | 37 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/studio/src/components/GlobalNav/SpaceSelector.js b/studio/src/components/GlobalNav/SpaceSelector.js index e663bad3a..ae4c4fcda 100644 --- a/studio/src/components/GlobalNav/SpaceSelector.js +++ b/studio/src/components/GlobalNav/SpaceSelector.js @@ -141,6 +141,7 @@ function SpaceSelector({ onClose }) { } /> } + title={"ID : " + details[item].id} description={ searchquery && details[item].name.toLowerCase().includes(searchquery.toLowerCase()) ? ( diff --git a/studio/src/pages/spaces/components/SpaceList.js b/studio/src/pages/spaces/components/SpaceList.js index b77ba5f53..4ef942dfc 100644 --- a/studio/src/pages/spaces/components/SpaceList.js +++ b/studio/src/pages/spaces/components/SpaceList.js @@ -20,6 +20,18 @@ function SpaceList() { dispatch(getSpaces()); }; + const formatDate = (dateString) => { + const options = { + year: 'numeric', + month: 'short', + day: 'numeric', + hour: '2-digit', + minute: '2-digit', + hour12: true, + }; + return new Date(dateString).toLocaleDateString(undefined, options); + }; + const columns = [ { title: 'ID', @@ -30,7 +42,7 @@ function SpaceList() { return ( @@ -42,7 +54,7 @@ function SpaceList() { }, }, { - title: 'Name', + title: 'Space name', dataIndex: 'name', key: 'name', width: 200, @@ -68,6 +80,27 @@ function SpaceList() { ); }, }, + { + title: 'Requested Date', + dataIndex: 'created_at', + key: 'created_at', + width: 200, + onCell: () => { + return { + style: { + minWidth: '200px', + }, + }; + }, + render: (_, record) => { + return ( + + {formatDate(record.created_at)} + + ); + }, + }, + { title: 'Site Address', dataIndex: 'site_address', From d9d0fa852bc15d33ab7a527b91a50755be0448e5 Mon Sep 17 00:00:00 2001 From: rapoler Date: Mon, 5 Aug 2024 12:34:44 +0530 Subject: [PATCH 2/2] modified the name to Created At --- docker | 0 docker-compose.yml | 2 -- studio/src/pages/spaces/components/SpaceList.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 docker diff --git a/docker b/docker new file mode 100644 index 000000000..e69de29bb diff --git a/docker-compose.yml b/docker-compose.yml index b0cd12b31..58ffadebc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: ########################################################################### ####### DB SERVICES ####### diff --git a/studio/src/pages/spaces/components/SpaceList.js b/studio/src/pages/spaces/components/SpaceList.js index 4ef942dfc..de7231102 100644 --- a/studio/src/pages/spaces/components/SpaceList.js +++ b/studio/src/pages/spaces/components/SpaceList.js @@ -81,7 +81,7 @@ function SpaceList() { }, }, { - title: 'Requested Date', + title: 'Created At', dataIndex: 'created_at', key: 'created_at', width: 200,