From 37d34d4f36b2201b0f01a46ac0de8965fa4ea73d Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Sat, 9 Dec 2023 19:29:42 +0100 Subject: [PATCH] fixed the issues for merge --- pkgs/ui/src/app/access-point/page.tsx | 9 +++------ pkgs/ui/src/app/client-1/page.tsx | 10 ++-------- pkgs/ui/src/app/client-2/page.tsx | 10 ++-------- pkgs/ui/src/app/home/page.tsx | 6 ++---- 4 files changed, 9 insertions(+), 26 deletions(-) diff --git a/pkgs/ui/src/app/access-point/page.tsx b/pkgs/ui/src/app/access-point/page.tsx index 05feee3..ba05481 100644 --- a/pkgs/ui/src/app/access-point/page.tsx +++ b/pkgs/ui/src/app/access-point/page.tsx @@ -6,7 +6,6 @@ import { APSummaryDetails, APAttachmentsDummyData, APAttachmentsTableConfig, - APServiceRepositoryDummyData, APServiceRepositoryTableConfig, } from "@/mock/access_point"; import { useEffect, useState } from "react"; @@ -30,16 +29,14 @@ export default function AccessPoint() { resp.json().then((jsonData) => { console.log(jsonData); - const transformedData = jsonData.map((item) => ({ + const transformedData = jsonData.map((item: { service_name: any; entity_did: any; network: any; }) => ({ entity_name: item.service_name, entity_did: item.entity_did, network: item.network, - ip_address: "", // You might need to set an appropriate default value + ip_address: "", })); - jsonData.length > 0 - ? setRepositoryData(transformedData) - : setRepositoryData(APServiceRepositoryDummyData); + setRepositoryData(transformedData); }), ) .then() diff --git a/pkgs/ui/src/app/client-1/page.tsx b/pkgs/ui/src/app/client-1/page.tsx index 3eb97c7..a2f6b0e 100644 --- a/pkgs/ui/src/app/client-1/page.tsx +++ b/pkgs/ui/src/app/client-1/page.tsx @@ -3,10 +3,8 @@ import SummaryDetails from "@/components/summary_card"; import { Client1SummaryDetails, - Client1ConsumerData, Client1ConsumerTableConfig, Client1ProducerTableConfig, - Client1ProducerData, } from "@/mock/client_1"; import CustomTable from "@/components/table"; import { useEffect, useState } from "react"; @@ -23,9 +21,7 @@ export default function Client1() { .then((resp) => resp.json().then((jsonData) => { console.log(jsonData); - jsonData.length > 0 - ? setConsumerData(jsonData) - : setConsumerData(Client1ConsumerData); + setConsumerData(jsonData); }), ) .then() @@ -38,9 +34,7 @@ export default function Client1() { .then((resp) => resp.json().then((jsonData) => { console.log(jsonData); - jsonData.length > 0 - ? setProducerData(jsonData) - : setProducerData(Client1ProducerData); + setProducerData(jsonData); }), ) .then() diff --git a/pkgs/ui/src/app/client-2/page.tsx b/pkgs/ui/src/app/client-2/page.tsx index 43da43d..8b9a8d0 100644 --- a/pkgs/ui/src/app/client-2/page.tsx +++ b/pkgs/ui/src/app/client-2/page.tsx @@ -2,9 +2,7 @@ import SummaryDetails from "@/components/summary_card"; import { - Client2ConsumerData, Client2ConsumerTableConfig, - Client2ProducerData, Client2ProducerTableConfig, Client2SummaryDetails, } from "@/mock/client_2"; @@ -23,9 +21,7 @@ export default function Client1() { .then((resp) => resp.json().then((jsonData) => { console.log(jsonData); - jsonData.length > 0 - ? setConsumerData(jsonData) - : setConsumerData(Client2ConsumerData); + setConsumerData(jsonData); }), ) .then() @@ -38,9 +34,7 @@ export default function Client1() { .then((resp) => resp.json().then((jsonData) => { console.log(jsonData); - jsonData.length > 0 - ? setProducerData(jsonData) - : setProducerData(Client2ProducerData); + setProducerData(jsonData); }), ) .then() diff --git a/pkgs/ui/src/app/home/page.tsx b/pkgs/ui/src/app/home/page.tsx index 08e702e..16b0984 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 { HomeTableConfig } from "@/mock/home"; import { useEffect, useState } from "react"; export default function Home() { @@ -17,9 +17,7 @@ export default function Home() { .then((resp) => resp.json().then((jsonData) => { console.log(jsonData); - jsonData.length > 0 - ? setHomeData(jsonData) - : setHomeData(HomeDummyData); + setHomeData(jsonData); }), ) .then()