From 2966c4a1022801c2d431f8261e9efa45ef9fd153 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 25 May 2022 16:06:59 -0700 Subject: [PATCH] Show note on language change and offer reload --- src-ui/messages.xlf | 55 +++++++++++++------ .../common/toasts/toasts.component.html | 2 +- .../manage/settings/settings.component.html | 2 +- .../manage/settings/settings.component.ts | 25 ++++++++- src-ui/src/styles.scss | 4 ++ src-ui/src/theme.scss | 3 +- 6 files changed, 69 insertions(+), 22 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 9ab7e46a2..f4c0d6598 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -1340,7 +1340,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 88 + 86 @@ -1884,7 +1884,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 26 + 24 src/app/components/document-list/document-list.component.html @@ -1899,7 +1899,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 15 + 14 src/app/components/document-list/document-list.component.html @@ -1914,7 +1914,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 72 + 70 src/app/components/manage/management-list/management-list.component.html @@ -1964,7 +1964,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 33 + 31 src/app/components/document-list/document-list.component.html @@ -1979,7 +1979,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 40 + 38 src/app/components/document-list/document-list.component.html @@ -1994,7 +1994,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 50 + 48 @@ -2005,7 +2005,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 51 + 49 @@ -2016,7 +2016,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 52 + 50 @@ -2764,35 +2764,56 @@ Saved view "" deleted. src/app/components/manage/settings/settings.component.ts - 167 + 174 - - Settings saved successfully. + + Settings saved src/app/components/manage/settings/settings.component.ts - 238 + 247 + + + + Settings were saved successfully. + + src/app/components/manage/settings/settings.component.ts + 248 + + + + Settings were saved successfully. Reload is required to apply some changes. + + src/app/components/manage/settings/settings.component.ts + 252 + + + + Reload now + + src/app/components/manage/settings/settings.component.ts + 253 An error occurred while saving settings. src/app/components/manage/settings/settings.component.ts - 242 + 263 Use system language src/app/components/manage/settings/settings.component.ts - 250 + 271 Use date format of display language src/app/components/manage/settings/settings.component.ts - 257 + 278 @@ -2801,7 +2822,7 @@ )"/> src/app/components/manage/settings/settings.component.ts - 277,279 + 298,300 diff --git a/src-ui/src/app/components/common/toasts/toasts.component.html b/src-ui/src/app/components/common/toasts/toasts.component.html index b79208ebf..03715a440 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.html +++ b/src-ui/src/app/components/common/toasts/toasts.component.html @@ -4,5 +4,5 @@ [class]="toast.classname" (hidden)="toastService.closeToast(toast)">

{{toast.content}}

-

+

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index 7e52db59e..002cc4eed 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -22,7 +22,7 @@ - You need to reload the page after applying a new language. + You need to reload the page after applying a new language. diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index d9877d281..22ecfe9bb 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -14,7 +14,7 @@ import { LanguageOption, SettingsService, } from 'src/app/services/settings.service' -import { ToastService } from 'src/app/services/toast.service' +import { Toast, ToastService } from 'src/app/services/toast.service' import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms' import { Observable, Subscription, BehaviorSubject, first } from 'rxjs' import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @@ -61,6 +61,13 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { ) } + get displayLanguageIsDirty(): boolean { + return ( + this.settingsForm.get('displayLanguage').value != + this.store?.getValue()['displayLanguage'] + ) + } + constructor( public savedViewService: SavedViewService, private documentListViewService: DocumentListViewService, @@ -170,6 +177,7 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { } private saveLocalSettings() { + const reloadRequired = this.displayLanguageIsDirty // just this one, for now this.settings.set( SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, this.settingsForm.value.bulkEditApplyOnClose @@ -235,7 +243,20 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { this.store.next(this.settingsForm.value) this.documentListViewService.updatePageSize() this.settings.updateAppearanceSettings() - this.toastService.showInfo($localize`Settings saved successfully.`) + let savedToast: Toast = { + title: $localize`Settings saved`, + content: $localize`Settings were saved successfully.`, + delay: 500000, + } + if (reloadRequired) { + ;(savedToast.content = $localize`Settings were saved successfully. Reload is required to apply some changes.`), + (savedToast.actionName = $localize`Reload now`) + savedToast.action = () => { + location.reload() + } + } + + this.toastService.show(savedToast) }, error: (error) => { this.toastService.showError( diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 4b78e9d21..e0934b84c 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -84,6 +84,10 @@ svg.logo { } } +.text-primary { + color: var(--bs-primary) !important; +} + .btn-outline-primary { border-color: var(--bs-primary) !important; color: var(--bs-primary) !important; diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss index 732ac47d9..bf9be6662 100644 --- a/src-ui/src/theme.scss +++ b/src-ui/src/theme.scss @@ -186,7 +186,8 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,