gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-21 08:04:24 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

fix(global_menu): uncaught exception if update request fails (closes #5700)

Browse Source
This commit is contained in:
Elian Doran 2025-11-20 19:52:13 +02:00
parent d51e3de674
commit 165357f444
No known key found for this signature in database
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/client/src/widgets/buttons/global_menu.tsx
View File

@ -26,7 +26,7 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
const isVerticalLayout = !isHorizontalLayout; const isVerticalLayout = !isHorizontalLayout;
const parentComponent = useContext(ParentComponent); const parentComponent = useContext(ParentComponent);
const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus(); const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus();
return ( return (
<Dropdown <Dropdown
className="global-menu" className="global-menu"
@ -58,14 +58,14 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
<KeyboardActionMenuItem command="showHelp" icon="bx bx-help-circle" text={t("global_menu.show_help")} /> <KeyboardActionMenuItem command="showHelp" icon="bx bx-help-circle" text={t("global_menu.show_help")} />
<KeyboardActionMenuItem command="showCheatsheet" icon="bx bxs-keyboard" text={t("global_menu.show-cheatsheet")} /> <KeyboardActionMenuItem command="showCheatsheet" icon="bx bxs-keyboard" text={t("global_menu.show-cheatsheet")} />
<MenuItem command="openAboutDialog" icon="bx bx-info-circle" text={t("global_menu.about")} /> <MenuItem command="openAboutDialog" icon="bx bx-info-circle" text={t("global_menu.about")} />
{isUpdateAvailable && <> {isUpdateAvailable && <>
<FormListHeader text={t("global_menu.new-version-available")} /> <FormListHeader text={t("global_menu.new-version-available")} />
<MenuItem command={() => window.open("https://github.com/TriliumNext/Trilium/releases/latest")} <MenuItem command={() => window.open("https://github.com/TriliumNext/Trilium/releases/latest")}
icon="bx bx-download" icon="bx bx-download"
text={t("global_menu.download-update", {latestVersion})} /> text={t("global_menu.download-update", {latestVersion})} />
</>} </>}
{!isElectron() && <BrowserOnlyOptions />} {!isElectron() && <BrowserOnlyOptions />}
</Dropdown> </Dropdown>
) )
@ -221,9 +221,15 @@ function useTriliumUpdateStatus() {
async function updateVersionStatus() { async function updateVersionStatus() {
const RELEASES_API_URL = "https://api.github.com/repos/TriliumNext/Trilium/releases/latest"; const RELEASES_API_URL = "https://api.github.com/repos/TriliumNext/Trilium/releases/latest";
const resp = await fetch(RELEASES_API_URL); let latestVersion: string | undefined = undefined;
const data = await resp.json(); try {
const latestVersion = data?.tag_name?.substring(1); const resp = await fetch(RELEASES_API_URL);
const data = await resp.json();
latestVersion = data?.tag_name?.substring(1);
} catch (e) {
console.warn("Unable to fetch latest version info from GitHub releases API", e);
}
setLatestVersion(latestVersion); setLatestVersion(latestVersion);
} }