From 250b21323b878ec6e93c71a643641417e304982c Mon Sep 17 00:00:00 2001 From: sara-pervana Date: Tue, 21 Nov 2023 17:45:57 +0100 Subject: [PATCH 1/2] Onur changes - added config and dummy data for DLG and AP --- pkgs/ui/src/mock/access-point/index.ts | 92 ++++++++++++++++++++++++++ pkgs/ui/src/mock/dlg/index.ts | 34 ++++++++++ 2 files changed, 126 insertions(+) create mode 100644 pkgs/ui/src/mock/access-point/index.ts create mode 100644 pkgs/ui/src/mock/dlg/index.ts diff --git a/pkgs/ui/src/mock/access-point/index.ts b/pkgs/ui/src/mock/access-point/index.ts new file mode 100644 index 0000000..1dce0d9 --- /dev/null +++ b/pkgs/ui/src/mock/access-point/index.ts @@ -0,0 +1,92 @@ +// AP - Attachements + +export const APAttachmentsDummyData = [ + { + "entity_name": "C1", + "entity_DID": "did:sov:test:1234", + "network": "Carlo's Home Network", + "ip_address": "127.0.0.1", + }, + { + "entity_name": "C2", + "entity_DID": "did:sov:test:4567", + "network": "Steve's Home Network", + "ip_address": "127.0.0.1", + }, + { + "entity_name": "C1-TEST", + "entity_DID": "did:sov:test:0001", + "network": "Test Network A", + "ip_address": "127.0.0.1", + }, + { + "entity_name": "C2-TEST", + "entity_DID": "did:sov:test:0002", + "network": "Test Network B", + "ip_address": "127.0.0.1", + } +] +export const APAttachmentsTableConfig = [ + { + key: "entity_name", + label: "Entity name" + }, + { + key: "entity_DID", + label: "Entity DID" + }, + { + key: "network", + label: "Network" + }, + { + key: "ip_address", + label: "IP address" + } +] + +// AP - Service Repository +export const APServiceRepositoryDummyData = [ + { + "service_name": "Carlo's Printing", + "service_type": "3D Printing", + "end_point": "URL", + "producer": "C1", + "producer_DID": "did:sov:test:1234", + "network": "Carlo's Home Network", + }, + { + "service_name": "Jeff's Printing", + "service_type": "3D Printing", + "end_point": "URL", + "producer": "C2", + "producer_DID": "did:sov:test:5678", + "network": "Jeff's Home Network", + }, +] +export const APServiceRepositoryTableConfig = [ + { + 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 diff --git a/pkgs/ui/src/mock/dlg/index.ts b/pkgs/ui/src/mock/dlg/index.ts new file mode 100644 index 0000000..6201847 --- /dev/null +++ b/pkgs/ui/src/mock/dlg/index.ts @@ -0,0 +1,34 @@ +export const DLGResolutionDummyData = [ + { + "requester_name": "C1", + "requester_DID": "did:sov:test:1234", + "DID_resolved": "did:sov:test:1234", + "timestamp": "2023.11.01 17:05:45", + }, + { + "requester_name": "C2", + "requester_DID": "did:sov:test:5678", + "DID_resolved": "did:sov:test:5678", + "timestamp": "2023.12.01 15:05:50", + }, +] + + +export const DLGResolutionTableConfig = [ + { + key: "requester_name", + label: "Requester name" + }, + { + key: "requester_DID", + label: "Requester DID" + }, + { + key: "DID_resolved", + label: "DID resolved" + }, + { + key: "timestamp", + label: "Timestamp" + } +] \ No newline at end of file -- 2.51.0 From 023f5e82a5c127e6592991cedc4a1a43d697a7da Mon Sep 17 00:00:00 2001 From: sara-pervana Date: Tue, 21 Nov 2023 18:09:58 +0100 Subject: [PATCH 2/2] ran format command --- pkgs/ui/src/components/table/index.tsx | 37 +++++------ pkgs/ui/src/components/table/style.tsx | 12 ++-- pkgs/ui/src/mock/access-point/index.ts | 92 +++++++++++++------------- pkgs/ui/src/mock/dlg/index.ts | 31 +++++---- pkgs/ui/src/types/index.ts | 6 +- 5 files changed, 88 insertions(+), 90 deletions(-) diff --git a/pkgs/ui/src/components/table/index.tsx b/pkgs/ui/src/components/table/index.tsx index 0b389cb..cbfec7e 100644 --- a/pkgs/ui/src/components/table/index.tsx +++ b/pkgs/ui/src/components/table/index.tsx @@ -1,27 +1,29 @@ import React from "react"; -import Table from '@mui/material/Table'; -import TableBody from '@mui/material/TableBody'; -import TableContainer from '@mui/material/TableContainer'; -import TableHead from '@mui/material/TableHead'; -import TableRow from '@mui/material/TableRow'; -import Paper from '@mui/material/Paper'; +import Table from "@mui/material/Table"; +import TableBody from "@mui/material/TableBody"; +import TableContainer from "@mui/material/TableContainer"; +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"; 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) => { + return ; + 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(', ') + if (Array.isArray(value)) renderedValue = value.join(", "); // cover use case if we want to render a component if (render) renderedValue = render(value); @@ -31,8 +33,7 @@ const CustomTable = ({ configuration, data }: ICustomTable) => { {renderedValue} ); - - } + }; return ( @@ -40,9 +41,7 @@ const CustomTable = ({ configuration, data }: ICustomTable) => { {configuration.map((header: CustomTableConfiguration) => ( - - {header.label} - + {header.label} ))} @@ -60,7 +59,7 @@ const CustomTable = ({ configuration, data }: ICustomTable) => { - ) -} + ); +}; -export default CustomTable; \ No newline at end of file +export default CustomTable; diff --git a/pkgs/ui/src/components/table/style.tsx b/pkgs/ui/src/components/table/style.tsx index 9785f80..b0e5429 100644 --- a/pkgs/ui/src/components/table/style.tsx +++ b/pkgs/ui/src/components/table/style.tsx @@ -1,6 +1,6 @@ -import { styled } from '@mui/material/styles'; -import TableCell, { tableCellClasses } from '@mui/material/TableCell'; -import TableRow from '@mui/material/TableRow'; +import { styled } from "@mui/material/styles"; +import TableCell, { tableCellClasses } from "@mui/material/TableCell"; +import TableRow from "@mui/material/TableRow"; export const StyledTableCell = styled(TableCell)(({ theme }) => ({ [`&.${tableCellClasses.head}`]: { @@ -13,11 +13,11 @@ export const StyledTableCell = styled(TableCell)(({ theme }) => ({ })); export const StyledTableRow = styled(TableRow)(({ theme }) => ({ - '&:nth-of-type(odd)': { + "&:nth-of-type(odd)": { backgroundColor: theme.palette.action.hover, }, // hide last border - '&:last-child td, &:last-child th': { + "&:last-child td, &:last-child th": { border: 0, }, -})); \ No newline at end of file +})); diff --git a/pkgs/ui/src/mock/access-point/index.ts b/pkgs/ui/src/mock/access-point/index.ts index 1dce0d9..9b139af 100644 --- a/pkgs/ui/src/mock/access-point/index.ts +++ b/pkgs/ui/src/mock/access-point/index.ts @@ -2,91 +2,91 @@ export const APAttachmentsDummyData = [ { - "entity_name": "C1", - "entity_DID": "did:sov:test:1234", - "network": "Carlo's Home Network", - "ip_address": "127.0.0.1", + entity_name: "C1", + entity_DID: "did:sov:test:1234", + network: "Carlo's Home Network", + ip_address: "127.0.0.1", }, { - "entity_name": "C2", - "entity_DID": "did:sov:test:4567", - "network": "Steve's Home Network", - "ip_address": "127.0.0.1", + entity_name: "C2", + entity_DID: "did:sov:test:4567", + network: "Steve's Home Network", + ip_address: "127.0.0.1", }, { - "entity_name": "C1-TEST", - "entity_DID": "did:sov:test:0001", - "network": "Test Network A", - "ip_address": "127.0.0.1", + entity_name: "C1-TEST", + entity_DID: "did:sov:test:0001", + network: "Test Network A", + ip_address: "127.0.0.1", }, { - "entity_name": "C2-TEST", - "entity_DID": "did:sov:test:0002", - "network": "Test Network B", - "ip_address": "127.0.0.1", - } -] + entity_name: "C2-TEST", + entity_DID: "did:sov:test:0002", + network: "Test Network B", + ip_address: "127.0.0.1", + }, +]; export const APAttachmentsTableConfig = [ { key: "entity_name", - label: "Entity name" + label: "Entity name", }, { key: "entity_DID", - label: "Entity DID" + label: "Entity DID", }, { key: "network", - label: "Network" + label: "Network", }, { key: "ip_address", - label: "IP address" - } -] + label: "IP address", + }, +]; // AP - Service Repository export const APServiceRepositoryDummyData = [ { - "service_name": "Carlo's Printing", - "service_type": "3D Printing", - "end_point": "URL", - "producer": "C1", - "producer_DID": "did:sov:test:1234", - "network": "Carlo's Home Network", - }, - { - "service_name": "Jeff's Printing", - "service_type": "3D Printing", - "end_point": "URL", - "producer": "C2", - "producer_DID": "did:sov:test:5678", - "network": "Jeff's Home Network", + service_name: "Carlo's Printing", + service_type: "3D Printing", + end_point: "URL", + producer: "C1", + producer_DID: "did:sov:test:1234", + network: "Carlo's Home Network", }, -] + { + service_name: "Jeff's Printing", + service_type: "3D Printing", + end_point: "URL", + producer: "C2", + producer_DID: "did:sov:test:5678", + network: "Jeff's Home Network", + }, +]; export const APServiceRepositoryTableConfig = [ { 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", }, -] \ No newline at end of file +]; diff --git a/pkgs/ui/src/mock/dlg/index.ts b/pkgs/ui/src/mock/dlg/index.ts index 6201847..33b9992 100644 --- a/pkgs/ui/src/mock/dlg/index.ts +++ b/pkgs/ui/src/mock/dlg/index.ts @@ -1,34 +1,33 @@ export const DLGResolutionDummyData = [ { - "requester_name": "C1", - "requester_DID": "did:sov:test:1234", - "DID_resolved": "did:sov:test:1234", - "timestamp": "2023.11.01 17:05:45", + requester_name: "C1", + requester_DID: "did:sov:test:1234", + DID_resolved: "did:sov:test:1234", + timestamp: "2023.11.01 17:05:45", }, { - "requester_name": "C2", - "requester_DID": "did:sov:test:5678", - "DID_resolved": "did:sov:test:5678", - "timestamp": "2023.12.01 15:05:50", + requester_name: "C2", + requester_DID: "did:sov:test:5678", + DID_resolved: "did:sov:test:5678", + timestamp: "2023.12.01 15:05:50", }, -] - +]; export const DLGResolutionTableConfig = [ { key: "requester_name", - label: "Requester name" + label: "Requester name", }, { key: "requester_DID", - label: "Requester DID" + label: "Requester DID", }, { key: "DID_resolved", - label: "DID resolved" + label: "DID resolved", }, { key: "timestamp", - label: "Timestamp" - } -] \ No newline at end of file + label: "Timestamp", + }, +]; diff --git a/pkgs/ui/src/types/index.ts b/pkgs/ui/src/types/index.ts index ca5a5fc..d4635d5 100644 --- a/pkgs/ui/src/types/index.ts +++ b/pkgs/ui/src/types/index.ts @@ -5,6 +5,6 @@ export interface CustomTableConfiguration { } export interface ICustomTable { - configuration: CustomTableConfiguration[], - data: any -} \ No newline at end of file + configuration: CustomTableConfiguration[]; + data: any; +} -- 2.51.0