From 21e71c4ec2b1598180cfb7ae881cbd71e4d07a49 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Thu, 23 Nov 2023 21:36:13 +0100 Subject: [PATCH 01/17] [Layout] Modify the Entities to be in a collapsible submenu - implemented collapsible submenu for Entities --- pkgs/ui/src/components/sidebar/index.tsx | 308 ++++++++++++++--------- 1 file changed, 186 insertions(+), 122 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index 50eaf33..fd1cf76 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -1,16 +1,17 @@ import { - Divider, - IconButton, - List, - ListItem, - ListItemButton, - ListItemIcon, - ListItemText, + Divider, + IconButton, + List, + ListItem, + ListItemButton, + ListItemIcon, + ListItemText, } from "@mui/material"; import Image from "next/image"; -import React, { ReactNode } from "react"; +import React, {ReactNode} from "react"; -import { tw } from "@/utils/tailwind"; +import {tw} from "@/utils/tailwind"; +import Collapse from '@mui/material/Collapse'; import Link from "next/link"; import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"; import HomeIcon from "@mui/icons-material/Home"; @@ -18,134 +19,197 @@ import HubIcon from "@mui/icons-material/Hub"; import PersonIcon from "@mui/icons-material/Person"; import RouterIcon from "@mui/icons-material/Router"; import StorageIcon from "@mui/icons-material/Storage"; +import ExpandLess from '@mui/icons-material/ExpandLess'; +import ExpandMore from '@mui/icons-material/ExpandMore'; type MenuEntry = { - icon: ReactNode; - label: string; - to: string; - disabled: boolean; + icon: ReactNode; + label: string; + to: string; + disabled: boolean; } & { - subMenuEntries?: MenuEntry[]; + subMenuEntries?: MenuEntry[]; }; +const menuEntityEntries: MenuEntry[] = [ + { + icon: , + label: "C1", + to: "/client-1", + disabled: false, + }, + { + icon: , + label: "C2", + to: "/client-2", + disabled: false, + } +]; + const menuEntries: MenuEntry[] = [ - { - icon: , - label: "Home", - to: "/", - disabled: false, - }, - { - icon: , - label: "Entities", - to: "/entities", - disabled: true, - }, - { - icon: , - label: "C1", - to: "/client-1", - disabled: false, - }, - { - icon: , - label: "C2", - to: "/client-2", - disabled: false, - }, - { - icon: , - label: "AP", - to: "/access-point", - disabled: false, - }, - { - icon: , - label: "DLG", - to: "/distributed-ledger-gateway", - disabled: false, - }, + { + icon: , + label: "Home", + to: "/", + disabled: false, + }, + { + icon: , + label: "Entities", + to: "/entities", + disabled: false, + }, + { + icon: , + label: "AP", + to: "/access-point", + disabled: false, + }, + { + icon: , + label: "DLG", + to: "/distributed-ledger-gateway", + disabled: false, + }, ]; const hideSidebar = tw`-translate-x-14 lg:-translate-x-64`; const showSidebar = tw`lg:translate-x-0`; interface SidebarProps { - show: boolean; - onClose: () => void; + show: boolean; + onClose: () => void; } + export function Sidebar(props: SidebarProps) { - const { show, onClose } = props; + const {show, onClose} = props; + const [activeMenuItem, setActiveMenuItem] = React.useState("/"); + const [collapseMenuOpen, setCollapseMenuOpen] = React.useState(true); - const [activeMenuItem, setActiveMenuItem] = React.useState("/"); + const handleCollapseClick = () => { + setCollapseMenuOpen(!collapseMenuOpen); + }; - const handleMenuItemClick = (path: string) => { - setActiveMenuItem(path); - }; + const handleMenuItemClick = (path: string) => { + setActiveMenuItem(path); + }; - return ( - - ); + return ( + + ); } From 7f6eab34087727cbd715fb064e5d9610ad79442d Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Thu, 23 Nov 2023 21:42:21 +0100 Subject: [PATCH 02/17] [Layout] Modify the Entities to be in a collapsible submenu - fixed the activeTab if refresh site --- pkgs/ui/src/components/sidebar/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index fd1cf76..cf29792 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -83,7 +83,7 @@ interface SidebarProps { export function Sidebar(props: SidebarProps) { const {show, onClose} = props; - const [activeMenuItem, setActiveMenuItem] = React.useState("/"); + const [activeMenuItem, setActiveMenuItem] = React.useState(window.location.pathname); const [collapseMenuOpen, setCollapseMenuOpen] = React.useState(true); const handleCollapseClick = () => { From 64d88244b8e1f567ad344a59ed3718d215e192d9 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Thu, 23 Nov 2023 22:10:26 +0100 Subject: [PATCH 03/17] [Layout] Modify the Entities to be in a collapsible submenu - small fix for window pathname --- pkgs/ui/src/components/sidebar/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index cf29792..18970b1 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -83,7 +83,7 @@ interface SidebarProps { export function Sidebar(props: SidebarProps) { const {show, onClose} = props; - const [activeMenuItem, setActiveMenuItem] = React.useState(window.location.pathname); + const [activeMenuItem, setActiveMenuItem] = React.useState(typeof window !== "undefined" ? window.location.pathname : ""); const [collapseMenuOpen, setCollapseMenuOpen] = React.useState(true); const handleCollapseClick = () => { From b96a150c78a22f4c5843ad038c02d7fcdb46c025 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Thu, 23 Nov 2023 22:33:27 +0100 Subject: [PATCH 04/17] [Layout] Update current Logo - add tub image --- pkgs/ui/public/tub-logo.png | Bin 0 -> 17272 bytes pkgs/ui/src/components/sidebar/index.tsx | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 pkgs/ui/public/tub-logo.png diff --git a/pkgs/ui/public/tub-logo.png b/pkgs/ui/public/tub-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3c9bb7cff52a950d8bda21db0a60dff959f61214 GIT binary patch literal 17272 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 literal 0 HcmV?d00001 diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index 18970b1..af2e924 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -104,8 +104,8 @@ export function Sidebar(props: SidebarProps) {
TUB Logo Date: Thu, 23 Nov 2023 22:47:37 +0100 Subject: [PATCH 05/17] [Layout] Change Favicon to TUB --- pkgs/ui/public/tub-favicon.ico | Bin 0 -> 1406 bytes pkgs/ui/public/tub-favicon.png | Bin 0 -> 1002 bytes pkgs/ui/src/app/layout.tsx | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 pkgs/ui/public/tub-favicon.ico create mode 100644 pkgs/ui/public/tub-favicon.png diff --git a/pkgs/ui/public/tub-favicon.ico b/pkgs/ui/public/tub-favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..fa7d7a5b38c5cbe52bf23ce5b9100072f52ec565 GIT binary patch literal 1406 zcmZQzU}Ruq5D);-91Iz(3=Con3=A3!3=9Gc3=9ek5OD?&U<46R3}S;Y0|SFR-%*mV z0^d;vX`Ukt+)M`;B)Ja5^~&)cWl$44&fsowo5MT_C zi%(!=WME(nk6>YqWQ>YdFpY_gWMp6r2n-4i2{lX%(@C_p2xnmQ@=i?ju{TNdH8n}} z^JidWbV*EfbxTZix3JFf@MK_QluJysvo}dJc5uvga%Ny;v`9>}w6adLwy?>{v}Ism z)Hg^pG%`*!F*VD`G-qI7R8!Z`)Y48&)X_~#*OQi!m6MlOP*h4xR8~nzRTWQ!0}08b zWGO*7H&IAfL{yBOgOdvkIJtRv`S=Bxm|0lCfQ1d@8;rmLWu^b^3=9Vu85j;QK=1QUNSs54@ z6p}rHd>I(3)EF2VS{N99F)%PRykKA`HDF+PmB7GYHG_dcykO3*KpO@IMy~*$5LX5U zhNFD)L?DGDJkkf4xDRtlLKXAM9T!tOZ{dDYRu?M5BYRrS49do4<}m@qQ_9BJ74XWP zkkrH~b%a~ygtRt_6tCPd5f!KiSmR}n&||_d5o}gN6_YD@?eue-4|G#=3ah!pHA+aRLFPMRWSy)nnuk7Njn+L79B_t$1 z&#Aw2@%>5f)bPUh z|4Qf8r$6}_#kwi$`dux~Wp{4)h@NB=;gD}V5YNubec8Wi4+8@OW0JSKOYUwqhP4a~ z4D2PIzOL+#8HKobEK`HcL2-Z9)5S4F;&O6=1G~=|oizyu4jnteA(Zg^!4oECzdX4( zyE;a;gDw^VLSllV$pY>i9v*6{-i98hPn0uV1)w$Service Aware Networks - + @@ -88,8 +88,8 @@ export default function RootLayout({
TUB Logo Date: Thu, 23 Nov 2023 22:59:13 +0100 Subject: [PATCH 06/17] [Layout] Change Favicon to TUB - remove current favicon --- pkgs/ui/public/tub-favicon.ico | Bin 1406 -> 0 bytes pkgs/ui/src/app/layout.tsx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 pkgs/ui/public/tub-favicon.ico diff --git a/pkgs/ui/public/tub-favicon.ico b/pkgs/ui/public/tub-favicon.ico deleted file mode 100644 index fa7d7a5b38c5cbe52bf23ce5b9100072f52ec565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmZQzU}Ruq5D);-91Iz(3=Con3=A3!3=9Gc3=9ek5OD?&U<46R3}S;Y0|SFR-%*mV z0^d;vX`Ukt+)M`;B)Ja5^~&)cWl$44&fsowo5MT_C zi%(!=WME(nk6>YqWQ>YdFpY_gWMp6r2n-4i2{lX%(@C_p2xnmQ@=i?ju{TNdH8n}} z^JidWbV*EfbxTZix3JFf@MK_QluJysvo}dJc5uvga%Ny;v`9>}w6adLwy?>{v}Ism z)Hg^pG%`*!F*VD`G-qI7R8!Z`)Y48&)X_~#*OQi!m6MlOP*h4xR8~nzRTWQ!0}08b zWGO*7H&IAfL{yBOgOdvkIJtRv`S=Bxm|0lCfQ1d@8;rmLWu^b^3=9Vu85j;QK=1Service Aware Networks - + From 2b500fa42ae3de31be994276b97b390427405929 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Thu, 23 Nov 2023 23:18:19 +0100 Subject: [PATCH 07/17] [Layout] Change Favicon to TUB - update favicon --- pkgs/ui/public/tub-favicon.ico | Bin 0 -> 1150 bytes pkgs/ui/src/app/layout.tsx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 pkgs/ui/public/tub-favicon.ico diff --git a/pkgs/ui/public/tub-favicon.ico b/pkgs/ui/public/tub-favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..44973f83791cb04a153a83d6a616effa2e634ec7 GIT binary patch literal 1150 zcmZQzU}Ruq5D);-3Je)63=Con3=A3!3=9Gc3=9ek5OD?&U;z>I$MSqf8Rhwovdi-w z<(20<%8kthP&Fd*d`Bha`Ho7+^Bv^?sgvhBDlgA>v{jz(XpcPK(JFbqqX*>qj>f~} zL25u)p6@89Jm1k}@_a|{$nzb&AisMvL={V@JrdA_4sAiXdw&v$elR4qt< zy*%I1bR_;0sGZ*x_`&Y^DbIH_3Z@rC%kv%WL{dK$&HndtyhjT)B~QFh488V0)Z_9$ z72#v0Abl_lH6LU*2(OaoJL)0NcNFAT5FbPr%kdt467F^Re_ry<|0*KKdSQA&v^?L@ zIC;LK|DbLFg`2HB-_iF_KFHryGTcY5d)r+A>(`b(u@s~ahUNK=n#uDW-6+p@bh|v? z(FyW=NA>0Tjy{I!2f3j|j`!#ZANz~{lf$q7*OWZ5SDx>vfjr;QYI(k+9Z>)G%JUrs zVNiTek>@-54oUwcMS){Gg556vFG#)h-&pz7WqH1%SCHgEcHqN{WO1hy&*k}!ekMWx968>j^=e|r@3>o>zo9F8@}fN7(K30yqaga0Jm1lqI50@=pgiAE zD+Ruz+|oQpB)FLlNJw%W2BmXmdA_5Service Aware Networks - + From 99821a1f81da7926d5e9b0c7f503358df97a0228 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Thu, 23 Nov 2023 23:18:55 +0100 Subject: [PATCH 08/17] [Layout] Update current Logo - adjust size of tub logo --- pkgs/ui/src/components/sidebar/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index af2e924..b70f66f 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -106,8 +106,8 @@ export function Sidebar(props: SidebarProps) { TU Berlin Logo
From 417ca354fcf9449cc3c31ea6fe0c6fdd6a8001fc Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Thu, 23 Nov 2023 23:28:46 +0100 Subject: [PATCH 09/17] [Layout] Update current Logo - adjust size of tub logo --- pkgs/ui/src/components/sidebar/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index b70f66f..77ae189 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -106,8 +106,8 @@ export function Sidebar(props: SidebarProps) { TU Berlin Logo
From 12c34c33a2dc7cbc4d1159d1ad0cf7a6b52b6d61 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Fri, 24 Nov 2023 00:08:20 +0100 Subject: [PATCH 10/17] [Entities] C1 Consumer View Table - create and add data to the consumer table --- pkgs/ui/src/app/client-1/page.tsx | 10 ++++- pkgs/ui/src/mock/client_1/index.ts | 64 ++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/pkgs/ui/src/app/client-1/page.tsx b/pkgs/ui/src/app/client-1/page.tsx index e290a0b..8aa6167 100644 --- a/pkgs/ui/src/app/client-1/page.tsx +++ b/pkgs/ui/src/app/client-1/page.tsx @@ -1,7 +1,8 @@ "use client"; import SummaryDetails from "@/components/summary_card"; -import { Client1SummaryDetails } from "@/mock/client_1"; +import { Client1SummaryDetails, Client1DummyData, Client1TableConfig } from "@/mock/client_1"; +import CustomTable from "@/components/table"; export default function Client1() { return ( @@ -14,6 +15,13 @@ export default function Client1() { details: Client1SummaryDetails, }} /> +
+

Consumer View

+ +
); } diff --git a/pkgs/ui/src/mock/client_1/index.ts b/pkgs/ui/src/mock/client_1/index.ts index 030cc7f..87ce8fe 100644 --- a/pkgs/ui/src/mock/client_1/index.ts +++ b/pkgs/ui/src/mock/client_1/index.ts @@ -14,3 +14,67 @@ export const Client1SummaryDetails = [ value: "Carlo's Home Network", }, ]; + +export const Client1DummyData = [ + { + "service_name": "Carlo's Printing", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:1223", + "network": "Carlo's Home Network", + }, + { + "service_name": "Steve's Printing", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:1234", + "network": "Steve's Home Network", + }, + { + "service_name": "Test A", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:4567", + "network": "Test Network A", + }, + { + "service_name": "Test B", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:0062", + "network": "Test Network B", + }, + +] + + +export const Client1TableConfig = [ + { + key: "service_name", + label: "Service name" + }, + { + key: "service_type", + label: "Service Type" + }, + { + key: "end_point", + label: "End Point" + }, + { + key: "producer", + label: "Producer" + }, + { + key: "producer_did", + label: "Producer DID" + }, + { + key: "network", + label: "Network" + } +] From 58f252204b1eda2e049f0d8e0b61e0aaca0df031 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Fri, 24 Nov 2023 00:11:10 +0100 Subject: [PATCH 11/17] [Entities] C1 Consumer View Table - refactoring --- pkgs/ui/src/app/client-1/page.tsx | 6 +++--- pkgs/ui/src/mock/client_1/index.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/ui/src/app/client-1/page.tsx b/pkgs/ui/src/app/client-1/page.tsx index 8aa6167..cb39bfc 100644 --- a/pkgs/ui/src/app/client-1/page.tsx +++ b/pkgs/ui/src/app/client-1/page.tsx @@ -1,7 +1,7 @@ "use client"; import SummaryDetails from "@/components/summary_card"; -import { Client1SummaryDetails, Client1DummyData, Client1TableConfig } from "@/mock/client_1"; +import { Client1SummaryDetails, Client1ConsumerData, Client1ConsumerTableConfig } from "@/mock/client_1"; import CustomTable from "@/components/table"; export default function Client1() { @@ -18,8 +18,8 @@ export default function Client1() {

Consumer View

diff --git a/pkgs/ui/src/mock/client_1/index.ts b/pkgs/ui/src/mock/client_1/index.ts index 87ce8fe..d374e38 100644 --- a/pkgs/ui/src/mock/client_1/index.ts +++ b/pkgs/ui/src/mock/client_1/index.ts @@ -15,7 +15,7 @@ export const Client1SummaryDetails = [ }, ]; -export const Client1DummyData = [ +export const Client1ConsumerData = [ { "service_name": "Carlo's Printing", "service_type": "3D Printing", @@ -52,7 +52,7 @@ export const Client1DummyData = [ ] -export const Client1TableConfig = [ +export const Client1ConsumerTableConfig = [ { key: "service_name", label: "Service name" From e93c6bb7eed35da354704c33c37516afb7f90756 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Fri, 24 Nov 2023 00:19:11 +0100 Subject: [PATCH 12/17] [Entities] C1 Producer View Table - create and add data to the producer table --- pkgs/ui/src/app/client-1/page.tsx | 15 ++++++- pkgs/ui/src/mock/client_1/index.ts | 64 +++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/pkgs/ui/src/app/client-1/page.tsx b/pkgs/ui/src/app/client-1/page.tsx index cb39bfc..4d74186 100644 --- a/pkgs/ui/src/app/client-1/page.tsx +++ b/pkgs/ui/src/app/client-1/page.tsx @@ -1,7 +1,13 @@ "use client"; import SummaryDetails from "@/components/summary_card"; -import { Client1SummaryDetails, Client1ConsumerData, Client1ConsumerTableConfig } from "@/mock/client_1"; +import { + Client1SummaryDetails, + Client1ConsumerData, + Client1ConsumerTableConfig, + Client1ProducerTableConfig, + Client1ProducerData +} from "@/mock/client_1"; import CustomTable from "@/components/table"; export default function Client1() { @@ -22,6 +28,13 @@ export default function Client1() { configuration={Client1ConsumerTableConfig} /> +
+

Producer View

+ +
); } diff --git a/pkgs/ui/src/mock/client_1/index.ts b/pkgs/ui/src/mock/client_1/index.ts index d374e38..fbbe0d5 100644 --- a/pkgs/ui/src/mock/client_1/index.ts +++ b/pkgs/ui/src/mock/client_1/index.ts @@ -48,10 +48,8 @@ export const Client1ConsumerData = [ "producer_did": "did:sov:test:0062", "network": "Test Network B", }, - ] - export const Client1ConsumerTableConfig = [ { key: "service_name", @@ -78,3 +76,65 @@ export const Client1ConsumerTableConfig = [ label: "Network" } ] + +export const Client1ProducerData = [ + { + "service_name": "Carlo's Printing", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "DRAFT, REGISTERED", + "action": "Register, Deregister, Delete", + }, + { + "service_name": "Steve's Printing", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "REGISTERED", + "action": "Create", + }, + { + "service_name": "Test Printing A", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "DRAFT", + "action": "Register, Deregister", + }, + { + "service_name": "Test Printing B", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "DRAFT, REGISTERED", + "action": "Delete, Create", + }, +] + +export const Client1ProducerTableConfig = [ + { + key: "service_name", + label: "Service name" + }, + { + key: "service_type", + label: "Service Type" + }, + { + key: "end_point", + label: "End Point" + }, + { + key: "usage", + label: "Usage" + }, + { + key: "status", + label: "Status" + }, + { + key: "action", + label: "Action" + } +] \ No newline at end of file From 2b590e9531e2949fe07556f987f3318233736505 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Fri, 24 Nov 2023 00:29:14 +0100 Subject: [PATCH 13/17] [Entities] C2 Consumer View Table - create and add data to the producer table --- pkgs/ui/src/app/client-2/page.tsx | 14 ++++++- pkgs/ui/src/mock/client_2/index.ts | 62 ++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/pkgs/ui/src/app/client-2/page.tsx b/pkgs/ui/src/app/client-2/page.tsx index a9a4168..39e68d5 100644 --- a/pkgs/ui/src/app/client-2/page.tsx +++ b/pkgs/ui/src/app/client-2/page.tsx @@ -1,7 +1,12 @@ "use client"; import SummaryDetails from "@/components/summary_card"; -import { Client2SummaryDetails } from "@/mock/client_2"; +import { + Client2ConsumerData, + Client2ConsumerTableConfig, + Client2SummaryDetails +} from "@/mock/client_2"; +import CustomTable from "@/components/table"; export default function Client1() { return ( @@ -14,6 +19,13 @@ export default function Client1() { details: Client2SummaryDetails, }} /> +
+

Consumer View

+ +
); } diff --git a/pkgs/ui/src/mock/client_2/index.ts b/pkgs/ui/src/mock/client_2/index.ts index 19e6936..0f7fb8e 100644 --- a/pkgs/ui/src/mock/client_2/index.ts +++ b/pkgs/ui/src/mock/client_2/index.ts @@ -14,3 +14,65 @@ export const Client2SummaryDetails = [ value: "Carlo's Home Network", }, ]; + +export const Client2ConsumerData = [ + { + "service_name": "Carlo's Printing", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:1223", + "network": "Carlo's Home Network", + }, + { + "service_name": "Steve's Printing", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:1234", + "network": "Steve's Home Network", + }, + { + "service_name": "Test A", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:4567", + "network": "Test Network A", + }, + { + "service_name": "Test B", + "service_type": "3D Printing", + "end_point": "Consume", + "producer": "C2", + "producer_did": "did:sov:test:0062", + "network": "Test Network B", + }, +] + +export const Client2ConsumerTableConfig = [ + { + key: "service_name", + label: "Service name" + }, + { + key: "service_type", + label: "Service Type" + }, + { + key: "end_point", + label: "End Point" + }, + { + key: "producer", + label: "Producer" + }, + { + key: "producer_did", + label: "Producer DID" + }, + { + key: "network", + label: "Network" + } +] \ No newline at end of file From 0cea4644c39618309f6c190921e4be21a00d6d4b Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Fri, 24 Nov 2023 00:30:09 +0100 Subject: [PATCH 14/17] [Entities] C2 Producer View Table - create and add data to the producer table --- pkgs/ui/src/app/client-2/page.tsx | 9 +++++ pkgs/ui/src/mock/client_2/index.ts | 64 +++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/pkgs/ui/src/app/client-2/page.tsx b/pkgs/ui/src/app/client-2/page.tsx index 39e68d5..accb479 100644 --- a/pkgs/ui/src/app/client-2/page.tsx +++ b/pkgs/ui/src/app/client-2/page.tsx @@ -4,6 +4,8 @@ import SummaryDetails from "@/components/summary_card"; import { Client2ConsumerData, Client2ConsumerTableConfig, + Client2ProducerData, + Client2ProducerTableConfig, Client2SummaryDetails } from "@/mock/client_2"; import CustomTable from "@/components/table"; @@ -26,6 +28,13 @@ export default function Client1() { configuration={Client2ConsumerTableConfig} /> +
+

Producer View

+ +
); } diff --git a/pkgs/ui/src/mock/client_2/index.ts b/pkgs/ui/src/mock/client_2/index.ts index 0f7fb8e..8898587 100644 --- a/pkgs/ui/src/mock/client_2/index.ts +++ b/pkgs/ui/src/mock/client_2/index.ts @@ -75,4 +75,66 @@ export const Client2ConsumerTableConfig = [ key: "network", label: "Network" } -] \ No newline at end of file +] + +export const Client2ProducerData = [ + { + "service_name": "Carlo's Printing", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "DRAFT, REGISTERED", + "action": "Register, Deregister, Delete", + }, + { + "service_name": "Steve's Printing", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "REGISTERED", + "action": "Create", + }, + { + "service_name": "Test Printing A", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "DRAFT", + "action": "Register, Deregister", + }, + { + "service_name": "Test Printing B", + "service_type": "3D Printing", + "end_point": "URL", + "usage": "C1(3), C3(4)", + "status": "DRAFT, REGISTERED", + "action": "Delete, Create", + }, +] + +export const Client2ProducerTableConfig = [ + { + key: "service_name", + label: "Service name" + }, + { + key: "service_type", + label: "Service Type" + }, + { + key: "end_point", + label: "End Point" + }, + { + key: "usage", + label: "Usage" + }, + { + key: "status", + label: "Status" + }, + { + key: "action", + label: "Action" + } +] From 30751442448c83edd72cb4a795f1804a8fc66fab Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Fri, 24 Nov 2023 01:05:54 +0100 Subject: [PATCH 15/17] fix linting --- pkgs/ui/src/app/client-1/page.tsx | 38 +-- pkgs/ui/src/app/client-2/page.tsx | 38 +-- pkgs/ui/src/components/sidebar/index.tsx | 369 ++++++++++++----------- pkgs/ui/src/mock/client_1/index.ts | 132 ++++---- pkgs/ui/src/mock/client_2/index.ts | 132 ++++---- 5 files changed, 359 insertions(+), 350 deletions(-) diff --git a/pkgs/ui/src/app/client-1/page.tsx b/pkgs/ui/src/app/client-1/page.tsx index 4d74186..5abb913 100644 --- a/pkgs/ui/src/app/client-1/page.tsx +++ b/pkgs/ui/src/app/client-1/page.tsx @@ -2,11 +2,11 @@ import SummaryDetails from "@/components/summary_card"; import { - Client1SummaryDetails, - Client1ConsumerData, - Client1ConsumerTableConfig, - Client1ProducerTableConfig, - Client1ProducerData + Client1SummaryDetails, + Client1ConsumerData, + Client1ConsumerTableConfig, + Client1ProducerTableConfig, + Client1ProducerData, } from "@/mock/client_1"; import CustomTable from "@/components/table"; @@ -21,20 +21,20 @@ export default function Client1() { details: Client1SummaryDetails, }} /> -
-

Consumer View

- -
-
-

Producer View

- -
+
+

Consumer View

+ +
+
+

Producer View

+ +
); } diff --git a/pkgs/ui/src/app/client-2/page.tsx b/pkgs/ui/src/app/client-2/page.tsx index accb479..80be865 100644 --- a/pkgs/ui/src/app/client-2/page.tsx +++ b/pkgs/ui/src/app/client-2/page.tsx @@ -2,11 +2,11 @@ import SummaryDetails from "@/components/summary_card"; import { - Client2ConsumerData, - Client2ConsumerTableConfig, - Client2ProducerData, - Client2ProducerTableConfig, - Client2SummaryDetails + Client2ConsumerData, + Client2ConsumerTableConfig, + Client2ProducerData, + Client2ProducerTableConfig, + Client2SummaryDetails, } from "@/mock/client_2"; import CustomTable from "@/components/table"; @@ -21,20 +21,20 @@ export default function Client1() { details: Client2SummaryDetails, }} /> -
-

