From 5262d83da08d5b0468be0bb85fa6e623bd1d5595 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Sun, 10 Dec 2023 00:15:34 +0100 Subject: [PATCH 1/3] [Functionality] Request DID Resolution - fetch resolution data - adjustments --- pkgs/ui/src/app/access-point/page.tsx | 12 +---------- pkgs/ui/src/app/client-1/page.tsx | 2 -- pkgs/ui/src/app/client-2/page.tsx | 1 - .../app/distributed-ledger-gateway/page.tsx | 20 +++++++++++++++++-- pkgs/ui/src/app/home/page.tsx | 1 - pkgs/ui/src/mock/dlg/index.ts | 14 ++++++------- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/ui/src/app/access-point/page.tsx b/pkgs/ui/src/app/access-point/page.tsx index 230ee98..6f07177 100644 --- a/pkgs/ui/src/app/access-point/page.tsx +++ b/pkgs/ui/src/app/access-point/page.tsx @@ -28,17 +28,7 @@ export default function AccessPoint() { .then((resp) => resp.json().then((jsonData) => { console.log(jsonData); - - 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: "", - }), - ); - - setRepositoryData(transformedData); + setRepositoryData(jsonData); }), ) .then() diff --git a/pkgs/ui/src/app/client-1/page.tsx b/pkgs/ui/src/app/client-1/page.tsx index a2f6b0e..763702a 100644 --- a/pkgs/ui/src/app/client-1/page.tsx +++ b/pkgs/ui/src/app/client-1/page.tsx @@ -16,7 +16,6 @@ export default function Client1() { useEffect(() => { fetch("http://localhost:2979/api/v1/get_consumers", { method: "GET", - // credentials: 'include', }) .then((resp) => resp.json().then((jsonData) => { @@ -29,7 +28,6 @@ export default function Client1() { fetch("http://localhost:2979/api/v1/get_producers", { method: "GET", - // credentials: 'include', }) .then((resp) => resp.json().then((jsonData) => { diff --git a/pkgs/ui/src/app/client-2/page.tsx b/pkgs/ui/src/app/client-2/page.tsx index 8b9a8d0..b3a7b75 100644 --- a/pkgs/ui/src/app/client-2/page.tsx +++ b/pkgs/ui/src/app/client-2/page.tsx @@ -16,7 +16,6 @@ export default function Client1() { useEffect(() => { fetch("http://localhost:2979/api/v1/get_consumers", { method: "GET", - // credentials: 'include', }) .then((resp) => resp.json().then((jsonData) => { diff --git a/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx b/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx index cc1c15e..41e83fa 100644 --- a/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx +++ b/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx @@ -1,14 +1,30 @@ "use client"; import { - DLGResolutionDummyData, DLGResolutionTableConfig, DLGSummaryDetails, } from "@/mock/dlg"; import CustomTable from "@/components/table"; import SummaryDetails from "@/components/summary_card"; +import {useEffect, useState} from "react"; export default function DLG() { + const [resolutionData, setResolutionData] = useState([]); + + useEffect(() => { + fetch("http://localhost:2979/api/v1/get_resolutions", { + method: "GET", + }) + .then((resp) => + resp.json().then((jsonData) => { + console.log(jsonData); + setResolutionData(jsonData); + }), + ) + .then() + .catch(); + }, []); + return (

DID Resolution View

diff --git a/pkgs/ui/src/app/home/page.tsx b/pkgs/ui/src/app/home/page.tsx index 16b0984..d6c3566 100644 --- a/pkgs/ui/src/app/home/page.tsx +++ b/pkgs/ui/src/app/home/page.tsx @@ -12,7 +12,6 @@ export default function Home() { useEffect(() => { fetch("http://localhost:2979/api/v1/get_entities", { method: "GET", - // credentials: 'include', }) .then((resp) => resp.json().then((jsonData) => { diff --git a/pkgs/ui/src/mock/dlg/index.ts b/pkgs/ui/src/mock/dlg/index.ts index 0163634..2e33f79 100644 --- a/pkgs/ui/src/mock/dlg/index.ts +++ b/pkgs/ui/src/mock/dlg/index.ts @@ -16,14 +16,14 @@ export const DLGSummaryDetails = [ export const DLGResolutionDummyData = [ { requester_name: "C1", - requester_DID: "did:sov:test:1234", - DID_resolved: "did:sov:test:1234", + requester_did: "did:sov:test:1234", + resolved_did: "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", + requester_did: "did:sov:test:5678", + resolved_did: "did:sov:test:5678", timestamp: "2023.12.01 15:05:50", }, ]; @@ -34,12 +34,12 @@ export const DLGResolutionTableConfig = [ label: "Requester name", }, { - key: "requester_DID", + key: "requester_did", label: "Requester DID", }, { - key: "DID_resolved", - label: "DID resolved", + key: "resolved_did", + label: "Resolved DID", }, { key: "timestamp", From 61261d7ac3c61c27558ec53ae07c5f88ef7510d4 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Sun, 10 Dec 2023 00:30:30 +0100 Subject: [PATCH 2/3] [Functionality] Request DID Resolution - fixes --- pkgs/ui/src/app/access-point/page.tsx | 1 - pkgs/ui/src/app/distributed-ledger-gateway/page.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/ui/src/app/access-point/page.tsx b/pkgs/ui/src/app/access-point/page.tsx index 6f07177..6a18acf 100644 --- a/pkgs/ui/src/app/access-point/page.tsx +++ b/pkgs/ui/src/app/access-point/page.tsx @@ -23,7 +23,6 @@ export default function AccessPoint() { useEffect(() => { fetch("http://localhost:2979/api/v1/get_repositories", { method: "GET", - // credentials: 'include', }) .then((resp) => resp.json().then((jsonData) => { diff --git a/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx b/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx index 41e83fa..731737a 100644 --- a/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx +++ b/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx @@ -6,7 +6,7 @@ import { } from "@/mock/dlg"; import CustomTable from "@/components/table"; import SummaryDetails from "@/components/summary_card"; -import {useEffect, useState} from "react"; +import { useEffect, useState } from "react"; export default function DLG() { const [resolutionData, setResolutionData] = useState([]); From 88578fe0077711fd59c1d728b212b5d9f5a23d37 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Sun, 10 Dec 2023 00:45:52 +0100 Subject: [PATCH 3/3] fix formatting --- pkgs/clan-cli/bin/clan | 0 pkgs/clan-cli/bin/clan-config | 0 pkgs/clan-cli/bin/gen-openapi | 0 pkgs/node-packages/generate.sh | 0 pkgs/ui/nix/update-ui-assets.sh | 0 pkgs/ui/src/app/distributed-ledger-gateway/page.tsx | 5 +---- 6 files changed, 1 insertion(+), 4 deletions(-) mode change 100755 => 100644 pkgs/clan-cli/bin/clan mode change 100755 => 100644 pkgs/clan-cli/bin/clan-config mode change 100755 => 100644 pkgs/clan-cli/bin/gen-openapi mode change 100755 => 100644 pkgs/node-packages/generate.sh mode change 100755 => 100644 pkgs/ui/nix/update-ui-assets.sh diff --git a/pkgs/clan-cli/bin/clan b/pkgs/clan-cli/bin/clan old mode 100755 new mode 100644 diff --git a/pkgs/clan-cli/bin/clan-config b/pkgs/clan-cli/bin/clan-config old mode 100755 new mode 100644 diff --git a/pkgs/clan-cli/bin/gen-openapi b/pkgs/clan-cli/bin/gen-openapi old mode 100755 new mode 100644 diff --git a/pkgs/node-packages/generate.sh b/pkgs/node-packages/generate.sh old mode 100755 new mode 100644 diff --git a/pkgs/ui/nix/update-ui-assets.sh b/pkgs/ui/nix/update-ui-assets.sh old mode 100755 new mode 100644 diff --git a/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx b/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx index 731737a..73312b2 100644 --- a/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx +++ b/pkgs/ui/src/app/distributed-ledger-gateway/page.tsx @@ -1,9 +1,6 @@ "use client"; -import { - DLGResolutionTableConfig, - DLGSummaryDetails, -} from "@/mock/dlg"; +import { DLGResolutionTableConfig, DLGSummaryDetails } from "@/mock/dlg"; import CustomTable from "@/components/table"; import SummaryDetails from "@/components/summary_card"; import { useEffect, useState } from "react";