-
+
+ {newlyCreatedStampId == "" && errorCreatingPostage.hasError && (
+
+ )}
+
)}
);
From d64e388ba1e9937d74e4f815eb940f6f08e3ca24 Mon Sep 17 00:00:00 2001
From: Ogheneochuko <7204868+amochuko@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:14:15 +0100
Subject: [PATCH 39/46] fix: made clean up to variables
---
.../src/components/GetPostageStamps.tsx | 5 ++-
react-vite/src/components/UploadFiles.tsx | 6 ++--
react-vite/src/hooks/usePostageBatch.tsx | 31 ++++++++++---------
3 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/react-vite/src/components/GetPostageStamps.tsx b/react-vite/src/components/GetPostageStamps.tsx
index 90b855c..ccd8536 100644
--- a/react-vite/src/components/GetPostageStamps.tsx
+++ b/react-vite/src/components/GetPostageStamps.tsx
@@ -41,7 +41,10 @@ export function GetPostageStamps() {
{postageStamps &&
postageStamps.map((ps) => (
-
Batch ID:
diff --git a/react-vite/src/components/UploadFiles.tsx b/react-vite/src/components/UploadFiles.tsx
index 74c8c94..891dd12 100644
--- a/react-vite/src/components/UploadFiles.tsx
+++ b/react-vite/src/components/UploadFiles.tsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
-import { API_URL } from "../constant";
+import { BEE_NODE_URL } from "../constant";
import { IUpload, useUpload } from "../hooks/useUpload";
import MultipleUploadResult from "./MultipleUploadResult";
import SingleUploadResult from "./SingleUploadResult";
@@ -177,14 +177,14 @@ export const UploadFile = () => {
{!isMultipleFile && uploadResultWithCid?.reference && (
)}
{isMultipleFile && uploadResultWithCid?.reference && (
)}
diff --git a/react-vite/src/hooks/usePostageBatch.tsx b/react-vite/src/hooks/usePostageBatch.tsx
index dac2047..ab2de6a 100644
--- a/react-vite/src/hooks/usePostageBatch.tsx
+++ b/react-vite/src/hooks/usePostageBatch.tsx
@@ -14,13 +14,13 @@ export interface BuyPostageBatchArgs {
export function usePostageBatch() {
const [postageStamps, setPostageStamps] = useState();
const [isLoadingStamps, setIsLoadingStamps] = useState(false);
- const [isBuyPostageBatch, setIsBuyPostageBatch] = useState(false);
- const [isErrorBuyPostageBatch, setIsErrorBuyPostageBatch] = useState({
+ const [creatingPostage, setCreatingPostage] = useState(false);
+ const [errorCreatingPostage, setErrorCreatingPostage] = useState({
hasError: false,
msg: "",
});
const [getAllStampError, setGetAllStampError] = useState(false);
- const [newlyCreatedBatchId, setNewlyCreatedBatchId] = useState();
+ const [newlyCreatedStampId, setNewlyCreatedStampId] = useState();
const [nodeActive, setNodeActive] = useState(false);
useEffect(() => {
@@ -64,35 +64,38 @@ export function usePostageBatch() {
* This function creates a Postage Stamp Batch
* @param args
*/
- const buyPostageBatch = async (args: BuyPostageBatchArgs) => {
+ const createPostageBatch = async (args: BuyPostageBatchArgs) => {
try {
- setIsBuyPostageBatch(true);
+
+ setCreatingPostage(true);
const resBatchId = await bee.createPostageBatch(
- args.amount.toString(),
+ BigInt(args.amount).toString(),
args.depth,
+
{
...args.options,
}
);
- setNewlyCreatedBatchId(resBatchId);
- setIsBuyPostageBatch(false);
+ setCreatingPostage(false);
+ setNewlyCreatedStampId(resBatchId);
} catch (err: any) {
console.error(err);
- setIsBuyPostageBatch(false);
- setIsErrorBuyPostageBatch({ hasError: true, msg: err });
+ setCreatingPostage(false);
+ setErrorCreatingPostage({ hasError: true, msg: err });
}
};
return {
+ setErrorCreatingPostage,
getAllStampError,
getAllPostageStamps,
postageStamps,
isLoadingStamps,
- buyPostageBatch,
- isBuyPostageBatch,
- isErrorBuyPostageBatch,
- newlyCreatedBatchId,
+ createPostageBatch,
+ creatingPostage,
+ newlyCreatedStampId,
+ errorCreatingPostage,
};
}
From 79160573d904192af9ac49e455c876a6228c1d30 Mon Sep 17 00:00:00 2001
From: Ogheneochuko <7204868+amochuko@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:16:32 +0100
Subject: [PATCH 40/46] feat: add clipboard and rename variable
---
react-vite/src/components/HandleCopy.tsx | 2 +-
react-vite/src/constant/index.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/react-vite/src/components/HandleCopy.tsx b/react-vite/src/components/HandleCopy.tsx
index 9b06aa7..fed95ad 100644
--- a/react-vite/src/components/HandleCopy.tsx
+++ b/react-vite/src/components/HandleCopy.tsx
@@ -1,4 +1,4 @@
-import { format } from "../utils/format";
+import { format } from "../utils";
const HandleCopy = ({ txt }: { txt: string }) => {
const handleClick = async () => {
diff --git a/react-vite/src/constant/index.ts b/react-vite/src/constant/index.ts
index 1780ef9..46abba8 100644
--- a/react-vite/src/constant/index.ts
+++ b/react-vite/src/constant/index.ts
@@ -1,3 +1,3 @@
-const BEE_NODE_URL = process.env.BEE_NODE_URL || "http://127.0.0.1:1633";
+const BEE_NODE_URL = "http://127.0.0.1:1633";
export { BEE_NODE_URL };
From 7ccf1ef5169358ab31320df45d38fe8275081755 Mon Sep 17 00:00:00 2001
From: Ogheneochuko <7204868+amochuko@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:17:25 +0100
Subject: [PATCH 41/46] fix: rename
---
react-vite/src/utils/format.ts | 40 ----------------------------------
1 file changed, 40 deletions(-)
delete mode 100644 react-vite/src/utils/format.ts
diff --git a/react-vite/src/utils/format.ts b/react-vite/src/utils/format.ts
deleted file mode 100644
index b42d9a3..0000000
--- a/react-vite/src/utils/format.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export const format = {
- parsePlur: (n: number) => {
- return n * 10 ** 16;
- },
- parsexBZZ: (n: number) => {
- return n * 1e18;
- },
- formatPlur: (n: number) => {
- return n / 10 ** 16;
- },
- copyText: async (txt: string) => {
- return new Promise((res, rej) => {
- if (navigator.clipboard) {
- navigator.clipboard
- .writeText(txt)
- .then(() => res(true))
- .catch((err) => rej(err));
- } else {
- // fallback
- const txtarea = document.createElement("textarea");
- txtarea.value = txt;
- document.body.appendChild(txtarea);
- txtarea.select();
-
- try {
- document.execCommand("copy");
- res(true);
- } catch (err) {
- document.removeChild(txtarea);
- rej(err);
- }
- }
- });
- },
- trimText: (txt: string) => {
- return txt.length > 16
- ? txt.slice(0, 10) + "..." + txt.substring(txt.length - 10)
- : txt;
- },
-};
From 464cfa8cc80c53955efffe831963c824cc223f62 Mon Sep 17 00:00:00 2001
From: Ogheneochuko <7204868+amochuko@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:35:32 +0100
Subject: [PATCH 42/46] fix: rename util file and remove testing component
---
react-vite/src/components/Main.tsx | 3 +-
react-vite/src/utils/index.ts | 178 +++++++++++++++++++++++++++++
2 files changed, 179 insertions(+), 2 deletions(-)
create mode 100644 react-vite/src/utils/index.ts
diff --git a/react-vite/src/components/Main.tsx b/react-vite/src/components/Main.tsx
index e80e896..5189bfa 100644
--- a/react-vite/src/components/Main.tsx
+++ b/react-vite/src/components/Main.tsx
@@ -9,10 +9,9 @@ function Main() {
return (
-
{nodeHealth?.status == "ok" && (
<>
- {/* */}
+
{postageStamps && postageStamps?.length > 0 && }
)}
diff --git a/react-vite/src/utils/index.ts b/react-vite/src/utils/index.ts
new file mode 100644
index 0000000..f8fd9a4
--- /dev/null
+++ b/react-vite/src/utils/index.ts
@@ -0,0 +1,178 @@
+export const format = {
+ parsePlur: (n: number) => {
+ return n * 10 ** 16;
+ },
+ parsexBZZ: (n: number) => {
+ return n * 1e18;
+ },
+ formatPlur: (n: number) => {
+ return n / 10 ** 16;
+ },
+ copyText: async (txt: string) => {
+ return new Promise((res, rej) => {
+ if (navigator.clipboard) {
+ navigator.clipboard
+ .writeText(txt)
+ .then(() => res(true))
+ .catch((err) => rej(err));
+ } else {
+ // fallback
+ const txtarea = document.createElement("textarea");
+ txtarea.value = txt;
+ document.body.appendChild(txtarea);
+ txtarea.select();
+
+ try {
+ document.execCommand("copy");
+ res(true);
+ } catch (err) {
+ document.removeChild(txtarea);
+ rej(err);
+ }
+ }
+ });
+ },
+ trimText: (txt: string) => {
+ return txt.length > 16
+ ? txt.slice(0, 10) + "..." + txt.substring(txt.length - 10)
+ : txt;
+ },
+};
+
+export function convertBytes(sizeInBytes: number) {
+ const KB = sizeInBytes / 1024;
+ const MB = KB / 1024;
+ const GB = MB / 1024;
+ const PB = GB / 1024;
+
+ let unit;
+ let value;
+
+ if (PB >= 1) {
+ unit = "PB";
+ value = KB / 1024;
+ } else if (GB >= 1) {
+ unit = "GB";
+ value = MB / 1024;
+ } else if (MB >= 1) {
+ unit = "MB";
+ value = GB / 1024;
+ } else if (KB >= 1) {
+ unit = "KB";
+ value = MB / 1024;
+ } else {
+ unit = "Bytes";
+ value = sizeInBytes;
+ }
+
+ return `${value.toFixed(7)} ${unit}`;
+}
+
+type UtilizationTableType = {
+ [index: string]: {
+ theoreticalMaxVolume: string;
+ effectiveVolume: string;
+ };
+};
+
+export const UTILIZATION_TABLE = (key: string) => {
+ const table: UtilizationTableType = {
+ "20": {
+ theoreticalMaxVolume: `4.29 GB`,
+ effectiveVolume: `0.0`,
+ },
+ "21": {
+ theoreticalMaxVolume: `8.59 GB`,
+ effectiveVolume: `0.0`,
+ },
+ "22": {
+ theoreticalMaxVolume: `17.18 GB`,
+ effectiveVolume: `4.93 GB`,
+ },
+ "23": {
+ theoreticalMaxVolume: `34.36 GB`,
+ effectiveVolume: `17.03 GB`,
+ },
+ "24": {
+ theoreticalMaxVolume: `68.72 GB`,
+ effectiveVolume: `44.21 GB`,
+ },
+ "25": {
+ theoreticalMaxVolume: `137.44 GB`,
+ effectiveVolume: `102.78 GB`,
+ },
+ "26": {
+ theoreticalMaxVolume: `274.88 GB`,
+ effectiveVolume: `225.86 GB`,
+ },
+ "27": {
+ theoreticalMaxVolume: `549.76 GB`,
+ effectiveVolume: `480.43 GB`,
+ },
+ "28": {
+ theoreticalMaxVolume: `1.1 TB`,
+ effectiveVolume: `1.0 TB`,
+ },
+ "29": {
+ theoreticalMaxVolume: `2.2 TB`,
+ effectiveVolume: `2.6 TB`,
+ },
+ "30": {
+ theoreticalMaxVolume: `4.40 TB`,
+ effectiveVolume: `4.2 TB`,
+ },
+ "31": {
+ theoreticalMaxVolume: `8.80 TB`,
+ effectiveVolume: `4.2 TB`,
+ },
+ "32": {
+ theoreticalMaxVolume: `17.59 TB`,
+ effectiveVolume: `17.20 TB`,
+ },
+ "33": {
+ theoreticalMaxVolume: `35.18 TB`,
+ effectiveVolume: `34.63 TB`,
+ },
+ "34": {
+ theoreticalMaxVolume: `70.37 TB`,
+ effectiveVolume: `69.58 TB`,
+ },
+ "35": {
+ theoreticalMaxVolume: `140.74 TB`,
+ effectiveVolume: `139.63 TB`,
+ },
+ "36": {
+ theoreticalMaxVolume: `281.47 TB`,
+ effectiveVolume: `279.91 TB`,
+ },
+ "37": {
+ theoreticalMaxVolume: `562.95 TB`,
+ effectiveVolume: `560.73 TB`,
+ },
+ "38": {
+ theoreticalMaxVolume: `1.3 PB`,
+ effectiveVolume: `1.12 PB`,
+ },
+ "39": {
+ theoreticalMaxVolume: `2.25 PB`,
+ effectiveVolume: `2.25 PB`,
+ },
+ "40": {
+ theoreticalMaxVolume: `4.50 PB`,
+ effectiveVolume: `4.50 PB`,
+ },
+ "41": {
+ theoreticalMaxVolume: `9.01 PB`,
+ effectiveVolume: `9.00 PB`,
+ },
+ };
+
+ if (key in table) {
+ return table[key];
+ }
+
+ return {
+ theoreticalMaxVolume: `0 PB`,
+ effectiveVolume: `0 PB`,
+ };
+};
From bb7e152c7c5652af29f2babae40df4d1fcdd238e Mon Sep 17 00:00:00 2001
From: Ogheneochuko <7204868+amochuko@users.noreply.github.com>
Date: Thu, 8 Aug 2024 04:45:23 +0100
Subject: [PATCH 43/46] fix: update ui when bee node not active
---
react-vite/src/components/Footer.tsx | 20 ++++++++++++++------
react-vite/src/components/Header.tsx | 14 +++++++++-----
react-vite/src/components/Main.tsx | 7 +++++++
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/react-vite/src/components/Footer.tsx b/react-vite/src/components/Footer.tsx
index 684054d..8a58112 100644
--- a/react-vite/src/components/Footer.tsx
+++ b/react-vite/src/components/Footer.tsx
@@ -1,8 +1,16 @@
-export function Footer(){
- const date = new Date();
- return (
+import { useNodeHealth } from "../hooks/useNodeHealth";
+
+export function Footer() {
+ const { nodeHealth } = useNodeHealth();
+ const date = new Date();
+
+ return (
+ <>
+ {nodeHealth?.status === "ok" && (
- )
-}
\ No newline at end of file
+ )}
+
+ );
+}
diff --git a/react-vite/src/components/Header.tsx b/react-vite/src/components/Header.tsx
index 447bf1d..038c0ac 100644
--- a/react-vite/src/components/Header.tsx
+++ b/react-vite/src/components/Header.tsx
@@ -3,12 +3,16 @@ import { NodeStatus } from "./NodeStatus";
import { useNodeHealth } from "../hooks/useNodeHealth";
function Header() {
- const { nodeHealth } = useNodeHealth();
+ const { nodeHealth } = useNodeHealth();
return (
-
+ <>
+ {nodeHealth?.status == "ok" && (
+
+ )}
+
);
}
diff --git a/react-vite/src/components/Main.tsx b/react-vite/src/components/Main.tsx
index 5189bfa..50dc9fa 100644
--- a/react-vite/src/components/Main.tsx
+++ b/react-vite/src/components/Main.tsx
@@ -15,6 +15,13 @@ function Main() {
{postageStamps && postageStamps?.length > 0 && }
)}
+ {nodeHealth?.status != "ok" && (
+
+
+
Oops! Seems your Bee node is not active....
+
+
-
Preview file
-
+ {!isProcessing ? (
+ <>
+
Preview file
+
+
+ ) : (
+
+ Processing manifest...
+
+ )}