Consumer View

- -
-
-

Producer View

- -
+
+

Consumer View

+ +
+
+

Producer View

+ +
); } diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index 77ae189..3b46170 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -1,17 +1,17 @@ import { - Divider, - IconButton, - List, - ListItem, - ListItemButton, - ListItemIcon, - ListItemText, + Divider, + IconButton, + List, + ListItem, + ListItemButton, + ListItemIcon, + ListItemText, } from "@mui/material"; import Image from "next/image"; -import React, {ReactNode} from "react"; +import React, { ReactNode } from "react"; -import {tw} from "@/utils/tailwind"; -import Collapse from '@mui/material/Collapse'; +import { tw } from "@/utils/tailwind"; +import Collapse from "@mui/material/Collapse"; import Link from "next/link"; import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"; import HomeIcon from "@mui/icons-material/Home"; @@ -19,197 +19,206 @@ import HubIcon from "@mui/icons-material/Hub"; import PersonIcon from "@mui/icons-material/Person"; import RouterIcon from "@mui/icons-material/Router"; import StorageIcon from "@mui/icons-material/Storage"; -import ExpandLess from '@mui/icons-material/ExpandLess'; -import ExpandMore from '@mui/icons-material/ExpandMore'; +import ExpandLess from "@mui/icons-material/ExpandLess"; +import ExpandMore from "@mui/icons-material/ExpandMore"; type MenuEntry = { - icon: ReactNode; - label: string; - to: string; - disabled: boolean; + icon: ReactNode; + label: string; + to: string; + disabled: boolean; } & { - subMenuEntries?: MenuEntry[]; + subMenuEntries?: MenuEntry[]; }; const menuEntityEntries: MenuEntry[] = [ - { - icon: , - label: "C1", - to: "/client-1", - disabled: false, - }, - { - icon: , - label: "C2", - to: "/client-2", - disabled: false, - } + { + icon: , + label: "C1", + to: "/client-1", + disabled: false, + }, + { + icon: , + label: "C2", + to: "/client-2", + disabled: false, + }, ]; const menuEntries: MenuEntry[] = [ - { - icon: , - label: "Home", - to: "/", - disabled: false, - }, - { - icon: , - label: "Entities", - to: "/entities", - disabled: false, - }, - { - icon: , - label: "AP", - to: "/access-point", - disabled: false, - }, - { - icon: , - label: "DLG", - to: "/distributed-ledger-gateway", - disabled: false, - }, + { + icon: , + label: "Home", + to: "/", + disabled: false, + }, + { + icon: , + label: "Entities", + to: "/entities", + disabled: false, + }, + { + icon: , + label: "AP", + to: "/access-point", + disabled: false, + }, + { + icon: , + label: "DLG", + to: "/distributed-ledger-gateway", + disabled: false, + }, ]; const hideSidebar = tw`-translate-x-14 lg:-translate-x-64`; const showSidebar = tw`lg:translate-x-0`; interface SidebarProps { - show: boolean; - onClose: () => void; + show: boolean; + onClose: () => void; } export function Sidebar(props: SidebarProps) { - const {show, onClose} = props; - const [activeMenuItem, setActiveMenuItem] = React.useState(typeof window !== "undefined" ? window.location.pathname : ""); - const [collapseMenuOpen, setCollapseMenuOpen] = React.useState(true); + const { show, onClose } = props; + const [activeMenuItem, setActiveMenuItem] = React.useState( + typeof window !== "undefined" ? window.location.pathname : "", + ); + const [collapseMenuOpen, setCollapseMenuOpen] = React.useState(true); - const handleCollapseClick = () => { - setCollapseMenuOpen(!collapseMenuOpen); - }; + const handleCollapseClick = () => { + setCollapseMenuOpen(!collapseMenuOpen); + }; - const handleMenuItemClick = (path: string) => { - setActiveMenuItem(path); - }; + const handleMenuItemClick = (path: string) => { + setActiveMenuItem(path); + }; - return ( - - ); + {menuEntry.icon} + + + + ))} + + + + )} + + ); + })} + + + + ); } diff --git a/pkgs/ui/src/mock/client_1/index.ts b/pkgs/ui/src/mock/client_1/index.ts index fbbe0d5..658b51e 100644 --- a/pkgs/ui/src/mock/client_1/index.ts +++ b/pkgs/ui/src/mock/client_1/index.ts @@ -17,124 +17,124 @@ export const Client1SummaryDetails = [ export const Client1ConsumerData = [ { - "service_name": "Carlo's Printing", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:1223", - "network": "Carlo's Home Network", + service_name: "Carlo's Printing", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:1223", + network: "Carlo's Home Network", }, { - "service_name": "Steve's Printing", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:1234", - "network": "Steve's Home Network", + service_name: "Steve's Printing", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:1234", + network: "Steve's Home Network", }, { - "service_name": "Test A", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:4567", - "network": "Test Network A", + service_name: "Test A", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:4567", + network: "Test Network A", }, { - "service_name": "Test B", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:0062", - "network": "Test Network B", + service_name: "Test B", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:0062", + network: "Test Network B", }, -] +]; export const Client1ConsumerTableConfig = [ { key: "service_name", - label: "Service name" + label: "Service name", }, { key: "service_type", - label: "Service Type" + label: "Service Type", }, { key: "end_point", - label: "End Point" + label: "End Point", }, { key: "producer", - label: "Producer" + label: "Producer", }, { key: "producer_did", - label: "Producer DID" + label: "Producer DID", }, { key: "network", - label: "Network" - } -] + label: "Network", + }, +]; export const Client1ProducerData = [ { - "service_name": "Carlo's Printing", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "DRAFT, REGISTERED", - "action": "Register, Deregister, Delete", + service_name: "Carlo's Printing", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "DRAFT, REGISTERED", + action: "Register, Deregister, Delete", }, { - "service_name": "Steve's Printing", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "REGISTERED", - "action": "Create", + service_name: "Steve's Printing", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "REGISTERED", + action: "Create", }, { - "service_name": "Test Printing A", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "DRAFT", - "action": "Register, Deregister", + service_name: "Test Printing A", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "DRAFT", + action: "Register, Deregister", }, { - "service_name": "Test Printing B", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "DRAFT, REGISTERED", - "action": "Delete, Create", + service_name: "Test Printing B", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "DRAFT, REGISTERED", + action: "Delete, Create", }, -] +]; export const Client1ProducerTableConfig = [ { key: "service_name", - label: "Service name" + label: "Service name", }, { key: "service_type", - label: "Service Type" + label: "Service Type", }, { key: "end_point", - label: "End Point" + label: "End Point", }, { key: "usage", - label: "Usage" + label: "Usage", }, { key: "status", - label: "Status" + label: "Status", }, { key: "action", - label: "Action" - } -] \ No newline at end of file + label: "Action", + }, +]; diff --git a/pkgs/ui/src/mock/client_2/index.ts b/pkgs/ui/src/mock/client_2/index.ts index 8898587..b0105fd 100644 --- a/pkgs/ui/src/mock/client_2/index.ts +++ b/pkgs/ui/src/mock/client_2/index.ts @@ -17,124 +17,124 @@ export const Client2SummaryDetails = [ export const Client2ConsumerData = [ { - "service_name": "Carlo's Printing", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:1223", - "network": "Carlo's Home Network", + service_name: "Carlo's Printing", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:1223", + network: "Carlo's Home Network", }, { - "service_name": "Steve's Printing", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:1234", - "network": "Steve's Home Network", + service_name: "Steve's Printing", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:1234", + network: "Steve's Home Network", }, { - "service_name": "Test A", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:4567", - "network": "Test Network A", + service_name: "Test A", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:4567", + network: "Test Network A", }, { - "service_name": "Test B", - "service_type": "3D Printing", - "end_point": "Consume", - "producer": "C2", - "producer_did": "did:sov:test:0062", - "network": "Test Network B", + service_name: "Test B", + service_type: "3D Printing", + end_point: "Consume", + producer: "C2", + producer_did: "did:sov:test:0062", + network: "Test Network B", }, -] +]; export const Client2ConsumerTableConfig = [ { key: "service_name", - label: "Service name" + label: "Service name", }, { key: "service_type", - label: "Service Type" + label: "Service Type", }, { key: "end_point", - label: "End Point" + label: "End Point", }, { key: "producer", - label: "Producer" + label: "Producer", }, { key: "producer_did", - label: "Producer DID" + label: "Producer DID", }, { key: "network", - label: "Network" - } -] + label: "Network", + }, +]; export const Client2ProducerData = [ { - "service_name": "Carlo's Printing", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "DRAFT, REGISTERED", - "action": "Register, Deregister, Delete", + service_name: "Carlo's Printing", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "DRAFT, REGISTERED", + action: "Register, Deregister, Delete", }, { - "service_name": "Steve's Printing", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "REGISTERED", - "action": "Create", + service_name: "Steve's Printing", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "REGISTERED", + action: "Create", }, { - "service_name": "Test Printing A", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "DRAFT", - "action": "Register, Deregister", + service_name: "Test Printing A", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "DRAFT", + action: "Register, Deregister", }, { - "service_name": "Test Printing B", - "service_type": "3D Printing", - "end_point": "URL", - "usage": "C1(3), C3(4)", - "status": "DRAFT, REGISTERED", - "action": "Delete, Create", + service_name: "Test Printing B", + service_type: "3D Printing", + end_point: "URL", + usage: "C1(3), C3(4)", + status: "DRAFT, REGISTERED", + action: "Delete, Create", }, -] +]; export const Client2ProducerTableConfig = [ { key: "service_name", - label: "Service name" + label: "Service name", }, { key: "service_type", - label: "Service Type" + label: "Service Type", }, { key: "end_point", - label: "End Point" + label: "End Point", }, { key: "usage", - label: "Usage" + label: "Usage", }, { key: "status", - label: "Status" + label: "Status", }, { key: "action", - label: "Action" - } -] + label: "Action", + }, +]; From 2e82186e6d05c9814f1a971ae62646fc89705500 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Fri, 24 Nov 2023 19:06:38 +0100 Subject: [PATCH 16/17] [Homepage] Table View - implemented home view table and added checkbox component --- pkgs/ui/src/app/home/page.tsx | 3 +- pkgs/ui/src/components/table/index.tsx | 98 ++++++++++++++------------ pkgs/ui/src/mock/home/index.ts | 47 ++++++++++++ 3 files changed, 100 insertions(+), 48 deletions(-) create mode 100644 pkgs/ui/src/mock/home/index.ts diff --git a/pkgs/ui/src/app/home/page.tsx b/pkgs/ui/src/app/home/page.tsx index bfcddf8..f60c2ff 100644 --- a/pkgs/ui/src/app/home/page.tsx +++ b/pkgs/ui/src/app/home/page.tsx @@ -3,6 +3,7 @@ import { NoDataOverlay } from "@/components/noDataOverlay"; import SummaryDetails from "@/components/summary_card"; import CustomTable from "@/components/table"; +import {HomeDummyData, HomeTableConfig} from "@/mock/home"; export default function Home() { return ( @@ -15,7 +16,7 @@ export default function Home() {

