Skip to content

fix(web): allow OS update/reboot UI when registration key state has an error #2029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eli Bosley (elibosley) wants to merge 8 commits into
base: main
Choose a base branch
from
Open

fix(web): allow OS update/reboot UI when registration key state has an error #2029

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e080f53
fix(web): show OS update confirm when key state has an error
elibosley Jun 17, 2026
71cc535
fix(web): allow OS update/reboot UI when key state has an error
elibosley Jun 18, 2026
2ff2475
fix(web): hide dropdown update button when update entitlement expired
elibosley Jun 18, 2026
a440c83
refactor(web): centralize OS update/reboot gating in useOsUpdateStatus
elibosley Jun 18, 2026
f5e703f
test(api): increase timeout for openid-client error properties test
elibosley Jun 18, 2026
ca45bca
fix(web): keep state errors gating OS update confirm during pending k…
elibosley Jun 18, 2026
07452bc
test(web): exercise real stateDataError and isolate mocks in OS updat…
elibosley Jun 18, 2026
4ffcd1c
test(api): apply suite-level timeout to oidc integration tests
elibosley Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions web/__test__/components/CallbackFeedback.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,61 @@ describe('CallbackFeedback.vue', () => {
expect(wrapper.find('.modal').attributes('data-success')).toBe('false');
});

describe('OS update confirmation', () => {
it('renders the update confirmation when a standalone update lands on a server with a state error', () => {
updateOsStatus.value = 'confirming';
callbackUpdateRelease.value = { name: 'Unraid 7.3.1' };
osVersion.value = '7.3.0';
// Server is in an error state (e.g. EGUID GUID mismatch) but no key was installed
stateDataError.value = true;
keyInstallStatus.value = 'ready';

const wrapper = mountComponent();

expect(wrapper.find('h1').text()).toBe('Update Unraid OS confirmation required');
expect(wrapper.text()).toContain('Current Version: Unraid 7.3.0');
expect(wrapper.text()).toContain('New Version: Unraid 7.3.1');
expect(wrapper.text()).toContain('Confirm and start update');
});

it('confirms the update when the confirm button is clicked', async () => {
updateOsStatus.value = 'confirming';
callbackUpdateRelease.value = { name: 'Unraid 7.3.1' };
stateDataError.value = true;
keyInstallStatus.value = 'ready';

const wrapper = mountComponent();

const confirmButton = wrapper
.findAll('button')
.find((button) => button.text() === 'Confirm and start update');
expect(confirmButton).toBeDefined();
await confirmButton!.trigger('click');

expect(mockInstallOsUpdate).toHaveBeenCalledTimes(1);
expect(mockSetCallbackStatus).toHaveBeenCalledWith('ready');
});

it('suppresses the update confirmation when a key install left the server in an error state', () => {
updateOsStatus.value = 'confirming';
callbackUpdateRelease.value = { name: 'Unraid 7.3.1' };
osVersion.value = '7.3.0';
// Combined key-install + update flow where the install errored
callbackStatus.value = 'success';
keyActionType.value = 'purchase';
keyInstallStatus.value = 'success';
keyType.value = 'Pro';
stateDataError.value = true;
callbackCallsCompleted.value = true;

const wrapper = mountComponent();

expect(wrapper.text()).not.toContain('New Version: Unraid 7.3.1');
expect(wrapper.text()).not.toContain('Confirm and start update');
expect(wrapper.text()).toContain('Post Install License Key Error');
});
});

it('reloads the page when the modal is dismissed after a callback action', async () => {
const mockReload = vi.fn();

Expand Down
4 changes: 2 additions & 2 deletions web/src/components/UserProfile/CallbackFeedback.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ const showPostInstallKeyError = computed(() =>
/>
</div>

<template v-if="updateOsStatus === 'confirming' && !stateDataError">
<template v-if="updateOsStatus === 'confirming' && !showPostInstallKeyError">
<div class="my-4 flex flex-col gap-y-2">
<div class="flex flex-col gap-y-1">
<p class="text-center text-lg">
Expand Down Expand Up @@ -383,7 +383,7 @@ const showPostInstallKeyError = computed(() =>
</template>
</template>

<template v-if="updateOsStatus === 'confirming' && !stateDataError">
<template v-if="updateOsStatus === 'confirming' && !showPostInstallKeyError">

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 17, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Block updates during pending key reconciliation

In a combined key-install + OS-update callback, actOnUpdateOsAction can put updateOsStatus into confirming before the delayed refreshServerState reconciliation has finished. If the server still has the pre-refresh stateDataError, showPostInstallKeyError is false while callbackCallsCompleted is false, so this predicate now exposes the confirm button and lets the user start the OS update before we know whether the key install actually cleared the license error. Keep state errors suppressing the update confirmation while a key-install reconciliation is still pending.

Useful? React with 👍 / 👎.

<BrandButton
variant="underline"
:icon="XMarkIcon"
Expand Down
Loading