mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-01-01 06:01:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: availableWithRenewal determined by updateOsResponse isEligible

Browse Source 
refactor: updateOsResponse changelogPretty key renamed
This commit is contained in:
Zack Spear
2024-01-31 14:52:00 -08:00
parent 17288a4c02
commit 7f010854b5
5 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/_data/serverState.ts
View File

@@ -178,6 +178,7 @@ export const serverState: Server = {
name: 'Unraid 6.12.6',
date: '2023-12-13',
isNewer: true,
isEligible: false,
changelog: 'https://docs.unraid.net/unraid-os/release-notes/6.12.6/',
sha256: '2f5debaf80549029cf6dfab0db59180e7e3391c059e6521aace7971419c9c4bf',
},

8
web/components/UpdateOs/ChangelogModal.vue
View File

@@ -72,11 +72,11 @@ const showExtendKeyButton = computed(() => {
{{ props.t(`It's highly recommended to review the changelog before continuing your update`) }}
</p>
<div
v-if="releaseForUpdate?.changelog_pretty"
v-if="releaseForUpdate?.changelogPretty"
class="flex self-center"
>
<BrandButton
:href="releaseForUpdate?.changelog_pretty"
:href="releaseForUpdate?.changelogPretty"
btn-style="underline"
:external="true"
:icon-right="ArrowTopRightOnSquareIcon"
@@ -106,10 +106,10 @@ const showExtendKeyButton = computed(() => {
{{ props.t("Close") }}
</BrandButton>
<BrandButton
v-if="releaseForUpdate?.changelog_pretty"
v-if="releaseForUpdate?.changelogPretty"
btn-style="underline"
:external="true"
:href="releaseForUpdate?.changelog_pretty"
:href="releaseForUpdate?.changelogPretty"
:icon="EyeIcon"
:icon-right="ArrowTopRightOnSquareIcon"
>

11
web/store/updateOs.ts
View File

@@ -39,12 +39,12 @@ export const useUpdateOsStore = defineStore('updateOs', () => {
}
return updateOsResponse.value.isNewer ? updateOsResponse.value.version : undefined;
});
const availableWithRenewal = computed(() => {
const availableWithRenewal = computed((): string | undefined => {
if (!available.value || !updateOsResponse.value || !regExp.value || !regUpdatesExpired.value) {
return undefined;
}
return updateOsResponse.value.isNewer && releaseDateGtRegExpDate(updateOsResponse.value.date, regExp.value)
return !updateOsResponse.value?.isEligible
? updateOsResponse.value.version
: undefined;
});
@@ -57,13 +57,6 @@ export const useUpdateOsStore = defineStore('updateOs', () => {
const availableRequiresAuth = computed((): boolean => !updateOsResponse.value?.sha256 ?? false);
// actions
const releaseDateGtRegExpDate = (releaseDate: number | string, regExpDate: number): boolean => {
const parsedReleaseDate = dayjs(releaseDate, 'YYYY-MM-DD');
const parsedUpdateExpirationDate = dayjs(regExpDate ?? undefined);
return parsedReleaseDate.isAfter(parsedUpdateExpirationDate, 'day');
};
const localCheckForUpdate = async (): Promise<void> => {
checkForUpdatesLoading.value = true;
setModalOpen(true);

2
web/store/updateOsActions.ts
View File

@@ -27,7 +27,7 @@ export interface Release {
date: string; // "2023-08-31"
url: string; // "https://stable.dl.unraid.net/unRAIDServer-6.12.4-x86_64.zip"
changelog: string; // "https://raw.githubusercontent.com/unraid/docs/main/docs/unraid-os/release-notes/6.12.4.md"
changelog_pretty: string; // "https://docs.unraid.net/unraid-os/release-notes/6.12.4/"
changelogPretty: string; // "https://docs.unraid.net/unraid-os/release-notes/6.12.4/"
md5: string; // "df6e5859d28c14617efde36d59458206"
size: string; // "439999418"
sha256: string; // "5ad2d22e8c124e3b925c3bd05f1d782d8521965aabcbedd7dd782db76afd9ace"

4
web/types/server.ts
View File

@@ -53,10 +53,10 @@ export interface ServerUpdateOsResponse {
version: string; // "6.13.0-beta0.27"
name: string; // "Unraid 6.13.0-beta0.27"
date: string; // "2023-12-13"
isEligible: boolean; // false
isNewer: boolean; // false
changelog: string | null; // "https://raw.githubusercontent.com/unraid/docs/main/docs/unraid-os/release-notes/6.13.0-beta0.27.md"
/** @todo have Eli return this when applicable */
changelog_pretty?: string; // "https://docs.unraid.net/unraid-os/release-notes/6.12.6/"
changelogPretty?: string; // "https://docs.unraid.net/unraid-os/release-notes/6.12.6/"
sha256: string | null;
}