Home View Table

- +
diff --git a/pkgs/ui/src/components/table/index.tsx b/pkgs/ui/src/components/table/index.tsx index cbfec7e..28ac3d8 100644 --- a/pkgs/ui/src/components/table/index.tsx +++ b/pkgs/ui/src/components/table/index.tsx @@ -6,60 +6,64 @@ import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; import Paper from "@mui/material/Paper"; -import { NoDataOverlay } from "@/components/noDataOverlay"; -import { StyledTableCell, StyledTableRow } from "./style"; -import { ICustomTable, CustomTableConfiguration } from "@/types"; +import {NoDataOverlay} from "@/components/noDataOverlay"; +import {StyledTableCell, StyledTableRow} from "./style"; +import {ICustomTable, CustomTableConfiguration} from "@/types"; +import {Checkbox} from "@mui/material"; -const CustomTable = ({ configuration, data }: ICustomTable) => { - // display empty icon in case there is no data - if (!data || data.length === 0) - return ; +const CustomTable = ({configuration, data}: ICustomTable) => { + // display empty icon in case there is no data + if (!data || data.length === 0) + return ; - const renderTableCell = ( - value: any, - cellKey: string, - render?: (param: any) => void | undefined, - ) => { - let renderedValue = value; + const renderTableCell = ( + value: any, + cellKey: string, + render?: (param: any) => void | undefined, + ) => { + let renderedValue = value; - // cover use case if the data is an array - if (Array.isArray(value)) renderedValue = value.join(", "); + // cover use case if the data is an array + if (Array.isArray(value)) renderedValue = value.join(", "); - // cover use case if we want to render a component - if (render) renderedValue = render(value); + // cover use case if the data is an boolean + if (typeof value === "boolean") renderedValue = ; + + // cover use case if we want to render a component + if (render) renderedValue = render(value); + + return ( + + {renderedValue} + + ); + }; return ( - - {renderedValue} - + + + + + {configuration.map((header: CustomTableConfiguration) => ( + {header.label} + ))} + + + + {data.map((data: any, rowIndex: number) => ( + + {configuration.map((column: CustomTableConfiguration) => { + const cellValue: any = data[column.key]; + const cellKey = column.key; + const renderComponent = column?.render; + return renderTableCell(cellValue, cellKey, renderComponent); + })} + + ))} + +
+ ); - }; - - return ( - - - - - {configuration.map((header: CustomTableConfiguration) => ( - {header.label} - ))} - - - - {data.map((data: any, rowIndex: number) => ( - - {configuration.map((column: CustomTableConfiguration) => { - const cellValue: any = data[column.key]; - const cellKey = column.key; - const renderComponent = column?.render; - return renderTableCell(cellValue, cellKey, renderComponent); - })} - - ))} - -
- - ); }; export default CustomTable; diff --git a/pkgs/ui/src/mock/home/index.ts b/pkgs/ui/src/mock/home/index.ts new file mode 100644 index 0000000..b92be36 --- /dev/null +++ b/pkgs/ui/src/mock/home/index.ts @@ -0,0 +1,47 @@ +// HOME - Table Data + +export const HomeDummyData = [ + { + entity_name: "C1", + entity_DID: "did:sov:test:1234", + network: "Carlo's Home Network", + ip_address: "127.0.0.1", + roles: "service repository, service consumer, DLG", + visible: true + }, + { + entity_name: "C2", + entity_DID: "did:sov:test:4567", + network: "Steve's Home Network", + ip_address: "127.0.0.1", + roles: "service repository, service consumer, DLG", + visible: false + } +]; + +export const HomeTableConfig = [ + { + key: "entity_name", + label: "Entity name", + }, + { + key: "entity_DID", + label: "Entity DID", + }, + { + key: "network", + label: "Network", + }, + { + key: "ip_address", + label: "IP address", + }, + { + key: "roles", + label: "Roles", + }, + { + key: "visible", + label: "Visible", + }, +]; \ No newline at end of file From e14b540687093e93b23146ca6579c88082c44eac Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Sat, 25 Nov 2023 01:43:31 +0100 Subject: [PATCH 17/17] fix linting --- pkgs/ui/src/app/home/page.tsx | 2 +- pkgs/ui/src/components/table/index.tsx | 101 +++++++++++++------------ pkgs/ui/src/mock/home/index.ts | 82 ++++++++++---------- 3 files changed, 93 insertions(+), 92 deletions(-) diff --git a/pkgs/ui/src/app/home/page.tsx b/pkgs/ui/src/app/home/page.tsx index f60c2ff..37e51de 100644 --- a/pkgs/ui/src/app/home/page.tsx +++ b/pkgs/ui/src/app/home/page.tsx @@ -3,7 +3,7 @@ import { NoDataOverlay } from "@/components/noDataOverlay"; import SummaryDetails from "@/components/summary_card"; import CustomTable from "@/components/table"; -import {HomeDummyData, HomeTableConfig} from "@/mock/home"; +import { HomeDummyData, HomeTableConfig } from "@/mock/home"; export default function Home() { return ( diff --git a/pkgs/ui/src/components/table/index.tsx b/pkgs/ui/src/components/table/index.tsx index 28ac3d8..36714df 100644 --- a/pkgs/ui/src/components/table/index.tsx +++ b/pkgs/ui/src/components/table/index.tsx @@ -6,64 +6,65 @@ import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; import Paper from "@mui/material/Paper"; -import {NoDataOverlay} from "@/components/noDataOverlay"; -import {StyledTableCell, StyledTableRow} from "./style"; -import {ICustomTable, CustomTableConfiguration} from "@/types"; -import {Checkbox} from "@mui/material"; +import { NoDataOverlay } from "@/components/noDataOverlay"; +import { StyledTableCell, StyledTableRow } from "./style"; +import { ICustomTable, CustomTableConfiguration } from "@/types"; +import { Checkbox } from "@mui/material"; -const CustomTable = ({configuration, data}: ICustomTable) => { - // display empty icon in case there is no data - if (!data || data.length === 0) - return ; +const CustomTable = ({ configuration, data }: ICustomTable) => { + // display empty icon in case there is no data + if (!data || data.length === 0) + return ; - const renderTableCell = ( - value: any, - cellKey: string, - render?: (param: any) => void | undefined, - ) => { - let renderedValue = value; + const renderTableCell = ( + value: any, + cellKey: string, + render?: (param: any) => void | undefined, + ) => { + let renderedValue = value; - // cover use case if the data is an array - if (Array.isArray(value)) renderedValue = value.join(", "); + // cover use case if the data is an array + if (Array.isArray(value)) renderedValue = value.join(", "); - // cover use case if the data is an boolean - if (typeof value === "boolean") renderedValue = ; + // cover use case if the data is an boolean + if (typeof value === "boolean") + renderedValue = ; - // cover use case if we want to render a component - if (render) renderedValue = render(value); - - return ( - - {renderedValue} - - ); - }; + // cover use case if we want to render a component + if (render) renderedValue = render(value); return ( - - - - - {configuration.map((header: CustomTableConfiguration) => ( - {header.label} - ))} - - - - {data.map((data: any, rowIndex: number) => ( - - {configuration.map((column: CustomTableConfiguration) => { - const cellValue: any = data[column.key]; - const cellKey = column.key; - const renderComponent = column?.render; - return renderTableCell(cellValue, cellKey, renderComponent); - })} - - ))} - -
- + + {renderedValue} + ); + }; + + return ( + + + + + {configuration.map((header: CustomTableConfiguration) => ( + {header.label} + ))} + + + + {data.map((data: any, rowIndex: number) => ( + + {configuration.map((column: CustomTableConfiguration) => { + const cellValue: any = data[column.key]; + const cellKey = column.key; + const renderComponent = column?.render; + return renderTableCell(cellValue, cellKey, renderComponent); + })} + + ))} + +
+ + ); }; export default CustomTable; diff --git a/pkgs/ui/src/mock/home/index.ts b/pkgs/ui/src/mock/home/index.ts index b92be36..ccff693 100644 --- a/pkgs/ui/src/mock/home/index.ts +++ b/pkgs/ui/src/mock/home/index.ts @@ -1,47 +1,47 @@ // HOME - Table Data export const HomeDummyData = [ - { - entity_name: "C1", - entity_DID: "did:sov:test:1234", - network: "Carlo's Home Network", - ip_address: "127.0.0.1", - roles: "service repository, service consumer, DLG", - visible: true - }, - { - entity_name: "C2", - entity_DID: "did:sov:test:4567", - network: "Steve's Home Network", - ip_address: "127.0.0.1", - roles: "service repository, service consumer, DLG", - visible: false - } + { + entity_name: "C1", + entity_DID: "did:sov:test:1234", + network: "Carlo's Home Network", + ip_address: "127.0.0.1", + roles: "service repository, service consumer, DLG", + visible: true, + }, + { + entity_name: "C2", + entity_DID: "did:sov:test:4567", + network: "Steve's Home Network", + ip_address: "127.0.0.1", + roles: "service repository, service consumer, DLG", + visible: false, + }, ]; export const HomeTableConfig = [ - { - key: "entity_name", - label: "Entity name", - }, - { - key: "entity_DID", - label: "Entity DID", - }, - { - key: "network", - label: "Network", - }, - { - key: "ip_address", - label: "IP address", - }, - { - key: "roles", - label: "Roles", - }, - { - key: "visible", - label: "Visible", - }, -]; \ No newline at end of file + { + key: "entity_name", + label: "Entity name", + }, + { + key: "entity_DID", + label: "Entity DID", + }, + { + key: "network", + label: "Network", + }, + { + key: "ip_address", + label: "IP address", + }, + { + key: "roles", + label: "Roles", + }, + { + key: "visible", + label: "Visible", + }, +];