summaryrefslogtreecommitdiff
path: root/frontend/src/components/settings/pages/general
diff options
context:
space:
mode:
authorParty Wumpus <48649272+PartyWumpus@users.noreply.github.com>2024-02-15 02:32:58 +0000
committerParty Wumpus <48649272+PartyWumpus@users.noreply.github.com>2024-02-20 21:33:41 +0000
commit35f6f041c1e800a8df9c222a17c00663ad3c9090 (patch)
treea53d23151458a140f9eb76f728eb5c5c552370fe /frontend/src/components/settings/pages/general
parent7e3f9edacf6a96e821a7e1850b598b6e303fae1c (diff)
downloaddecky-loader-35f6f041c1e800a8df9c222a17c00663ad3c9090.tar.gz
decky-loader-35f6f041c1e800a8df9c222a17c00663ad3c9090.zip
Testing PRs from within decky (#496)
* git no work so manually uploading files :( * argh i wish git was working * ok next time i'll make git work * Update updater.py * git please work next time this took ages without you * fix me locales * Update updater.py * Update en-US.json * Update updater.py * Update updater.py * i wish my python LSP stuff was working * fix it * Update updater.py * Update updater.py * Only show testing branch as an option if it is already selected * Initial implementation for fetching the open PRs. Still need testing and a token to complete this. * Wrong filter capitalization * Fix a couple of typos in the python backend updater. * Fix typos pt 3 * This should be the last one * Prepend the PR version number with PR- to make it clearer that's the PR number. * Update prettier to the latest version otherwise it will never be happy with the formatting. * fix merge mistake * fix pyright errors & type hint most new code * fix strict pyright errors... * not sure why my local linter didn't catch this * Reimplement the logic between PR and artifact build to limit API calls * Fix pyright errors * use nightly.link for downloads * remove accidental dollar sign * fix various logical errors. the code actually works now. * set branch to testing when user downloads a testing version --------- Co-authored-by: Marco Rodolfi <marco.rodolfi@tuta.io>
Diffstat (limited to 'frontend/src/components/settings/pages/general')
-rw-r--r--frontend/src/components/settings/pages/general/BranchSelect.tsx15
-rw-r--r--frontend/src/components/settings/pages/general/Updater.tsx4
2 files changed, 12 insertions, 7 deletions
diff --git a/frontend/src/components/settings/pages/general/BranchSelect.tsx b/frontend/src/components/settings/pages/general/BranchSelect.tsx
index 6e69208a..d51f1db8 100644
--- a/frontend/src/components/settings/pages/general/BranchSelect.tsx
+++ b/frontend/src/components/settings/pages/general/BranchSelect.tsx
@@ -8,10 +8,15 @@ import { useSetting } from '../../../../utils/hooks/useSetting';
const logger = new Logger('BranchSelect');
-enum UpdateBranch {
+export enum UpdateBranch {
+ Stable,
+ Prerelease,
+ Testing,
+}
+
+enum LessUpdateBranch {
Stable,
Prerelease,
- // Testing,
}
const BranchSelect: FunctionComponent<{}> = () => {
@@ -24,11 +29,11 @@ const BranchSelect: FunctionComponent<{}> = () => {
const [selectedBranch, setSelectedBranch] = useSetting<UpdateBranch>('branch', UpdateBranch.Stable);
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
+ // Returns numerical values from 0 to 2 (with current branch setup as of 6/16/23)
+ // 0 being stable, 1 being pre-release and 2 being testing (not a branch!)
<Field label={t('BranchSelect.update_channel.label')} childrenContainerWidth={'fixed'}>
<Dropdown
- rgOptions={Object.values(UpdateBranch)
+ rgOptions={Object.values(selectedBranch == UpdateBranch.Testing ? UpdateBranch : LessUpdateBranch)
.filter((branch) => typeof branch == 'number')
.map((branch) => ({
label: tBranches[branch as number],
diff --git a/frontend/src/components/settings/pages/general/Updater.tsx b/frontend/src/components/settings/pages/general/Updater.tsx
index 01aeb4c3..45b026ca 100644
--- a/frontend/src/components/settings/pages/general/Updater.tsx
+++ b/frontend/src/components/settings/pages/general/Updater.tsx
@@ -136,8 +136,8 @@ export default function UpdaterSettings() {
{checkingForUpdates
? t('Updater.updates.checking')
: !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
- ? t('Updater.updates.check_button')
- : t('Updater.updates.install_button')}
+ ? t('Updater.updates.check_button')
+ : t('Updater.updates.install_button')}
</DialogButton>
) : (
<ProgressBarWithInfo