From eae6d75bcacbabcab70dbba3e7b4587804b102e9 Mon Sep 17 00:00:00 2001 From: Zack Spear Date: Thu, 28 Sep 2023 17:14:03 -0700 Subject: [PATCH] refactor(web): update os check includeNext defaults --- web/_data/serverState.ts | 4 ++-- web/components/UpdateOs/CheckButton.vue | 4 ++-- web/components/UserProfile.ce.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/_data/serverState.ts b/web/_data/serverState.ts index b2ce42b58..dc19cdda8 100644 --- a/web/_data/serverState.ts +++ b/web/_data/serverState.ts @@ -29,7 +29,7 @@ const randomGuid = `1111-1111-${makeid(4)}-123412341234`; // this guid is regist // EBLACKLISTED1 // EBLACKLISTED2 // ENOCONN -const state: ServerState = 'STARTER'; +const state: ServerState = 'ENOKEYFILE'; let regDev = 0; let regTy = ''; switch (state) { @@ -94,7 +94,7 @@ export const serverState: Server = { license: '', locale: 'en_US', // en_US, ja name: 'fuji', - osVersion: '6.12.3', + osVersion: '6.12.3-beta25', registered: true, regGen: 0, regTm: uptime, diff --git a/web/components/UpdateOs/CheckButton.vue b/web/components/UpdateOs/CheckButton.vue index 55fa8546d..59e8dbb92 100644 --- a/web/components/UpdateOs/CheckButton.vue +++ b/web/components/UpdateOs/CheckButton.vue @@ -23,9 +23,9 @@ const serverStore = useServerStore(); const updateOsStore = useUpdateOsStore(); const { guid, keyfile, osVersion } = storeToRefs(serverStore); -const { parsedReleaseTimestamp } = storeToRefs(updateOsStore); +const { isOsVersionStable, parsedReleaseTimestamp } = storeToRefs(updateOsStore); -const includeNext = ref(false); +const includeNext = ref(isOsVersionStable.value ?? false); const status = ref<'ready' | 'checking' | 'ineligible'>('ready'); diff --git a/web/components/UserProfile.ce.vue b/web/components/UserProfile.ce.vue index d45419ade..7b1e71cd2 100644 --- a/web/components/UserProfile.ce.vue +++ b/web/components/UserProfile.ce.vue @@ -102,7 +102,7 @@ onBeforeMount(() => { updateOsStore.checkForUpdate({ cache: true, guid: guid.value, - includeNext: isOsVersionStable.value, // @todo ensure this is correct + includeNext: !isOsVersionStable.value, // if we're already on a non-stable release, include next keyfile: keyfile.value, osVersion: osVersion.value, });