Skip to content
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

NAS-133479 / 25.04 / HA notice showing on a single system #11322

Merged
merged 4 commits into from
Jan 10, 2025
Merged

NAS-133479 / 25.04 / HA notice showing on a single system #11322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fc7d36
NAS-133479: HA notice showing on a single system
AlexKarpov98 Jan 9, 2025
397b193
NAS-133479: PR Update
AlexKarpov98 Jan 10, 2025
addfe44
NAS-133479: PR Update
AlexKarpov98 Jan 10, 2025
4bebd07
NAS-133479: NAS_133479: PR Update
AlexKarpov98 Jan 10, 2025
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
1 change: 1 addition & 0 deletions src/app/pages/system/general-settings/email/email-card/email-card.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ describe('EmailCardComponent with Outlook OAuth', () => {

expect(itemTexts).toEqual([
'Send Mail Method: Outlook OAuth',
'From: Test [email protected] via google.com',
]);
});
});
2 changes: 1 addition & 1 deletion src/app/pages/system/update/components/manual-update-form/manual-update-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export class ManualUpdateFormComponent implements OnInit {
hideCheckbox: true,
buttonText: helptext.ha_update.complete_action,
hideCancel: true,
}).pipe(untilDestroyed(this)).subscribe(() => {});
}).pipe(untilDestroyed(this)).subscribe();
}

handleUpdateSuccess(): void {
Expand Down
28 changes: 21 additions & 7 deletions src/app/pages/system/update/components/update-actions-card/update-actions-card.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,26 @@ export class UpdateActionsCardComponent implements OnInit {
});
}

private finishHaUpdate(): Observable<boolean> {
return this.dialogService.confirm({
title: helptext.ha_update.complete_title,
message: helptext.ha_update.complete_msg,
buttonText: helptext.ha_update.complete_action,
hideCheckbox: true,
hideCancel: true,
});
}

private finishNonHaUpdate(): Observable<boolean> {
return this.dialogService.confirm({
title: helptext.ha_update.complete_title,
message: this.translate.instant('Update completed successfully. The system will reboot shortly'),
buttonText: helptext.ha_update.complete_action,
hideCheckbox: true,
hideCancel: true,
});
}

private update(resume = false): void {
this.window.sessionStorage.removeItem('updateLastChecked');
this.window.sessionStorage.removeItem('updateAvailable');
Expand All @@ -308,13 +328,7 @@ export class UpdateActionsCardComponent implements OnInit {
this.isUpdateRunning = false;
this.sysGenService.updateDone(); // Send 'finished' signal to topbar
this.cdr.markForCheck();
return this.dialogService.confirm({
title: helptext.ha_update.complete_title,
message: helptext.ha_update.complete_msg,
hideCheckbox: true,
buttonText: helptext.ha_update.complete_action,
hideCancel: true,
});
return this.isHaLicensed ? this.finishHaUpdate() : this.finishNonHaUpdate();
}),
this.errorHandler.catchError(),
untilDestroyed(this),
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/ast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/az.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/be.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/bg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/bn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/br.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/bs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4100,6 +4100,7 @@
"Unset to disable the scheduled scrub without deleting it.": "",
"Unset to disable this service without deleting it.": "",
"Update Members": "",
"Update completed successfully. The system will reboot shortly": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updating Instance": "",
"Updating custom app": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/cy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3523,6 +3523,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
"Updated Date": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/dsb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/el.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/en-au.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/en-gb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/eo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/es-ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"Table Actions of Expandable Table": "",
"USB Passthrough Device": "",
"Unlock Child Encrypted Roots": "",
"Update completed successfully. The system will reboot shortly": "",
"Virtualization (Old)": "",
"Virtualization Method": "",
"everyone@": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/es-co.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/es-mx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/es-ni.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/es-ve.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4370,6 +4370,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
"Updated Date": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/et.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/eu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/fa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/fi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@
"URL": "",
"Unix NSS Info": "",
"Unlink": "",
"Update completed successfully. The system will reboot shortly": "",
"Usage Collection": "",
"Usages": "",
"User API Keys": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/fy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/ga.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@
"Unexpected power loss necessitating a restart.": "",
"Unresponsive system necessitating a forced restart.": "",
"Unsaved Changes": "",
"Update completed successfully. The system will reboot shortly": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updating Instance": "",
"Updating custom app": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/gd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/gl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/he.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/hi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/hr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/hsb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/hu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/ia.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4780,6 +4780,7 @@
"Update System": "",
"Update TrueCommand Settings": "",
"Update available": "",
"Update completed successfully. The system will reboot shortly": "",
"Update in Progress": "",
"Update successful. Please restart for the update to take effect. Restart now?": "",
"Updated 'Use as Home Share'": "",
Expand Down
Loading
Loading