diff options
Diffstat (limited to 'frontend/src/components')
4 files changed, 23 insertions, 15 deletions
diff --git a/frontend/src/components/DeckyState.tsx b/frontend/src/components/DeckyState.tsx index 386880e9..283fb118 100644 --- a/frontend/src/components/DeckyState.tsx +++ b/frontend/src/components/DeckyState.tsx @@ -2,6 +2,7 @@ import { FC, createContext, useContext, useEffect, useState } from 'react'; import { Plugin } from '../plugin'; import { PluginUpdateMapping } from '../store'; +import { VerInfo } from '../updater'; interface PublicDeckyState { plugins: Plugin[]; @@ -9,6 +10,7 @@ interface PublicDeckyState { updates: PluginUpdateMapping | null; hasLoaderUpdate?: boolean; isLoaderUpdating: boolean; + versionInfo: VerInfo | null; } export class DeckyState { @@ -17,6 +19,7 @@ export class DeckyState { private _updates: PluginUpdateMapping | null = null; private _hasLoaderUpdate: boolean = false; private _isLoaderUpdating: boolean = false; + private _versionInfo: VerInfo | null = null; public eventBus = new EventTarget(); @@ -27,9 +30,15 @@ export class DeckyState { updates: this._updates, hasLoaderUpdate: this._hasLoaderUpdate, isLoaderUpdating: this._isLoaderUpdating, + versionInfo: this._versionInfo, }; } + setVersionInfo(versionInfo: VerInfo) { + this._versionInfo = versionInfo; + this.notifyUpdate(); + } + setPlugins(plugins: Plugin[]) { this._plugins = plugins; this.notifyUpdate(); @@ -66,6 +75,7 @@ export class DeckyState { } interface DeckyStateContext extends PublicDeckyState { + setVersionInfo(versionInfo: VerInfo): void; setIsLoaderUpdating(hasUpdate: boolean): void; setActivePlugin(name: string): void; closeActivePlugin(): void; @@ -93,12 +103,13 @@ export const DeckyStateContextProvider: FC<Props> = ({ children, deckyState }) = }, []); const setIsLoaderUpdating = (hasUpdate: boolean) => deckyState.setIsLoaderUpdating(hasUpdate); + const setVersionInfo = (versionInfo: VerInfo) => deckyState.setVersionInfo(versionInfo); const setActivePlugin = (name: string) => deckyState.setActivePlugin(name); const closeActivePlugin = () => deckyState.closeActivePlugin(); return ( <DeckyStateContext.Provider - value={{ ...publicDeckyState, setIsLoaderUpdating, setActivePlugin, closeActivePlugin }} + value={{ ...publicDeckyState, setIsLoaderUpdating, setVersionInfo, setActivePlugin, closeActivePlugin }} > {children} </DeckyStateContext.Provider> diff --git a/frontend/src/components/settings/pages/general/BranchSelect.tsx b/frontend/src/components/settings/pages/general/BranchSelect.tsx index 91e814e5..d803f604 100644 --- a/frontend/src/components/settings/pages/general/BranchSelect.tsx +++ b/frontend/src/components/settings/pages/general/BranchSelect.tsx @@ -1,18 +1,21 @@ import { Dropdown, Field } from 'decky-frontend-lib'; import { FunctionComponent } from 'react'; +import { callUpdaterMethod } from '../../../../updater'; import { useSetting } from '../../../../utils/hooks/useSetting'; enum UpdateBranch { Stable, Prerelease, - Nightly, + // Nightly, } const BranchSelect: FunctionComponent<{}> = () => { const [selectedBranch, setSelectedBranch] = useSetting<UpdateBranch>('branch', UpdateBranch.Prerelease); return ( + // Returns numerical values from 0 to 2 (with current branch setup as of 8/28/22) + // 0 being stable, 1 being pre-release and 2 being nightly <Field label="Update Channel"> <Dropdown rgOptions={Object.values(UpdateBranch) @@ -22,8 +25,10 @@ const BranchSelect: FunctionComponent<{}> = () => { data: UpdateBranch[branch], }))} selectedOption={selectedBranch} - onChange={(newVal) => { - setSelectedBranch(newVal.data); + onChange={async (newVal) => { + await setSelectedBranch(newVal.data); + callUpdaterMethod('check_for_updates'); + console.log('switching branches!'); }} /> </Field> diff --git a/frontend/src/components/settings/pages/general/Updater.tsx b/frontend/src/components/settings/pages/general/Updater.tsx index 9635162c..7056ed13 100644 --- a/frontend/src/components/settings/pages/general/Updater.tsx +++ b/frontend/src/components/settings/pages/general/Updater.tsx @@ -55,21 +55,13 @@ function PatchNotesModal({ versionInfo, closeModal }: { versionInfo: VerInfo | n } export default function UpdaterSettings() { - const { isLoaderUpdating, setIsLoaderUpdating } = useDeckyState(); + const { isLoaderUpdating, setIsLoaderUpdating, versionInfo, setVersionInfo } = useDeckyState(); - const [versionInfo, setVersionInfo] = useState<VerInfo | null>(null); const [checkingForUpdates, setCheckingForUpdates] = useState<boolean>(false); const [updateProgress, setUpdateProgress] = useState<number>(-1); const [reloading, setReloading] = useState<boolean>(false); useEffect(() => { - (async () => { - const res = (await callUpdaterMethod('get_version')) as { result: VerInfo }; - setVersionInfo(res.result); - })(); - }, []); - - useEffect(() => { window.DeckyUpdater = { updateProgress: (i) => { setUpdateProgress(i); diff --git a/frontend/src/components/settings/pages/general/index.tsx b/frontend/src/components/settings/pages/general/index.tsx index c5f9b9dc..a37d8dab 100644 --- a/frontend/src/components/settings/pages/general/index.tsx +++ b/frontend/src/components/settings/pages/general/index.tsx @@ -3,7 +3,7 @@ import { useState } from 'react'; import { FaShapes } from 'react-icons/fa'; import { installFromURL } from '../../../../store'; -// import BranchSelect from './BranchSelect'; +import BranchSelect from './BranchSelect'; import RemoteDebuggingSettings from './RemoteDebugging'; import UpdaterSettings from './Updater'; @@ -22,7 +22,7 @@ export default function GeneralSettings() { /> </Field> */} <UpdaterSettings /> - {/* <BranchSelect /> */} + <BranchSelect /> <RemoteDebuggingSettings /> <Field label="Manual plugin install" |