From cbb4dc79581b392e8f4cbf1ef86f52109376cc63 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Oct 2024 21:35:17 +0530 Subject: [PATCH 1/4] Added the latest repo version in about section of Settings page --- Client/src/Pages/Settings/index.jsx | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/Client/src/Pages/Settings/index.jsx b/Client/src/Pages/Settings/index.jsx index db3fe232b..e957d020f 100644 --- a/Client/src/Pages/Settings/index.jsx +++ b/Client/src/Pages/Settings/index.jsx @@ -17,7 +17,7 @@ import PropTypes from "prop-types"; import LoadingButton from "@mui/lab/LoadingButton"; import { setTimezone, setMode } from "../../Features/UI/uiSlice"; import timezones from "../../Utils/timezones.json"; -import { useState } from "react"; +import { useState,useEffect } from "react"; import { ConfigBox } from "./styled"; import { networkService } from "../../main"; import { settingsValidation } from "../../Validation/validation"; @@ -37,10 +37,30 @@ const Settings = ({ isAdmin }) => { const [form, setForm] = useState({ ttl: checkTTL ? (checkTTL / SECONDS_PER_DAY).toString() : 0, }); + const [version,setVersion]=useState(""); const [errors, setErrors] = useState({}); const dispatch = useDispatch(); const navigate = useNavigate(); + //Fetching latest release version from github + useEffect(() => { + const fetchLatestVersion = async () => { + try { + const response = await fetch( + "https://api.github.com/repos/bluewave-labs/bluewave-uptime/releases/latest" + ); + if (!response.ok) { + throw new Error("Failed to fetch latest version"); + } + const data = await response.json(); + setVersion(data.tag_name); // Set the latest version number + } catch (error) { + createToast({ body: error.message || "Error fetching latest version" }); // Set error message + } + }; + fetchLatestVersion(); + }); + const handleChange = (event) => { const { value, id } = event.target; const { error } = settingsValidation.validate( @@ -300,6 +320,7 @@ const Settings = ({ isAdmin }) => { BlueWave Uptime v1.0.0 + Latest Version: {version} @@ -307,8 +328,8 @@ const Settings = ({ isAdmin }) => { From 33dd78defd90e715d652a4730d58853d0f8c7a9d Mon Sep 17 00:00:00 2001 From: navishmonga <141874091+navishmonga@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:44:41 +0530 Subject: [PATCH 2/4] Update index.jsx --- Client/src/Pages/Settings/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Pages/Settings/index.jsx b/Client/src/Pages/Settings/index.jsx index e957d020f..34df4b528 100644 --- a/Client/src/Pages/Settings/index.jsx +++ b/Client/src/Pages/Settings/index.jsx @@ -59,7 +59,7 @@ const Settings = ({ isAdmin }) => { } }; fetchLatestVersion(); - }); + },[]); const handleChange = (event) => { const { value, id } = event.target; From 94e287658082b424500061f0f335e53cfd138d03 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Oct 2024 12:13:18 +0530 Subject: [PATCH 3/4] Fixed the default version profile and the network calls to be made using NetworkService --- Client/src/Pages/Settings/index.jsx | 16 ++++++++-------- Client/src/Utils/NetworkService.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Client/src/Pages/Settings/index.jsx b/Client/src/Pages/Settings/index.jsx index 34df4b528..2ffec346e 100644 --- a/Client/src/Pages/Settings/index.jsx +++ b/Client/src/Pages/Settings/index.jsx @@ -37,7 +37,7 @@ const Settings = ({ isAdmin }) => { const [form, setForm] = useState({ ttl: checkTTL ? (checkTTL / SECONDS_PER_DAY).toString() : 0, }); - const [version,setVersion]=useState(""); + const [version,setVersion]=useState("unknown"); const [errors, setErrors] = useState({}); const dispatch = useDispatch(); const navigate = useNavigate(); @@ -45,18 +45,18 @@ const Settings = ({ isAdmin }) => { //Fetching latest release version from github useEffect(() => { const fetchLatestVersion = async () => { + let version="unknown"; try { - const response = await fetch( - "https://api.github.com/repos/bluewave-labs/bluewave-uptime/releases/latest" - ); - if (!response.ok) { + const response = await networkService.fetchGithubLatestRelease(); + if (!response.status===200) { throw new Error("Failed to fetch latest version"); } - const data = await response.json(); - setVersion(data.tag_name); // Set the latest version number + version=response.data.tag_name; } catch (error) { createToast({ body: error.message || "Error fetching latest version" }); // Set error message - } + } finally{ + setVersion(version); + } }; fetchLatestVersion(); },[]); diff --git a/Client/src/Utils/NetworkService.js b/Client/src/Utils/NetworkService.js index 573651f58..79e5b701e 100644 --- a/Client/src/Utils/NetworkService.js +++ b/Client/src/Utils/NetworkService.js @@ -832,6 +832,20 @@ class NetworkService { } ); } + + /** + * ************************************ + * Fetcher github latest release version + * ************************************ + * + * @async + * @returns {Promise} The response from the axios GET request. + * + */ + async fetchGithubLatestRelease() { + return this.axiosInstance.get('https://api.github.com/repos/bluewave-labs/bluewave-uptime/releases/latest'); + } + } export default NetworkService; From 3b4bab707fc9fb38c0795ba361a56f983f4dcc60 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Oct 2024 12:22:54 +0530 Subject: [PATCH 4/4] converted into a single version line --- Client/src/Pages/Settings/index.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Client/src/Pages/Settings/index.jsx b/Client/src/Pages/Settings/index.jsx index 2ffec346e..5ba4d676a 100644 --- a/Client/src/Pages/Settings/index.jsx +++ b/Client/src/Pages/Settings/index.jsx @@ -319,8 +319,7 @@ const Settings = ({ isAdmin }) => { About - BlueWave Uptime v1.0.0 - Latest Version: {version} + BlueWave Uptime {version}