From 35f6f041c1e800a8df9c222a17c00663ad3c9090 Mon Sep 17 00:00:00 2001 From: Party Wumpus <48649272+PartyWumpus@users.noreply.github.com> Date: Thu, 15 Feb 2024 02:32:58 +0000 Subject: 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 --- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 16 ++-- frontend/src/components/DeckyToaster.tsx | 13 ++-- frontend/src/components/settings/index.tsx | 14 +++- .../settings/pages/general/BranchSelect.tsx | 15 ++-- .../components/settings/pages/general/Updater.tsx | 4 +- .../components/settings/pages/testing/index.tsx | 89 ++++++++++++++++++++++ 7 files changed, 131 insertions(+), 22 deletions(-) create mode 100644 frontend/src/components/settings/pages/testing/index.tsx (limited to 'frontend') diff --git a/frontend/package.json b/frontend/package.json index 3f57c078..ad48ba77 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,7 +25,7 @@ "i18next-parser": "^8.0.0", "import-sort-style-module": "^6.0.0", "inquirer": "^8.2.5", - "prettier": "^2.8.8", + "prettier": "^3.2.5", "prettier-plugin-import-sort": "^0.0.7", "react": "16.14.0", "react-dom": "16.14.0", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 1fa185de..705f935b 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -77,11 +77,11 @@ devDependencies: specifier: ^8.2.5 version: 8.2.5 prettier: - specifier: ^2.8.8 - version: 2.8.8 + specifier: ^3.2.5 + version: 3.2.5 prettier-plugin-import-sort: specifier: ^0.0.7 - version: 0.0.7(prettier@2.8.8) + version: 0.0.7(prettier@3.2.5) react: specifier: 16.14.0 version: 16.14.0 @@ -3104,7 +3104,7 @@ packages: engines: {node: '>=8.6'} dev: true - /prettier-plugin-import-sort@0.0.7(prettier@2.8.8): + /prettier-plugin-import-sort@0.0.7(prettier@3.2.5): resolution: {integrity: sha512-O0KlUSq+lwvh+UiN3wZDT6wWkf7TNxTVv2/XXE5KqpRNbFJq3nRg2ftzBYFFO8QGpdWIrOB0uCTCtFjIxmVKQw==} peerDependencies: prettier: '>= 2.0' @@ -3113,14 +3113,14 @@ packages: import-sort-config: 6.0.0 import-sort-parser-babylon: 6.0.0 import-sort-parser-typescript: 6.0.0 - prettier: 2.8.8 + prettier: 3.2.5 transitivePeerDependencies: - supports-color dev: true - /prettier@2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} - engines: {node: '>=10.13.0'} + /prettier@3.2.5: + resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} + engines: {node: '>=14'} hasBin: true dev: true diff --git a/frontend/src/components/DeckyToaster.tsx b/frontend/src/components/DeckyToaster.tsx index eaee75eb..6faece09 100644 --- a/frontend/src/components/DeckyToaster.tsx +++ b/frontend/src/components/DeckyToaster.tsx @@ -30,11 +30,14 @@ const DeckyToaster: FC = () => { // not actually node but TS is shit let interval: NodeJS.Timer | null; if (renderedToast) { - interval = setTimeout(() => { - interval = null; - console.log('clear toast', renderedToast.data); - removeToast(renderedToast.data); - }, (renderedToast.data.duration || 5e3) + 1000); + interval = setTimeout( + () => { + interval = null; + console.log('clear toast', renderedToast.data); + removeToast(renderedToast.data); + }, + (renderedToast.data.duration || 5e3) + 1000, + ); console.log('set int', interval); } return () => { diff --git a/frontend/src/components/settings/index.tsx b/frontend/src/components/settings/index.tsx index f3a76407..568a0a49 100644 --- a/frontend/src/components/settings/index.tsx +++ b/frontend/src/components/settings/index.tsx @@ -1,7 +1,7 @@ import { SidebarNavigation } from 'decky-frontend-lib'; import { lazy } from 'react'; import { useTranslation } from 'react-i18next'; -import { FaCode, FaPlug } from 'react-icons/fa'; +import { FaCode, FaFlask, FaPlug } from 'react-icons/fa'; import { useSetting } from '../../utils/hooks/useSetting'; import DeckyIcon from '../DeckyIcon'; @@ -10,6 +10,7 @@ import GeneralSettings from './pages/general'; import PluginList from './pages/plugin_list'; const DeveloperSettings = lazy(() => import('./pages/developer')); +const TestingMenu = lazy(() => import('./pages/testing')); export default function SettingsPage() { const [isDeveloper, setIsDeveloper] = useSetting('developer.enabled', false); @@ -39,6 +40,17 @@ export default function SettingsPage() { icon: , visible: isDeveloper, }, + { + title: t('SettingsIndex.testing_title'), + content: ( + + + + ), + route: '/decky/settings/testing', + icon: , + visible: isDeveloper, + }, ]; return ; 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('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!) 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')} ) : ( ('updater/get_testing_versions'); +const downloadTestingVersion = DeckyBackend.callable<[pr_id: number, sha: string]>('updater/download_testing_version'); + +export default function TestingVersionList() { + const { t } = useTranslation(); + const [testingVersions, setTestingVersions] = useState([]); + + useEffect(() => { + (async () => { + setTestingVersions(await getTestingVersions()); + })(); + }, []); + + if (testingVersions.length === 0) { + return ( +
+

No open PRs found

+
+ ); + } + + return ( + + +
    + {testingVersions.map((version) => { + return ( +
  • + + {version.name} {'#' + version.id} + + + { + downloadTestingVersion(version.id, version.head_sha); + setSetting('branch', UpdateBranch.Testing); + }} + > +
    + {t('Testing.download')} + +
    +     + Navigation.NavigateToExternalWeb(version.link)} + > + + +     +
    • + ); + })} +
+ + + ); +} -- cgit v1.2.3