From 6a4d96f9880ceeea7dd5794e6586042a92156978 Mon Sep 17 00:00:00 2001 From: Fabricio Silva Date: Sun, 10 Sep 2023 15:59:59 +0100 Subject: [PATCH] feat(config): check for updates reading from config (#1038) * go indent linting * getLatest endpoint follows config.CheckForUpdates * Revert "getLatest endpoint follows config.CheckForUpdates" This reverts commit 495fabad13b1a96aa83ce50792f5725e9b51061a. * getLatestRelease follows config.check_for_updates * revert: rename data - less changes to conflict * fixup: revert: rename data - less changes to conflict * change queryFn to arrow function --- internal/http/server.go | 2 +- web/src/components/header/Header.tsx | 15 ++++++++++++--- web/src/screens/settings/Application.tsx | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/internal/http/server.go b/internal/http/server.go index cf744b5..ac307c6 100644 --- a/internal/http/server.go +++ b/internal/http/server.go @@ -81,7 +81,7 @@ func (s Server) Open() error { } server := http.Server{ - Handler: s.Handler(), + Handler: s.Handler(), ReadHeaderTimeout: time.Second * 15, } diff --git a/web/src/components/header/Header.tsx b/web/src/components/header/Header.tsx index 5ad3f2e..56ba4aa 100644 --- a/web/src/components/header/Header.tsx +++ b/web/src/components/header/Header.tsx @@ -17,11 +17,20 @@ import { RightNav } from "./RightNav"; import { MobileNav } from "./MobileNav"; export const Header = () => { + const { data: config } = useQuery({ + queryKey: ["config"], + queryFn: () => APIClient.config.get(), + retry: false, + refetchOnWindowFocus: false, + onError: err => console.log(err) + }); + const { data } = useQuery({ queryKey: ["updates"], queryFn: () => APIClient.updates.getLatestRelease(), retry: false, refetchOnWindowFocus: false, + enabled: config?.check_for_updates === true, onError: err => console.log(err) }); @@ -67,7 +76,7 @@ export const Header = () => { - {data && data.html_url && ( + {data?.html_url && (
@@ -82,5 +91,5 @@ export const Header = () => { )} - ) -} + ); +}; diff --git a/web/src/screens/settings/Application.tsx b/web/src/screens/settings/Application.tsx index cba53fc..dcd7583 100644 --- a/web/src/screens/settings/Application.tsx +++ b/web/src/screens/settings/Application.tsx @@ -88,6 +88,7 @@ function ApplicationSettings() { queryFn: APIClient.updates.getLatestRelease, retry: false, refetchOnWindowFocus: false, + enabled: data?.check_for_updates === true, onError: err => console.log(err) });