From 2c098f4ba02e38240536ef5eba49fb153e798786 Mon Sep 17 00:00:00 2001
From: Onur Arslan <runoxa@hotmail.com>
Date: Sat, 2 Dec 2023 21:12:04 +0100
Subject: [PATCH] [Functionality] Request Consumer / Producer - request
 consumer, producer data for client-2 - refactored statements

---
 pkgs/ui/src/app/access-point/page.tsx |  6 +----
 pkgs/ui/src/app/client-1/page.tsx     | 20 +++++----------
 pkgs/ui/src/app/client-2/page.tsx     | 36 +++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/pkgs/ui/src/app/access-point/page.tsx b/pkgs/ui/src/app/access-point/page.tsx
index 997f915..277d5c0 100644
--- a/pkgs/ui/src/app/access-point/page.tsx
+++ b/pkgs/ui/src/app/access-point/page.tsx
@@ -22,11 +22,7 @@ export default function AccessPoint() {
       .then((resp) =>
         resp.json().then((jsonData) => {
           console.log(jsonData);
-          if (jsonData.length > 0) {
-            setRepositoryData(jsonData);
-          } else {
-            setRepositoryData(APServiceRepositoryDummyData);
-          }
+          jsonData.length > 0 ? setRepositoryData(jsonData) : setRepositoryData(APServiceRepositoryDummyData);
         }),
       )
       .then()
diff --git a/pkgs/ui/src/app/client-1/page.tsx b/pkgs/ui/src/app/client-1/page.tsx
index 90437e6..bf47d67 100644
--- a/pkgs/ui/src/app/client-1/page.tsx
+++ b/pkgs/ui/src/app/client-1/page.tsx
@@ -23,11 +23,7 @@ export default function Client1() {
       .then((resp) =>
         resp.json().then((jsonData) => {
           console.log(jsonData);
-          if (jsonData.length > 0) {
-            setConsumerData(jsonData);
-          } else {
-            setConsumerData(Client1ConsumerData);
-          }
+          jsonData.length > 0 ? setConsumerData(jsonData) : setConsumerData(Client1ConsumerData);
         }),
       )
       .then()
@@ -37,15 +33,11 @@ export default function Client1() {
       method: "GET",
       // credentials: 'include',
     })
-      .then((resp) =>
-        resp.json().then((jsonData) => {
-          console.log(jsonData);
-          if (jsonData.length > 0) {
-            setProducerData(jsonData);
-          } else {
-            setProducerData(Client1ProducerData);
-          }
-        }),
+        .then((resp) =>
+            resp.json().then((jsonData) => {
+                console.log(jsonData);
+                jsonData.length > 0 ? setProducerData(jsonData) : setProducerData(Client1ProducerData);
+            }),
       )
       .then()
       .catch();
diff --git a/pkgs/ui/src/app/client-2/page.tsx b/pkgs/ui/src/app/client-2/page.tsx
index 80be865..b833d89 100644
--- a/pkgs/ui/src/app/client-2/page.tsx
+++ b/pkgs/ui/src/app/client-2/page.tsx
@@ -9,8 +9,40 @@ import {
   Client2SummaryDetails,
 } from "@/mock/client_2";
 import CustomTable from "@/components/table";
+import {useEffect, useState} from "react";
 
 export default function Client1() {
+  const [consumerData, setConsumerData] = useState([]);
+  const [producerData, setProducerData] = useState([]);
+
+  useEffect(() => {
+    fetch("http://localhost:2979/api/v1/get_consumers", {
+      method: "GET",
+      // credentials: 'include',
+    })
+      .then((resp) =>
+        resp.json().then((jsonData) => {
+          console.log(jsonData);
+          jsonData.length > 0 ? setConsumerData(jsonData) : setConsumerData(Client2ConsumerData);
+        }),
+      )
+      .then()
+      .catch();
+
+    fetch("http://localhost:2979/api/v1/get_producers", {
+      method: "GET",
+      // credentials: 'include',
+    })
+        .then((resp) =>
+            resp.json().then((jsonData) => {
+                console.log(jsonData);
+                jsonData.length > 0 ? setProducerData(jsonData) : setProducerData(Client2ProducerData);
+            }),
+      )
+      .then()
+      .catch();
+  }, []);
+
   return (
     <div className="m-10">
       <SummaryDetails
@@ -24,14 +56,14 @@ export default function Client1() {
       <div>
         <h4>Consumer View</h4>
         <CustomTable
-          data={Client2ConsumerData}
+          data={consumerData}
           configuration={Client2ConsumerTableConfig}
         />
       </div>
       <div>
         <h4>Producer View</h4>
         <CustomTable
-          data={Client2ProducerData}
+          data={producerData}
           configuration={Client2ProducerTableConfig}
         />
       </div>