UpdaterPage: Do not error if update check failed
This commit is contained in:
parent
57d586fab7
commit
f31fd75efc
5 changed files with 54 additions and 16 deletions
|
@ -1,5 +1,6 @@
|
||||||
import Logger from "../utils/logger";
|
import Logger from "../utils/logger";
|
||||||
import { Card, React } from "../webpack/common";
|
import { Card, React } from "../webpack/common";
|
||||||
|
import { ErrorCard } from "./ErrorCard";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
fallback?: React.ComponentType<React.PropsWithChildren<{ error: any; }>>;
|
fallback?: React.ComponentType<React.PropsWithChildren<{ error: any; }>>;
|
||||||
|
@ -49,12 +50,8 @@ export default class ErrorBoundary extends React.Component<React.PropsWithChildr
|
||||||
/>;
|
/>;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card style={{
|
<ErrorCard style={{
|
||||||
overflow: "hidden",
|
overflow: "hidden",
|
||||||
padding: "2em",
|
|
||||||
backgroundColor: color + "30",
|
|
||||||
borderColor: color,
|
|
||||||
color: "var(--text-normal)"
|
|
||||||
}}>
|
}}>
|
||||||
<h1>Oh no!</h1>
|
<h1>Oh no!</h1>
|
||||||
<p>
|
<p>
|
||||||
|
@ -62,10 +59,11 @@ export default class ErrorBoundary extends React.Component<React.PropsWithChildr
|
||||||
and in your console.
|
and in your console.
|
||||||
</p>
|
</p>
|
||||||
<code>
|
<code>
|
||||||
<pre>{this.state.error}
|
<pre>
|
||||||
|
{this.state.error}
|
||||||
</pre>
|
</pre>
|
||||||
</code>
|
</code>
|
||||||
</Card>
|
</ErrorCard>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
21
src/components/ErrorCard.tsx
Normal file
21
src/components/ErrorCard.tsx
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
import { Card } from "../webpack/common";
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
style?: React.CSSProperties;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
export function ErrorCard(props: React.PropsWithChildren<Props>) {
|
||||||
|
return (
|
||||||
|
<Card className={props.className} style={
|
||||||
|
{
|
||||||
|
padding: "2em",
|
||||||
|
backgroundColor: "#e7828430",
|
||||||
|
borderColor: "#e78284",
|
||||||
|
color: "var(--text-normal)",
|
||||||
|
...props.style
|
||||||
|
}
|
||||||
|
}>
|
||||||
|
{props.children}
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
|
@ -74,7 +74,7 @@ export default ErrorBoundary.wrap(function Settings() {
|
||||||
|
|
||||||
<Flex className={classes(Margins.marginBottom20)}>
|
<Flex className={classes(Margins.marginBottom20)}>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => VencordNative.ipc.invoke(IpcEvents.OPEN_PATH, settingsDir)}
|
onClick={() => window.DiscordNative.fileManager.showItemInFolder(settingsDir)}
|
||||||
size={Button.Sizes.SMALL}
|
size={Button.Sizes.SMALL}
|
||||||
disabled={settingsDirPending}
|
disabled={settingsDirPending}
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
import gitHash from "git-hash";
|
import gitHash from "git-hash";
|
||||||
import { changes, checkForUpdates, getRepo, rebuild, update, UpdateLogger } from "../utils/updater";
|
import { changes, checkForUpdates, getRepo, rebuild, update, UpdateLogger, updateError } from '../utils/updater';
|
||||||
import { React, Forms, Button, Margins, Alerts, Card, Parser, Toasts } from '../webpack/common';
|
import { React, Forms, Button, Margins, Alerts, Card, Parser, Toasts } from '../webpack/common';
|
||||||
import { Flex } from "./Flex";
|
import { Flex } from "./Flex";
|
||||||
import { useAwaiter } from '../utils/misc';
|
import { useAwaiter } from '../utils/misc';
|
||||||
import { Link } from "./Link";
|
import { Link } from "./Link";
|
||||||
import ErrorBoundary from "./ErrorBoundary";
|
import ErrorBoundary from "./ErrorBoundary";
|
||||||
|
import { ErrorCard } from "./ErrorCard";
|
||||||
|
|
||||||
|
|
||||||
function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>>, action: () => any) {
|
function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>>, action: () => any) {
|
||||||
|
@ -31,7 +32,11 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
|
||||||
}
|
}
|
||||||
Alerts.show({
|
Alerts.show({
|
||||||
title: "Oops!",
|
title: "Oops!",
|
||||||
body: err.split("\n").map(line => <div>{Parser.parse(line)}</div>)
|
body: (
|
||||||
|
<ErrorCard>
|
||||||
|
{err.split("\n").map(line => <div>{Parser.parse(line)}</div>)}
|
||||||
|
</ErrorCard>
|
||||||
|
)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
|
@ -51,7 +56,7 @@ export default ErrorBoundary.wrap(function Updater() {
|
||||||
UpdateLogger.error("Failed to retrieve repo", err);
|
UpdateLogger.error("Failed to retrieve repo", err);
|
||||||
}, [err]);
|
}, [err]);
|
||||||
|
|
||||||
const isOutdated = updates.length > 0;
|
const isOutdated = updates?.length > 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Forms.FormSection tag="h1" title="Vencord Updater">
|
<Forms.FormSection tag="h1" title="Vencord Updater">
|
||||||
|
@ -67,11 +72,22 @@ export default ErrorBoundary.wrap(function Updater() {
|
||||||
|
|
||||||
<Forms.FormTitle tag="h5">Updates</Forms.FormTitle>
|
<Forms.FormTitle tag="h5">Updates</Forms.FormTitle>
|
||||||
|
|
||||||
|
{!updates && updateError ? (
|
||||||
|
<>
|
||||||
|
<Forms.FormText>Failed to check updates. Check the console for more info</Forms.FormText>
|
||||||
|
<ErrorCard style={{ padding: "1em" }}>
|
||||||
|
<p>{updateError.stderr || updateError.stdout || "An unknown error occurred"}</p>
|
||||||
|
</ErrorCard>
|
||||||
|
</>
|
||||||
|
) :
|
||||||
|
(
|
||||||
<Forms.FormText className={Margins.marginBottom8}>
|
<Forms.FormText className={Margins.marginBottom8}>
|
||||||
{updates.length ? `There are ${updates.length} Updates` : "Up to Date!"}
|
{isOutdated ? `There are ${updates.length} Updates` : "Up to Date!"}
|
||||||
</Forms.FormText>
|
</Forms.FormText>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
{updates.length > 0 && (
|
{isOutdated && (
|
||||||
<Card style={{ padding: ".5em" }}>
|
<Card style={{ padding: ".5em" }}>
|
||||||
{updates.map(({ hash, author, message }) => (
|
{updates.map(({ hash, author, message }) => (
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -4,12 +4,15 @@ import { IpcRes } from './types';
|
||||||
|
|
||||||
export const UpdateLogger = new Logger("Updater", "white");
|
export const UpdateLogger = new Logger("Updater", "white");
|
||||||
export let isOutdated = false;
|
export let isOutdated = false;
|
||||||
|
export let updateError: any;
|
||||||
export let changes: Record<"hash" | "author" | "message", string>[];
|
export let changes: Record<"hash" | "author" | "message", string>[];
|
||||||
|
|
||||||
async function Unwrap<T>(p: Promise<IpcRes<T>>) {
|
async function Unwrap<T>(p: Promise<IpcRes<T>>) {
|
||||||
const res = await p;
|
const res = await p;
|
||||||
|
|
||||||
if (res.ok) return res.value;
|
if (res.ok) return res.value;
|
||||||
|
|
||||||
|
updateError = res.error;
|
||||||
throw res.error;
|
throw res.error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue