diff --git a/README.md b/README.md index ebaa94b68..881ba1d5f 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,5 @@ # Redaction -## Swagger Generated Code - -To re-generate http rune swagger - -YOu need swagger-codegen installed `brew install swagger-codegen` - -``` -BASE=https://dev-06.iqser.cloud/ -URL="$BASE"redaction-gateway-v1/v2/api-docs?group=redaction-gateway-v1 -rm -Rf /tmp/swagger -mkdir -p /tmp/swagger -swagger-codegen generate -i "$URL" -l typescript-angular -o /tmp/swagger -cd /tmp/swagger -``` - ## To Create a new Stack in rancher Goto rancher.iqser.com: Select Cluster `Development`, go to apps, click launch and select `Redaction` from the `dev` @@ -25,17 +10,25 @@ Add cloudflare certificate and specify a hostname to use `timo-redaction-dev.iqs ## Keycloak Staging Config -keycloak: -authServerUrl: 'https://redkc-staging.iqser.cloud/auth' -client: -secret: 'a4e8aa56-03b0-4e6b-b822-8ac1f41280c4' +- keycloak: + - authServerUrl: 'https://redkc-staging.iqser.cloud/auth' +- client: + - secret: 'a4e8aa56-03b0-4e6b-b822-8ac1f41280c4' ## Default Testing URL -`https://timo-redaction-dev.iqser.cloud/` -Hostname: +`https://dev-04.iqser.cloud/` -timo-redaction-dev.iqser.cloud +## Known errors + +- In case of CORS or redirect_uri errors follow these steps: + - Go to `.iqser.cloud/auth/admin/master/console` + - Login with `admin` and `admin1234` + - In the left menu go to `Clients` + - In the table click `redaction` + - Find `Valid Redirect URIs` input + - Under `/ui/*` add new value `http://localhost:4200/*` + - **Save** ## Test Users diff --git a/angular.json b/angular.json index bef6f9183..271a6fd05 100644 --- a/angular.json +++ b/angular.json @@ -1,6 +1,6 @@ { "cli": { - "analytics": "4b8eed12-a1e6-4b7a-9ea2-925b27941271" + "analytics": false }, "version": 1, "projects": { diff --git a/apps/red-ui/src/app/app.component.html b/apps/red-ui/src/app/app.component.html index ff64625af..20a8fecb2 100644 --- a/apps/red-ui/src/app/app.component.html +++ b/apps/red-ui/src/app/app.component.html @@ -1,3 +1,4 @@ + diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index a1d31741d..00d8fdf7b 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -36,9 +36,10 @@ import { KeycloakService } from 'keycloak-angular'; import { GeneralSettingsService } from '@services/general-settings.service'; import { BreadcrumbsComponent } from '@components/breadcrumbs/breadcrumbs.component'; import { UserPreferenceService } from '@services/user-preference.service'; +import { UserService } from '@services/user.service'; -export function httpLoaderFactory(httpClient: HttpClient): PruningTranslationLoader { - return new PruningTranslationLoader(httpClient, '/assets/i18n/', '.json'); +export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigService): PruningTranslationLoader { + return new PruningTranslationLoader(httpClient, '/assets/i18n/', `.json?version=${configService.values.FRONTEND_APP_VERSION}`); } function cleanupBaseUrl(baseUrl: string) { @@ -76,7 +77,7 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp loader: { provide: TranslateLoader, useFactory: httpLoaderFactory, - deps: [HttpClient], + deps: [HttpClient, ConfigService], }, compiler: { provide: TranslateCompiler, @@ -114,7 +115,7 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp provide: APP_INITIALIZER, multi: true, useFactory: configurationInitializer, - deps: [KeycloakService, Title, ConfigService, GeneralSettingsService, LanguageService, UserPreferenceService], + deps: [KeycloakService, Title, ConfigService, GeneralSettingsService, LanguageService, UserService, UserPreferenceService], }, { provide: MissingTranslationHandler, @@ -136,6 +137,7 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp export class AppModule { constructor(private readonly _router: Router, private readonly _route: ActivatedRoute) { this._configureKeyCloakRouteHandling(); + // this._test(); } private _configureKeyCloakRouteHandling() { @@ -152,4 +154,60 @@ export class AppModule { } }); } + + // private _test(){ + // + // const flatGerman = flatten(german); + // + // + // const flatEnglish = flatten(english); + // + // const tmfc = new TranslateMessageFormatCompiler(); + // + // + // + // for (const key of Object.keys(flatGerman)) { + // try { + // const result = tmfc.compile(flatGerman[key], 'de'); + // //console.log(result); + // } catch (e) { + // console.error('ERROR AT: ', flatGerman[key]); + // } + // } + // + // for (const key of Object.keys(flatEnglish)) { + // try { + // const result = tmfc.compile(flatEnglish[key], 'de'); + // //console.log(result); + // } catch (e) { + // console.error('ERROR AT: ', flatEnglish[key]); + // } + // } + // console.log('done'); + // } } + +// +// function flatten(data: any) { +// const result: any = {}; +// +// function recurse(cur: any, prop: any) { +// if (Object(cur) !== cur) { +// result[prop] = cur; +// } else if (Array.isArray(cur)) { +// let l = 0; +// for (let i = 0, l = cur.length; i < l; i++) recurse(cur[i], prop + '[' + i + ']'); +// if (l === 0) result[prop] = []; +// } else { +// let isEmpty = true; +// for (const p in cur) { +// isEmpty = false; +// recurse(cur[p], prop ? prop + '.' + p : p); +// } +// if (isEmpty && prop) result[prop] = {}; +// } +// } +// +// recurse(data, ''); +// return result; +// } diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 534a5c4fb..1f7abb691 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -27,7 +27,6 @@ @@ -36,7 +35,6 @@ diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index 1771c2bdd..3392423a7 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -9,7 +9,6 @@ import { TranslateService } from '@ngx-translate/core'; import { SpotlightSearchAction } from '@components/spotlight-search/spotlight-search-action'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { filter, map, startWith } from 'rxjs/operators'; -import { DossiersService } from '@services/entity-services/dossiers.service'; import { shareDistinctLast } from '@iqser/common-ui'; import { BreadcrumbsService } from '@services/breadcrumbs.service'; @@ -36,26 +35,22 @@ export class BaseScreenComponent { routerLink: '/main/account', show: true, action: this.appStateService.reset, - showDot: () => false, }, { name: _('top-bar.navigation-items.my-account.children.admin'), routerLink: '/main/admin', show: this.currentUser.isManager || this.currentUser.isUserAdmin, action: this.appStateService.reset, - showDot: () => false, }, { name: _('top-bar.navigation-items.my-account.children.downloads'), routerLink: '/main/downloads', show: this.currentUser.isUser, - showDot: () => this.fileDownloadService.hasPendingDownloads, }, { name: _('top-bar.navigation-items.my-account.children.trash'), routerLink: '/main/admin/trash', show: this.currentUser.isManager, - showDot: () => false, }, ]; readonly searchActions: readonly SpotlightSearchAction[] = [ @@ -81,11 +76,9 @@ export class BaseScreenComponent { constructor( readonly appStateService: AppStateService, - readonly dossiersService: DossiersService, readonly userService: UserService, readonly userPreferenceService: UserPreferenceService, readonly titleService: Title, - readonly fileDownloadService: FileDownloadService, private readonly _router: Router, private readonly _translateService: TranslateService, readonly breadcrumbsService: BreadcrumbsService, diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html index 00792193c..fdf4f4b27 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html @@ -9,7 +9,7 @@ this._loadData())) + .subscribe(); } downloadItem(download: DownloadStatus) { @@ -55,11 +60,11 @@ export class DownloadsListScreenComponent extends ListingComponent d.storageId); - await this.fileDownloadService.delete({ storageIds }).toPromise(); + await firstValueFrom(this.fileDownloadService.delete({ storageIds })); await this._loadData(); } private async _loadData() { - await this.fileDownloadService.loadAll().toPromise(); + await firstValueFrom(this.fileDownloadService.loadAll()); } } diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.scss b/apps/red-ui/src/app/components/notifications/notifications.component.scss index ae5488b69..41d696e1c 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.scss +++ b/apps/red-ui/src/app/components/notifications/notifications.component.scss @@ -1,9 +1,5 @@ @use 'variables'; -.mt-2 { - margin-top: 2px; -} - ::ng-deep .notifications-backdrop + .cdk-overlay-connected-position-bounding-box { right: 0 !important; @@ -20,6 +16,7 @@ .view-all { cursor: pointer; + &:hover { color: var(--iqser-primary); } diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.ts b/apps/red-ui/src/app/components/notifications/notifications.component.ts index 963e9d5da..29b22b627 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.ts +++ b/apps/red-ui/src/app/components/notifications/notifications.component.ts @@ -6,7 +6,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; import { NotificationsService } from '@services/notifications.service'; import { Notification } from '@red/domain'; import { distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; -import { BehaviorSubject, Observable, timer } from 'rxjs'; +import { BehaviorSubject, firstValueFrom, Observable, timer } from 'rxjs'; import { AutoUnsubscribe, List, shareLast } from '@iqser/common-ui'; import { CHANGED_CHECK_INTERVAL } from '@utils/constants'; @@ -63,12 +63,12 @@ export class NotificationsComponent extends AutoUnsubscribe implements OnInit { async markRead($event, notifications: List = this._notifications$.getValue().map(n => n.id), isRead = true): Promise { $event.stopPropagation(); - await this._notificationsService.toggleNotificationRead(notifications, isRead).toPromise(); + await firstValueFrom(this._notificationsService.toggleNotificationRead(notifications, isRead)); await this._loadData(); } private async _loadData(): Promise { - const notifications = await this._notificationsService.getNotifications(INCLUDE_SEEN).toPromise(); + const notifications = await firstValueFrom(this._notificationsService.getNotifications(INCLUDE_SEEN)); this._notifications$.next(notifications); } diff --git a/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html b/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html index 348cc56ae..1ffe83c77 100644 --- a/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html +++ b/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html @@ -1,30 +1,29 @@ -
- + - - -
- -
- - + + +
+ +
+ + - - -
+ + +
- - -
+ + diff --git a/apps/red-ui/src/app/guards/can-deactivate.guard.ts b/apps/red-ui/src/app/guards/can-deactivate.guard.ts index b92aabb6c..38a494c00 100644 --- a/apps/red-ui/src/app/guards/can-deactivate.guard.ts +++ b/apps/red-ui/src/app/guards/can-deactivate.guard.ts @@ -1,40 +1,34 @@ import { CanDeactivate } from '@angular/router'; -import { Directive, HostListener, Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { TranslateService } from '@ngx-translate/core'; +import { Injectable } from '@angular/core'; +import { map, Observable } from 'rxjs'; +import { ConfirmationDialogService, ConfirmOptions } from '@iqser/common-ui'; export interface ComponentCanDeactivate { - hasChanges: boolean; -} - -@Directive() -export abstract class ComponentHasChanges implements ComponentCanDeactivate { - abstract hasChanges: boolean; - - protected constructor(protected _translateService: TranslateService) {} - - @HostListener('window:beforeunload', ['$event']) - unloadNotification($event: any) { - if (this.hasChanges) { - // This message will be displayed in IE/Edge - $event.returnValue = this._translateService.instant('pending-changes-guard'); - } - } + changed: boolean; + valid?: boolean; + isLeavingPage?: boolean; + save: () => Promise; } @Injectable({ providedIn: 'root' }) export class PendingChangesGuard implements CanDeactivate { - constructor(private readonly _translateService: TranslateService) {} + constructor(private _dialogService: ConfirmationDialogService) {} canDeactivate(component: ComponentCanDeactivate): boolean | Observable { - // if there are no pending changes, just allow deactivation; else confirm first - return !component.hasChanges - ? true - : // NOTE: this warning message will only be shown when navigating elsewhere - // within your angular app; - // when navigating away from your angular app, - // the browser will show a generic warning message - // see http://stackoverflow.com/a/42207299/7307355 - confirm(this._translateService.instant('pending-changes-guard')); + if (component.changed) { + component.isLeavingPage = true; + + const dialogRef = this._dialogService.openDialog({ disableConfirm: component.valid === false }); + return dialogRef.afterClosed().pipe( + map(result => { + if (result === ConfirmOptions.CONFIRM) { + component.save(); + } + component.isLeavingPage = false; + return !!result; + }), + ); + } + return true; } } diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index 5dd539adc..bf08f4737 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -3,6 +3,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; +import { firstValueFrom } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class DossierFilesGuard implements CanActivate { @@ -22,7 +23,7 @@ export class DossierFilesGuard implements CanActivate { } if (!this._filesMapService.has(dossierId)) { - await this._filesService.loadAll(dossierId).toPromise(); + await firstValueFrom(this._filesService.loadAll(dossierId)); } return true; } diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index be0c1550e..66a37f509 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { CanActivate, Router } from '@angular/router'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { TranslateService } from '@ngx-translate/core'; +import { firstValueFrom } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate { @@ -12,7 +13,7 @@ export class DossiersGuard implements CanActivate { ) {} async canActivate(): Promise { - await this._dossiersService.loadAll().toPromise(); + await firstValueFrom(this._dossiersService.loadAll()); return true; } } diff --git a/apps/red-ui/src/app/i18n/language.service.ts b/apps/red-ui/src/app/i18n/language.service.ts index d7a5b0c98..6a89894a6 100644 --- a/apps/red-ui/src/app/i18n/language.service.ts +++ b/apps/red-ui/src/app/i18n/language.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { UserPreferenceService } from '@services/user-preference.service'; +import { firstValueFrom } from 'rxjs'; @Injectable({ providedIn: 'root', @@ -8,6 +9,7 @@ import { UserPreferenceService } from '@services/user-preference.service'; export class LanguageService { constructor(private readonly _translateService: TranslateService, private readonly _userPreferenceService: UserPreferenceService) { _translateService.addLangs(['en', 'de']); + _translateService.setDefaultLang('en'); } get currentLanguage() { @@ -26,12 +28,12 @@ export class LanguageService { } document.documentElement.lang = defaultLang; this._translateService.setDefaultLang(defaultLang); - this._translateService.use(defaultLang).toPromise().then(); + firstValueFrom(this._translateService.use(defaultLang)).then(); } async changeLanguage(language: string) { await this._userPreferenceService.saveLanguage(language); document.documentElement.lang = language; - await this._translateService.use(language).toPromise(); + await firstValueFrom(this._translateService.use(language)); } } diff --git a/apps/red-ui/src/app/models/file/annotation.permissions.ts b/apps/red-ui/src/app/models/file/annotation.permissions.ts index ca2f1f911..1431b3e0c 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -1,6 +1,6 @@ import { AnnotationWrapper } from './annotation.wrapper'; -import { isArray } from 'rxjs/internal-compatibility'; import { User } from '@red/domain'; +import { isArray } from 'lodash'; export class AnnotationPermissions { canUndo = true; @@ -14,6 +14,7 @@ export class AnnotationPermissions { canChangeLegalBasis = true; canResizeAnnotation = true; canRecategorizeImage = true; + canForceHint = true; static forUser(isApprover: boolean, user: User, annotations: AnnotationWrapper | AnnotationWrapper[]) { if (!isArray(annotations)) { @@ -29,12 +30,13 @@ export class AnnotationPermissions { permissions.canAcceptSuggestion = isApprover && (annotation.isSuggestion || annotation.isDeclinedSuggestion); permissions.canRejectSuggestion = isApprover && annotation.isSuggestion; + permissions.canForceHint = annotation.isIgnoredHint; permissions.canForceRedaction = annotation.isSkipped && !annotation.isFalsePositive; permissions.canAcceptRecommendation = annotation.isRecommendation; permissions.canMarkAsFalsePositive = annotation.canBeMarkedAsFalsePositive; - permissions.canRemoveOrSuggestToRemoveOnlyHere = annotation.isRedacted; + permissions.canRemoveOrSuggestToRemoveOnlyHere = annotation.isRedacted || annotation.isHint; permissions.canRemoveOrSuggestToRemoveFromDictionary = annotation.isModifyDictionary && (annotation.isRedacted || annotation.isSkipped || annotation.isHint); @@ -42,7 +44,9 @@ export class AnnotationPermissions { permissions.canRecategorizeImage = (annotation.isImage && !annotation.isSuggestion) || annotation.isSuggestionRecategorizeImage; permissions.canResizeAnnotation = - ((annotation.isRedacted || annotation.isImage) && !annotation.isSuggestion) || annotation.isSuggestionResize; + ((annotation.isRedacted || annotation.isImage) && !annotation.isSuggestion) || + annotation.isSuggestionResize || + annotation.isRecommendation; summedPermissions._merge(permissions); } diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 51a75e509..6751a0812 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -12,6 +12,7 @@ export type AnnotationSuperType = | 'suggestion-remove-dictionary' | 'suggestion-add' | 'suggestion-remove' + | 'ignored-hint' | 'skipped' | 'redaction' | 'manual-redaction' @@ -43,7 +44,9 @@ export class AnnotationWrapper { legalBasisChangeValue?: string; resizing?: boolean; rectangle?: boolean; + hintDictionary?: boolean; section?: string; + reference: Array; manual?: boolean; @@ -87,7 +90,7 @@ export class AnnotationWrapper { } get isSuperTypeBasedColor() { - return this.isSkipped || this.isSuggestion || this.isDeclinedSuggestion; + return this.isSkipped || this.isSuggestion || this.isDeclinedSuggestion || this.isIgnoredHint; } get isSkipped() { @@ -106,6 +109,20 @@ export class AnnotationWrapper { return this.recategorizationType || this.typeValue; } + get topLevelFilter() { + return ( + this.superType !== 'hint' && + this.superType !== 'redaction' && + this.superType !== 'recommendation' && + this.superType !== 'ignored-hint' && + this.superType !== 'skipped' + ); + } + + get filterKey() { + return this.topLevelFilter ? this.superType : this.superType + this.type; + } + get isManuallySkipped() { return this.isSkipped && this.manual; } @@ -113,7 +130,10 @@ export class AnnotationWrapper { get isFalsePositive() { return ( this.type?.toLowerCase() === 'false_positive' && - (this.superType === 'skipped' || this.superType === 'hint' || this.superType === 'redaction') + (this.superType === 'skipped' || + this.superType === 'hint' || + this.superType === 'ignored-hint' || + this.superType === 'redaction') ); } @@ -133,6 +153,10 @@ export class AnnotationWrapper { return this.superType === 'hint'; } + get isIgnoredHint() { + return this.superType === 'ignored-hint'; + } + get isRedacted() { return this.superType === 'redaction' || this.superType === 'manual-redaction'; } @@ -236,12 +260,14 @@ export class AnnotationWrapper { annotationWrapper.manual = redactionLogEntry.manual; annotationWrapper.engines = redactionLogEntry.engines; annotationWrapper.section = redactionLogEntry.section; + annotationWrapper.reference = redactionLogEntry.reference || []; annotationWrapper.rectangle = redactionLogEntry.rectangle; annotationWrapper.hasBeenResized = redactionLogEntry.hasBeenResized; annotationWrapper.hasBeenRecategorized = redactionLogEntry.hasBeenRecategorized; annotationWrapper.hasLegalBasisChanged = redactionLogEntry.hasLegalBasisChanged; annotationWrapper.hasBeenForced = redactionLogEntry.hasBeenForced; annotationWrapper.hasBeenRemovedByManualOverride = redactionLogEntry.hasBeenRemovedByManualOverride; + annotationWrapper.hintDictionary = redactionLogEntry.hintDictionary; this._createContent(annotationWrapper, redactionLogEntry); this._setSuperType(annotationWrapper, redactionLogEntry); @@ -259,11 +285,7 @@ export class AnnotationWrapper { private static _setSuperType(annotationWrapper: AnnotationWrapper, redactionLogEntryWrapper: RedactionLogEntryWrapper) { if (redactionLogEntryWrapper.recommendation) { - if (redactionLogEntryWrapper.redacted) { - annotationWrapper.superType = 'recommendation'; - } else { - annotationWrapper.superType = 'skipped'; - } + annotationWrapper.superType = 'recommendation'; return; } @@ -280,7 +302,7 @@ export class AnnotationWrapper { if (redactionLogEntryWrapper.status === 'REQUESTED') { annotationWrapper.superType = 'suggestion-force-redaction'; } else if (redactionLogEntryWrapper.status === 'APPROVED') { - annotationWrapper.superType = 'redaction'; + annotationWrapper.superType = redactionLogEntryWrapper.hint ? 'hint' : 'redaction'; } else { annotationWrapper.superType = 'skipped'; } @@ -408,6 +430,11 @@ export class AnnotationWrapper { if (!annotationWrapper.superType) { annotationWrapper.superType = annotationWrapper.redaction ? 'redaction' : annotationWrapper.hint ? 'hint' : 'skipped'; } + if (annotationWrapper.superType === 'skipped') { + if (redactionLogEntryWrapper.hintDictionary) { + annotationWrapper.superType = 'ignored-hint'; + } + } } private static _createContent(annotationWrapper: AnnotationWrapper, entry: RedactionLogEntryWrapper) { diff --git a/apps/red-ui/src/app/models/file/file-data.model.ts b/apps/red-ui/src/app/models/file/file-data.model.ts index 1c0d3b920..16727d14b 100644 --- a/apps/red-ui/src/app/models/file/file-data.model.ts +++ b/apps/red-ui/src/app/models/file/file-data.model.ts @@ -1,36 +1,48 @@ -import { Dictionary, File, IRedactionLog, IRedactionLogEntry, IViewedPage, User, ViewMode } from '@red/domain'; +import { Dictionary, File, IRedactionLog, IRedactionLogEntry, IViewedPage, ViewMode } from '@red/domain'; import { AnnotationWrapper } from './annotation.wrapper'; import { RedactionLogEntryWrapper } from './redaction-log-entry.wrapper'; import * as moment from 'moment'; - -export class AnnotationData { - visibleAnnotations: AnnotationWrapper[]; - allAnnotations: AnnotationWrapper[]; -} +import { BehaviorSubject } from 'rxjs'; export class FileDataModel { static readonly DELTA_VIEW_TIME = 10 * 60 * 1000; // 10 minutes; + allAnnotations: AnnotationWrapper[]; + readonly hasChangeLog$ = new BehaviorSubject(false); + readonly blob$ = new BehaviorSubject(undefined); + readonly file$ = new BehaviorSubject(undefined); - hasChangeLog: boolean; + constructor( + private readonly _file: File, + private readonly _blob: Blob, + private _redactionLog: IRedactionLog, + public viewedPages?: IViewedPage[], + private _dictionaryData?: { [p: string]: Dictionary }, + private _areDevFeaturesEnabled?: boolean, + ) { + this.file$.next(_file); + this.blob$.next(_blob); + this._buildAllAnnotations(); + } - constructor(public file: File, public fileData: Blob, public redactionLog: IRedactionLog, public viewedPages?: IViewedPage[]) {} + get file(): File { + return this.file$.value; + } - getAnnotations( - dictionaryData: { [p: string]: Dictionary }, - currentUser: User, - viewMode: ViewMode, - areDevFeaturesEnabled: boolean, - ): AnnotationData { - const entries: RedactionLogEntryWrapper[] = this._convertData(); - let allAnnotations = entries - .map(entry => AnnotationWrapper.fromData(entry)) - .filter(ann => ann.manual || !this.file.excludedPages.includes(ann.pageNumber)); + set file(file: File) { + this.file$.next(file); + } - if (!areDevFeaturesEnabled) { - allAnnotations = allAnnotations.filter(annotation => !annotation.isFalsePositive); - } + get redactionLog(): IRedactionLog { + return this._redactionLog; + } - const visibleAnnotations = allAnnotations.filter(annotation => { + set redactionLog(redactionLog: IRedactionLog) { + this._redactionLog = redactionLog; + this._buildAllAnnotations(); + } + + getVisibleAnnotations(viewMode: ViewMode) { + return this.allAnnotations.filter(annotation => { if (viewMode === 'STANDARD') { return !annotation.isChangeLogRemoved; } else if (viewMode === 'DELTA') { @@ -39,11 +51,30 @@ export class FileDataModel { return annotation.isRedacted; } }); + } - return { - visibleAnnotations: visibleAnnotations, - allAnnotations: allAnnotations, - }; + private _buildAllAnnotations() { + const entries: RedactionLogEntryWrapper[] = this._convertData(); + + const previousAnnotations = this.allAnnotations || []; + this.allAnnotations = entries + .map(entry => AnnotationWrapper.fromData(entry)) + .filter(ann => ann.manual || !this._file.excludedPages.includes(ann.pageNumber)); + + if (!this._areDevFeaturesEnabled) { + this.allAnnotations = this.allAnnotations.filter(annotation => !annotation.isFalsePositive); + } + + this._setHiddenPropertyToNewAnnotations(this.allAnnotations, previousAnnotations); + } + + private _setHiddenPropertyToNewAnnotations(newAnnotations: AnnotationWrapper[], oldAnnotations: AnnotationWrapper[]) { + newAnnotations.forEach(newAnnotation => { + const oldAnnotation = oldAnnotations.find(a => a.annotationId === newAnnotation.annotationId); + if (oldAnnotation) { + newAnnotation.hidden = oldAnnotation.hidden; + } + }); } private _convertData(): RedactionLogEntryWrapper[] { @@ -55,6 +86,7 @@ export class FileDataModel { const redactionLogEntryWrapper: RedactionLogEntryWrapper = {}; Object.assign(redactionLogEntryWrapper, redactionLogEntry); redactionLogEntryWrapper.type = redactionLogEntry.type; + redactionLogEntryWrapper.hintDictionary = this._dictionaryData[redactionLogEntry.type].hint; this._isChangeLogEntry(redactionLogEntry, redactionLogEntryWrapper); @@ -101,11 +133,11 @@ export class FileDataModel { } private _isChangeLogEntry(redactionLogEntry: IRedactionLogEntry, wrapper: RedactionLogEntryWrapper) { - if (this.file.numberOfAnalyses > 1) { - redactionLogEntry.changes.sort((a, b) => moment(a.dateTime).valueOf() - moment(b.dateTime).valueOf()); + if (this._file.numberOfAnalyses > 1) { + const viableChanges = redactionLogEntry.changes.filter(c => c.analysisNumber > 1); + viableChanges.sort((a, b) => moment(a.dateTime).valueOf() - moment(b.dateTime).valueOf()); - const lastChange = - redactionLogEntry.changes.length >= 1 ? redactionLogEntry.changes[redactionLogEntry.changes.length - 1] : undefined; + const lastChange = viableChanges.length >= 1 ? viableChanges[viableChanges.length - 1] : undefined; const page = redactionLogEntry.positions?.[0].page; const viewedPage = this.viewedPages.filter(p => p.page === page).pop(); @@ -114,14 +146,14 @@ export class FileDataModel { if (viewedPage) { const viewTime = moment(viewedPage.viewedTime).valueOf() - FileDataModel.DELTA_VIEW_TIME; // these are all unseen changes - const relevantChanges = redactionLogEntry.changes.filter(change => moment(change.dateTime).valueOf() > viewTime); + const relevantChanges = viableChanges.filter(change => moment(change.dateTime).valueOf() > viewTime); // at least one unseen change if (relevantChanges.length > 0) { // at least 1 relevant change wrapper.changeLogType = relevantChanges[relevantChanges.length - 1].type; wrapper.isChangeLogEntry = true; viewedPage.showAsUnseen = moment(viewedPage.viewedTime).valueOf() < moment(lastChange.dateTime).valueOf(); - this.hasChangeLog = true; + this.hasChangeLog$.next(true); } else { // no relevant changes - hide removed anyway wrapper.isChangeLogEntry = false; diff --git a/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts b/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts index f3bcacbd8..a406aba68 100644 --- a/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts +++ b/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts @@ -11,6 +11,7 @@ export interface RedactionLogEntryWrapper { startOffset?: number; type?: string; rectangle?: boolean; + hintDictionary?: boolean; color?: Array; dictionaryEntry?: boolean; diff --git a/apps/red-ui/src/app/modules/account/account-routing.module.ts b/apps/red-ui/src/app/modules/account/account-routing.module.ts index 9c77d73a2..56164ffa9 100644 --- a/apps/red-ui/src/app/modules/account/account-routing.module.ts +++ b/apps/red-ui/src/app/modules/account/account-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router'; import { CompositeRouteGuard } from '@iqser/common-ui'; import { AuthGuard } from '../auth/auth.guard'; import { RedRoleGuard } from '../auth/red-role.guard'; -import { AppStateGuard } from '../../state/app-state.guard'; +import { AppStateGuard } from '@state/app-state.guard'; import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component'; const routes = [ diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/constants.ts b/apps/red-ui/src/app/modules/account/screens/notifications/constants.ts deleted file mode 100644 index a6649c927..000000000 --- a/apps/red-ui/src/app/modules/account/screens/notifications/constants.ts +++ /dev/null @@ -1,43 +0,0 @@ -export const NotificationCategories = { - inAppNotifications: 'inAppNotifications', - emailNotifications: 'emailNotifications', -} as const; - -export const NotificationCategoriesValues = Object.values(NotificationCategories); - -export const DossierNotificationsTypes = { - dossierOwnerSet: 'DOSSIER_OWNER_SET', - dossierOwnerRemoved: 'DOSSIER_OWNER_REMOVED', - userBecomseDossierMember: 'USER_BECOMES_DOSSIER_MEMBER', - userRemovedAsDossierMember: 'USER_REMOVED_AS_DOSSIER_MEMBER', - userPromotedToApprover: 'USER_PROMOTED_TO_APPROVER', - userDegradedToReviewer: 'USER_DEGRADED_TO_REVIEWER', - dossierOwnerDeleted: 'DOSSIER_OWNER_DELETED', - dossierDeleted: 'DOSSIER_DELETED', -} as const; - -export const DossierNotificationsTypesValues = Object.values(DossierNotificationsTypes); - -export const DocumentNotificationsTypes = { - assignReviewer: 'ASSIGN_REVIEWER', - assignApprover: 'ASSIGN_APPROVER', - unassignedFromFile: 'UNASSIGNED_FROM_FILE', - // documentUnderReview: 'DOCUMENT_UNDER_REVIEW', - // documentUnderApproval: 'DOCUMENT_UNDER_APPROVAL', - documentApproved: 'DOCUMENT_APPROVED', -} as const; - -export const DocumentNotificationsTypesValues = Object.values(DocumentNotificationsTypes); - -export const OtherNotificationsTypes = { - downloadReady: 'DOWNLOAD_READY', -} as const; - -export const OtherNotificationsTypesValues = Object.values(OtherNotificationsTypes); - -export const NotificationGroupsKeys = ['dossier', 'document', 'other'] as const; -export const NotificationGroupsValues = [ - DossierNotificationsTypesValues, - DocumentNotificationsTypesValues, - OtherNotificationsTypesValues, -] as const; diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html index 8c76795dc..cf0f4412e 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html @@ -1,4 +1,4 @@ -
+
@@ -7,25 +7,25 @@ }}
-
-
-
- - - {{ translations[type.toLocaleLowerCase()] | translate }} -
-
+
+ + + + + + +
-
-
+
+
{{ translations[preference] | translate }} @@ -36,7 +36,7 @@
-
diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts index c2003cddb..a862021bd 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts @@ -2,10 +2,15 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { notificationsTranslations } from '../../../translations/notifications-translations'; import { NotificationPreferencesService } from '../../../services/notification-preferences.service'; -import { LoadingService, Toaster } from '@iqser/common-ui'; +import { BaseFormComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { NotificationCategoriesValues, NotificationGroupsKeys, NotificationGroupsValues } from '../constants'; -import { EmailNotificationScheduleTypesValues } from '@red/domain'; +import { + EmailNotificationScheduleTypesValues, + NotificationCategoriesValues, + NotificationGroupsKeys, + NotificationGroupsValues, +} from '@red/domain'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-notifications-screen', @@ -13,26 +18,63 @@ import { EmailNotificationScheduleTypesValues } from '@red/domain'; styleUrls: ['./notifications-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class NotificationsScreenComponent implements OnInit { +export class NotificationsScreenComponent extends BaseFormComponent implements OnInit { readonly emailNotificationScheduleTypes = EmailNotificationScheduleTypesValues; readonly notificationCategories = NotificationCategoriesValues; readonly notificationGroupsKeys = NotificationGroupsKeys; readonly notificationGroupsValues = NotificationGroupsValues; readonly translations = notificationsTranslations; - readonly formGroup: FormGroup = this._getForm(); - constructor( private readonly _toaster: Toaster, private readonly _formBuilder: FormBuilder, private readonly _loadingService: LoadingService, private readonly _notificationPreferencesService: NotificationPreferencesService, - ) {} + ) { + super(); + } async ngOnInit(): Promise { await this._initializeForm(); } + isCategoryActive(category: string) { + return this.form.get(`${category}Enabled`).value; + } + + setEmailNotificationType(type: string) { + this.form.get('emailNotificationType').setValue(type); + } + + getEmailNotificationType() { + return this.form.get('emailNotificationType').value; + } + + isPreferenceChecked(category: string, preference: string) { + return this.form.get(category).value.includes(preference); + } + + addRemovePreference(checked: boolean, category: string, preference: string) { + const preferences = this.form.get(category).value; + if (checked) { + preferences.push(preference); + } else { + const indexOfPreference = preferences.indexOf(preference); + preferences.splice(indexOfPreference, 1); + } + this.form.get(category).setValue(preferences); + } + + async save() { + this._loadingService.start(); + try { + await firstValueFrom(this._notificationPreferencesService.update(this.form.value)); + } catch (e) { + this._toaster.error(_('notifications-screen.error.generic')); + } + this._loadingService.stop(); + } + private _getForm(): FormGroup { return this._formBuilder.group({ inAppNotificationsEnabled: [undefined], @@ -43,48 +85,13 @@ export class NotificationsScreenComponent implements OnInit { }); } - isCategoryActive(category: string) { - return this.formGroup.get(`${category}Enabled`).value; - } - - setEmailNotificationType(type: string) { - this.formGroup.get('emailNotificationType').setValue(type); - } - - getEmailNotificationType() { - return this.formGroup.get('emailNotificationType').value; - } - - isPreferenceChecked(category: string, preference: string) { - return this.formGroup.get(category).value.includes(preference); - } - - addRemovePreference(checked: boolean, category: string, preference: string) { - const preferences = this.formGroup.get(category).value; - if (checked) { - preferences.push(preference); - } else { - const indexOfPreference = preferences.indexOf(preference); - preferences.splice(indexOfPreference, 1); - } - this.formGroup.get(category).setValue(preferences); - } - - async save() { - this._loadingService.start(); - try { - await this._notificationPreferencesService.update(this.formGroup.value).toPromise(); - } catch (e) { - this._toaster.error(_('notifications-screen.error.generic')); - } - this._loadingService.stop(); - } - private async _initializeForm() { this._loadingService.start(); - const notificationPreferences = await this._notificationPreferencesService.get().toPromise(); - this.formGroup.patchValue(notificationPreferences); + this.form = this._getForm(); + const notificationPreferences = await firstValueFrom(this._notificationPreferencesService.get()); + this.form.patchValue(notificationPreferences); + this.initialFormValue = JSON.parse(JSON.stringify(this.form.getRawValue())); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts index d7a134836..ef7874558 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts @@ -3,8 +3,9 @@ import { RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared/shared.module'; import { NotificationsScreenComponent } from './notifications-screen/notifications-screen.component'; +import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard'; -const routes = [{ path: '', component: NotificationsScreenComponent }]; +const routes = [{ path: '', component: NotificationsScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [NotificationsScreenComponent], diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts index 8c3d896bf..421d54e39 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts @@ -2,13 +2,14 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { LoadingService } from '@iqser/common-ui'; +import { BaseFormComponent, LoadingService } from '@iqser/common-ui'; import { IProfile } from '@red/domain'; import { languagesTranslations } from '../../../translations/languages-translations'; -import { PermissionsService } from '../../../../../services/permissions.service'; -import { UserService } from '../../../../../services/user.service'; +import { PermissionsService } from '@services/permissions.service'; +import { UserService } from '@services/user.service'; import { ConfigService } from '../../../../../services/config.service'; import { LanguageService } from '../../../../../i18n/language.service'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-user-profile-screen', @@ -16,8 +17,7 @@ import { LanguageService } from '../../../../../i18n/language.service'; styleUrls: ['./user-profile-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class UserProfileScreenComponent implements OnInit { - readonly form: FormGroup = this._getForm(); +export class UserProfileScreenComponent extends BaseFormComponent implements OnInit { changePasswordUrl: SafeResourceUrl; translations = languagesTranslations; @@ -30,25 +30,16 @@ export class UserProfileScreenComponent implements OnInit { private readonly _configService: ConfigService, private readonly _languageService: LanguageService, private readonly _domSanitizer: DomSanitizer, - private readonly _translateService: TranslateService, private readonly _loadingService: LoadingService, + protected readonly _translateService: TranslateService, ) { + super(); this._loadingService.start(); - this.changePasswordUrl = this._domSanitizer.bypassSecurityTrustResourceUrl( `${this._configService.values.OAUTH_URL}/account/password`, ); } - private _getForm(): FormGroup { - return this._formBuilder.group({ - email: [undefined, [Validators.required, Validators.email]], - firstName: [undefined], - lastName: [undefined], - language: [undefined], - }); - } - get languageChanged(): boolean { return this._profileModel['language'] !== this.form.get('language').value; } @@ -82,24 +73,34 @@ export class UserProfileScreenComponent implements OnInit { } if (this.profileChanged) { - const value = this.form.value as IProfile; + const value = this.form.getRawValue() as IProfile; delete value.language; - await this._userService - .updateMyProfile({ + await firstValueFrom( + this._userService.updateMyProfile({ ...value, - }) - .toPromise(); + }), + ); await this._userService.loadCurrentUser(); - await this._userService.loadAll().toPromise(); + await firstValueFrom(this._userService.loadAll()); } this._initializeForm(); } + private _getForm(): FormGroup { + return this._formBuilder.group({ + email: [undefined, [Validators.required, Validators.email]], + firstName: [undefined], + lastName: [undefined], + language: [undefined], + }); + } + private _initializeForm(): void { try { + this.form = this._getForm(); this._profileModel = { email: this._userService.currentUser.email, firstName: this._userService.currentUser.firstName, @@ -111,6 +112,7 @@ export class UserProfileScreenComponent implements OnInit { this.form.get('email').disable(); } this.form.patchValue(this._profileModel, { emitEvent: false }); + this.initialFormValue = this.form.getRawValue(); } catch (e) { } finally { this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts index 64bf3d6f4..775a99569 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts @@ -3,8 +3,9 @@ import { RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared/shared.module'; import { UserProfileScreenComponent } from './user-profile-screen/user-profile-screen.component'; +import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard'; -const routes = [{ path: '', component: UserProfileScreenComponent }]; +const routes = [{ path: '', component: UserProfileScreenComponent, canDeactivate: [PendingChangesGuard] }]; @NgModule({ declarations: [UserProfileScreenComponent], diff --git a/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts b/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts index acd23a718..0d875dfed 100644 --- a/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts +++ b/apps/red-ui/src/app/modules/account/services/notification-preferences.service.ts @@ -1,7 +1,7 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService } from '@iqser/common-ui'; import { Observable, of } from 'rxjs'; -import { UserService } from '../../../services/user.service'; +import { UserService } from '@services/user.service'; import { EmailNotificationScheduleTypes, INotificationPreferences } from '@red/domain'; import { catchError } from 'rxjs/operators'; @@ -11,14 +11,6 @@ export class NotificationPreferencesService extends GenericService { - return super.get().pipe(catchError(() => of(this._defaultPreferences))); - } - - update(notificationPreferences: INotificationPreferences): Observable { - return super._post(notificationPreferences); - } - private get _defaultPreferences(): INotificationPreferences { return { emailNotificationType: EmailNotificationScheduleTypes.INSTANT, @@ -28,4 +20,12 @@ export class NotificationPreferencesService extends GenericService { + return super.get().pipe(catchError(() => of(this._defaultPreferences))); + } + + update(notificationPreferences: INotificationPreferences): Observable { + return super._post(notificationPreferences); + } } diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index 74ee574cc..4593549ea 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -3,7 +3,6 @@ import { AuthGuard } from '../auth/auth.guard'; import { CompositeRouteGuard } from '@iqser/common-ui'; import { RedRoleGuard } from '../auth/red-role.guard'; import { AppStateGuard } from '@state/app-state.guard'; -import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/dossier-templates-listing-screen.component'; import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component'; import { DictionaryOverviewScreenComponent } from './screens/dictionary-overview/dictionary-overview-screen.component'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; @@ -21,6 +20,7 @@ import { DossierAttributesListingScreenComponent } from './screens/dossier-attri import { TrashScreenComponent } from './screens/trash/trash-screen.component'; import { GeneralConfigScreenComponent } from './screens/general-config/general-config-screen.component'; import { BaseAdminScreenComponent } from './base-admin-screen/base-admin-screen.component'; +import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; const routes: Routes = [ { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' }, @@ -29,15 +29,25 @@ const routes: Routes = [ children: [ { path: '', - component: DossierTemplatesListingScreenComponent, + component: BaseAdminScreenComponent, canActivate: [CompositeRouteGuard], data: { routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard], }, + loadChildren: () => + import('./screens/dossier-templates-listing/dossier-templates-listing.module').then( + m => m.DossierTemplatesListingModule, + ), }, { path: ':dossierTemplateId', children: [ + { + path: 'info', + canActivate: [CompositeRouteGuard], + component: BaseDossierTemplateScreenComponent, + loadChildren: () => import('./screens/info/dossier-template-info.module').then(m => m.DossierTemplateInfoModule), + }, { path: 'dictionaries', children: [ @@ -111,11 +121,11 @@ const routes: Routes = [ }, { path: 'justifications', - component: BaseAdminScreenComponent, + component: BaseDossierTemplateScreenComponent, canActivate: [CompositeRouteGuard], loadChildren: () => import('./screens/justifications/justifications.module').then(m => m.JustificationsModule), }, - { path: '', redirectTo: 'dictionaries', pathMatch: 'full' }, + { path: '', redirectTo: 'info', pathMatch: 'full' }, ], }, ], @@ -164,6 +174,7 @@ const routes: Routes = [ path: 'general-config', component: GeneralConfigScreenComponent, canActivate: [CompositeRouteGuard], + canDeactivate: [PendingChangesGuard], data: { routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard], requiredRoles: ['RED_ADMIN'], diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts index 8dd9f629d..db715d7b9 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts @@ -28,7 +28,7 @@ export class AdminSideNavComponent implements OnInit { settings: [ { screen: 'dossier-templates', - label: _('dossier-templates'), + label: _('dossier-templates.label'), hideIf: !this.currentUser.isManager && !this.currentUser.isAdmin, }, { @@ -50,6 +50,7 @@ export class AdminSideNavComponent implements OnInit { }, ], dossierTemplates: [ + { screen: 'info', label: _('dossier-template-info') }, { screen: 'dictionaries', label: _('dictionaries') }, { screen: 'rules', diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 6ed502c5b..aee060360 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { AdminRoutingModule } from './admin-routing.module'; import { RulesScreenComponent } from './screens/rules/rules-screen.component'; import { SharedModule } from '@shared/shared.module'; -import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/dossier-templates-listing-screen.component'; import { AuditScreenComponent } from './screens/audit/audit-screen.component'; import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component'; import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component'; @@ -13,13 +12,12 @@ import { FileAttributesListingScreenComponent } from './screens/file-attributes- import { LicenseInformationScreenComponent } from './screens/license-information/license-information-screen.component'; import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component'; import { WatermarkScreenComponent } from './screens/watermark/watermark-screen.component'; -import { AdminBreadcrumbsComponent } from './components/breadcrumbs/admin-breadcrumbs.component'; -import { DossierTemplateActionsComponent } from './components/dossier-template-actions/dossier-template-actions.component'; +import { DossierTemplateBreadcrumbsComponent } from './components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component'; import { ColorPickerModule } from 'ngx-color-picker'; import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; import { AddEditDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component'; import { AddEditDictionaryDialogComponent } from './dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component'; -import { ConfirmDeleteFileAttributeDialogComponent } from './dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component'; +import { ConfirmDeleteAttributeDialogComponent } from './dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component'; import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component'; import { ComboChartComponent, ComboSeriesVerticalComponent } from './components/combo-chart'; import { NgxChartsModule } from '@swimlane/ngx-charts'; @@ -49,12 +47,14 @@ import { UploadDictionaryDialogComponent } from './dialogs/upload-dictionary-dia import { GeneralConfigFormComponent } from './screens/general-config/general-config-form/general-config-form.component'; import { SmtpFormComponent } from './screens/general-config/smtp-form/smtp-form.component'; import { FileAttributesConfigurationsDialogComponent } from './dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; +import { SharedAdminModule } from './shared/shared-admin.module'; +import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; const dialogs = [ AddEditDossierTemplateDialogComponent, AddEditDictionaryDialogComponent, AddEditFileAttributeDialogComponent, - ConfirmDeleteFileAttributeDialogComponent, + ConfirmDeleteAttributeDialogComponent, EditColorDialogComponent, SmtpAuthDialogComponent, AddEditUserDialogComponent, @@ -66,7 +66,6 @@ const dialogs = [ ]; const screens = [ - DossierTemplatesListingScreenComponent, RulesScreenComponent, AuditScreenComponent, DefaultColorsScreenComponent, @@ -84,8 +83,7 @@ const screens = [ ]; const components = [ - AdminBreadcrumbsComponent, - DossierTemplateActionsComponent, + DossierTemplateBreadcrumbsComponent, ComboChartComponent, ComboSeriesVerticalComponent, UsersStatsComponent, @@ -94,14 +92,17 @@ const components = [ ResetPasswordComponent, UserDetailsComponent, BaseAdminScreenComponent, + BaseDossierTemplateScreenComponent, + GeneralConfigFormComponent, + SmtpFormComponent, ...dialogs, ...screens, ]; @NgModule({ - declarations: [...components, GeneralConfigFormComponent, SmtpFormComponent], + declarations: [...components], providers: [AdminDialogService, AuditService, DigitalSignatureService, LicenseReportService, RulesService, SmtpConfigService], - imports: [CommonModule, SharedModule, AdminRoutingModule, NgxChartsModule, ColorPickerModule, MonacoEditorModule], + imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, NgxChartsModule, ColorPickerModule, MonacoEditorModule], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html index e4f858437..4f54ba8f4 100644 --- a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.html @@ -1,26 +1,5 @@ - +
-
-
- + -
- - - -
-
- -
-
- - - - -
-
+ diff --git a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss index e69de29bb..e7a72018d 100644 --- a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.scss @@ -0,0 +1,3 @@ +:host { + display: flex; +} diff --git a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts index fd4af2801..f15acbbb4 100644 --- a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts @@ -1,7 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ - selector: 'redaction-base-admin-screen', templateUrl: './base-admin-screen.component.html', styleUrls: ['./base-admin-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html new file mode 100644 index 000000000..ee08d19cc --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.html @@ -0,0 +1,26 @@ + + +
+
+ + +
+ + + +
+
+ +
+
+ + + + +
+
diff --git a/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts new file mode 100644 index 000000000..298ec017c --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/base-dossier-templates-screen/base-dossier-template-screen.component.ts @@ -0,0 +1,7 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; + +@Component({ + templateUrl: './base-dossier-template-screen.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class BaseDossierTemplateScreenComponent {} diff --git a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.ts b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.ts deleted file mode 100644 index 3c1d06a08..000000000 --- a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { AppStateService } from '@state/app-state.service'; -import { UserPreferenceService } from '@services/user-preference.service'; -import { PermissionsService } from '@services/permissions.service'; -import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; - -@Component({ - selector: 'redaction-admin-breadcrumbs', - templateUrl: './admin-breadcrumbs.component.html', - styleUrls: ['./admin-breadcrumbs.component.scss'], -}) -export class AdminBreadcrumbsComponent { - @Input() root = false; - - constructor( - readonly userPreferenceService: UserPreferenceService, - readonly permissionService: PermissionsService, - readonly appStateService: AppStateService, - readonly dossierTemplatesService: DossierTemplatesService, - ) {} -} diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.ts b/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.ts index fff29fbc4..0f949194c 100644 --- a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.ts +++ b/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-chart.component.ts @@ -12,7 +12,18 @@ import { import { curveLinear } from 'd3-shape'; import { scaleBand, scaleLinear, scalePoint, scaleTime } from 'd3-scale'; -import { BaseChartComponent, calculateViewDimensions, ColorHelper, LineSeriesComponent, ViewDimensions } from '@swimlane/ngx-charts'; +import { + BaseChartComponent, + calculateViewDimensions, + Color, + ColorHelper, + LegendPosition, + LineSeriesComponent, + Orientation, + ScaleType, + ViewDimensions, +} from '@swimlane/ngx-charts'; +import { ILineChartSeries } from './models'; @Component({ // eslint-disable-next-line @angular-eslint/component-selector @@ -25,7 +36,7 @@ export class ComboChartComponent extends BaseChartComponent { @Input() curve: any = curveLinear; @Input() legend = false; @Input() legendTitle = 'Legend'; - @Input() legendPosition = 'right'; + @Input() legendPosition: LegendPosition = LegendPosition.Right; @Input() xAxis; @Input() yAxis; @Input() showXAxisLabel; @@ -38,33 +49,33 @@ export class ComboChartComponent extends BaseChartComponent { @Input() gradient: boolean; @Input() showGridLines = true; @Input() activeEntries: any[] = []; - @Input() schemeType: string; + @Input() schemeType: ScaleType; @Input() xAxisTickFormatting: any; @Input() yAxisTickFormatting: any; @Input() yRightAxisTickFormatting: any; @Input() roundDomains = false; - @Input() colorSchemeLine: any; + @Input() colorSchemeLine: Color; @Input() autoScale; - @Input() lineChart: any; + @Input() lineChart: ILineChartSeries[]; @Input() yLeftAxisScaleFactor: any; @Input() yRightAxisScaleFactor: any; @Input() rangeFillOpacity: number; @Input() animations = true; @Input() noBarWhenZero = true; - @Output() activate: EventEmitter = new EventEmitter(); - @Output() deactivate: EventEmitter = new EventEmitter(); + @Output() activate = new EventEmitter<{ value; entries: unknown[] }>(); + @Output() deactivate = new EventEmitter<{ value; entries: unknown[] }>(); - @ContentChild('tooltipTemplate') tooltipTemplate: TemplateRef; - @ContentChild('seriesTooltipTemplate') seriesTooltipTemplate: TemplateRef; + @ContentChild('tooltipTemplate') tooltipTemplate: TemplateRef; + @ContentChild('seriesTooltipTemplate') seriesTooltipTemplate: TemplateRef; @ViewChild(LineSeriesComponent) lineSeriesComponent: LineSeriesComponent; dims: ViewDimensions; xScale: any; yScale: any; - xDomain: any; - yDomain: any; + xDomain: string[] | number[]; + yDomain: string[] | number[]; transform: string; colors: ColorHelper; colorsLine: ColorHelper; @@ -72,19 +83,19 @@ export class ComboChartComponent extends BaseChartComponent { xAxisHeight = 0; yAxisWidth = 0; legendOptions: any; - scaleType = 'linear'; + scaleType: ScaleType = ScaleType.Linear; xScaleLine; yScaleLine; xDomainLine; yDomainLine; seriesDomain; scaledAxis; - combinedSeries; + combinedSeries: ILineChartSeries[]; xSet; filteredDomain; hoveredVertical; - yOrientLeft = 'left'; - yOrientRight = 'right'; + yOrientLeft: Orientation = Orientation.Left; + yOrientRight: Orientation = Orientation.Right; legendSpacing = 0; bandwidth: number; barPadding = 8; @@ -176,15 +187,11 @@ export class ComboChartComponent extends BaseChartComponent { return this.combinedSeries.map(d => d.name); } - isDate(value): boolean { - if (value instanceof Date) { - return true; - } - - return false; + isDate(value): value is Date { + return value instanceof Date; } - getScaleType(values): string { + getScaleType(values): ScaleType { let date = true; let num = true; @@ -199,16 +206,16 @@ export class ComboChartComponent extends BaseChartComponent { } if (date) { - return 'time'; + return ScaleType.Time; } if (num) { - return 'linear'; + return ScaleType.Linear; } - return 'ordinal'; + return ScaleType.Ordinal; } getXDomainLine(): any[] { - let values = []; + let values: number[] = []; for (const results of this.lineChart) { for (const d of results.series) { @@ -239,7 +246,7 @@ export class ComboChartComponent extends BaseChartComponent { } getYDomainLine(): any[] { - const domain = []; + const domain: number[] = []; for (const results of this.lineChart) { for (const d of results.series) { @@ -263,7 +270,7 @@ export class ComboChartComponent extends BaseChartComponent { const max = Math.max(...domain); if (this.yRightAxisScaleFactor) { const minMax = this.yRightAxisScaleFactor(min, max); - return [Math.min(0, minMax.min), minMax.max]; + return [Math.min(0, minMax.min as number), minMax.max]; } else { min = Math.min(0, min); return [min, max]; @@ -317,12 +324,12 @@ export class ComboChartComponent extends BaseChartComponent { } getYDomain() { - const values = this.results.map(d => d.value); + const values: number[] = this.results.map(d => d.value); const min = Math.min(0, ...values); const max = Math.max(...values); if (this.yLeftAxisScaleFactor) { const minMax = this.yLeftAxisScaleFactor(min, max); - return [Math.min(0, minMax.min), minMax.max]; + return [Math.min(0, minMax.min as number), minMax.max]; } else { return [min, max]; } @@ -333,7 +340,7 @@ export class ComboChartComponent extends BaseChartComponent { } setColors(): void { - let domain; + let domain: number[] | string[]; if (this.schemeType === 'ordinal') { domain = this.xDomain; } else { diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-series-vertical.component.ts b/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-series-vertical.component.ts index 6289f88d6..483125c2a 100644 --- a/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-series-vertical.component.ts +++ b/apps/red-ui/src/app/modules/admin/components/combo-chart/combo-series-vertical.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { animate, style, transition, trigger } from '@angular/animations'; -import { formatLabel } from '@swimlane/ngx-charts'; +import { Bar, BarOrientation, formatLabel, PlacementTypes, StyleTypes } from '@swimlane/ngx-charts'; @Component({ // eslint-disable-next-line @angular-eslint/component-selector @@ -17,7 +17,7 @@ import { formatLabel } from '@swimlane/ngx-charts'; [fill]="bar.color" [stops]="bar.gradientStops" [data]="bar.data" - [orientation]="'vertical'" + [orientation]="orientations.Vertical" [roundEdges]="bar.roundEdges" [gradient]="gradient" [isActive]="isActive(bar.data)" @@ -27,8 +27,8 @@ import { formatLabel } from '@swimlane/ngx-charts'; (deactivate)="deactivate.emit($event)" ngx-tooltip [tooltipDisabled]="tooltipDisabled" - [tooltipPlacement]="0" - [tooltipType]="1" + [tooltipPlacement]="tooltipPlacements.Top" + [tooltipType]="tooltipTypes.tooltip" [tooltipTitle]="bar.tooltipText" > `, @@ -67,6 +67,9 @@ export class ComboSeriesVerticalComponent implements OnChanges { bars: any; x: any; y: any; + readonly tooltipTypes = StyleTypes; + readonly tooltipPlacements = PlacementTypes; + readonly orientations = BarOrientation; ngOnChanges(): void { this.update(); @@ -91,7 +94,7 @@ export class ComboSeriesVerticalComponent implements OnChanges { const formattedLabel = formatLabel(label); const roundEdges = this.type === 'standard'; - const bar: any = { + const bar: Bar = { value, label, roundEdges, @@ -101,8 +104,15 @@ export class ComboSeriesVerticalComponent implements OnChanges { height: 0, x: 0, y: 0, + ariaLabel: label, + tooltipText: label, + color: undefined, + gradientStops: undefined, }; + let offset0 = d0; + let offset1 = offset0 + value; + if (this.type === 'standard') { bar.height = Math.abs(this.yScale(value) - this.yScale(0)); bar.x = this.xScale(label); @@ -113,18 +123,14 @@ export class ComboSeriesVerticalComponent implements OnChanges { bar.y = this.yScale(value); } } else if (this.type === 'stacked') { - const offset0 = d0; - const offset1 = offset0 + value; d0 += value; bar.height = this.yScale(offset0) - this.yScale(offset1); bar.x = 0; bar.y = this.yScale(offset1); - bar.offset0 = offset0; - bar.offset1 = offset1; + // bar.offset0 = offset0; + // bar.offset1 = offset1; } else if (this.type === 'normalized') { - let offset0 = d0; - let offset1 = offset0 + value; d0 += value; if (total > 0) { @@ -138,8 +144,8 @@ export class ComboSeriesVerticalComponent implements OnChanges { bar.height = this.yScale(offset0) - this.yScale(offset1); bar.x = 0; bar.y = this.yScale(offset1); - bar.offset0 = offset0; - bar.offset1 = offset1; + // bar.offset0 = offset0; + // bar.offset1 = offset1; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore value = (offset1 - offset0).toFixed(2) + '%'; @@ -152,8 +158,8 @@ export class ComboSeriesVerticalComponent implements OnChanges { bar.color = this.colors.getColor(value); bar.gradientStops = this.colors.getLinearGradientStops(value); } else { - bar.color = this.colors.getColor(bar.offset1); - bar.gradientStops = this.colors.getLinearGradientStops(bar.offset1, bar.offset0); + bar.color = this.colors.getColor(offset1); + bar.gradientStops = this.colors.getLinearGradientStops(offset1, offset0); } } diff --git a/apps/red-ui/src/app/modules/admin/components/combo-chart/models.ts b/apps/red-ui/src/app/modules/admin/components/combo-chart/models.ts new file mode 100644 index 000000000..7358f8e55 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/components/combo-chart/models.ts @@ -0,0 +1,11 @@ +export interface ISeries { + name: number; + value: number; + min: number; + max: number; +} + +export interface ILineChartSeries { + name: string; + series: ISeries[]; +} diff --git a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html similarity index 69% rename from apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html rename to apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html index 1afff1dac..b91797330 100644 --- a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html @@ -3,13 +3,14 @@ *ngIf="root || !!dossierTemplatesService.activeDossierTemplate" [routerLink]="'/main/admin/dossier-templates'" class="breadcrumb" - translate="dossier-templates" + translate="dossier-templates.label" > - - - - {{ activeDossierTemplate.name }} + + + + + {{ dossierTemplate.name }} @@ -17,7 +18,7 @@ ; + + constructor( + readonly userPreferenceService: UserPreferenceService, + readonly permissionService: PermissionsService, + readonly appStateService: AppStateService, + readonly dossierTemplatesService: DossierTemplatesService, + private readonly _route: ActivatedRoute, + ) { + this.dossierTemplate$ = _route.paramMap.pipe( + map(params => params.get('dossierTemplateId')), + switchMap((dossierTemplateId: string) => this.dossierTemplatesService.getEntityChanged$(dossierTemplateId)), + ); + } +} diff --git a/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss b/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss index 11153dd15..baf2e798b 100644 --- a/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss +++ b/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss @@ -13,7 +13,3 @@ left: 270px; } } - -.mt-44 { - margin-top: 44px; -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html index 2e69716c7..7acf0cf23 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.html @@ -95,11 +95,11 @@
-
- + diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss index d630c483b..b057ad746 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss @@ -10,10 +10,6 @@ } } -.mb-14 { - margin-bottom: 14px; -} - .technical-name { font-weight: 600; } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts index 737d96915..3e1ec0ec1 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts @@ -1,12 +1,12 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Observable } from 'rxjs'; +import { firstValueFrom, Observable } from 'rxjs'; import { BaseDialogComponent, shareDistinctLast, Toaster } from '@iqser/common-ui'; import { TranslateService } from '@ngx-translate/core'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { AppStateService } from '@state/app-state.service'; -import { toKebabCase } from '@utils/functions'; +import { toSnakeCase } from '@utils/functions'; import { DictionaryService } from '@shared/services/dictionary.service'; import { Dictionary, IDictionary } from '@red/domain'; import { UserService } from '@services/user.service'; @@ -21,7 +21,6 @@ import { HttpStatusCode } from '@angular/common/http'; }) export class AddEditDictionaryDialogComponent extends BaseDialogComponent { readonly dictionary = this._data.dictionary; - readonly form: FormGroup = this._getForm(this.dictionary); readonly canEditLabel$ = this._canEditLabel$; readonly technicalName$: Observable; readonly dialogHeader = this._translateService.instant('add-edit-dictionary.title', { @@ -29,7 +28,6 @@ export class AddEditDictionaryDialogComponent extends BaseDialogComponent { name: this._data.dictionary?.label, }); readonly hasColor$: Observable; - readonly disabled = false; private readonly _dossierTemplateId = this._data.dossierTemplateId; constructor( @@ -39,37 +37,18 @@ export class AddEditDictionaryDialogComponent extends BaseDialogComponent { private readonly _appStateService: AppStateService, private readonly _translateService: TranslateService, private readonly _dictionaryService: DictionaryService, - private readonly _dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) private readonly _data: { readonly dictionary: Dictionary; readonly dossierTemplateId: string }, ) { - super(); + super(_injector, _dialogRef); + this.form = this._getForm(this.dictionary); + this.initialFormValue = this.form.getRawValue(); this.hasColor$ = this._colorEmpty$; this.technicalName$ = this.form.get('label').valueChanges.pipe(map(value => this._toTechnicalName(value))); } - get valid(): boolean { - return this.form.valid; - } - - get changed(): boolean { - if (!this.dictionary) { - return true; - } - - for (const key of Object.keys(this.form.getRawValue())) { - if (key === 'caseSensitive') { - if (this.getDictCaseSensitive(this.dictionary) !== this.form.get(key).value) { - return true; - } - } else if (this.dictionary[key] !== this.form.get(key).value) { - return true; - } - } - - return false; - } - private get _canEditLabel$() { return this.userService.currentUser$.pipe( map(user => user.isAdmin || !this._data.dictionary), @@ -98,8 +77,7 @@ export class AddEditDictionaryDialogComponent extends BaseDialogComponent { observable = this._dictionaryService.addDictionary({ ...dictionary, dossierTemplateId }); } - return observable - .toPromise() + return firstValueFrom(observable) .then(() => this._dialogRef.close(true)) .catch(error => { if (error.status === HttpStatusCode.Conflict) { @@ -126,11 +104,11 @@ export class AddEditDictionaryDialogComponent extends BaseDialogComponent { private _toTechnicalName(value: string) { const existingTechnicalNames = Object.keys(this._appStateService.dictionaryData[this._dossierTemplateId]); - const baseTechnicalName = toKebabCase(value.trim()); + const baseTechnicalName = toSnakeCase(value.trim()); let technicalName = baseTechnicalName; let suffix = 1; while (existingTechnicalNames.includes(technicalName)) { - technicalName = [baseTechnicalName, suffix++].join('-'); + technicalName = [baseTechnicalName, suffix++].join('_'); } return technicalName; } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html index ab55a854a..4abe7268e 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html @@ -35,11 +35,11 @@
-
- + diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts index 96642be2e..f20fa7042 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts @@ -1,8 +1,8 @@ -import { Component, HostListener, Inject, OnDestroy } from '@angular/core'; +import { Component, HostListener, Inject, Injector, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { DossierAttributeConfigTypes, FileAttributeConfigTypes, IDossierAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { AutoUnsubscribe, IqserEventTarget, LoadingService, Toaster } from '@iqser/common-ui'; +import { BaseDialogComponent, IqserEventTarget, LoadingService, Toaster } from '@iqser/common-ui'; import { HttpErrorResponse } from '@angular/common/http'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations'; @@ -12,9 +12,8 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; templateUrl: './add-edit-dossier-attribute-dialog.component.html', styleUrls: ['./add-edit-dossier-attribute-dialog.component.scss'], }) -export class AddEditDossierAttributeDialogComponent extends AutoUnsubscribe implements OnDestroy { +export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent implements OnDestroy { dossierAttribute: IDossierAttributeConfig = this.data.dossierAttribute; - readonly form: FormGroup = this._getForm(this.dossierAttribute); readonly translations = dossierAttributeTypesTranslations; readonly typeOptions = Object.keys(DossierAttributeConfigTypes); @@ -23,11 +22,14 @@ export class AddEditDossierAttributeDialogComponent extends AutoUnsubscribe impl private readonly _loadingService: LoadingService, private readonly _dossierAttributesService: DossierAttributesService, private readonly _toaster: Toaster, - readonly dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: { readonly dossierAttribute: IDossierAttributeConfig }, ) { - super(); + super(_injector, _dialogRef); + this.form = this._getForm(this.dossierAttribute); + this.initialFormValue = this.form.getRawValue(); } get changed(): boolean { @@ -55,7 +57,7 @@ export class AddEditDossierAttributeDialogComponent extends AutoUnsubscribe impl this._dossierAttributesService.createOrUpdate(attribute).subscribe( () => { - this.dialogRef.close(true); + this._dialogRef.close(true); }, (error: HttpErrorResponse) => { this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html index a8ee5cdf2..a5d11d920 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html @@ -33,16 +33,11 @@
- + {{ 'add-edit-dossier-template.form.valid-from' | translate }} - + {{ 'add-edit-dossier-template.form.valid-to' | translate }}
@@ -87,11 +82,11 @@
-
- + diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index 39025d390..778150cc5 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts @@ -1,23 +1,23 @@ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, Injector } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import * as moment from 'moment'; import { Moment } from 'moment'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; +import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DownloadFileType, IDossierTemplate } from '@red/domain'; import { HttpStatusCode } from '@angular/common/http'; +import { firstValueFrom } from 'rxjs'; @Component({ templateUrl: './add-edit-dossier-template-dialog.component.html', styleUrls: ['./add-edit-dossier-template-dialog.component.scss'], }) export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { - readonly form: FormGroup = this._getForm(); hasValidFrom: boolean; hasValidTo: boolean; downloadTypesEnum: DownloadFileType[] = ['ORIGINAL', 'PREVIEW', 'REDACTED']; @@ -25,79 +25,64 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { key: type, label: downloadTypesTranslations[type], })); - readonly disabled = false; private _previousValidFrom: Moment; private _previousValidTo: Moment; + private _lastValidFrom: Moment; + private _lastValidTo: Moment; constructor( private readonly _appStateService: AppStateService, private readonly _toaster: Toaster, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _formBuilder: FormBuilder, - public dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, + private readonly _loadingService: LoadingService, @Inject(MAT_DIALOG_DATA) readonly dossierTemplate: IDossierTemplate, ) { - super(); + super(_injector, _dialogRef); + this.form = this._getForm(); + this.initialFormValue = this.form.getRawValue(); this.hasValidFrom = !!this.dossierTemplate?.validFrom; this.hasValidTo = !!this.dossierTemplate?.validTo; - this._previousValidFrom = this.form.get('validFrom').value; - this._previousValidTo = this.form.get('validTo').value; + this._previousValidFrom = this._lastValidFrom = this.form.get('validFrom').value; + this._previousValidTo = this._lastValidTo = this.form.get('validTo').value; - this.form.valueChanges.subscribe(value => { + this.addSubscription = this.form.valueChanges.subscribe(value => { this._applyValidityIntervalConstraints(value); }); + + this.addSubscription = this.form.controls['validFrom'].valueChanges.subscribe(value => { + this._lastValidFrom = value ? value : this._lastValidFrom; + }); + this.addSubscription = this.form.controls['validTo'].valueChanges.subscribe(value => { + this._lastValidFrom = value ? value : this._lastValidFrom; + }); } - get valid(): boolean { - return this.form.valid; - } - - get changed(): boolean { - if (!this.dossierTemplate) { - return true; + toggleHasValid(extremity: string) { + if (extremity === 'from') { + this.hasValidFrom = !this.hasValidFrom; + this.form.controls['validFrom'].setValue(this.hasValidFrom ? this._lastValidFrom : null); + } else { + this.hasValidTo = !this.hasValidTo; + this.form.controls['validTo'].setValue(this.hasValidTo ? this._lastValidTo : null); } - - for (const key of Object.keys(this.form.getRawValue())) { - const formValue = this.form.get(key).value; - const objectValue = this.dossierTemplate[key]; - if (key === 'validFrom') { - if (this.hasValidFrom !== !!objectValue || (this.hasValidFrom && !moment(objectValue).isSame(moment(formValue)))) { - return true; - } - } else if (key === 'validTo') { - if (this.hasValidTo !== !!objectValue || (this.hasValidTo && !moment(objectValue).isSame(moment(formValue)))) { - return true; - } - } else if (formValue instanceof Array) { - if (objectValue.length !== formValue.length) { - return true; - } - for (const item of objectValue) { - if (!formValue.includes(item)) { - return true; - } - } - } else if (objectValue !== formValue) { - return true; - } - } - - return false; } async save() { + this._loadingService.start(); try { const dossierTemplate = { dossierTemplateId: this.dossierTemplate?.dossierTemplateId, ...this.form.getRawValue(), validFrom: this.hasValidFrom ? this.form.get('validFrom').value : null, validTo: this.hasValidTo ? this.form.get('validTo').value : null, - }; + } as IDossierTemplate; await this._dossierTemplatesService.createOrUpdate(dossierTemplate).toPromise(); - await this._dossierTemplatesService.loadAll().toPromise(); await this._appStateService.loadDictionaryData(); - this.dialogRef.close(true); + this._dialogRef.close(true); } catch (error: any) { const message = error.status === HttpStatusCode.Conflict @@ -105,6 +90,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { : _('add-edit-dossier-template.error.generic'); this._toaster.error(message, { error }); } + this._loadingService.stop(); } private _getForm(): FormGroup { @@ -134,7 +120,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent { } private _requiredIfValidator(predicate) { - return formControl => { + return (formControl: AbstractControl) => { if (!formControl.parent) { return null; } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html index 4715598f6..7867b41a6 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html @@ -84,11 +84,11 @@
-
- + diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index 7346bf384..413cdc418 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; -import { BaseDialogComponent } from '@iqser/common-ui'; +import { BaseDialogComponent } from '../../../../../../../../libs/common-ui/src'; @Component({ selector: 'redaction-add-edit-file-attribute-dialog', @@ -13,12 +13,10 @@ import { BaseDialogComponent } from '@iqser/common-ui'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class AddEditFileAttributeDialogComponent extends BaseDialogComponent { - readonly disabled = false; DISPLAYED_FILTERABLE_LIMIT = 3; translations = fileAttributeTypesTranslations; fileAttribute: IFileAttributeConfig = this.data.fileAttribute; dossierTemplateId: string = this.data.dossierTemplateId; - readonly form!: FormGroup; readonly typeOptions = Object.keys(FileAttributeConfigTypes); readonly canSetDisplayed!: boolean; readonly canSetFilterable!: boolean; @@ -26,7 +24,8 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent { constructor( private readonly _formBuilder: FormBuilder, private readonly _fileAttributesService: FileAttributesService, - public dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: { fileAttribute: IFileAttributeConfig; @@ -35,32 +34,11 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent { numberOfFilterableAttrs: number; }, ) { - super(); + super(_injector, _dialogRef); this.canSetDisplayed = data.numberOfDisplayedAttrs < this.DISPLAYED_FILTERABLE_LIMIT || data.fileAttribute?.displayedInFileList; this.canSetFilterable = data.numberOfFilterableAttrs < this.DISPLAYED_FILTERABLE_LIMIT || data.fileAttribute?.filterable; this.form = this._getForm(this.fileAttribute); - } - - get valid(): boolean { - return this.form.valid; - } - - get changed(): boolean { - if (!this.fileAttribute) { - return true; - } - - for (const key of Object.keys(this.form.getRawValue())) { - if (key === 'readonly') { - if (this.fileAttribute.editable === this.form.get(key).value) { - return true; - } - } else if (this.fileAttribute[key] !== this.form.get(key).value) { - return true; - } - } - - return false; + this.initialFormValue = this.form.getRawValue(); } save() { @@ -69,7 +47,7 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent { editable: !this.form.get('readonly').value, ...this.form.getRawValue(), }; - this.dialogRef.close(fileAttribute); + this._dialogRef.close(fileAttribute); } private _getForm(fileAttribute: IFileAttributeConfig): FormGroup { diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.html index 1f17a0d25..51cae0fa7 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.html @@ -1,17 +1,18 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts index 30b9e7c21..a35e42d2e 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts @@ -1,18 +1,44 @@ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, Injector, ViewChild } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { User } from '@red/domain'; +import { UserDetailsComponent } from './user-details/user-details.component'; +import { BaseDialogComponent } from '@iqser/common-ui'; @Component({ selector: 'redaction-add-edit-user-dialog', templateUrl: './add-edit-user-dialog.component.html', styleUrls: ['./add-edit-user-dialog.component.scss'], }) -export class AddEditUserDialogComponent { +export class AddEditUserDialogComponent extends BaseDialogComponent { + @ViewChild(UserDetailsComponent) private readonly _userDetailsComponent: UserDetailsComponent; + resettingPassword = false; - constructor(readonly dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly user: User) {} + constructor( + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) readonly user: User, + ) { + super(_injector, _dialogRef); + } toggleResetPassword() { this.resettingPassword = !this.resettingPassword; } + + async save(): Promise { + await this._userDetailsComponent.save(); + } + + get changed(): boolean { + return this._userDetailsComponent.changed; + } + + get valid(): boolean { + return this._userDetailsComponent.valid; + } + + closeDialog(event) { + this._dialogRef.close(event); + } } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts index 1839e3bfe..441249ef4 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts @@ -4,6 +4,7 @@ import { UserService } from '@services/user.service'; import { LoadingService, Toaster } from '@iqser/common-ui'; import { User } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-reset-password', @@ -25,15 +26,15 @@ export class ResetPasswordComponent { async save() { this._loadingService.start(); try { - await this._userService - .resetPassword( + await firstValueFrom( + this._userService.resetPassword( { password: this.form.get('temporaryPassword').value, temporary: true, }, this.user.id, - ) - .toPromise(); + ), + ); this.toggleResetPassword.emit(); } catch (error) { this._toaster.error(_('reset-password-dialog.error.password-policy')); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html index 75615f9ec..4ca949f7f 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html @@ -53,6 +53,6 @@ icon="iqser:trash" > -
+
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts index ec82eb9d5..220f6aa12 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts @@ -1,28 +1,29 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AdminDialogService } from '../../../services/admin-dialog.service'; -import { AutoUnsubscribe, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; +import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { rolesTranslations } from '../../../../../translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { User } from '@red/domain'; import { UserService } from '@services/user.service'; import { HttpStatusCode } from '@angular/common/http'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-user-details', templateUrl: './user-details.component.html', styleUrls: ['./user-details.component.scss'], }) -export class UserDetailsComponent extends AutoUnsubscribe implements OnChanges, OnDestroy { +export class UserDetailsComponent extends BaseFormComponent implements OnChanges, OnDestroy { readonly iconButtonTypes = IconButtonTypes; @Input() user: User; @Output() readonly toggleResetPassword = new EventEmitter(); @Output() readonly closeDialog = new EventEmitter(); + @Output() readonly cancel = new EventEmitter(); readonly ROLES = ['RED_USER', 'RED_MANAGER', 'RED_USER_ADMIN', 'RED_ADMIN']; readonly translations = rolesTranslations; - form: FormGroup; private readonly _ROLE_REQUIREMENTS = { RED_MANAGER: 'RED_USER', RED_ADMIN: 'RED_USER_ADMIN' }; constructor( @@ -35,29 +36,6 @@ export class UserDetailsComponent extends AutoUnsubscribe implements OnChanges, super(); } - get changed(): boolean { - if (!this.user) { - return true; - } - - if (this.user.roles.length !== this.activeRoles.length) { - return true; - } - - for (const key of Object.keys(this.form.getRawValue())) { - const keyValue = this.form.get(key).value; - if (key.startsWith('RED_')) { - if (this.user.roles.includes(key) !== keyValue) { - return true; - } - } else if (this.user[key] !== keyValue) { - return true; - } - } - - return false; - } - get activeRoles(): string[] { return this.ROLES.reduce((acc, role) => { if (this.form.get(role).value) { @@ -85,6 +63,7 @@ export class UserDetailsComponent extends AutoUnsubscribe implements OnChanges, ngOnChanges() { this.form = this._getForm(); this._setRolesRequirements(); + this.initialFormValue = this.form.getRawValue(); } shouldBeDisabled(role: string): boolean { @@ -107,9 +86,7 @@ export class UserDetailsComponent extends AutoUnsubscribe implements OnChanges, const userData = { ...this.form.getRawValue(), roles: this.activeRoles }; if (!this.user) { - await this.userService - .create(userData) - .toPromise() + await firstValueFrom(this.userService.create(userData)) .then(() => { this.closeDialog.emit(true); }) @@ -122,7 +99,7 @@ export class UserDetailsComponent extends AutoUnsubscribe implements OnChanges, this._loadingService.stop(); }); } else { - await this.userService.updateProfile(userData, this.user.id).toPromise(); + await firstValueFrom(this.userService.updateProfile(userData, this.user.id)); this.closeDialog.emit(true); } } @@ -140,7 +117,7 @@ export class UserDetailsComponent extends AutoUnsubscribe implements OnChanges, email: [ { value: this.user?.email, - disabled: !!this.user, + disabled: !!this.user?.email, }, [Validators.required, Validators.email], ], diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html similarity index 64% rename from apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.html rename to apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html index d90c5f201..b7442e49a 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html @@ -1,13 +1,6 @@
- {{ - 'confirm-delete-file-attribute.title' - | translate - : { - type: type, - name: fileAttribute?.label - } - }} + {{ 'confirm-delete-file-attribute.title' | translate: translateArgs }}
@@ -20,14 +13,11 @@
- - {{ checkbox.label | translate: { type: type } }} - + + + {{ checkbox.label }} + +
@@ -35,7 +25,7 @@ {{ 'confirm-delete-file-attribute.delete' | translate: { type: type } }}
+ value instanceof FileAttributeConfig; + +interface CheckBox { + value: boolean; + label: string; +} + +interface DialogData { + attribute: FileAttributeConfig | DossierAttributeConfig; + count: number; +} + +@Component({ + selector: 'redaction-confirm-delete-attribute-dialog', + templateUrl: './confirm-delete-attribute-dialog.component.html', + styleUrls: ['./confirm-delete-attribute-dialog.component.scss'], +}) +export class ConfirmDeleteAttributeDialogComponent { + checkboxes: CheckBox[]; + showToast = false; + + constructor( + private readonly _translateService: TranslateService, + readonly dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: DialogData, + ) { + this.checkboxes = this.checkBoxConfig; + } + + get checkBoxConfig(): CheckBox[] { + const checkBoxes = isFileAttributeConfig(this.data.attribute) ? this._fileAttributeCheckboxes : this._dossierAttributeCheckboxes; + if (this.data.count !== 0) { + checkBoxes.push({ + value: false, + label: this._translateService.instant('confirm-delete-file-attribute.impacted-report', { count: this.data.count }), + }); + } + + return checkBoxes; + } + + get valid() { + return this.checkboxes.reduce((acc, currentValue) => acc && currentValue.value, true); + } + + get type(): 'bulk' | 'single' { + return this.data.attribute ? 'single' : 'bulk'; + } + + get translateArgs() { + return { + type: this.type, + name: this.data.attribute?.label, + }; + } + + private get _fileAttributeCheckboxes(): CheckBox[] { + return [ + { + value: false, + label: this._translateService.instant('confirm-delete-file-attribute.file-impacted-documents', { type: this.type }), + }, + { value: false, label: this._translateService.instant('confirm-delete-file-attribute.file-lost-details') }, + ]; + } + + private get _dossierAttributeCheckboxes(): CheckBox[] { + return [ + { value: false, label: this._translateService.instant('confirm-delete-file-attribute.dossier-impacted-documents') }, + { value: false, label: this._translateService.instant('confirm-delete-file-attribute.dossier-lost-details') }, + ]; + } + + deleteFileAttribute() { + if (this.valid) { + this.dialogRef.close(true); + } else { + this.showToast = true; + } + } +} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.ts deleted file mode 100644 index 1cf2cee1b..000000000 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, Inject } from '@angular/core'; -import { IFileAttributeConfig } from '@red/domain'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; - -@Component({ - selector: 'redaction-confirm-delete-file-attribute-dialog', - templateUrl: './confirm-delete-file-attribute-dialog.component.html', - styleUrls: ['./confirm-delete-file-attribute-dialog.component.scss'], -}) -export class ConfirmDeleteFileAttributeDialogComponent { - fileAttribute: IFileAttributeConfig; - checkboxes = [ - { value: false, label: _('confirm-delete-file-attribute.impacted-documents') }, - { value: false, label: _('confirm-delete-file-attribute.lost-details') }, - ]; - showToast = false; - - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: IFileAttributeConfig, - ) { - this.fileAttribute = data; - } - - get valid() { - return this.checkboxes[0].value && this.checkboxes[1].value; - } - - get type(): 'bulk' | 'single' { - return this.fileAttribute ? 'single' : 'bulk'; - } - - deleteFileAttribute() { - if (this.valid) { - this.dialogRef.close(true); - } else { - this.showToast = true; - } - } - - cancel() { - this.dialogRef.close(); - } -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts index b437e57ec..62cf4cb8b 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts @@ -4,6 +4,7 @@ import { List, LoadingService } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { UserService } from '@services/user.service'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-confirm-delete-users-dialog', @@ -40,7 +41,7 @@ export class ConfirmDeleteUsersDialogComponent { async deleteUser() { if (this.valid) { this._loadingService.start(); - await this._userService.delete(this.userIds).toPromise(); + await firstValueFrom(this._userService.delete(this.userIds)); this.dialogRef.close(true); } else { this.showToast = true; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html index 1d42f37a4..d77ea8f49 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html @@ -28,11 +28,11 @@
-
- +
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts index 519eb2dd2..2f544c1d0 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, Injector } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DefaultColorType, IColors } from '@red/domain'; import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; @@ -7,6 +7,7 @@ import { TranslateService } from '@ngx-translate/core'; import { defaultColorsTranslations } from '../../translations/default-colors-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionaryService } from '@shared/services/dictionary.service'; +import { firstValueFrom } from 'rxjs'; interface IEditColorData { colors: IColors; @@ -19,10 +20,7 @@ interface IEditColorData { styleUrls: ['./edit-color-dialog.component.scss'], }) export class EditColorDialogComponent extends BaseDialogComponent { - readonly form: FormGroup; translations = defaultColorsTranslations; - readonly disabled = false; - private readonly _initialColor: string; private readonly _dossierTemplateId: string; constructor( @@ -30,23 +28,16 @@ export class EditColorDialogComponent extends BaseDialogComponent { private readonly _dictionaryService: DictionaryService, private readonly _toaster: Toaster, private readonly _translateService: TranslateService, - private readonly _dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: IEditColorData, ) { - super(); + super(_injector, _dialogRef); this._dossierTemplateId = data.dossierTemplateId; - this._initialColor = data.colors[data.colorKey]; this.form = this._getForm(); - } - - get changed(): boolean { - return this.form.get('color').value !== this._initialColor; - } - - get valid(): boolean { - return this.form.valid; + this.initialFormValue = this.form.getRawValue(); } async save() { @@ -56,7 +47,7 @@ export class EditColorDialogComponent extends BaseDialogComponent { }; try { - await this._dictionaryService.setColors(colors, this._dossierTemplateId).toPromise(); + await firstValueFrom(this._dictionaryService.setColors(colors, this._dossierTemplateId)); this._dialogRef.close(true); const color = this._translateService.instant(defaultColorsTranslations[this.data.colorKey]); this._toaster.info(_('edit-color-dialog.success'), { params: { color: color } }); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts index 5f95a12ad..496abd8f0 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts @@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/c import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import * as Papa from 'papaparse'; -import { Observable } from 'rxjs'; +import { firstValueFrom, Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; -import { DefaultListingServices, ListingComponent, TableColumnConfig, Toaster, trackBy } from '@iqser/common-ui'; +import { DefaultListingServices, ListingComponent, TableColumnConfig, Toaster, trackByFactory } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileAttributeConfig, FileAttributeConfigTypes, IField, IFileAttributesConfig } from '@red/domain'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; @@ -34,7 +34,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent { @@ -183,7 +175,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent { if ((this.parseResult?.meta?.fields || []).indexOf(control.value) !== -1) { diff --git a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html index 55d87f45c..ab82c0fe3 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html @@ -27,5 +27,5 @@ - + diff --git a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts index a30311fcf..d5cc95383 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts @@ -1,23 +1,27 @@ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, Injector } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UserService } from '@services/user.service'; import { ISmtpConfiguration } from '@red/domain'; +import { BaseDialogComponent } from '@iqser/common-ui'; @Component({ selector: 'redaction-smtp-auth-dialog', templateUrl: './smtp-auth-dialog.component.html', styleUrls: ['./smtp-auth-dialog.component.scss'], }) -export class SmtpAuthDialogComponent { - readonly form: FormGroup = this._getForm(); - +export class SmtpAuthDialogComponent extends BaseDialogComponent { constructor( private readonly _formBuilder: FormBuilder, private readonly _userService: UserService, - public dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: ISmtpConfiguration, - ) {} + ) { + super(_injector, _dialogRef); + this.form = this._getForm(); + this.initialFormValue = this.form.getRawValue(); + } private _getForm(): FormGroup { return this._formBuilder.group({ @@ -27,6 +31,6 @@ export class SmtpAuthDialogComponent { } save() { - this.dialogRef.close(this.form.getRawValue()); + this._dialogRef.close(this.form.getRawValue()); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html index 296eb49c8..0d7278f2d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html @@ -60,7 +60,6 @@ *ngIf="form.get('userId').value !== ALL_USERS" [user]="form.get('userId').value" [withName]="true" - size="small" >
@@ -69,7 +68,6 @@ *ngIf="userId !== ALL_USERS" [user]="userId" [withName]="true" - size="small" >
@@ -109,7 +107,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss index 010d52fd9..fee44202a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss @@ -17,11 +17,3 @@ form { font-size: 16px; opacity: 0.7; } - -.mr-0 { - margin-right: 0; -} - -.mr-20 { - margin-right: 20px; -} diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts index b803e3549..1a0d3508c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts @@ -8,6 +8,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { Audit, IAudit, IAuditResponse, IAuditSearchRequest } from '@red/domain'; import { AuditService } from '../../services/audit.service'; +import { firstValueFrom } from 'rxjs'; const PAGE_SIZE = 50; @@ -52,15 +53,6 @@ export class AuditScreenComponent extends ListingComponent implements OnD }); } - private _getForm(): FormGroup { - return this._formBuilder.group({ - category: [this.ALL_CATEGORIES], - userId: [this.ALL_USERS], - from: [], - to: [], - }); - } - get totalPages(): number { if (!this.logs) { return 0; @@ -76,6 +68,15 @@ export class AuditScreenComponent extends ListingComponent implements OnD await this._fetchData(); } + private _getForm(): FormGroup { + return this._formBuilder.group({ + category: [this.ALL_CATEGORIES], + userId: [this.ALL_USERS], + from: [], + to: [], + }); + } + private _updateDateFilters(value): boolean { if (applyIntervalConstraints(value, this._previousFrom, this._previousTo, this.form, 'from', 'to')) { return true; @@ -105,8 +106,8 @@ export class AuditScreenComponent extends ListingComponent implements OnD to, }; - promises.push(this._auditService.getCategories().toPromise()); - promises.push(this._auditService.searchAuditLog(logsRequestBody).toPromise()); + promises.push(firstValueFrom(this._auditService.getCategories())); + promises.push(firstValueFrom(this._auditService.searchAuditLog(logsRequestBody))); const data = await Promise.all(promises); this.categories = data[0].map(c => c.category); diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html index 8e7cd2833..747671e52 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts index 729330eb0..a81508f20 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts @@ -15,6 +15,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DictionaryService } from '@shared/services/dictionary.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { firstValueFrom } from 'rxjs'; interface ListItem extends IListable { readonly key: string; @@ -72,7 +73,7 @@ export class DefaultColorsScreenComponent extends ListingComponent imp private async _loadColors() { this._loadingService.start(); - const data = await this._appStateService.loadColors(this._dossierTemplatesService.activeDossierTemplateId).toPromise(); + const data = await firstValueFrom(this._appStateService.loadColors(this._dossierTemplatesService.activeDossierTemplateId)); this._colorsObj = data; const entities = Object.keys(data) .map(key => ({ diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html index b30f090a1..20cb45626 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html @@ -1,6 +1,6 @@
- +
@@ -78,51 +78,53 @@
- -
-
-
-
-
- {{ dict.label }} -
-
-
- - {{ dict.entries?.length }} + + +
+
+
+
+
+ {{ dict.label }}
-
- - {{ 'dictionary-listing.case-sensitive' | translate }} +
+
+ + {{ templateStats.dictionarySummary(dict.type)?.entriesCount || 0 }} +
+
+ + {{ 'dictionary-listing.case-sensitive' | translate }} +
-
-
- {{ dict.rank }} -
+
+ {{ dict.rank }} +
-
- -
+
+ +
-
-
- +
+
+ - + +
-
- + + diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts index 07c195482..8abdb0d58 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts @@ -1,8 +1,6 @@ import { Component, forwardRef, Injector, OnInit } from '@angular/core'; import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { AppStateService } from '@state/app-state.service'; -import { catchError, defaultIfEmpty, tap } from 'rxjs/operators'; -import { forkJoin, of } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { CircleButtonTypes, @@ -17,14 +15,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DictionaryService } from '@shared/services/dictionary.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { Dictionary } from '@red/domain'; - -const toChartConfig = (dict: Dictionary): DoughnutChartConfig => ({ - value: dict.entries?.length ?? 0, - color: dict.hexColor, - label: dict.label, - key: dict.type, -}); +import { Dictionary, DossierTemplateStats } from '@red/domain'; +import { firstValueFrom, Observable } from 'rxjs'; +import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; +import { ActivatedRoute } from '@angular/router'; +import { tap } from 'rxjs/operators'; @Component({ templateUrl: './dictionary-listing-screen.component.html', @@ -42,6 +37,8 @@ export class DictionaryListingScreenComponent extends ListingComponent; + templateStats: DossierTemplateStats; constructor( protected readonly _injector: Injector, @@ -52,27 +49,30 @@ export class DictionaryListingScreenComponent extends ListingComponent (this.templateStats = stats))); } - ngOnInit(): void { - this._loadDictionaryData(); + async ngOnInit(): Promise { + await this._loadDictionaryData(false); } openDeleteDictionariesDialog($event?: MouseEvent, types = this.listingService.selected) { this._dialogService.openDialog('confirm', $event, null, async () => { this._loadingService.start(); - await this._dictionaryService - .deleteDictionaries( + await firstValueFrom( + this._dictionaryService.deleteDictionaries( types.map(t => t.type), this._dossierTemplatesService.activeDossierTemplateId, - ) - .toPromise(); - await this._appStateService.loadDictionaryData(); - this._loadDictionaryData(false); - this._calculateData(); + ), + ); + await this._loadDictionaryData(); this._loadingService.stop(); }); } @@ -87,50 +87,31 @@ export class DictionaryListingScreenComponent extends ListingComponent { this._loadingService.start(); - await this._appStateService.loadDictionaryData(); - this._loadDictionaryData(false); - this._calculateData(); + await this._loadDictionaryData(); this._loadingService.stop(); }, ); } - private _loadDictionaryData(loadEntries = true): void { + private async _loadDictionaryData(refresh = true): Promise { + if (refresh) { + await this._appStateService.loadDictionaryData(); + } + const appStateDictionaryData = this._appStateService.dictionaryData[this._dossierTemplatesService.activeDossierTemplateId]; const entities = Object.values(appStateDictionaryData).filter(d => !d.virtual); + this.entitiesService.setEntities(entities); - if (!loadEntries) { - this.entitiesService.setEntities( - entities.map(dict => { - dict.entries = this.allEntities.find(d => d.type === dict.type)?.entries || []; - return dict; - }), - ); - } else { - this.entitiesService.setEntities(entities); - } - - if (!loadEntries) { - return; - } - - const dataObs = this.allEntities.map(dict => - this._dictionaryService.getForType(this._dossierTemplatesService.activeDossierTemplateId, dict.type).pipe( - tap(values => (dict.entries = [...values.entries] ?? [])), - catchError(() => { - dict.entries = []; - return of({}); - }), - ), - ); - - forkJoin(dataObs) - .pipe(defaultIfEmpty(null)) - .subscribe(() => this._calculateData()); + this._calculateData(); } private _calculateData(): void { - this.chartData = this.allEntities.map(dict => toChartConfig(dict)); + this.chartData = this.allEntities.map(dict => ({ + value: this.templateStats.dictionarySummary(dict.type).entriesCount ?? 0, + color: dict.hexColor, + label: dict.label, + key: dict.type, + })); this.chartData.sort((a, b) => (a.label < b.label ? -1 : 1)); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html index d7c10b8b8..6c6387dba 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts index 6f32d193a..b0bd3c4b4 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts @@ -3,7 +3,6 @@ import { AppStateService } from '@state/app-state.service'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { saveAs } from 'file-saver'; -import { ComponentHasChanges } from '@guards/can-deactivate.guard'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { DictionaryManagerComponent } from '@shared/components/dictionary-manager/dictionary-manager.component'; import { DictionaryService } from '@shared/services/dictionary.service'; @@ -11,17 +10,19 @@ import { CircleButtonTypes, LoadingService } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { Dictionary } from '@red/domain'; +import { firstValueFrom } from 'rxjs'; @Component({ templateUrl: './dictionary-overview-screen.component.html', styleUrls: ['./dictionary-overview-screen.component.scss'], }) -export class DictionaryOverviewScreenComponent extends ComponentHasChanges implements OnInit, OnDestroy { +export class DictionaryOverviewScreenComponent implements OnInit, OnDestroy { readonly circleButtonTypes = CircleButtonTypes; readonly currentUser = this._userService.currentUser; initialEntries: string[] = []; dictionary: Dictionary; + isLeavingPage = false; @ViewChild('dictionaryManager', { static: false }) private readonly _dictionaryManager: DictionaryManagerComponent; @@ -37,11 +38,9 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple private readonly _dialogService: AdminDialogService, protected readonly _translateService: TranslateService, private readonly _dictionaryService: DictionaryService, - ) { - super(_translateService); - } + ) {} - get hasChanges() { + get changed() { return this._dictionaryManager.editor.hasChanges; } @@ -72,7 +71,7 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple $event?.stopPropagation(); this._dialogService.openDialog('confirm', $event, null, async () => { - await this._dictionaryService.deleteDictionaries([this.dictionary.type], this.dictionary.dossierTemplateId).toPromise(); + await firstValueFrom(this._dictionaryService.deleteDictionaries([this.dictionary.type], this.dictionary.dossierTemplateId)); await this._appStateService.loadDictionaryData(); await this._router.navigate([ '/main', @@ -116,7 +115,9 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple } } - saveEntries(entries: string[]) { + save() { + const entries = this._dictionaryManager.editor?.currentEntries; + this._loadingService.start(); this._dictionaryService .saveEntries(entries, this.initialEntries, this.dictionary.dossierTemplateId, this.dictionary.type, null) @@ -149,9 +150,7 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple private async _loadEntries() { this._loadingService.start(); - await this._dictionaryService - .getForType(this.dictionary.dossierTemplateId, this.dictionary.type) - .toPromise() + await firstValueFrom(this._dictionaryService.getForType(this.dictionary.dossierTemplateId, this.dictionary.type)) .then( data => { this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts index 66eabc70e..732c73209 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts @@ -6,7 +6,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; import { DigitalSignatureService } from '../../services/digital-signature.service'; -import { IDigitalSignature } from '@red/domain'; +import { IDigitalSignature, IDigitalSignatureRequest } from '@red/domain'; import { HttpStatusCode } from '@angular/common/http'; @Component({ @@ -40,29 +40,30 @@ export class DigitalSignatureScreenComponent extends AutoUnsubscribe implements } saveDigitalSignature() { - const digitalSignature = { - ...this.form.getRawValue(), + const formValue = this.form.getRawValue(); + const digitalSignature: IDigitalSignature = { + ...formValue, }; //adjusted for chrome auto-complete / password manager - digitalSignature.password = digitalSignature.keySecret; + digitalSignature.password = formValue.keySecret; const observable = this.digitalSignatureExists ? this._digitalSignatureService.update(digitalSignature) : this._digitalSignatureService.save(digitalSignature); - this.addSubscription = observable.subscribe( - () => { + this.addSubscription = observable.subscribe({ + next: () => { this.loadDigitalSignatureAndInitializeForm(); this._toaster.success(_('digital-signature-screen.action.save-success')); }, - error => { + error: error => { if (error.status === HttpStatusCode.BadRequest) { this._toaster.error(_('digital-signature-screen.action.certificate-not-valid-error')); } else { this._toaster.error(_('digital-signature-screen.action.save-error')); } }, - ); + }); } removeDigitalSignature() { @@ -85,23 +86,23 @@ export class DigitalSignatureScreenComponent extends AutoUnsubscribe implements this.form.get('certificateName').setValue(file.name); input.value = null; }; - fileReader.readAsDataURL(file); + fileReader.readAsDataURL(file as Blob); } loadDigitalSignatureAndInitializeForm() { this._loadingService.start(); - this.addSubscription = this._digitalSignatureService + this._digitalSignatureService .getSignature() - .subscribe( - digitalSignature => { + .subscribe({ + next: digitalSignature => { this.digitalSignatureExists = true; this.digitalSignature = digitalSignature; }, - () => { + error: () => { this.digitalSignatureExists = false; this.digitalSignature = {}; }, - ) + }) .add(() => { this.form = this._getForm(); this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html index 97115261d..fdb4d86a7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index 66bb09192..50f43dc35 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -15,6 +15,8 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DossierAttributeConfig, IDossierAttributeConfig } from '@red/domain'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { firstValueFrom } from 'rxjs'; +import { ReportTemplateService } from '../../../../services/report-template.service'; @Component({ templateUrl: './dossier-attributes-listing-screen.component.html', @@ -44,6 +46,7 @@ export class DossierAttributesListingScreenComponent extends ListingComponent { + async openConfirmDeleteAttributeDialog($event: MouseEvent, dossierAttribute?: DossierAttributeConfig) { + const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; + const resp = await firstValueFrom( + this._reportTemplateService.getTemplatesByPlaceholder(dossierTemplateId, dossierAttribute.placeholder), + ); + + this._dialogService.openDialog('deleteAttribute', $event, { attribute: dossierAttribute, count: resp.length }, async () => { this._loadingService.start(); const ids = dossierAttribute ? [dossierAttribute.id] : this.listingService.selected.map(item => item.id); - await this._dossierAttributesService.delete(ids).toPromise(); + await firstValueFrom(this._dossierAttributesService.delete(ids)); await this._loadData(); }); } @@ -71,7 +79,7 @@ export class DossierAttributesListingScreenComponent extends ListingComponent -
- - - -
- - -
-
- -
-
-
-
- - - - - - - - - - -
- - - -
- - - -
-
-
- {{ dossierTemplate.name }} -
-
-
- - {{ 'dossier-templates-listing.dictionaries' | translate: { length: dossierTemplate.dictionariesCount } }} -
-
-
- -
- -
- -
-
- {{ dossierTemplate.dateAdded | date: 'd MMM. yyyy' }} -
-
- -
-
- {{ dossierTemplate.dateModified | date: 'd MMM. yyyy' }} -
- -
-
- diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html new file mode 100644 index 000000000..3ee132dc1 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html @@ -0,0 +1,47 @@ + + + + + + + + + +
+ + + +
+ + + + + diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.scss new file mode 100644 index 000000000..2ec996eec --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.scss @@ -0,0 +1,6 @@ +:host { + display: flex; + flex-direction: column; + flex-grow: 1; + overflow: hidden; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts similarity index 70% rename from apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts rename to apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts index 94dbda669..58ad942ef 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts @@ -1,7 +1,7 @@ -import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; import { UserPreferenceService } from '@services/user-preference.service'; -import { AdminDialogService } from '../../services/admin-dialog.service'; +import { AdminDialogService } from '../../../services/admin-dialog.service'; import { DossierTemplate } from '@red/domain'; import { CircleButtonTypes, @@ -18,6 +18,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { RouterHistoryService } from '@services/router-history.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { HttpStatusCode } from '@angular/common/http'; +import { firstValueFrom } from 'rxjs'; @Component({ templateUrl: './dossier-templates-listing-screen.component.html', @@ -29,7 +30,7 @@ import { HttpStatusCode } from '@angular/common/http'; { provide: ListingComponent, useExisting: forwardRef(() => DossierTemplatesListingScreenComponent) }, ], }) -export class DossierTemplatesListingScreenComponent extends ListingComponent implements OnInit { +export class DossierTemplatesListingScreenComponent extends ListingComponent { readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; readonly currentUser = this._userService.currentUser; @@ -39,6 +40,7 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent { this._loadingService.loadWhile(this._deleteTemplates()); @@ -66,38 +64,17 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent { - this.loadDossierTemplateStats(); - }); - } - - loadDossierTemplateStats() { - this.entitiesService.all.forEach(rs => { - const dictionaries = this._appStateService.dictionaryData[rs.dossierTemplateId]; - if (dictionaries) { - rs.dictionariesCount = Object.keys(dictionaries) - .map(key => dictionaries[key]) - .filter(d => !d.virtual || d.type === 'false_positive').length; - } else { - rs.dictionariesCount = 0; - rs.totalDictionaryEntries = 0; - } - }); + this._dialogService.openDialog('addEditDossierTemplate', null, null); } private async _deleteTemplates(templateIds = this.listingService.selected.map(d => d.dossierTemplateId)) { - await this._dossierTemplatesService - .delete(templateIds) - .toPromise() - .catch(error => { - if (error.status === HttpStatusCode.Conflict) { - this._toaster.error(_('dossier-templates-listing.error.conflict')); - } else { - this._toaster.error(_('dossier-templates-listing.error.generic')); - } - }); - await this._dossierTemplatesService.loadAll().toPromise(); + await firstValueFrom(this._dossierTemplatesService.delete(templateIds)).catch(error => { + if (error.status === HttpStatusCode.Conflict) { + this._toaster.error(_('dossier-templates-listing.error.conflict')); + } else { + this._toaster.error(_('dossier-templates-listing.error.generic')); + } + }); await this._appStateService.loadDictionaryData(); - this.loadDossierTemplateStats(); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts new file mode 100644 index 000000000..2052576de --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; +import { SharedModule } from '@shared/shared.module'; +import { TableItemComponent } from './table-item/table-item.component'; +import { DossierTemplatesListingScreenComponent } from './dossier-templates-listing-screen/dossier-templates-listing-screen.component'; +import { SharedAdminModule } from '../../shared/shared-admin.module'; + +const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }]; + +@NgModule({ + declarations: [TableItemComponent, DossierTemplatesListingScreenComponent], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedAdminModule], +}) +export class DossierTemplatesListingModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html new file mode 100644 index 000000000..03c9fb9ee --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html @@ -0,0 +1,41 @@ +
+
+ {{ dossierTemplate.name }} +
+
+
+ + {{ 'dossier-templates-listing.dictionaries' | translate: { length: stats.numberOfDictionaries } }} +
+
+
+ +
+ +
+ +
+
+ {{ dossierTemplate.dateAdded | date: 'd MMM. yyyy' }} +
+
+ +
+
+ {{ dossierTemplate.dateModified | date: 'd MMM. yyyy' }} +
+
+ +
+
+ {{ translations[dossierTemplate.dossierTemplateStatus] | translate }} +
+ +
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss rename to apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts new file mode 100644 index 000000000..e7532490a --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts @@ -0,0 +1,30 @@ +import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; +import { DossierTemplate, DossierTemplateStats } from '@red/domain'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; +import { switchMap } from 'rxjs/operators'; +import { dossierTemplateStatusTranslations } from '../../../translations/dossier-template-status-translations'; + +@Component({ + selector: 'redaction-table-item [dossierTemplate]', + templateUrl: './table-item.component.html', + styleUrls: ['./table-item.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class TableItemComponent implements OnChanges { + @Input() dossierTemplate!: DossierTemplate; + + readonly translations = dossierTemplateStatusTranslations; + readonly stats$: Observable; + private readonly _ngOnChanges$ = new BehaviorSubject(undefined); + + constructor(readonly dossierTemplateStatsService: DossierTemplateStatsService) { + this.stats$ = this._ngOnChanges$.pipe(switchMap(id => this.dossierTemplateStatsService.watch$(id))); + } + + ngOnChanges() { + if (this.dossierTemplate) { + this._ngOnChanges$.next(this.dossierTemplate.id); + } + } +} diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index 3cb293336..b8df7eacf 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts index 3d8d08064..b98fd7620 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts @@ -17,6 +17,8 @@ import { FileAttributeConfig, IFileAttributeConfig, IFileAttributesConfig } from import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { HttpStatusCode } from '@angular/common/http'; +import { firstValueFrom } from 'rxjs'; +import { ReportTemplateService } from '../../../../services/report-template.service'; @Component({ templateUrl: './file-attributes-listing-screen.component.html', @@ -59,6 +61,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent { + this._dialogService.openDialog('deleteAttribute', $event, { attribute: fileAttribute, count: resp.length }, async () => { this._loadingService.start(); - const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; if (fileAttribute) { - await this._fileAttributesService.deleteFileAttributes([fileAttribute.id], dossierTemplateId).toPromise(); + await firstValueFrom(this._fileAttributesService.deleteFileAttributes([fileAttribute.id], dossierTemplateId)); } else { - await this._fileAttributesService - .deleteFileAttributes( + await firstValueFrom( + this._fileAttributesService.deleteFileAttributes( this.listingService.selected.map(f => f.id), dossierTemplateId, - ) - .toPromise(); + ), + ); } await this._appStateService.refreshDossierTemplate(dossierTemplateId); await this._loadData(); @@ -126,18 +129,21 @@ export class FileAttributesListingScreenComponent extends ListingComponent { - await this._fileAttributesService - .setFileAttributesConfig(newValue, this._dossierTemplatesService.activeDossierTemplateId) - .toPromise() - .catch(error => { - if (error.status === HttpStatusCode.Conflict) { - this._toaster.error(_('file-attributes-listing.error.conflict')); - } else { - this._toaster.error(_('file-attributes-listing.error.generic')); - } - this._loadingService.stop(); - }); + await firstValueFrom( + this._fileAttributesService.setFileAttributesConfig(newValue, this._dossierTemplatesService.activeDossierTemplateId), + ).catch(error => { + if (error.status === HttpStatusCode.Conflict) { + this._toaster.error(_('file-attributes-listing.error.conflict')); + } else { + this._toaster.error(_('file-attributes-listing.error.generic')); + } + this._loadingService.stop(); + }); await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId); await this._loadData(); } @@ -146,9 +152,9 @@ export class FileAttributesListingScreenComponent extends ListingComponent new FileAttributeConfig(item)) || []; this.entitiesService.setEntities(fileAttributeConfig); diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html index d85baac5a..3c999db20 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html @@ -2,7 +2,7 @@
-
+
@@ -23,7 +23,7 @@
-
diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts index 546b0b1ce..70b032385 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts @@ -1,18 +1,18 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { AutoUnsubscribe, LoadingService } from '@iqser/common-ui'; +import { BaseFormComponent, LoadingService } from '@iqser/common-ui'; import { GeneralSettingsService } from '@services/general-settings.service'; import { IGeneralConfiguration } from '@red/domain'; import { ConfigService } from '@services/config.service'; import { FormBuilder, FormGroup } from '@angular/forms'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-general-config-form', templateUrl: './general-config-form.component.html', styleUrls: ['./general-config-form.component.scss'], }) -export class GeneralConfigFormComponent extends AutoUnsubscribe implements OnInit, OnDestroy { +export class GeneralConfigFormComponent extends BaseFormComponent implements OnInit, OnDestroy { private _initialConfiguration: IGeneralConfiguration; - readonly form: FormGroup = this._getForm(); constructor( private readonly _loadingService: LoadingService, @@ -21,28 +21,7 @@ export class GeneralConfigFormComponent extends AutoUnsubscribe implements OnIni private readonly _formBuilder: FormBuilder, ) { super(); - } - - private _getForm(): FormGroup { - return this._formBuilder.group({ - forgotPasswordFunctionEnabled: [false], - auxiliaryName: [undefined], - }); - } - - async ngOnInit(): Promise { - await this._loadData(); - } - - async saveGeneralConfig() { - this._loadingService.start(); - - const configFormValues = this.form.getRawValue(); - - await this._generalSettingsService.updateGeneralConfigurations(configFormValues).toPromise(); - this._initialConfiguration = await this._generalSettingsService.getGeneralConfigurations().toPromise(); - this._configService.updateDisplayName(this._initialConfiguration.displayName); - this._loadingService.stop(); + this.form = this._getForm(); } get generalConfigurationChanged(): boolean { @@ -59,11 +38,35 @@ export class GeneralConfigFormComponent extends AutoUnsubscribe implements OnIni return false; } + async ngOnInit(): Promise { + await this._loadData(); + } + + async save() { + this._loadingService.start(); + + const configFormValues = this.form.getRawValue(); + + await firstValueFrom(this._generalSettingsService.updateGeneralConfigurations(configFormValues)); + this._initialConfiguration = await firstValueFrom(this._generalSettingsService.getGeneralConfigurations()); + this._configService.updateDisplayName(this._initialConfiguration.displayName); + this._loadingService.stop(); + await this._loadData(); + } + + private _getForm(): FormGroup { + return this._formBuilder.group({ + forgotPasswordFunctionEnabled: [false], + auxiliaryName: [undefined], + }); + } + private async _loadData() { this._loadingService.start(); try { - this._initialConfiguration = await this._generalSettingsService.getGeneralConfigurations().toPromise(); + this._initialConfiguration = await firstValueFrom(this._generalSettingsService.getGeneralConfigurations()); this.form.patchValue(this._initialConfiguration, { emitEvent: false }); + this.initialFormValue = this.form.getRawValue(); } catch (e) {} this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts index aceb558f7..94b036eca 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts @@ -1,13 +1,52 @@ -import { Component } from '@angular/core'; +import { AfterViewInit, Component, ViewChild } from '@angular/core'; import { UserService } from '@services/user.service'; +import { GeneralConfigFormComponent } from './general-config-form/general-config-form.component'; +import { SmtpFormComponent } from './smtp-form/smtp-form.component'; +import { BaseFormComponent } from '@iqser/common-ui'; @Component({ selector: 'redaction-general-config-screen', templateUrl: './general-config-screen.component.html', styleUrls: ['./general-config-screen.component.scss'], }) -export class GeneralConfigScreenComponent { +export class GeneralConfigScreenComponent extends BaseFormComponent implements AfterViewInit { readonly currentUser = this._userService.currentUser; - constructor(private readonly _userService: UserService) {} + @ViewChild(GeneralConfigFormComponent) generalConfigFormComponent: GeneralConfigFormComponent; + @ViewChild(SmtpFormComponent) smtpFormComponent: SmtpFormComponent; + children: BaseFormComponent[]; + + constructor(private readonly _userService: UserService) { + super(); + } + + ngAfterViewInit() { + this.children = [this.generalConfigFormComponent, this.smtpFormComponent]; + } + + get changed(): boolean { + for (const child of this.children) { + if (child.changed) { + return true; + } + } + return false; + } + + get valid() { + for (const child of this.children) { + if (!child.valid) { + return false; + } + } + return true; + } + + async save(): Promise { + for (const child of this.children) { + if (child.changed) { + await child.save(); + } + } + } } diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html index bc4fee456..17402e94d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html @@ -94,7 +94,7 @@
- diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts index d2ce349de..9625ecac9 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts @@ -1,20 +1,20 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ISmtpConfiguration } from '@red/domain'; -import { AutoUnsubscribe, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; +import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { SmtpConfigService } from '../../../services/smtp-config.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-smtp-form', templateUrl: './smtp-form.component.html', styleUrls: ['./smtp-form.component.scss'], }) -export class SmtpFormComponent extends AutoUnsubscribe implements OnInit, OnDestroy { +export class SmtpFormComponent extends BaseFormComponent implements OnInit, OnDestroy { readonly iconButtonTypes = IconButtonTypes; private _initialConfiguration: ISmtpConfiguration; - readonly form: FormGroup = this._getForm(); constructor( private readonly _formBuilder: FormBuilder, @@ -24,6 +24,7 @@ export class SmtpFormComponent extends AutoUnsubscribe implements OnInit, OnDest private readonly _toaster: Toaster, ) { super(); + this.form = this._getForm(); this.addSubscription = this.form.controls.auth.valueChanges.subscribe(auth => { if (auth) { this.openAuthConfigDialog(); @@ -35,6 +36,36 @@ export class SmtpFormComponent extends AutoUnsubscribe implements OnInit, OnDest await this._loadData(); } + openAuthConfigDialog(skipDisableOnCancel?: boolean) { + this._dialogService.openDialog('smtpAuthConfig', null, this.form.getRawValue(), null, authConfig => { + if (authConfig) { + this.form.patchValue(authConfig); + } else if (!skipDisableOnCancel) { + this.form.patchValue({ auth: false }, { emitEvent: false }); + } + }); + } + + async save() { + this._loadingService.start(); + await firstValueFrom(this._smtpConfigService.updateSMTPConfiguration(this.form.getRawValue())); + this._initialConfiguration = this.form.getRawValue(); + this._loadingService.stop(); + this._loadData(); + } + + async testConnection() { + this._loadingService.start(); + try { + await firstValueFrom(this._smtpConfigService.testSMTPConfiguration(this.form.getRawValue())); + this._toaster.success(_('general-config-screen.test.success')); + } catch (e) { + this._toaster.error(_('general-config-screen.test.error')); + } finally { + this._loadingService.stop(); + } + } + private _getForm(): FormGroup { return this._formBuilder.group({ host: [undefined, Validators.required], @@ -52,57 +83,15 @@ export class SmtpFormComponent extends AutoUnsubscribe implements OnInit, OnDest }); } - openAuthConfigDialog(skipDisableOnCancel?: boolean) { - this._dialogService.openDialog('smtpAuthConfig', null, this.form.getRawValue(), null, authConfig => { - if (authConfig) { - this.form.patchValue(authConfig); - } else if (!skipDisableOnCancel) { - this.form.patchValue({ auth: false }, { emitEvent: false }); - } - }); - } - - async save() { - this._loadingService.start(); - await this._smtpConfigService.updateSMTPConfiguration(this.form.getRawValue()).toPromise(); - this._initialConfiguration = this.form.getRawValue(); - this._loadingService.stop(); - } - - get smtpConfigurationChanged(): boolean { - if (!this._initialConfiguration) { - return true; - } - - for (const key of Object.keys(this.form.getRawValue())) { - if (this._initialConfiguration[key] !== this.form.get(key).value) { - return true; - } - } - - return false; - } - - async testConnection() { - this._loadingService.start(); - try { - await this._smtpConfigService.testSMTPConfiguration(this.form.getRawValue()).toPromise(); - this._toaster.success(_('general-config-screen.test.success')); - } catch (e) { - this._toaster.error(_('general-config-screen.test.error')); - } finally { - this._loadingService.stop(); - } - } - private async _loadData() { this._loadingService.start(); try { - this._initialConfiguration = await this._smtpConfigService.getCurrentSMTPConfiguration().toPromise(); + this._initialConfiguration = await firstValueFrom(this._smtpConfigService.getCurrentSMTPConfiguration()); this.form.patchValue(this._initialConfiguration, { emitEvent: false }); } catch (e) {} + this.initialFormValue = this.form.getRawValue(); this._loadingService.stop(); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts new file mode 100644 index 000000000..01a475122 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { DossierTemplateInfoScreenComponent } from './info-screen/dossier-template-info-screen.component'; +import { RouterModule } from '@angular/router'; +import { SharedModule } from '@shared/shared.module'; + +const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }]; + +@NgModule({ + declarations: [DossierTemplateInfoScreenComponent], + imports: [RouterModule.forChild(routes), CommonModule, SharedModule], +}) +export class DossierTemplateInfoModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html new file mode 100644 index 000000000..3d0ad05c5 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.html @@ -0,0 +1,56 @@ +
+ +
{{ dossierTemplate.name }}
+ +
+ + + +
+
+ + {{ 'dossier-template-info-screen.dictionaries' | translate: { count: stats.numberOfDictionaries } }} +
+ +
+ + {{ 'dossier-template-info-screen.valid-from' | translate: { date: dossierTemplate.validFrom | date: 'd MMM. yyyy' } }} +
+ +
+ + {{ 'dossier-template-info-screen.created-on' | translate: { date: dossierTemplate.dateAdded | date: 'd MMM. yyyy' } }} +
+ +
+ + {{ 'dossier-template-info-screen.entries' | translate: { count: stats.numberOfEntries } }} +
+ +
+ + {{ 'dossier-template-info-screen.valid-to' | translate: { date: dossierTemplate.validTo | date: 'd MMM. yyyy' } }} +
+ +
+ + {{ 'dossier-template-info-screen.modified-on' | translate: { date: dossierTemplate.dateModified | date: 'd MMM. yyyy' } }} +
+
+ +
+ +
+ +
{{ dossierTemplate.description }}
+ +
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss new file mode 100644 index 000000000..ec2f71ce4 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss @@ -0,0 +1,30 @@ +@use 'variables'; +@use 'common-mixins'; + +:host { + display: flex; + flex-grow: 1; + overflow: hidden; +} + +.content-container { + flex: 1; + padding: 30px; + overflow: auto; + @include common-mixins.scroll-bar; +} + +.heading { + display: flex; + align-items: center; + margin-top: 40px; + margin-bottom: 8px; +} + +.stats-subtitle { + margin-top: 16px; + display: grid; + grid-template-columns: repeat(3, max-content); + grid-row-gap: 8px; + grid-column-gap: 40px; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts new file mode 100644 index 000000000..031bb2306 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts @@ -0,0 +1,34 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { ActivatedRoute } from '@angular/router'; +import { Observable } from 'rxjs'; +import { DossierTemplate, DossierTemplateStats } from '@red/domain'; +import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; +import { AdminDialogService } from '../../../services/admin-dialog.service'; +import { PermissionsService } from '@services/permissions.service'; + +@Component({ + templateUrl: './dossier-template-info-screen.component.html', + styleUrls: ['./dossier-template-info-screen.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class DossierTemplateInfoScreenComponent { + readonly dossierTemplate$: Observable; + readonly dossierTemplateStats$: Observable; + + constructor( + private readonly _dossierTemplatesService: DossierTemplatesService, + private readonly _dossierTemplateStatsService: DossierTemplateStatsService, + private readonly _dialogService: AdminDialogService, + private readonly _route: ActivatedRoute, + readonly permissionsService: PermissionsService, + ) { + const dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId'); + this.dossierTemplate$ = this._dossierTemplatesService.getEntityChanged$(dossierTemplateId); + this.dossierTemplateStats$ = this._dossierTemplateStatsService.watch$(dossierTemplateId); + } + + openEditDossierTemplateDialog($event: MouseEvent, dossierTemplate: DossierTemplate) { + this._dialogService.openDialog('addEditDossierTemplate', $event, dossierTemplate); + } +} diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html index 4a86c9beb..3e36230b7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html @@ -43,13 +43,13 @@
- -
+
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts index f8048607f..41d47bbef 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts @@ -1,10 +1,11 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Justification } from '@red/domain'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { LoadingService } from '@iqser/common-ui'; +import { BaseDialogComponent, LoadingService } from '@iqser/common-ui'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-add-edit-justification-dialog', @@ -12,33 +13,31 @@ import { LoadingService } from '@iqser/common-ui'; styleUrls: ['./add-edit-justification-dialog.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AddEditJustificationDialogComponent { - readonly form: FormGroup = this._getForm(); +export class AddEditJustificationDialogComponent extends BaseDialogComponent { constructor( private readonly _formBuilder: FormBuilder, private readonly _justificationService: JustificationsService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _loadingService: LoadingService, - public dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public justification: Justification, - ) {} + ) { + super(_injector, _dialogRef); - get changed(): boolean { - return ( - !this.justification || - Object.keys(this.form.getRawValue()).reduce((prev, key) => prev || this.justification[key] !== this.form.get(key).value, false) - ); + this.form = this._getForm(); + this.initialFormValue = this.form.getRawValue(); } async save() { const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; this._loadingService.start(); - await this._justificationService.createOrUpdate(this.form.getRawValue(), dossierTemplateId).toPromise(); - await this._justificationService.loadAll(dossierTemplateId).toPromise(); + await firstValueFrom(this._justificationService.createOrUpdate(this.form.getRawValue(), dossierTemplateId)); + await firstValueFrom(this._justificationService.loadAll(dossierTemplateId)); this._loadingService.stop(); - this.dialogRef.close(true); + this._dialogRef.close(true); } private _getForm(): FormGroup { diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts index a4ee07326..aa8295caa 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts @@ -13,6 +13,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Justification } from '@red/domain'; +import { firstValueFrom } from 'rxjs'; type DialogType = 'confirm' | 'addEditJustification'; @@ -51,8 +52,8 @@ export class JustificationsDialogService extends DialogService { this._loadingService.start(); const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; const justificationIds = justifications.map(j => j.id); - await this._justificationService.delete(justificationIds, dossierTemplateId).toPromise(); - await this._justificationService.loadAll(dossierTemplateId).toPromise(); + await firstValueFrom(this._justificationService.delete(justificationIds, dossierTemplateId)); + await firstValueFrom(this._justificationService.loadAll(dossierTemplateId)); this._loadingService.stop(); }); } diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.html index 9d77bbc85..80a96d3d8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.html @@ -11,7 +11,7 @@ { this._loadingService.start(); - await this._justificationService.loadAll(this._dossierTemplatesService.activeDossierTemplateId).toPromise(); + await firstValueFrom(this._justificationService.loadAll(this._dossierTemplatesService.activeDossierTemplateId)); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.html b/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.html index db52b4bb5..8424e1c7d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.html @@ -24,7 +24,7 @@ , + readonly userPreferenceService: UserPreferenceService, readonly userService: UserService, ) {} diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts index 00006cde9..095261402 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts @@ -8,6 +8,8 @@ import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; import { LicenseReportService } from '../../services/licence-report.service'; import { ILicenseReport } from '@red/domain'; +import { Color, ScaleType } from '@swimlane/ngx-charts'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-license-information-screen', @@ -31,14 +33,16 @@ export class LicenseInformationScreenComponent implements OnInit { analysisPercentageOfLicense = 100; barChart: any[]; lineChartSeries: any[] = []; - lineChartScheme = { + lineChartScheme: Color = { + name: 'Line chart scheme', selectable: true, - group: 'Ordinal', + group: ScaleType.Ordinal, domain: ['#dd4d50', '#5ce594', '#0389ec'], }; - comboBarScheme = { + comboBarScheme: Color = { + name: 'Combo bar scheme', selectable: true, - group: 'Ordinal', + group: ScaleType.Ordinal, domain: ['#0389ec'], }; @@ -69,15 +73,15 @@ export class LicenseInformationScreenComponent implements OnInit { endDate: endDate.toDate(), }; const promises = [ - this._licenseReportService.licenseReport(currentConfig).toPromise(), - this._licenseReportService.licenseReport({}).toPromise(), + firstValueFrom(this._licenseReportService.licenseReport(currentConfig)), + firstValueFrom(this._licenseReportService.licenseReport({})), ]; if (endDate.isBefore(moment())) { const unlicensedConfig = { startDate: endDate.toDate(), }; - promises.push(this._licenseReportService.licenseReport(unlicensedConfig).toPromise()); + promises.push(firstValueFrom(this._licenseReportService.licenseReport(unlicensedConfig))); } Promise.all(promises).then(reports => { @@ -132,12 +136,12 @@ export class LicenseInformationScreenComponent implements OnInit { } promises.push( - this._licenseReportService - .licenseReport({ + firstValueFrom( + this._licenseReportService.licenseReport({ startDate: moment(`01-${m + 1}-${y}`, 'DD-MM-YYYY').toDate(), endDate: moment(`01-${nm + 1}-${ny}`, 'DD-MM-YYYY').toDate(), - }) - .toPromise(), + }), + ), ); y = ny; diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html index d4cfbba47..e676105d7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts index 3d34001ee..a78562025 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts @@ -12,6 +12,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; +import { firstValueFrom } from 'rxjs'; interface Placeholder { placeholder: string; @@ -56,9 +57,9 @@ export class ReportsScreenComponent implements OnInit { async download(template: IReportTemplate) { this._loadingService.start(); try { - const data = await this._reportTemplateService - .downloadReportTemplate(template.dossierTemplateId, template.templateId, 'response') - .toPromise(); + const data = await firstValueFrom( + this._reportTemplateService.downloadReportTemplate(template.dossierTemplateId, template.templateId, 'response'), + ); this._loadingService.stop(); download(data, template.fileName); } catch (e) { @@ -92,6 +93,31 @@ export class ReportsScreenComponent implements OnInit { } const dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId; + + if (this.availableTemplates.some(template => template.fileName === file.name)) { + const data = new ConfirmationDialogInput({ + title: _('confirmation-dialog.report-template-same-name.title'), + question: _('confirmation-dialog.report-template-same-name.question'), + confirmationText: _('confirmation-dialog.report-template-same-name.confirmation-text'), + denyText: _('confirmation-dialog.report-template-same-name.deny-text'), + translateParams: { + fileName: file.name, + }, + }); + + this._dialogService.openDialog('confirm', null, data, null, async result => { + if (result) { + await this._openConfirmationDialog(file, dossierTemplateId); + } + }); + } else { + await this._openConfirmationDialog(file, dossierTemplateId); + } + + this._fileInput.nativeElement.value = null; + } + + private async _openConfirmationDialog(file: File, dossierTemplateId: string) { if (this._isExcelFile(file)) { const data = new ConfirmationDialogInput({ title: _('confirmation-dialog.upload-report-template.title'), @@ -105,32 +131,31 @@ export class ReportsScreenComponent implements OnInit { }); this._dialogService.openDialog('confirm', null, data, null, async result => { if (result) { - await this._reportTemplateService.uploadTemplateForm(dossierTemplateId, result > 1, file).toPromise(); + await firstValueFrom(this._reportTemplateService.uploadTemplateForm(dossierTemplateId, result > 1, file)); await this._loadReportTemplates(); } }); } else { - await this._reportTemplateService.uploadTemplateForm(dossierTemplateId, false, file).toPromise(); + await firstValueFrom(this._reportTemplateService.uploadTemplateForm(dossierTemplateId, false, file)); await this._loadReportTemplates(); } - this._fileInput.nativeElement.value = null; } private async _deleteTemplate(template: IReportTemplate) { - await this._reportTemplateService.delete(template.dossierTemplateId, template.templateId).toPromise(); + await firstValueFrom(this._reportTemplateService.delete(template.dossierTemplateId, template.templateId)); await this._loadReportTemplates(); } private async _loadReportTemplates() { - this.availableTemplates = await this._reportTemplateService - .getAvailableReportTemplates(this._dossierTemplatesService.activeDossierTemplateId) - .toPromise(); + this.availableTemplates = await firstValueFrom( + this._reportTemplateService.getAvailableReportTemplates(this._dossierTemplatesService.activeDossierTemplateId), + ); } private async _loadPlaceholders() { - const placeholdersResponse: IPlaceholdersResponse = await this._reportTemplateService - .getAvailablePlaceholders(this._dossierTemplatesService.activeDossierTemplateId) - .toPromise(); + const placeholdersResponse: IPlaceholdersResponse = await firstValueFrom( + this._reportTemplateService.getAvailablePlaceholders(this._dossierTemplatesService.activeDossierTemplateId), + ); this.placeholders = placeholderTypes.flatMap(type => placeholdersResponse[type].map(placeholder => ({ placeholder, diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html index faea56034..8f63c3a6d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html @@ -1,6 +1,6 @@
- +
@@ -22,7 +22,7 @@
-
+
{ this._loadingService.start(); - await this._rulesService - .uploadRules({ + await firstValueFrom( + this._rulesService.uploadRules({ rules: this._codeEditor.getModel().getValue(), dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId, - }) - .toPromise() - .then( - async () => { - await this._initialize(); - this._toaster.success(_('rules-screen.success.generic')); - }, - () => { - this._loadingService.stop(); - this._toaster.error(_('rules-screen.error.generic')); - }, - ); + }), + ).then( + async () => { + await this._initialize(); + this._toaster.success(_('rules-screen.success.generic')); + }, + () => { + this._loadingService.stop(); + this._toaster.error(_('rules-screen.error.generic')); + }, + ); } revert(): void { this.currentLines = this.initialLines; this._decorations = this._codeEditor?.deltaDecorations(this._decorations, []) || []; + this._changeDetectorRef.detectChanges(); this._loadingService.stop(); } @@ -145,15 +152,12 @@ export class RulesScreenComponent extends ComponentHasChanges implements OnInit private async _initialize() { this._loadingService.start(); - await this._rulesService - .download(this._dossierTemplatesService.activeDossierTemplateId) - .toPromise() - .then( - rules => { - this.currentLines = this.initialLines = rules.rules.split('\n'); - this.revert(); - }, - () => this._loadingService.stop(), - ); + await firstValueFrom(this._rulesService.download(this._dossierTemplatesService.activeDossierTemplateId)).then( + rules => { + this.currentLines = this.initialLines = rules.rules.split('\n'); + this.revert(); + }, + () => this._loadingService.stop(), + ); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index e5cced318..20edea6f2 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -14,7 +14,7 @@ import { NestedFilter, TableColumnConfig, } from '@iqser/common-ui'; -import { Observable } from 'rxjs'; +import { firstValueFrom, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { rolesTranslations } from '../../../../translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -96,7 +96,7 @@ export class UserListingScreenComponent extends ListingComponent implement async toggleActive(user: User) { this._loadingService.start(); const requestBody = { ...user, roles: user.isActive ? [] : ['RED_USER'] }; - await this.userService.updateProfile(requestBody, user.id).toPromise(); + await firstValueFrom(this.userService.updateProfile(requestBody, user.id)); await this._loadData(); } @@ -105,7 +105,7 @@ export class UserListingScreenComponent extends ListingComponent implement } private async _loadData() { - await this.userService.loadAll().toPromise(); + await firstValueFrom(this.userService.loadAll()); this._computeStats(); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html index b15fe1963..b279ead7e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html @@ -1,6 +1,6 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss index a6a1f2223..9e316aa55 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss @@ -84,7 +84,3 @@ } } } - -.mb-5 { - margin-bottom: 5px; -} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts index 9d2d00fc3..607ef3ca4 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts @@ -11,6 +11,7 @@ import { stampPDFPage } from '@utils/page-stamper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { WatermarkService } from '@shared/services/watermark.service'; +import { firstValueFrom } from 'rxjs'; export const DEFAULT_WATERMARK: IWatermark = { text: null, @@ -80,7 +81,7 @@ export class WatermarkScreenComponent implements OnInit { ? this._watermarkService.saveWatermark(watermark, dossierTemplateId) : this._watermarkService.deleteWatermark(dossierTemplateId); - observable.toPromise().then( + firstValueFrom(observable).then( () => { this._loadWatermark(); this._toaster.success( diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 8b5ac7db1..7e31b7b0d 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog'; import { AddEditFileAttributeDialogComponent } from '../dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; import { AddEditDictionaryDialogComponent } from '../dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component'; import { AddEditDossierTemplateDialogComponent } from '../dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component'; -import { ConfirmDeleteFileAttributeDialogComponent } from '../dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component'; +import { ConfirmDeleteAttributeDialogComponent } from '../dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component'; import { EditColorDialogComponent } from '../dialogs/edit-color-dialog/edit-color-dialog.component'; import { SmtpAuthDialogComponent } from '../dialogs/smtp-auth-dialog/smtp-auth-dialog.component'; import { AddEditUserDialogComponent } from '../dialogs/add-edit-user-dialog/add-edit-user-dialog.component'; @@ -20,7 +20,7 @@ type DialogType = | 'addEditDictionary' | 'editColor' | 'addEditFileAttribute' - | 'deleteFileAttribute' + | 'deleteAttribute' | 'importFileAttributes' | 'fileAttributesConfigurations' | 'addEditUser' @@ -36,6 +36,7 @@ export class AdminDialogService extends DialogService { protected readonly _config: DialogConfig = { confirm: { component: ConfirmationDialogComponent, + dialogConfig: { disableClose: false }, }, addEditDictionary: { component: AddEditDictionaryDialogComponent, @@ -49,19 +50,20 @@ export class AdminDialogService extends DialogService { component: AddEditFileAttributeDialogComponent, dialogConfig: { autoFocus: true }, }, - deleteFileAttribute: { - component: ConfirmDeleteFileAttributeDialogComponent, + deleteAttribute: { + component: ConfirmDeleteAttributeDialogComponent, + dialogConfig: { disableClose: false }, }, fileAttributesConfigurations: { component: FileAttributesConfigurationsDialogComponent, }, importFileAttributes: { component: FileAttributesCsvImportDialogComponent, - dialogConfig: largeDialogConfig, + dialogConfig: { ...largeDialogConfig, ...{ disableClose: false } }, }, deleteUsers: { component: ConfirmDeleteUsersDialogComponent, - dialogConfig: { autoFocus: true }, + dialogConfig: { autoFocus: true, disableClose: false }, }, addEditUser: { component: AddEditUserDialogComponent, diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.html rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.scss b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.scss rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.scss diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts similarity index 80% rename from apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts index b435bca35..194abbecc 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts @@ -1,12 +1,13 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; import { Router } from '@angular/router'; -import { AdminDialogService } from '../../services/admin-dialog.service'; +import { AdminDialogService } from '../../../services/admin-dialog.service'; import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { HttpStatusCode } from '@angular/common/http'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-dossier-template-actions', @@ -18,7 +19,6 @@ export class DossierTemplateActionsComponent implements OnInit { readonly currentUser = this._userService.currentUser; @Input() dossierTemplateId: string; - @Output() readonly loadDossierTemplatesData = new EventEmitter(); constructor( private readonly _router: Router, @@ -39,22 +39,17 @@ export class DossierTemplateActionsComponent implements OnInit { } openEditDossierTemplateDialog($event: any) { - this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplate, () => { - this.loadDossierTemplatesData.emit(); - }); + this._dialogService.openDialog('addEditDossierTemplate', $event, this.dossierTemplate); } openDeleteDossierTemplateDialog($event?: MouseEvent) { this._dialogService.openDialog('confirm', $event, null, async () => { this._loadingService.start(); - await this._dossierTemplatesService - .delete([this.dossierTemplateId]) - .toPromise() + await firstValueFrom(this._dossierTemplatesService.delete([this.dossierTemplateId])) .then(async () => { - await this._dossierTemplatesService.loadAll().toPromise(); + await firstValueFrom(this._dossierTemplatesService.loadAll()); await this._appStateService.loadDictionaryData(); - this.loadDossierTemplatesData.emit(); await this._router.navigate(['main', 'admin']); }) .catch(error => { diff --git a/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts b/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts new file mode 100644 index 000000000..09552f814 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '@shared/shared.module'; +import { DossierTemplateActionsComponent } from './components/dossier-template-actions/dossier-template-actions.component'; + +const components = [DossierTemplateActionsComponent]; + +@NgModule({ + declarations: [...components], + exports: [...components], + providers: [], + imports: [CommonModule, SharedModule], +}) +export class SharedAdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts b/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts index 7103ed3be..ac6364a98 100644 --- a/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts @@ -3,4 +3,4 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; export const adminSideNavTranslations = { settings: _('admin-side-nav.settings'), dossierTemplates: _('admin-side-nav.dossier-templates'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts index b0bbb0552..bf7560b38 100644 --- a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts @@ -1,6 +1,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -export const auditCategoriesTranslations: { [key: string]: string } = { +export const auditCategoriesTranslations = { allCategories: _('audit-screen.categories.all-categories'), LICENSE: _('audit-screen.categories.license'), DOWNLOAD: _('audit-screen.categories.download'), @@ -13,4 +13,4 @@ export const auditCategoriesTranslations: { [key: string]: string } = { DOCUMENT: _('audit-screen.categories.document'), AUDIT: _('audit-screen.categories.audit'), DOSSIER_TEMPLATE: _('audit-screen.categories.dossier-template'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts index 9e5408ee1..ecc426d8c 100644 --- a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts @@ -1,7 +1,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DefaultColorType } from '@red/domain'; -export const defaultColorsTranslations: { [key in DefaultColorType]: string } = { +export const defaultColorsTranslations: { readonly [key in DefaultColorType]: string } = { analysisColor: _('default-colors-screen.types.analysisColor'), defaultColor: _('default-colors-screen.types.defaultColor'), dictionaryRequestColor: _('default-colors-screen.types.dictionaryRequestColor'), @@ -11,4 +11,5 @@ export const defaultColorsTranslations: { [key in DefaultColorType]: string } = requestAdd: _('default-colors-screen.types.requestAdd'), requestRemove: _('default-colors-screen.types.requestRemove'), updatedColor: _('default-colors-screen.types.updatedColor'), -}; + ignoredHintColor: _('default-colors-screen.types.ignoredHintColor'), +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts index f37ed8473..cfd268a36 100644 --- a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts @@ -1,9 +1,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierAttributeConfigType } from '@red/domain'; -export const dossierAttributeTypesTranslations: { [key in DossierAttributeConfigType]: string } = { +export const dossierAttributeTypesTranslations: { readonly [key in DossierAttributeConfigType]: string } = { TEXT: _('dossier-attribute-types.text'), NUMBER: _('dossier-attribute-types.number'), DATE: _('dossier-attribute-types.date'), IMAGE: _('dossier-attribute-types.image'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts b/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts new file mode 100644 index 000000000..452ab8825 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts @@ -0,0 +1,7 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { DossierTemplateStatus } from '@red/domain'; + +export const dossierTemplateStatusTranslations: { readonly [key in DossierTemplateStatus]: string } = { + ACTIVE: _('dossier-templates.status.active'), + INCOMPLETE: _('dossier-templates.status.incomplete'), +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts b/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts index bbef380b6..fc13a865f 100644 --- a/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts @@ -1,8 +1,8 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileAttributeConfigType } from '@red/domain'; -export const fileAttributeTypesTranslations: { [key in FileAttributeConfigType]: string } = { +export const fileAttributeTypesTranslations: { readonly [key in FileAttributeConfigType]: string } = { TEXT: _('file-attribute-types.text'), NUMBER: _('file-attribute-types.number'), DATE: _('file-attribute-types.date'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts b/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts index 3050c5996..366aaa667 100644 --- a/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts @@ -1,11 +1,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -export const placeholdersDescriptionsTranslations: { [key: string]: string } = { +export const placeholdersDescriptionsTranslations = { dossierAttributePlaceholders: _('reports-screen.descriptions.dossier-attributes'), fileAttributePlaceholders: _('reports-screen.descriptions.file-attributes'), -}; +} as const; -export const generalPlaceholdersDescriptionsTranslations: { [key: string]: string } = { +export const generalPlaceholdersDescriptionsTranslations = { 'file.name': _('reports-screen.descriptions.general.file.name'), 'redaction.page': _('reports-screen.descriptions.general.redaction.page'), 'redaction.paragraph': _('reports-screen.descriptions.general.redaction.paragraph'), @@ -18,4 +18,4 @@ export const generalPlaceholdersDescriptionsTranslations: { [key: string]: strin 'date.MM/dd/yyyy': _('reports-screen.descriptions.general.date.m-d-y'), 'time.HH:mm': _('reports-screen.descriptions.general.time.h-m'), 'dossier.name': _('reports-screen.descriptions.general.dossier.name'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/auth/auth.module.ts b/apps/red-ui/src/app/modules/auth/auth.module.ts index 1246d36fd..a71370167 100644 --- a/apps/red-ui/src/app/modules/auth/auth.module.ts +++ b/apps/red-ui/src/app/modules/auth/auth.module.ts @@ -5,6 +5,7 @@ import { HttpClientModule } from '@angular/common/http'; import { KeycloakAngularModule, KeycloakOptions, KeycloakService } from 'keycloak-angular'; import { ConfigService } from '@services/config.service'; import { BASE_HREF } from '../../tokens'; +import { firstValueFrom } from 'rxjs'; function getKeycloakOptions(configService: ConfigService, baseUrl: string) { let url: string = configService.values.OAUTH_URL; @@ -36,14 +37,11 @@ function configureAutomaticRedirectToLoginScreen(keyCloakService: KeycloakServic export function keycloakInitializer(keycloakService: KeycloakService, configService: ConfigService, baseUrl: string): () => Promise { return () => - configService - .loadAppConfig() - .toPromise() - .then(() => - keycloakService - .init(getKeycloakOptions(configService, baseUrl)) - .then(() => configureAutomaticRedirectToLoginScreen(keycloakService)), - ); + firstValueFrom(configService.loadAppConfig()).then(() => + keycloakService + .init(getKeycloakOptions(configService, baseUrl)) + .then(() => configureAutomaticRedirectToLoginScreen(keycloakService)), + ); } @NgModule({ diff --git a/apps/red-ui/src/app/modules/auth/red-role.guard.ts b/apps/red-ui/src/app/modules/auth/red-role.guard.ts index 524ba77e2..9ac205529 100644 --- a/apps/red-ui/src/app/modules/auth/red-role.guard.ts +++ b/apps/red-ui/src/app/modules/auth/red-role.guard.ts @@ -28,6 +28,7 @@ export class RedRoleGuard implements CanActivate { if ( this._userService.currentUser.isUserAdmin && !this._userService.currentUser.isAdmin && + !this._userService.currentUser.isUser && !(state.url.startsWith('/main/admin/users') || state.url.startsWith('/main/my-profile')) ) { this._router.navigate(['/main/admin/users']); diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index e4b6d7c77..96a77da55 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -1,5 +1,5 @@
-
+
@@ -91,7 +91,7 @@ - +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index a980580f3..edc03ca0e 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -1,22 +1,22 @@ -import { Component } from '@angular/core'; +import { Component, Injector } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { DownloadFileType, IDossierRequest, IDossierTemplate, IReportTemplate } from '@red/domain'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import * as moment from 'moment'; import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; -import { IconButtonTypes } from '@iqser/common-ui'; +import { BaseDialogComponent, IconButtonTypes, SaveOptions } from '@iqser/common-ui'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; +import { firstValueFrom } from 'rxjs'; @Component({ templateUrl: './add-dossier-dialog.component.html', styleUrls: ['./add-dossier-dialog.component.scss'], }) -export class AddDossierDialogComponent { +export class AddDossierDialogComponent extends BaseDialogComponent { readonly iconButtonTypes = IconButtonTypes; - readonly form: FormGroup; hasDueDate = false; downloadTypes: { key: DownloadFileType; label: string }[] = ['ORIGINAL', 'PREVIEW', 'REDACTED'].map((type: DownloadFileType) => ({ key: type, @@ -30,10 +30,65 @@ export class AddDossierDialogComponent { private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _formBuilder: FormBuilder, private readonly _reportTemplateController: ReportTemplateService, - readonly dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, ) { + super(_injector, _dialogRef); this._getDossierTemplates(); this.form = this._getForm(); + this.initialFormValue = this.form.getRawValue(); + } + + get reportTemplateIdsLength() { + return this.form.controls['reportTemplateIds']?.value?.length || 0; + } + + get downloadFileTypesLength() { + return this.form.controls['downloadFileTypes']?.value?.length || 0; + } + + get disabled() { + if (this.hasDueDate && this.form.get('dueDate').value === null) { + return true; + } + + return this.form.invalid; + } + + reportTemplateValueMapper = (reportTemplate: IReportTemplate) => reportTemplate.templateId; + + async save(options?: SaveOptions) { + const savedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(this._formToObject())); + if (savedDossier) { + this._dialogRef.close({ dossier: savedDossier, addMembers: options?.addMembers }); + } + } + + async dossierTemplateChanged(dossierTemplateId) { + // get current selected dossierTemplate + const dossierTemplate = this.dossierTemplates.find(r => r.dossierTemplateId === dossierTemplateId); + + if (dossierTemplate) { + this.availableReportTypes = + (await firstValueFrom(this._reportTemplateController.getAvailableReportTemplates(dossierTemplate.dossierTemplateId))) || []; + // update dropdown values + this.form.patchValue( + { + downloadFileTypes: dossierTemplate.downloadFileTypes, + reportTemplateIds: [], // TODO DEFAULT + }, + { emitEvent: false }, + ); + } else { + this.availableReportTypes = []; + this.form.patchValue( + { + downloadFileTypes: [], + reportTemplateIds: [], + }, + { emitEvent: false }, + ); + } } private _getForm(): FormGroup { @@ -57,64 +112,12 @@ export class AddDossierDialogComponent { ); } - get reportTemplateIdsLength() { - return this.form.controls['reportTemplateIds']?.value?.length || 0; - } - - get downloadFileTypesLength() { - return this.form.controls['downloadFileTypes']?.value?.length || 0; - } - - get disabled() { - if (this.hasDueDate && this.form.get('dueDate').value === null) { - return true; - } - - return this.form.invalid; - } - - reportTemplateValueMapper = (reportTemplate: IReportTemplate) => reportTemplate.templateId; - - async saveDossier(addMembers = false) { - const savedDossier = await this._dossiersService.createOrUpdate(this._formToObject()).toPromise(); - if (savedDossier) { - this.dialogRef.close({ dossier: savedDossier, addMembers }); - } - } - - async dossierTemplateChanged(dossierTemplateId) { - // get current selected dossierTemplate - const dossierTemplate = this.dossierTemplates.find(r => r.dossierTemplateId === dossierTemplateId); - - if (dossierTemplate) { - this.availableReportTypes = - (await this._reportTemplateController.getAvailableReportTemplates(dossierTemplate.dossierTemplateId).toPromise()) || []; - // update dropdown values - this.form.patchValue( - { - downloadFileTypes: dossierTemplate.downloadFileTypes, - reportTemplateIds: [], // TODO DEFAULT - }, - { emitEvent: false }, - ); - } else { - this.availableReportTypes = []; - this.form.patchValue( - { - downloadFileTypes: [], - reportTemplateIds: [], - }, - { emitEvent: false }, - ); - } - } - private _getDossierTemplates() { this.dossierTemplates = this._dossierTemplatesService.all .filter(r => { const notYetValid = !!r.validFrom && moment(r.validFrom).isAfter(moment()); const notValidAnymore = !!r.validTo && moment(r.validTo).add(1, 'd').isBefore(moment()); - return !(notYetValid || notValidAnymore); + return !(notYetValid || notValidAnymore) && r.isActive; }) .sort((t1, t2) => t1.name.toLowerCase().localeCompare(t2.name.toLowerCase())); } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts index 27757ca3e..8c41436ea 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts @@ -8,6 +8,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/entity-services/files.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { PermissionsService } from '@services/permissions.service'; +import { firstValueFrom } from 'rxjs'; class DialogData { mode: 'approver' | 'reviewer'; @@ -101,28 +102,28 @@ export class AssignReviewerApproverDialogComponent { this._loadingService.start(); try { if (!this.selectedUser) { - await this._filesService - .setUnassigned( + await firstValueFrom( + this._filesService.setUnassigned( this.data.files.map(f => f.fileId), this.dossier.id, - ) - .toPromise(); + ), + ); } else if (this.data.mode === 'reviewer') { - await this._filesService - .setReviewerFor( + await firstValueFrom( + this._filesService.setReviewerFor( this.data.files.map(f => f.fileId), this.dossier.id, this.selectedUser, - ) - .toPromise(); + ), + ); } else { - await this._filesService - .setUnderApprovalFor( + await firstValueFrom( + this._filesService.setUnderApprovalFor( this.data.files.map(f => f.fileId), this.dossier.id, this.selectedUser, - ) - .toPromise(); + ), + ); } } catch (error) { this._toaster.error(_('error.http.generic'), { params: error }); diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html index 97a07755e..5395eb4df 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html @@ -38,12 +38,12 @@
-
- +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts index 16f9f5e8f..350bba3e4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { Component, Inject, Injector, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -6,6 +6,8 @@ import { PermissionsService } from '@services/permissions.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dossier } from '@red/domain'; +import { BaseDialogComponent } from '@iqser/common-ui'; +import { firstValueFrom } from 'rxjs'; export interface LegalBasisOption { label?: string; @@ -16,8 +18,7 @@ export interface LegalBasisOption { @Component({ templateUrl: './change-legal-basis-dialog.component.html', }) -export class ChangeLegalBasisDialogComponent implements OnInit { - form: FormGroup = this._getForm(); +export class ChangeLegalBasisDialogComponent extends BaseDialogComponent implements OnInit { isDocumentAdmin: boolean; legalOptions: LegalBasisOption[] = []; @@ -26,16 +27,12 @@ export class ChangeLegalBasisDialogComponent implements OnInit { private readonly _dossiersService: DossiersService, private readonly _permissionsService: PermissionsService, private readonly _formBuilder: FormBuilder, - readonly dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) private readonly _data: { annotations: AnnotationWrapper[]; dossier: Dossier }, - ) {} - - get changed(): boolean { - return ( - this.form.get('reason').value.legalBasis !== this._data.annotations[0].legalBasis || - this.form.get('section').value !== this._data.annotations[0].section || - this.form.get('classification').value !== this._data.annotations[0].value - ); + ) { + super(_injector, _dialogRef); + this.form = this._getForm(); } get allRectangles(): boolean { @@ -43,7 +40,8 @@ export class ChangeLegalBasisDialogComponent implements OnInit { } async ngOnInit() { - const data = await this._justificationsService.getForDossierTemplate(this._data.dossier.dossierTemplateId).toPromise(); + super.ngOnInit(); + const data = await firstValueFrom(this._justificationsService.getForDossierTemplate(this._data.dossier.dossierTemplateId)); this.legalOptions = data .map(lbm => ({ @@ -56,6 +54,16 @@ export class ChangeLegalBasisDialogComponent implements OnInit { this.form.patchValue({ reason: this.legalOptions.find(option => option.legalBasis === this._data.annotations[0].legalBasis), }); + this.initialFormValue = this.form.getRawValue(); + } + + save() { + this._dialogRef.close({ + legalBasis: this.form.get('reason').value.legalBasis, + section: this.form.get('section').value, + comment: this.form.get('comment').value, + value: this.form.get('classification').value, + }); } private _getForm(): FormGroup { @@ -67,13 +75,4 @@ export class ChangeLegalBasisDialogComponent implements OnInit { section: [this._data.annotations[0].section], }); } - - save() { - this.dialogRef.close({ - legalBasis: this.form.get('reason').value.legalBasis, - section: this.form.get('section').value, - comment: this.form.get('comment').value, - value: this.form.get('classification').value, - }); - } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.html index 2d8ddfe7c..49fadde08 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.html @@ -1,7 +1,7 @@
-
+
@@ -9,11 +9,11 @@
-
- +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts index b18ead053..7062c9d41 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts @@ -1,16 +1,18 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { Component, Inject, Injector, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { Dossier, File, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; +import { BaseDialogComponent } from '@iqser/common-ui'; +import { firstValueFrom } from 'rxjs'; @Component({ templateUrl: './document-info-dialog.component.html', styleUrls: ['./document-info-dialog.component.scss'], }) -export class DocumentInfoDialogComponent implements OnInit { +export class DocumentInfoDialogComponent extends BaseDialogComponent implements OnInit { form: FormGroup; attributes: IFileAttributeConfig[]; @@ -21,27 +23,31 @@ export class DocumentInfoDialogComponent implements OnInit { private readonly _formBuilder: FormBuilder, private readonly _fileAttributesService: FileAttributesService, private readonly _filesService: FilesService, - public dialogRef: MatDialogRef, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: File, ) { + super(_injector, _dialogRef); this._dossier = this._dossiersService.find(this.data.dossierId); } async ngOnInit() { + super.ngOnInit(); this.attributes = ( - await this._fileAttributesService.getFileAttributesConfig(this._dossier.dossierTemplateId).toPromise() + await firstValueFrom(this._fileAttributesService.getFileAttributesConfig(this._dossier.dossierTemplateId)) ).fileAttributeConfigs.filter(attr => attr.editable); this.form = this._getForm(); + this.initialFormValue = this.form.getRawValue(); } - async saveDocumentInfo() { + async save() { const attributeIdToValue = { ...this.data.fileAttributes?.attributeIdToValue, ...this.form.getRawValue(), }; - await this._fileAttributesService.setFileAttributes({ attributeIdToValue }, this.data.dossierId, this.data.fileId).toPromise(); + await firstValueFrom(this._fileAttributesService.setFileAttributes({ attributeIdToValue }, this.data.dossierId, this.data.fileId)); this._filesService.reload(this.data.dossierId, this.data.fileId); - this.dialogRef.close(true); + this._dialogRef.close(true); } private _getForm(): FormGroup { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts index e22722727..614d7d632 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts @@ -7,6 +7,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import * as moment from 'moment'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-edit-dossier-attributes', @@ -66,12 +67,13 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa async save(): EditDossierSaveResult { const dossierAttributeList = this.attributes.map(attr => ({ dossierAttributeConfigId: attr.id, - value: this.isSpecificType(attr, DossierAttributeConfigTypes.DATE) - ? moment(this.currentAttrValue(attr)).format('YYYY-MM-DD') - : this.currentAttrValue(attr), + value: + this.isSpecificType(attr, DossierAttributeConfigTypes.DATE) && !!this.currentAttrValue(attr) + ? moment(this.currentAttrValue(attr)).format('YYYY-MM-DD') + : this.currentAttrValue(attr), })); try { - await this._dossierAttributesService.setAttributes(this.dossier, dossierAttributeList).toPromise(); + await firstValueFrom(this._dossierAttributesService.setAttributes(this.dossier, dossierAttributeList)); await this._loadAttributes(); return { success: true }; } catch (error) { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html index 7319b9040..ce1c54ddc 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html @@ -28,7 +28,7 @@
+
+ +
+ +
+ +
+
{{ file.softDeleted | date: 'exactDate' }}
@@ -65,6 +83,7 @@ implements EditDossierSectionInterface, OnInit { + readonly fileStatusTranslations = workflowFileStatusTranslations; @Input() dossier: Dossier; readonly changed = false; readonly valid = false; readonly canRestoreSelected$ = this._canRestoreSelected$; + readonly canDeleteSelected$ = this._canDeleteSelected$; disabled: boolean; readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('edit-dossier-dialog.deleted-documents.table-col-names.name'), width: '3fr' }, { label: _('edit-dossier-dialog.deleted-documents.table-col-names.pages') }, + { label: _('edit-dossier-dialog.deleted-documents.table-col-names.assignee'), class: 'user-column' }, + { label: _('edit-dossier-dialog.deleted-documents.table-col-names.status') }, { label: _('edit-dossier-dialog.deleted-documents.table-col-names.deleted-on'), sortByKey: 'softDeleted', width: '2fr' }, { label: _('edit-dossier-dialog.deleted-documents.table-col-names.time-to-restore'), sortByKey: 'softDeleted', width: '2fr' }, ]; @@ -59,6 +67,8 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent { + return this.listingService.selectedEntities$.pipe( + map(entities => entities.length && !entities.find(file => !file.canHardDelete)), + distinctUntilChanged(), + ); + } + hardDelete(files = this.listingService.selected) { const data = new ConfirmationDialogInput({ title: _('confirmation-dialog.permanently-delete-file.title'), @@ -90,7 +107,7 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent { const fileIds = files.map(f => f.fileId); - await this._fileManagementService.restore(fileIds, this.dossier.id).toPromise(); + await firstValueFrom(this._fileManagementService.restore(fileIds, this.dossier.id)); this._removeFromList(fileIds); - await this._filesService.loadAll(files[0].dossierId).toPromise(); + await firstValueFrom(this._filesService.loadAll(files[0].dossierId)); } private async _hardDelete(files: FileListItem[]) { const fileIds = files.map(f => f.fileId); - await this._fileManagementService.hardDelete(this.dossier.id, fileIds).toPromise(); + await firstValueFrom(this._fileManagementService.hardDelete(this.dossier.id, fileIds)); this._removeFromList(fileIds); } @@ -133,21 +150,26 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent this._toListItem(file)); } - private _toListItem(file: IFile): FileListItem { - const restoreDate = this._getRestoreDate(file.softDeleted); + private _toListItem(_file: IFile): FileListItem { + const file = new File(_file, this._userService.getNameForId(_file.assignee)); + const restoreDate = this._getRestoreDate(_file.softDeleted); return { id: file.fileId, ...file, restoreDate, searchKey: file.filename, - canRestore: this._canRestoreFile(restoreDate), + canRestore: this._canRestore(file, restoreDate), + canHardDelete: this._canPerformActions(file), }; } - private _canRestoreFile(restoreDate: string): boolean { - const { daysLeft, hoursLeft, minutesLeft } = getLeftDateTime(restoreDate); + private _canPerformActions(file: File): boolean { + return this._userService.currentUser.isManager || this._permissionsService.canDeleteFile(file); + } - return daysLeft >= 0 && hoursLeft >= 0 && minutesLeft >= 0; + private _canRestore(file: File, restoreDate: string): boolean { + const { daysLeft, hoursLeft, minutesLeft } = getLeftDateTime(restoreDate); + return this._canPerformActions(file) && daysLeft + hoursLeft + minutesLeft > 0; } private _getRestoreDate(softDeletedTime: string): string { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html index 6cd5f9d5f..6aec3866c 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html @@ -1,12 +1,22 @@
-
-
{{ dossierDictionary?.label }}
-
-
- - {{ 'edit-dossier-dialog.dictionary.entries' | translate: { length: (dossierDictionary?.entries || []).length } }} +
+
+
{{ dossierDictionary?.label }}
+
+
+ + {{ 'edit-dossier-dialog.dictionary.entries' | translate: { length: (dossierDictionary?.entries || []).length } }} +
+ +
+
+ + {{ 'add-edit-dictionary.form.add-to-dictionary-action' | translate }} + +
+
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss index 84c64d950..db87a56e3 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.scss @@ -2,6 +2,14 @@ display: flex; justify-content: space-between; + .header-left { + display: flex; + + .iqser-input-group { + margin-left: 24px; + } + } + .display-name { display: flex; align-items: center; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts index 2e309c464..6944b4683 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts @@ -7,6 +7,8 @@ import { DictionaryService } from '@shared/services/dictionary.service'; import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-edit-dossier-dictionary', @@ -15,10 +17,13 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; }) export class EditDossierDictionaryComponent implements EditDossierSectionInterface, OnInit { @Input() dossier: Dossier; + + form: FormGroup; canEdit = false; - readonly circleButtonTypes = CircleButtonTypes; dossierDictionary: IDictionary; + readonly circleButtonTypes = CircleButtonTypes; + @ViewChild(DictionaryManagerComponent, { static: false }) private readonly _dictionaryManager: DictionaryManagerComponent; constructor( @@ -26,11 +31,20 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa private readonly _dictionaryService: DictionaryService, private readonly _permissionsService: PermissionsService, private readonly _loadingService: LoadingService, + private readonly _formBuilder: FormBuilder, private readonly _toaster: Toaster, ) {} + get formChanged() { + if (this.form) { + return this.form.get('addToDictionaryAction').value !== this.dossierDictionary.addToDictionaryAction; + } + + return false; + } + get changed(): boolean { - return this._dictionaryManager.editor.hasChanges; + return this._dictionaryManager.editor.hasChanges || this.formChanged; } get disabled(): boolean { @@ -38,13 +52,14 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa } get valid(): boolean { - return this._dictionaryManager.editor.hasChanges; + return this._dictionaryManager.editor.hasChanges || this.formChanged; } async ngOnInit() { this._loadingService.start(); this.canEdit = this._permissionsService.isDossierMember(this.dossier); await this._updateDossierDictionary(); + this.form = this._getForm(); this._loadingService.stop(); } @@ -53,9 +68,9 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa this._loadingService.start(); // TODO: Setting the type manually shouldn't be necessary, but for now it fails with status code 500... const dictionary: IDictionary = { ...this.dossierDictionary, type: 'dossier_redaction', label }; - await this._dictionaryService - .updateDictionary(dictionary, this.dossier.dossierTemplateId, 'dossier_redaction', this.dossier.id) - .toPromise(); + await firstValueFrom( + this._dictionaryService.updateDictionary(dictionary, this.dossier.dossierTemplateId, 'dossier_redaction', this.dossier.id), + ); await this._updateDossierDictionary(); this._toaster.success(_('edit-dossier-dialog.dictionary.display-name.success')); } catch (error) { @@ -66,16 +81,26 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa async save(): EditDossierSaveResult { try { - await this._dictionaryService - .saveEntries( + const dictionary: IDictionary = { + ...this.dossierDictionary, + type: 'dossier_redaction', + addToDictionaryAction: this.form.get('addToDictionaryAction').value, + }; + await firstValueFrom( + this._dictionaryService.updateDictionary(dictionary, this.dossier.dossierTemplateId, 'dossier_redaction', this.dossier.id), + ); + + await firstValueFrom( + this._dictionaryService.saveEntries( this._dictionaryManager.editor.currentEntries, this._dictionaryManager.initialEntries, this.dossier.dossierTemplateId, 'dossier_redaction', this.dossier.id, false, - ) - .toPromise(); + ), + ); + await this._updateDossierDictionary(); return { success: true }; } catch (error) { @@ -85,10 +110,26 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa revert() { this._dictionaryManager.revert(); + this.form.reset({ + addToDictionaryAction: this.dossierDictionary.addToDictionaryAction, + }); + } + + private _getForm(): FormGroup { + return this._formBuilder.group({ + addToDictionaryAction: [ + { + value: this.dossierDictionary.addToDictionaryAction, + disabled: !this._permissionsService.isOwner(this.dossier), + }, + ], + }); } private async _updateDossierDictionary() { const { dossierId, dossierTemplateId } = this.dossier; - this.dossierDictionary = await this._dictionaryService.getForType(dossierTemplateId, 'dossier_redaction', dossierId).toPromise(); + this.dossierDictionary = await firstValueFrom( + this._dictionaryService.getForType(dossierTemplateId, 'dossier_redaction', dossierId), + ); } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 9ddc8a127..7338c9590 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -5,6 +5,8 @@ import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-doss import { downloadTypesTranslations } from '../../../../../translations/download-types-translations'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { ReportTemplateService } from '@services/report-template.service'; +import { PermissionsService } from '@services/permissions.service'; +import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-edit-dossier-download-package', @@ -25,6 +27,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS private readonly _dossiersService: DossiersService, private readonly _reportTemplateController: ReportTemplateService, private readonly _formBuilder: FormBuilder, + private readonly _permissionsService: PermissionsService, ) {} get reportTypesLength() { @@ -68,9 +71,12 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS async ngOnInit() { this.availableReportTypes = - (await this._reportTemplateController.getAvailableReportTemplates(this.dossier.dossierTemplateId).toPromise()) || []; + (await firstValueFrom(this._reportTemplateController.getAvailableReportTemplates(this.dossier.dossierTemplateId))) || []; this.form = this._getForm(); + if (!this._permissionsService.canEditDossier()) { + this.form.disable(); + } } async save(): EditDossierSaveResult { @@ -80,7 +86,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS reportTemplateIds: this.form.get('reportTemplateIds').value, }; try { - await this._dossiersService.createOrUpdate(dossier).toPromise(); + await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); return { success: true }; } catch (error) { return { success: false }; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index 8b9f90c77..ea40e9549 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -49,11 +49,11 @@
-
- +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index 87235becf..486375e34 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, Inject, Injector, ViewChild } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Dossier } from '@red/domain'; import { EditDossierGeneralInfoComponent } from './general-info/edit-dossier-general-info.component'; import { EditDossierDownloadPackageComponent } from './download-package/edit-dossier-download-package.component'; import { EditDossierSectionInterface } from './edit-dossier-section.interface'; -import { BaseDialogComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; +import { BaseDialogComponent, ConfirmOptions, IconButtonTypes, LoadingService, SaveOptions, Toaster } from '@iqser/common-ui'; import { EditDossierDictionaryComponent } from './dictionary/edit-dossier-dictionary.component'; import { EditDossierAttributesComponent } from './attributes/edit-dossier-attributes.component'; @@ -14,6 +14,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; import { EditDossierTeamComponent } from './edit-dossier-team/edit-dossier-team.component'; +import { PermissionsService } from '@services/permissions.service'; type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'members' | 'dossierAttributes' | 'deletedDocuments'; @@ -39,15 +40,17 @@ export class EditDossierDialogComponent extends BaseDialogComponent { private readonly _toaster: Toaster, private readonly _dossiersService: DossiersService, private readonly _changeRef: ChangeDetectorRef, - private readonly _dialogRef: MatDialogRef, private readonly _loadingService: LoadingService, + private readonly _permissionsService: PermissionsService, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) private readonly _data: { dossierId: string; section?: Section; }, ) { - super(); + super(_injector, _dialogRef); this.navItems = [ { key: 'dossierInfo', @@ -109,7 +112,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent { } get showActionButtons(): boolean { - return !['deletedDocuments'].includes(this.activeNav); + return !['deletedDocuments'].includes(this.activeNav) && this._permissionsService.canEditDossier(); } get changed(): boolean { @@ -124,7 +127,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent { return this.activeComponent?.disabled; } - async save(closeAfterSave: boolean = false) { + async save(options?: SaveOptions) { this._loadingService.start(); const result = await this.activeComponent.save(); this._loadingService.stop(); @@ -133,7 +136,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent { this._toaster.success(_('edit-dossier-dialog.change-successful'), { params: { dossierName: this._dossierName } }); } - if (result.success && closeAfterSave) { + if (result.success && options?.closeAfterSave) { this._dialogRef.close(); } } @@ -144,9 +147,19 @@ export class EditDossierDialogComponent extends BaseDialogComponent { changeTab(key: Section) { if (this.changed) { - this._toaster.error(_('edit-dossier-dialog.unsaved-changes')); - return; + this._openConfirmDialog().then(async result => { + if (result in ConfirmOptions) { + if (result === ConfirmOptions.CONFIRM) { + await this.save(); + } else { + this.revert(); + } + this.activeNav = key; + } + this._waitingForConfirmation = false; + }); + } else { + this.activeNav = key; } - this.activeNav = key; } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html index 26d46072e..5d2809aec 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html @@ -1,5 +1,5 @@
-
+
{{ 'assign-dossier-owner.dialog.single-user' | translate }} @@ -13,7 +13,7 @@ - 

-
     

     
 
-    

+    
+        
{{ 'assign-dossier-owner.dialog.no-reviewers' | translate }}

+        
{{ 'assign-dossier-owner.dialog.select-below' | translate }}

+    
 
-    
+    
+        
 
-    

-        

-            
-            

-                

-                    
-                    
+        

+            

+                
+                

+                    

+                        
+                        
+                    

+                    
                 

-                
             

         

-    

+    
 
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss
index fad35d935..8dcbfe2fc 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss
@@ -60,7 +60,3 @@ redaction-team-members {
         }
     }
 }
-
-.info {
-    margin-top: 4px;
-}
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
index 0d9f1a7cc..9f92db656 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
@@ -5,7 +5,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service';
 import { Dossier, IDossierRequest } from '@red/domain';
 import { AutoUnsubscribe } from '@iqser/common-ui';
 import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-edit-dossier-team',
@@ -77,7 +77,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos
         } as IDossierRequest;
 
         try {
-            await this._dossiersService.createOrUpdate(dossier).toPromise();
+            await firstValueFrom(this._dossiersService.createOrUpdate(dossier));
             return { success: true };
         } catch (error) {
             return { success: false };
@@ -146,7 +146,13 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos
 
     private _loadData() {
         this.form = this._formBuilder.group({
-            owner: [this.dossier?.ownerId, Validators.required],
+            owner: [
+                {
+                    value: this.dossier?.ownerId,
+                    disabled: this.disabled,
+                },
+                Validators.required,
+            ],
             approvers: [[...this.dossier?.approverIds]],
             members: [[...this.dossier?.memberIds]],
         });
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
index 4e2abec05..aebea6535 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
@@ -50,7 +50,13 @@
     

 
     

-        
+        
             {{ 'edit-dossier-dialog.general-info.form.due-date' | translate }}
         
 
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
index 4f7d35d7d..4925acddb 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
@@ -13,6 +13,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-edit-dossier-general-info',
@@ -68,6 +69,9 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
     ngOnInit() {
         this._filterInvalidDossierTemplates();
         this.form = this._getForm();
+        if (!this.permissionsService.canEditDossier()) {
+            this.form.disable();
+        }
         this.hasDueDate = !!this.dossier.dueDate;
     }
 
@@ -93,7 +97,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
             dossierTemplateId: this.form.get('dossierTemplateId').value,
         } as IDossierRequest;
         try {
-            await this._dossiersService.createOrUpdate(dossier).toPromise();
+            await firstValueFrom(this._dossiersService.createOrUpdate(dossier));
             return { success: true };
         } catch (error) {
             return { success: false };
@@ -115,7 +119,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
             },
         });
         this._dialogService.openDialog('confirm', null, data, async () => {
-            await this._dossiersService.delete(this.dossier).toPromise();
+            await firstValueFrom(this._dossiersService.delete(this.dossier));
             this._editDossierDialogRef.close();
             this._router.navigate(['main', 'dossiers']).then(() => this._notifyDossierDeleted());
         });
@@ -149,7 +153,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
             }
             const notYetValid = !!r.validFrom && moment(r.validFrom).isAfter(moment());
             const notValidAnymore = !!r.validTo && moment(r.validTo).add(1, 'd').isBefore(moment());
-            return !(notYetValid || notValidAnymore);
+            return !(notYetValid || notValidAnymore) && r.isActive;
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.html
similarity index 66%
rename from apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.html
rename to apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.html
index cb10c3df8..be573e7aa 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.html
@@ -1,9 +1,10 @@
 

-    

-        

+    
+        

+        

 
         

-            

+            

                 
                 
             

 
-            

+            

                 
-                
+                
             

 
             

                 
-                
+                
             

         

 
         

-            
         

     
 
-    
+    
 

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.scss
similarity index 100%
rename from apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.scss
rename to apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.scss
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts
similarity index 63%
rename from apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
rename to apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts
index b6b0f0191..9dbbe5eb8 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts
@@ -1,7 +1,7 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, Injector, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { Toaster } from '@iqser/common-ui';
+import { BaseDialogComponent, Toaster } from '@iqser/common-ui';
 import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '@services/user.service';
 import { ManualAnnotationService } from '../../services/manual-annotation.service';
@@ -9,6 +9,7 @@ import { PermissionsService } from '@services/permissions.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Dossier, ILegalBasisChangeRequest } from '@red/domain';
+import { firstValueFrom } from 'rxjs';
 
 export interface LegalBasisOption {
     label?: string;
@@ -17,12 +18,11 @@ export interface LegalBasisOption {
 }
 
 @Component({
-    selector: 'redaction-force-redaction-dialog',
-    templateUrl: './force-redaction-dialog.component.html',
-    styleUrls: ['./force-redaction-dialog.component.scss'],
+    selector: 'redaction-force-annotation-dialog',
+    templateUrl: './force-annotation-dialog.component.html',
+    styleUrls: ['./force-annotation-dialog.component.scss'],
 })
-export class ForceRedactionDialogComponent implements OnInit {
-    redactionForm: FormGroup;
+export class ForceAnnotationDialogComponent extends BaseDialogComponent implements OnInit {
     isDocumentAdmin: boolean;
     legalOptions: LegalBasisOption[] = [];
 
@@ -35,23 +35,22 @@ export class ForceRedactionDialogComponent implements OnInit {
         private readonly _justificationsService: JustificationsService,
         private readonly _manualAnnotationService: ManualAnnotationService,
         private readonly _permissionsService: PermissionsService,
-        public dialogRef: MatDialogRef,
-        @Inject(MAT_DIALOG_DATA) private readonly _data: { readonly dossier: Dossier },
+        protected readonly _injector: Injector,
+        protected readonly _dialogRef: MatDialogRef,
+        @Inject(MAT_DIALOG_DATA) private readonly _data: { readonly dossier: Dossier; readonly hint: boolean },
     ) {
-        this.redactionForm = this._getForm();
+        super(_injector, _dialogRef);
+        this.form = this._getForm();
+        this.initialFormValue = this.form.getRawValue();
     }
 
-    private _getForm(): FormGroup {
-        this.isDocumentAdmin = this._permissionsService.isApprover(this._data.dossier);
-
-        return this._formBuilder.group({
-            reason: [null, Validators.required],
-            comment: this.isDocumentAdmin ? [null] : [null, Validators.required],
-        });
+    get isHintDialog() {
+        return this._data.hint;
     }
 
     async ngOnInit() {
-        const data = await this._justificationsService.getForDossierTemplate(this._data.dossier.dossierTemplateId).toPromise();
+        super.ngOnInit();
+        const data = await firstValueFrom(this._justificationsService.getForDossierTemplate(this._data.dossier.dossierTemplateId));
 
         this.legalOptions = data.map(lbm => ({
             legalBasis: lbm.reason,
@@ -62,17 +61,26 @@ export class ForceRedactionDialogComponent implements OnInit {
         this.legalOptions.sort((a, b) => a.label.localeCompare(b.label));
     }
 
-    handleForceRedaction() {
-        this.dialogRef.close(this._createForceRedactionRequest());
+    save() {
+        this._dialogRef.close(this._createForceRedactionRequest());
+    }
+
+    private _getForm(): FormGroup {
+        this.isDocumentAdmin = this._permissionsService.isApprover(this._data.dossier);
+
+        return this._formBuilder.group({
+            reason: this._data.hint ? ['Forced Hint'] : [null, Validators.required],
+            comment: this.isDocumentAdmin ? [null] : [null, Validators.required],
+        });
     }
 
     private _createForceRedactionRequest(): ILegalBasisChangeRequest {
         const request: ILegalBasisChangeRequest = {};
 
-        const legalOption: LegalBasisOption = this.redactionForm.get('reason').value;
+        const legalOption: LegalBasisOption = this.form.get('reason').value;
 
         request.legalBasis = legalOption.legalBasis;
-        request.comment = this.redactionForm.get('comment').value;
+        request.comment = this.form.get('comment').value;
 
         return request;
     }
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
index 46db18d59..00e585c58 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
@@ -1,5 +1,5 @@
 

-    

+    
         

 
         

@@ -54,7 +54,7 @@
 
             

                 
-                
+                
             

 
             

@@ -74,11 +74,11 @@
         

 
         

-            
         

     
 
-    
+    
 

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index 710b4fc6b..593e776ab 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, Injector, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AppStateService } from '@state/app-state.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
@@ -7,8 +7,11 @@ import { ManualAnnotationService } from '../../services/manual-annotation.servic
 import { ManualAnnotationResponse } from '@models/file/manual-annotation-response';
 import { PermissionsService } from '@services/permissions.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
-import { Dictionary, Dossier, File, IAddRedactionRequest } from '@red/domain';
+import { Dictionary, Dossier, File, IAddRedactionRequest, IManualAddResponse } from '@red/domain';
 import { DossiersService } from '@services/entity-services/dossiers.service';
+import { DictionaryService } from '@shared/services/dictionary.service';
+import { BaseDialogComponent } from '@iqser/common-ui';
+import { firstValueFrom } from 'rxjs';
 
 export interface LegalBasisOption {
     label?: string;
@@ -21,9 +24,7 @@ export interface LegalBasisOption {
     templateUrl: './manual-annotation-dialog.component.html',
     styleUrls: ['./manual-annotation-dialog.component.scss'],
 })
-export class ManualAnnotationDialogComponent implements OnInit {
-    redactionForm: FormGroup;
-
+export class ManualAnnotationDialogComponent extends BaseDialogComponent implements OnInit {
     isDocumentAdmin: boolean;
     isDictionaryRequest: boolean;
     isFalsePositiveRequest: boolean;
@@ -40,18 +41,20 @@ export class ManualAnnotationDialogComponent implements OnInit {
         private readonly _manualAnnotationService: ManualAnnotationService,
         private readonly _permissionsService: PermissionsService,
         private readonly _dossiersService: DossiersService,
-        public dialogRef: MatDialogRef,
+        private readonly _dictionaryService: DictionaryService,
+        protected readonly _injector: Injector,
+        protected readonly _dialogRef: MatDialogRef,
         @Inject(MAT_DIALOG_DATA) public data: { manualRedactionEntryWrapper: ManualRedactionEntryWrapper; file: File },
     ) {
+        super(_injector, _dialogRef);
         this._dossier = this._dossiersService.find(this.data.file.dossierId);
         this.isDocumentAdmin = this._permissionsService.isApprover(this._dossier);
 
         this.isFalsePositiveRequest = this.data.manualRedactionEntryWrapper.type === 'FALSE_POSITIVE';
         this.isDictionaryRequest = this.data.manualRedactionEntryWrapper.type === 'DICTIONARY' || this.isFalsePositiveRequest;
 
-        this.redactionForm = this._getForm();
-
-        this.possibleDictionaries = this._possibleDictionaries;
+        this.form = this._getForm();
+        this.initialFormValue = this.form.getRawValue();
     }
 
     get title() {
@@ -59,32 +62,24 @@ export class ManualAnnotationDialogComponent implements OnInit {
     }
 
     get displayedDictionaryLabel() {
-        const dictType = this.redactionForm.get('dictionary').value;
+        const dictType = this.form.get('dictionary').value;
         if (dictType) {
             return this.possibleDictionaries.find(d => d.type === dictType).label;
         }
         return null;
     }
 
-    private get _possibleDictionaries(): Dictionary[] {
-        const possibleDictionaries: Dictionary[] = [];
-        const dossier = this._dossier;
-
-        for (const key of Object.keys(this._appStateService.dictionaryData[dossier.dossierTemplateId])) {
-            const dictionaryData = this._appStateService.getDictionary(key, dossier.dossierTemplateId);
-            if (!dictionaryData.virtual && dictionaryData.addToDictionaryAction) {
-                possibleDictionaries.push(dictionaryData);
-            }
-        }
-
-        possibleDictionaries.sort((a, b) => a.label.localeCompare(b.label));
-
-        return possibleDictionaries;
+    get disabled() {
+        return this.form.invalid;
     }
 
     async ngOnInit() {
-        const data = await this._justificationsService.getForDossierTemplate(this._dossier.dossierTemplateId).toPromise();
-
+        super.ngOnInit();
+        this.possibleDictionaries = await this._appStateService.getDictionariesOptions(
+            this._dossier.dossierTemplateId,
+            this._dossier.dossierId,
+        );
+        const data = await firstValueFrom(this._justificationsService.getForDossierTemplate(this._dossier.dossierTemplateId));
         this.legalOptions = data.map(lbm => ({
             legalBasis: lbm.reason,
             description: lbm.description,
@@ -94,11 +89,12 @@ export class ManualAnnotationDialogComponent implements OnInit {
         this.legalOptions.sort((a, b) => a.label.localeCompare(b.label));
     }
 
-    handleAddRedaction() {
+    save() {
         this._enhanceManualRedaction(this.data.manualRedactionEntryWrapper.manualRedactionEntry);
         this._manualAnnotationService.addAnnotation(this.data.manualRedactionEntryWrapper.manualRedactionEntry, this.data.file).subscribe(
-            response => this.dialogRef.close(new ManualAnnotationResponse(this.data.manualRedactionEntryWrapper, response)),
-            () => this.dialogRef.close(),
+            (response: IManualAddResponse) =>
+                this._dialogRef.close(new ManualAnnotationResponse(this.data.manualRedactionEntryWrapper, response)),
+            () => this._dialogRef.close(),
         );
     }
 
@@ -123,22 +119,22 @@ export class ManualAnnotationDialogComponent implements OnInit {
     }
 
     private _enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
-        const legalOption: LegalBasisOption = this.redactionForm.get('reason').value;
-        addRedactionRequest.type = this.redactionForm.get('dictionary').value;
+        const legalOption: LegalBasisOption = this.form.get('reason').value;
+        addRedactionRequest.type = this.form.get('dictionary').value;
         if (legalOption) {
             addRedactionRequest.reason = legalOption.description;
             addRedactionRequest.legalBasis = legalOption.legalBasis;
         }
-        addRedactionRequest.addToDictionary = this.isDictionaryRequest;
         // todo fix this in backend
+        addRedactionRequest.addToDictionary = this.isDictionaryRequest && addRedactionRequest.type !== 'dossier_redaction';
+        addRedactionRequest.addToDossierDictionary = this.isDictionaryRequest && addRedactionRequest.type === 'dossier_redaction';
+
         if (!addRedactionRequest.reason) {
             addRedactionRequest.reason = 'Dictionary Request';
         }
-        const commentValue = this.redactionForm.get('comment').value;
+        const commentValue = this.form.get('comment').value;
         addRedactionRequest.comment = commentValue ? { text: commentValue } : null;
-        addRedactionRequest.section = this.redactionForm.get('section').value;
-        addRedactionRequest.value = addRedactionRequest.rectangle
-            ? this.redactionForm.get('classification').value
-            : addRedactionRequest.value;
+        addRedactionRequest.section = this.form.get('section').value;
+        addRedactionRequest.value = addRedactionRequest.rectangle ? this.form.get('classification').value : addRedactionRequest.value;
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html
index aeafba369..a1073bcd3 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html
@@ -1,5 +1,5 @@
 

-    

+    
         

 
         

@@ -23,12 +23,12 @@
         

 
         

-            
             

         

     

 
-    
+    
 

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts
index 3e6771b28..488438e46 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts
@@ -1,17 +1,17 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Component, Inject, Injector, OnInit } from '@angular/core';
+import { FormBuilder, Validators } from '@angular/forms';
 import { PermissionsService } from '@services/permissions.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { imageCategoriesTranslations } from '../../translations/image-categories-translations';
 import { ImageCategory } from '../../models/image-category.model';
 import { Dossier } from '@red/domain';
+import { BaseDialogComponent } from '@iqser/common-ui';
 
 @Component({
     templateUrl: './recategorize-image-dialog.component.html',
 })
-export class RecategorizeImageDialogComponent implements OnInit {
-    recategorizeImageForm: FormGroup;
+export class RecategorizeImageDialogComponent extends BaseDialogComponent implements OnInit {
     isDocumentAdmin: boolean;
     typeOptions: ImageCategory[] = ['signature', 'logo', 'formula', 'image'];
     translations = imageCategoriesTranslations;
@@ -19,27 +19,32 @@ export class RecategorizeImageDialogComponent implements OnInit {
     constructor(
         private readonly _permissionsService: PermissionsService,
         private readonly _formBuilder: FormBuilder,
-        public dialogRef: MatDialogRef,
+        protected readonly _injector: Injector,
+        protected readonly _dialogRef: MatDialogRef,
         @Inject(MAT_DIALOG_DATA) public data: { annotations: AnnotationWrapper[]; dossier: Dossier },
-    ) {}
+    ) {
+        super(_injector, _dialogRef);
+    }
 
     get changed(): boolean {
-        return this.recategorizeImageForm.get('type').value !== this.data.annotations[0].type;
+        return this.form.get('type').value !== this.data.annotations[0].type;
     }
 
     ngOnInit() {
+        super.ngOnInit();
         this.isDocumentAdmin = this._permissionsService.isApprover(this.data.dossier);
 
-        this.recategorizeImageForm = this._formBuilder.group({
+        this.form = this._formBuilder.group({
             type: [this.data.annotations[0].type, Validators.required],
             comment: this.isDocumentAdmin ? [null] : [null, Validators.required],
         });
+        this.initialFormValue = this.form.getRawValue();
     }
 
     save() {
-        this.dialogRef.close({
-            type: this.recategorizeImageForm.get('type').value,
-            comment: this.recategorizeImageForm.get('comment').value,
+        this._dialogRef.close({
+            type: this.form.get('type').value,
+            comment: this.form.get('comment').value,
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html
index 5a7e4f1a5..287629e70 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html
@@ -4,16 +4,16 @@
             (data.removeFromDictionary
                 ? 'remove-annotations-dialog.remove-from-dictionary.title'
                 : 'remove-annotations-dialog.remove-only-here.title'
-            ) | translate
+            ) | translate: { hint: data.hint }
         }}
     

-    

+    
         

             {{
                 (data.removeFromDictionary
                     ? 'remove-annotations-dialog.remove-from-dictionary.question'
                     : 'remove-annotations-dialog.remove-only-here.question'
-                ) | translate
+                ) | translate: { hint: data.hint }
             }}
 
             

@@ -46,12 +46,12 @@
         

 
         

-            
             

         

     
 
-    
+    
 

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
index 8c8f00246..16591d344 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
@@ -1,15 +1,16 @@
-import { Component, Inject } from '@angular/core';
+import { Component, Inject, Injector } from '@angular/core';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { TranslateService } from '@ngx-translate/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { PermissionsService } from '@services/permissions.service';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { humanize } from '@iqser/common-ui';
+import { FormBuilder, Validators } from '@angular/forms';
+import { BaseDialogComponent, humanize } from '@iqser/common-ui';
 import { Dossier } from '@red/domain';
 
 export interface RemoveAnnotationsDialogInput {
     annotationsToRemove: AnnotationWrapper[];
     removeFromDictionary: boolean;
+    hint: boolean;
     dossier: Dossier;
 }
 
@@ -17,23 +18,24 @@ export interface RemoveAnnotationsDialogInput {
     templateUrl: './remove-annotations-dialog.component.html',
     styleUrls: ['./remove-annotations-dialog.component.scss'],
 })
-export class RemoveAnnotationsDialogComponent {
-    redactionForm: FormGroup;
-
+export class RemoveAnnotationsDialogComponent extends BaseDialogComponent {
     constructor(
         private readonly _translateService: TranslateService,
         private readonly _formBuilder: FormBuilder,
         readonly permissionsService: PermissionsService,
-        public dialogRef: MatDialogRef,
+        protected readonly _injector: Injector,
+        protected readonly _dialogRef: MatDialogRef,
         @Inject(MAT_DIALOG_DATA) public data: RemoveAnnotationsDialogInput,
     ) {
-        this.redactionForm = this._formBuilder.group({
+        super(_injector, _dialogRef);
+        this.form = this._formBuilder.group({
             comment: this.permissionsService.isApprover(this.data.dossier) ? [null] : [null, Validators.required],
         });
+        this.initialFormValue = this.form.getRawValue();
     }
 
-    confirm() {
-        this.dialogRef.close({ comment: this.redactionForm.getRawValue().comment });
+    save() {
+        this._dialogRef.close({ comment: this.form.getRawValue().comment });
     }
 
     printable(annotation: AnnotationWrapper) {
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html
index 72a505f70..a83614b35 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html
@@ -1,5 +1,5 @@
 

-    

+    
         

 
         

@@ -10,12 +10,12 @@
         

 
         

-            
             

         

     

 
-    
+    
 

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts
index 51e55a1ef..14b6e1b64 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.ts
@@ -1,34 +1,40 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, Injector, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, Validators } from '@angular/forms';
 import { PermissionsService } from '@services/permissions.service';
 import { Dossier } from '@red/domain';
+import { BaseDialogComponent } from '@iqser/common-ui';
 
 @Component({
     templateUrl: './resize-annotation-dialog.component.html',
 })
-export class ResizeAnnotationDialogComponent implements OnInit {
-    resizeForm: FormGroup;
+export class ResizeAnnotationDialogComponent extends BaseDialogComponent implements OnInit {
     isDocumentAdmin: boolean;
 
     constructor(
         private readonly _permissionsService: PermissionsService,
         private readonly _formBuilder: FormBuilder,
-        public dialogRef: MatDialogRef,
+        protected readonly _injector: Injector,
+        protected readonly _dialogRef: MatDialogRef,
         @Inject(MAT_DIALOG_DATA) private readonly _data: { dossier: Dossier },
-    ) {}
+    ) {
+        super(_injector, _dialogRef);
+    }
 
     ngOnInit() {
+        super.ngOnInit();
+
         this.isDocumentAdmin = this._permissionsService.isApprover(this._data.dossier);
 
-        this.resizeForm = this._formBuilder.group({
+        this.form = this._formBuilder.group({
             comment: this.isDocumentAdmin ? [null] : [null, Validators.required],
         });
+        this.initialFormValue = this.form.getRawValue();
     }
 
     save() {
-        this.dialogRef.close({
-            comment: this.resizeForm.get('comment').value,
+        this._dialogRef.close({
+            comment: this.form.get('comment').value,
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts
index 44c107c38..9fd58b8cb 100644
--- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts
+++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts
@@ -3,17 +3,14 @@ import { CommonModule } from '@angular/common';
 import { AddDossierDialogComponent } from './dialogs/add-dossier-dialog/add-dossier-dialog.component';
 import { AssignReviewerApproverDialogComponent } from './dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component';
 import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
-import { ForceRedactionDialogComponent } from './dialogs/force-redaction-dialog/force-redaction-dialog.component';
+import { ForceAnnotationDialogComponent } from './dialogs/force-redaction-dialog/force-annotation-dialog.component';
 import { RemoveAnnotationsDialogComponent } from './dialogs/remove-annotations-dialog/remove-annotations-dialog.component';
 import { DocumentInfoDialogComponent } from './dialogs/document-info-dialog/document-info-dialog.component';
 import { SharedModule } from '@shared/shared.module';
 import { DossiersRoutingModule } from './dossiers-routing.module';
 import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module';
 import { DossiersDialogService } from './services/dossiers-dialog.service';
-import { AnnotationActionsService } from './services/annotation-actions.service';
-import { PdfViewerDataService } from './services/pdf-viewer-data.service';
 import { ManualAnnotationService } from './services/manual-annotation.service';
-import { AnnotationDrawService } from './services/annotation-draw.service';
 import { AnnotationProcessingService } from './services/annotation-processing.service';
 import { EditDossierDialogComponent } from './dialogs/edit-dossier-dialog/edit-dossier-dialog.component';
 import { EditDossierGeneralInfoComponent } from './dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component';
@@ -35,7 +32,7 @@ const dialogs = [
     AddDossierDialogComponent,
     EditDossierDialogComponent,
     ManualAnnotationDialogComponent,
-    ForceRedactionDialogComponent,
+    ForceAnnotationDialogComponent,
     RemoveAnnotationsDialogComponent,
     ResizeAnnotationDialogComponent,
     DocumentInfoDialogComponent,
@@ -56,14 +53,7 @@ const components = [
     ...dialogs,
 ];
 
-const services = [
-    DossiersDialogService,
-    AnnotationActionsService,
-    ManualAnnotationService,
-    PdfViewerDataService,
-    AnnotationDrawService,
-    AnnotationProcessingService,
-];
+const services = [DossiersDialogService, ManualAnnotationService, AnnotationProcessingService];
 
 @NgModule({
     declarations: [...components],
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts
index afdffeb42..87f035344 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts
@@ -3,7 +3,7 @@ import { Dossier, DossierAttributeWithValue, DossierStats } from '@red/domain';
 import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { FilesService } from '@services/entity-services/files.service';
-import { Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 import { FilesMapService } from '@services/entity-services/files-map.service';
@@ -43,7 +43,7 @@ export class DossierDetailsStatsComponent implements OnInit {
     openEditDossierDialog(section: string): void {
         const data = { dossierId: this.dossier.dossierId, section };
         this._dialogService.openDialog('editDossier', null, data, async () => {
-            await this._filesService.loadAll(this.dossier.dossierId).toPromise();
+            await firstValueFrom(this._filesService.loadAll(this.dossier.dossierId));
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
index 35f209cb4..3c6148a13 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
@@ -9,7 +9,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 import { pluck, switchMap } from 'rxjs/operators';
 import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
@@ -73,7 +73,7 @@ export class DossierDetailsComponent {
     async assignOwner(user: User | string, dossier: Dossier) {
         const owner = typeof user === 'string' ? this._userService.find(user) : user;
         const dossierRequest: IDossierRequest = { ...dossier, ownerId: owner.id };
-        await this.dossiersService.createOrUpdate(dossierRequest).toPromise();
+        await firstValueFrom(this.dossiersService.createOrUpdate(dossierRequest));
 
         const ownerName = this._userService.getNameForId(owner.id);
         const dossierName = dossier.dossierName;
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html
index 0af735eb1..4a3050292 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html
@@ -5,10 +5,15 @@
     [showCloseButton]="true"
     [viewModeSelection]="viewModeSelection"
 >
-    
+    
 
      this.sortingService.defaultSort(entities)));
         sortedEntities$.pipe(take(1)).subscribe(entities => {
             const fileName = this.dossier.dossierName + '.export.csv';
-            saveAsCSV(
-                fileName,
-                entities,
-                [
-                    'dossierId',
-                    'fileId',
-                    'filename',
-                    'primaryAttribute',
-                    'numberOfPages',
-                    'assignee',
-                    'workflowStatus',
-                    'processingStatus',
-                    'lastUpdated',
-                    'lastUploaded',
-                    'lastProcessed',
-                    'hasHints',
-                    'hasImages',
-                    'hasRedactions',
-                    'hasUpdates',
-                    'excluded',
-                ],
-                fsv => ({ ...fsv, assignee: this._userService.getNameForId(fsv.assignee) }),
-            );
+            const mapper = (file?: IFile) => ({
+                ...file,
+                assignee: this._userService.getNameForId(file.assignee),
+                primaryAttribute: this._primaryFileAttributeService.getPrimaryFileAttributeValue(file, this.dossier.dossierTemplateId),
+            });
+            const fileFields = [
+                'dossierId',
+                'fileId',
+                'filename',
+                'primaryAttribute',
+                'numberOfPages',
+                'assignee',
+                'workflowStatus',
+                'processingStatus',
+                'lastUpdated',
+                'lastUploaded',
+                'lastProcessed',
+                'hasHints',
+                'hasImages',
+                'hasRedactions',
+                'hasUpdates',
+                'excluded',
+            ];
+            saveAsCSV(fileName, entities, fileFields, mapper);
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts
index dbb49eea1..4b205542e 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { File } from '@red/domain';
-import { FileAttributesService } from '@services/entity-services/file-attributes.service';
+import { PrimaryFileAttributeService } from '../../../../../../../services/primary-file-attribute.service';
 
 @Component({
     selector: 'redaction-file-name-column',
@@ -13,19 +13,9 @@ export class FileNameColumnComponent implements OnChanges {
     @Input() dossierTemplateId: string;
     primaryAttribute: string;
 
-    constructor(private readonly _fileAttributesService: FileAttributesService) {}
+    constructor(private readonly _primaryFileAttributeService: PrimaryFileAttributeService) {}
 
     ngOnChanges() {
-        const fileAttributesConfig = this._fileAttributesService.getFileAttributeConfig(this.dossierTemplateId);
-        if (fileAttributesConfig) {
-            const primary = fileAttributesConfig.fileAttributeConfigs?.find(c => c.primaryAttribute);
-            if (primary && this.file.fileAttributes?.attributeIdToValue) {
-                this.primaryAttribute = this.file.fileAttributes?.attributeIdToValue[primary.id];
-            }
-
-            if (!this.primaryAttribute) {
-                this.primaryAttribute = '-';
-            }
-        }
+        this.primaryAttribute = this._primaryFileAttributeService.getPrimaryFileAttributeValue(this.file, this.dossierTemplateId);
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html
index f5d0bc0e4..9ae92f1b8 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html
@@ -1,6 +1,11 @@
 

     
-    
+    
     
     
     
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts
index 0b69ee12a..cd7ceaddc 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts
@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { AppStateService } from '@state/app-state.service';
 import { File } from '@red/domain';
 import { DossiersService } from '@services/entity-services/dossiers.service';
+import { UserService } from '../../../../../../../services/user.service';
 
 @Component({
     selector: 'redaction-file-workload',
@@ -12,7 +13,11 @@ import { DossiersService } from '@services/entity-services/dossiers.service';
 export class FileWorkloadComponent {
     @Input() file: File;
 
-    constructor(private readonly _appStateService: AppStateService, private readonly _dossiersService: DossiersService) {}
+    constructor(
+        public readonly userService: UserService,
+        private readonly _appStateService: AppStateService,
+        private readonly _dossiersService: DossiersService,
+    ) {}
 
     get suggestionColor() {
         return this._getDictionaryColor('suggestion');
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss
index 9468a2610..3f2e7cc60 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss
@@ -54,7 +54,3 @@ redaction-file-workload {
 redaction-file-actions:not(.keep-visible) {
     display: none;
 }
-
-.mt-4 {
-    margin-top: 4px;
-}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
index 77a6b107e..21df3658c 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
@@ -102,7 +102,7 @@ export class ConfigService {
         };
     }
 
-    actionConfig(dossierId: string): List {
+    actionConfig(dossierId: string, disabled$: Observable): List {
         return [
             {
                 label: this._translateService.instant('dossier-overview.header-actions.edit'),
@@ -110,6 +110,7 @@ export class ConfigService {
                 icon: 'iqser:edit',
                 hide: !this._userService.currentUser.isManager,
                 helpModeKey: 'edit-dossier-attributes',
+                disabled$,
             },
         ];
     }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
index bf8865bdd..ccf776a8f 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
@@ -15,19 +15,19 @@ import { FileDropOverlayService } from '@upload-download/services/file-drop-over
 import { FileUploadModel } from '@upload-download/model/file-upload.model';
 import { FileUploadService } from '@upload-download/services/file-upload.service';
 import { StatusOverlayService } from '@upload-download/services/status-overlay.service';
-import * as moment from 'moment';
-import { Observable, timer } from 'rxjs';
+import { Observable } from 'rxjs';
 import { filter, skip, switchMap, tap } from 'rxjs/operators';
 import { convertFiles, Files, handleFileDrop } from '@utils/index';
 import {
     CircleButtonTypes,
+    CustomError,
     DefaultListingServices,
+    ErrorService,
     ListingComponent,
     ListingModes,
     LoadingService,
     NestedFilter,
     OnAttach,
-    OnDetach,
     TableColumnConfig,
     TableComponent,
     WorkflowConfig,
@@ -37,7 +37,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { PermissionsService } from '@services/permissions.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { FileAttributesService } from '@services/entity-services/file-attributes.service';
-import { ConfigService as AppConfigService } from '@services/config.service';
 import { ConfigService } from '../config.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
@@ -45,7 +44,6 @@ import { LongPressEvent } from '@shared/directives/long-press.directive';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 import { FilesService } from '@services/entity-services/files.service';
-import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
 
 @Component({
     templateUrl: './dossier-overview-screen.component.html',
@@ -53,7 +51,7 @@ import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
     providers: [...DefaultListingServices, { provide: ListingComponent, useExisting: forwardRef(() => DossierOverviewScreenComponent) }],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DossierOverviewScreenComponent extends ListingComponent implements OnInit, OnDestroy, OnDetach, OnAttach {
+export class DossierOverviewScreenComponent extends ListingComponent implements OnInit, OnDestroy, OnAttach {
     readonly listingModes = ListingModes;
     readonly circleButtonTypes = CircleButtonTypes;
     readonly tableHeaderLabel = _('dossier-overview.table-header.title');
@@ -78,21 +76,21 @@ export class DossierOverviewScreenComponent extends ListingComponent imple
     constructor(
         protected readonly _injector: Injector,
         private readonly _router: Router,
-        readonly permissionsService: PermissionsService,
         private readonly _loadingService: LoadingService,
         private readonly _dossiersService: DossiersService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
-        private readonly _appConfigService: AppConfigService,
         private readonly _fileUploadService: FileUploadService,
         private readonly _filesService: FilesService,
         private readonly _statusOverlayService: StatusOverlayService,
         private readonly _fileDropOverlayService: FileDropOverlayService,
         private readonly _dossierAttributesService: DossierAttributesService,
         private readonly _fileAttributesService: FileAttributesService,
-        readonly configService: ConfigService,
         private readonly _userPreferenceService: UserPreferenceService,
         private readonly _fileMapService: FilesMapService,
-        activatedRoute: ActivatedRoute,
+        private readonly _errorService: ErrorService,
+        readonly permissionsService: PermissionsService,
+        readonly configService: ConfigService,
+        readonly activatedRoute: ActivatedRoute,
     ) {
         super(_injector);
         this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId');
@@ -118,6 +116,8 @@ export class DossierOverviewScreenComponent extends ListingComponent imple
     async ngOnInit(): Promise {
         this._loadEntitiesFromState();
 
+        this._setRemovableSubscriptions();
+
         this.addSubscription = this._fileMapService
             .get$(this.dossierId)
             .pipe(
@@ -128,18 +128,17 @@ export class DossierOverviewScreenComponent extends ListingComponent imple
 
         this._fileDropOverlayService.initFileDropHandling(this.dossierId);
 
-        this.addSubscription = timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL)
-            .pipe(
-                switchMap(() => this._filesService.hasChanges$(this.dossierId)),
-                filter(changed => changed),
-                switchMap(() => this._reloadFiles()),
-            )
-            .subscribe();
-
         this.addSubscription = this.configService.listingMode$.subscribe(() => {
             this._computeAllFilters();
         });
 
+        this.addSubscription = this._dossiersService.dossierFileChanges$
+            .pipe(
+                filter(dossierId => dossierId === this.dossierId),
+                switchMap(dossierId => this._filesService.loadAll(dossierId)),
+            )
+            .subscribe();
+
         this.addSubscription = this._dossierTemplatesService
             .getEntityChanged$(this.currentDossier.dossierTemplateId)
             .pipe(
@@ -166,11 +165,10 @@ export class DossierOverviewScreenComponent extends ListingComponent imple
 
     ngOnAttach() {
         this._fileDropOverlayService.initFileDropHandling(this.dossierId);
+        this._setRemovableSubscriptions();
         this._tableComponent?.scrollToLastIndex();
     }
 
-    ngOnDetach() {}
-
     forceReanalysisAction($event: LongPressEvent) {
         this.analysisForced = !$event.touchEnd && this._userPreferenceService.areDevFeaturesEnabled;
     }
@@ -192,8 +190,18 @@ export class DossierOverviewScreenComponent extends ListingComponent imple
         (this._fileInput as any).nativeElement.value = null;
     }
 
-    recentlyModifiedChecker = (file: File) =>
-        moment(file.lastUpdated).add(this._appConfigService.values.RECENT_PERIOD_IN_HOURS, 'hours').isAfter(moment());
+    private _setRemovableSubscriptions(): void {
+        this.addActiveScreenSubscription = this._dossiersService
+            .getEntityDeleted$(this.dossierId)
+            .pipe(tap(() => this._handleDeletedDossier()))
+            .subscribe();
+    }
+
+    private _handleDeletedDossier(): void {
+        this._errorService.set(
+            new CustomError(_('error.deleted-entity.dossier.label'), _('error.deleted-entity.dossier.action'), 'iqser:expand'),
+        );
+    }
 
     private _updateFileAttributes(): void {
         this._fileAttributeConfigs =
@@ -204,11 +212,6 @@ export class DossierOverviewScreenComponent extends ListingComponent imple
         this._computeAllFilters();
     }
 
-    private async _reloadFiles() {
-        await this._filesService.loadAll(this.dossierId).toPromise();
-        this._computeAllFilters();
-    }
-
     private _loadEntitiesFromState() {
         this.currentDossier = this._dossiersService.find(this.dossierId);
         this._computeAllFilters();
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts
index dd8f8c967..a0b27b673 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts
@@ -8,6 +8,7 @@ import { FileAssignService } from '../../../shared/services/file-assign.service'
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ReanalysisService } from '../../../../../services/reanalysis.service';
 import { FileManagementService } from '@services/entity-services/file-management.service';
+import { firstValueFrom } from 'rxjs';
 
 @Injectable()
 export class BulkActionsService {
@@ -28,13 +29,13 @@ export class BulkActionsService {
             this._assignFiles(files, 'approver', true);
         } else {
             this._loadingService.start();
-            await this._filesService
-                .setUnderApprovalFor(
+            await firstValueFrom(
+                this._filesService.setUnderApprovalFor(
                     files.map(f => f.id),
                     dossier.id,
                     dossier.approverIds[0],
-                )
-                .toPromise();
+                ),
+            );
             this._loadingService.stop();
         }
     }
@@ -45,12 +46,12 @@ export class BulkActionsService {
 
     async ocr(files: File[]) {
         this._loadingService.start();
-        await this._reanalysisService
-            .ocrFiles(
+        await firstValueFrom(
+            this._reanalysisService.ocrFiles(
                 files.map(f => f.fileId),
                 files[0].dossierId,
-            )
-            .toPromise();
+            ),
+        );
         this._loadingService.stop();
     }
 
@@ -64,12 +65,12 @@ export class BulkActionsService {
             }),
             async () => {
                 this._loadingService.start();
-                await this._fileManagementService
-                    .delete(
+                await firstValueFrom(
+                    this._fileManagementService.delete(
                         files.map(item => item.fileId),
                         files[0].dossierId,
-                    )
-                    .toPromise();
+                    ),
+                );
                 this._loadingService.stop();
             },
         );
@@ -78,18 +79,18 @@ export class BulkActionsService {
     async reanalyse(files: File[]) {
         this._loadingService.start();
         const fileIds = files.filter(file => file.analysisRequired).map(file => file.fileId);
-        await this._reanalysisService.reanalyzeFilesForDossier(fileIds, files[0].dossierId).toPromise();
+        await firstValueFrom(this._reanalysisService.reanalyzeFilesForDossier(fileIds, files[0].dossierId));
         this._loadingService.stop();
     }
 
     async backToUnderReview(files: File[]): Promise {
         this._loadingService.start();
-        await this._filesService
-            .setUnderReviewFor(
+        await firstValueFrom(
+            this._filesService.setUnderReviewFor(
                 files.map(f => f.id),
                 files[0].dossierId,
-            )
-            .toPromise();
+            ),
+        );
         this._loadingService.stop();
     }
 
@@ -105,23 +106,23 @@ export class BulkActionsService {
                 }),
                 async () => {
                     this._loadingService.start();
-                    await this._filesService
-                        .setApprovedFor(
+                    await firstValueFrom(
+                        this._filesService.setApprovedFor(
                             files.map(f => f.id),
                             files[0].dossierId,
-                        )
-                        .toPromise();
+                        ),
+                    );
                     this._loadingService.stop();
                 },
             );
         } else {
             this._loadingService.start();
-            await this._filesService
-                .setApprovedFor(
+            await firstValueFrom(
+                this._filesService.setApprovedFor(
                     files.map(f => f.id),
                     files[0].dossierId,
-                )
-                .toPromise();
+                ),
+            );
             this._loadingService.stop();
         }
     }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html
index 7ab3ea424..c37bd2a84 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html
@@ -9,10 +9,10 @@
 >
     
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
index fd02bf16f..9c93cf143 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
@@ -9,6 +9,7 @@ import { UserPreferenceService } from '@services/user-preference.service';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 import { ReanalysisService } from '@services/reanalysis.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-dossiers-listing-actions',
@@ -60,6 +61,6 @@ export class DossiersListingActionsComponent implements OnChanges {
 
     async reanalyseDossier($event: MouseEvent, id: string): Promise {
         $event.stopPropagation();
-        await this._reanalysisService.reanalyzeDossier(id).toPromise();
+        await firstValueFrom(this._reanalysisService.reanalyzeDossier(id));
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts
index cb44b7a4c..68f053b36 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts
@@ -38,10 +38,10 @@ export class DossiersListingDetailsComponent {
 
     private async _toDossierChartData(dossiers: Dossier[]): Promise {
         // TODO: deleted dossiers count should come with stats
-        const deletedDossiers = await this.dossiersService.getDeleted();
+        // const deletedDossiers = await this.dossiersService.getDeleted();
         return [
             { value: dossiers.length, color: 'ACTIVE', label: _('active') },
-            { value: deletedDossiers.length, color: 'DELETED', label: _('archived') },
+            // { value: deletedDossiers.length, color: 'DELETED', label: _('archived') },
         ];
     }
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html
index 7f8d42a1e..c12eabe47 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html
@@ -9,28 +9,28 @@
     

 

 
-

-    

+

+    

         
         {{ dossierStats.numberOfFiles }}
     

 
-    

+    

         
         {{ dossierStats.numberOfPages }}
     

 
-    

+    

         
         {{ dossier.memberIds.length }}
     

 
-    

+    

         
         {{ dossier.date | date: 'mediumDate' }}
     

 
-    

+    

         
         {{ dossier.dueDate | date: 'mediumDate' }}
     

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts
index 5a270d9fc..bbc7be107 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts
@@ -3,6 +3,9 @@ import { Dossier, DossierStats } from '@red/domain';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
+import * as moment from 'moment';
+
+const DUE_DATE_WARN_DAYS = 14;
 
 @Component({
     selector: 'redaction-dossiers-listing-dossier-name',
@@ -20,6 +23,18 @@ export class DossiersListingDossierNameComponent {
         private readonly _dossiersService: DossiersService,
     ) {}
 
+    get approachingDueDate(): boolean {
+        return this._dueDateDaysDiff >= 0 && this._dueDateDaysDiff <= DUE_DATE_WARN_DAYS;
+    }
+
+    get passedDueDate(): boolean {
+        return this._dueDateDaysDiff < 0;
+    }
+
+    private get _dueDateDaysDiff(): number {
+        return moment(this.dossier.dueDate).diff(moment().startOf('day'), 'days');
+    }
+
     getDossierTemplateNameFor(dossierTemplateId: string): string {
         return this._dossierTemplatesService.find(dossierTemplateId).name;
     }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
index c7ba3f10b..d70a2ae00 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
@@ -1,19 +1,17 @@
-import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { Dossier } from '@red/domain';
 import { UserService } from '@services/user.service';
 import { PermissionsService } from '@services/permissions.service';
 import { TranslateChartService } from '@services/translate-chart.service';
-import { timer } from 'rxjs';
 import { Router } from '@angular/router';
 import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
-import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, OnDetach, TableComponent } from '@iqser/common-ui';
+import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, TableComponent } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ConfigService } from '../config.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
-import { switchMap, tap } from 'rxjs/operators';
-import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
+import { tap } from 'rxjs/operators';
 
 @Component({
     templateUrl: './dossiers-listing-screen.component.html',
@@ -25,7 +23,7 @@ import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
     ],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DossiersListingScreenComponent extends ListingComponent implements OnInit, OnDestroy, OnAttach, OnDetach {
+export class DossiersListingScreenComponent extends ListingComponent implements OnInit, OnAttach {
     readonly currentUser = this._userService.currentUser;
     readonly tableColumnConfigs = this._configService.tableConfig;
     readonly tableHeaderLabel = _('dossier-listing.table-header.title');
@@ -57,22 +55,13 @@ export class DossiersListingScreenComponent extends ListingComponent im
     }
 
     ngOnInit(): void {
-        this.addSubscription = timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL)
-            .pipe(switchMap(() => this._dossiersService.loadAllIfChanged()))
-            .subscribe();
-
         this.addSubscription = this._dossiersService.all$.pipe(tap(() => this._computeAllFilters())).subscribe();
     }
 
     ngOnAttach(): void {
-        this.ngOnInit();
         this._tableComponent?.scrollToLastIndex();
     }
 
-    ngOnDetach(): void {
-        this.ngOnDestroy();
-    }
-
     openAddDossierDialog(): void {
         this._dialogService.openDialog('addDossier', null, null, async (addResponse: { dossier: Dossier; addMembers: boolean }) => {
             await this._router.navigate([addResponse.dossier.routerLink]);
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html
index 4ede0e6b6..90a83df7a 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html
@@ -42,7 +42,7 @@
         >
 
         
 
         
+
+        
 
+        
+
         
 
         
 
         (
+            AcceptRecommendationDialogComponent,
+            { ...defaultDialogConfig, autoFocus: true, data: { annotations: this.annotations, file: this.file } },
+        );
+        const dialogClosed = dialogRef.afterClosed().pipe(filter(value => !!value && !!value.annotations));
+        dialogClosed.subscribe(({ annotations, comment: commentText }) => {
+            const comment = commentText ? { text: commentText } : undefined;
+            this.annotationActionsService.convertRecommendationToAnnotation(
+                $event,
+                annotations,
+                this.file,
+                this.annotationsChanged,
+                comment,
+            );
+        });
+    }
+
     hideAnnotation($event: MouseEvent) {
         $event.stopPropagation();
         this.viewer.Core.annotationManager.hideAnnotations(this.viewerAnnotations);
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.html
new file mode 100644
index 000000000..a23949aed
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.html
@@ -0,0 +1,22 @@
+

+    
+
+    

+        

+            {{ annotation.typeLabel | translate }}
+        

+        

+            
+                {{ annotation.descriptor | translate }}: {{ annotation.type | humanize: false }}
+        

+        

+            : {{ annotation.shortContent }}
+        

+    

+
+    

+        
+    

+

diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.scss
new file mode 100644
index 000000000..06d7ec7bb
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.scss
@@ -0,0 +1,15 @@
+.details {
+    display: flex;
+    position: relative;
+    font-size: 11px;
+    line-height: 14px;
+}
+
+.active-icon-marker-container {
+    min-width: 20px;
+}
+
+redaction-type-annotation-icon {
+    margin-top: 6px;
+    margin-right: 10px;
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.ts
new file mode 100644
index 000000000..0ce73621e
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-card/annotation-card.component.ts
@@ -0,0 +1,18 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AnnotationWrapper } from '../../../../../../models/file/annotation.wrapper';
+import { File } from '@red/domain';
+import { MultiSelectService } from '../../services/multi-select.service';
+
+@Component({
+    selector: 'redaction-annotation-card',
+    templateUrl: './annotation-card.component.html',
+    styleUrls: ['./annotation-card.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AnnotationCardComponent {
+    @Input() annotation: AnnotationWrapper;
+    @Input() file: File;
+    @Input() isSelected = false;
+
+    constructor(readonly multiSelectService: MultiSelectService) {}
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.html
new file mode 100644
index 000000000..fe7f4ac8d
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.html
@@ -0,0 +1,34 @@
+

+    

+        

+            

+                {{ annotationReferences.length }}
+                {{ (annotationReferences.length === 1 ? 'references.singular' : 'references.plural') | translate }}
+            

+            
+        

+        

+            

+                

+                    
+                    
+                

+            

+            

+                

+                    
+                    
+                

+            

+        

+    

+

diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.scss
new file mode 100644
index 000000000..537436d50
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.scss
@@ -0,0 +1,41 @@
+@use 'variables';
+
+.references-dialog {
+    position: fixed;
+    margin: 0;
+    width: 280px;
+    max-height: 380px;
+    right: 370px;
+    top: 165px;
+
+    .references-header {
+        padding: 8px 8px 8px 13px;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .annotations-container {
+        flex-direction: column;
+        overflow: auto;
+        max-height: 330px;
+
+        .annotation-container {
+            width: 100%;
+            border-top: 1px solid rgba(226, 228, 233, 0.9);
+
+            &.active {
+                background-color: variables.$grey-8;
+            }
+
+            &:not(:first-child) {
+                cursor: pointer;
+            }
+
+            .annotation-card-container {
+                padding: 11px 16px 16px 10px;
+                justify-content: space-between;
+                align-items: flex-start;
+            }
+        }
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.ts
new file mode 100644
index 000000000..b759f0d94
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-list/annotation-references-list.component.ts
@@ -0,0 +1,30 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
+import { AnnotationWrapper } from '@models/file/annotation.wrapper';
+import { AnnotationReferencesService } from '../../services/annotation-references.service';
+import { File } from '@red/domain';
+import { FileDataModel } from '@models/file/file-data.model';
+
+@Component({
+    selector: 'redaction-annotation-references-list',
+    templateUrl: './annotation-references-list.component.html',
+    styleUrls: ['./annotation-references-list.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AnnotationReferencesListComponent implements OnChanges {
+    @Input() annotation: AnnotationWrapper;
+    @Input() file: File;
+    @Input() fileData: FileDataModel;
+    @Input() selectedAnnotations: AnnotationWrapper[];
+    @Output() readonly referenceClicked = new EventEmitter();
+    annotationReferences: AnnotationWrapper[];
+
+    constructor(readonly annotationReferencesService: AnnotationReferencesService) {}
+
+    ngOnChanges(): void {
+        this.annotationReferences = this.fileData.allAnnotations.filter(a => this.annotation.reference.includes(a.annotationId));
+    }
+
+    isSelected(annotationId: string): boolean {
+        return this.selectedAnnotations.some(a => a.annotationId === annotationId);
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html
new file mode 100644
index 000000000..0b5e6e40b
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.html
@@ -0,0 +1,6 @@
+

+    
+    

+        {{ number }}
+    

+

diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss
new file mode 100644
index 000000000..d8ac8ff76
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.scss
@@ -0,0 +1,23 @@
+.page-number-wrapper {
+    position: relative;
+    height: 30px;
+
+    mat-icon {
+        width: 27px;
+        height: 100%;
+    }
+
+    .text {
+        left: 0;
+        right: 0;
+        bottom: 0;
+        top: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 11px;
+        line-height: 11px;
+        position: absolute;
+        background: transparent;
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts
new file mode 100644
index 000000000..55edb86bc
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-references-page-indicator/annotation-references-page-indicator.component.ts
@@ -0,0 +1,11 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+@Component({
+    selector: 'redaction-annotation-references-page-indicator',
+    templateUrl: './annotation-references-page-indicator.component.html',
+    styleUrls: ['./annotation-references-page-indicator.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AnnotationReferencesPageIndicatorComponent {
+    @Input() number: number;
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html
index 368df6874..77df13518 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html
@@ -11,31 +11,13 @@
     

 
     

-        

-            
-
-            

-                

-                    {{ annotation.typeLabel | translate }}
-                

-                

-                    
-                        {{ annotation.descriptor | translate }}: {{ annotation.type | humanize: false }}
-                

-                

-                    : {{ annotation.shortContent }}
-                

-            

-
-            

-                
-            

-        

+        
 
         

             

 

+
+
+    
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.scss
index e159e24af..047e483e4 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.scss
@@ -16,10 +16,6 @@
         min-height: 100%;
     }
 
-    .active-icon-marker-container {
-        min-width: 20px;
-    }
-
     &.active {
         &:not(.lower-height) .active-bar-marker {
             background-color: variables.$primary;
@@ -40,11 +36,6 @@
             color: variables.$grey-7;
         }
 
-        .details {
-            display: flex;
-            position: relative;
-        }
-
         .actions-wrapper {
             display: flex;
             justify-content: space-between;
@@ -74,11 +65,6 @@
                 }
             }
         }
-
-        redaction-type-annotation-icon {
-            margin-top: 6px;
-            margin-right: 10px;
-        }
     }
 
     &:hover,
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts
index 437b31c31..19877e3bc 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts
@@ -1,8 +1,10 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, TemplateRef } from '@angular/core';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { HelpModeService, IqserEventTarget } from '@iqser/common-ui';
+import { FilterService, HelpModeService, IqserEventTarget } from '@iqser/common-ui';
 import { File } from '@red/domain';
 import { MultiSelectService } from '../../services/multi-select.service';
+import { AnnotationReferencesService } from '../../services/annotation-references.service';
+import { FileDataModel } from '../../../../../../models/file/file-data.model';
 
 @Component({
     selector: 'redaction-annotations-list',
@@ -12,6 +14,7 @@ import { MultiSelectService } from '../../services/multi-select.service';
 })
 export class AnnotationsListComponent implements OnChanges {
     @Input() file: File;
+    @Input() fileData: FileDataModel;
     @Input() annotations: AnnotationWrapper[];
     @Input() selectedAnnotations: AnnotationWrapper[];
     @Input() annotationActionsTemplate: TemplateRef;
@@ -22,7 +25,12 @@ export class AnnotationsListComponent implements OnChanges {
     @Output() readonly selectAnnotations = new EventEmitter();
     @Output() readonly deselectAnnotations = new EventEmitter();
 
-    constructor(readonly multiSelectService: MultiSelectService, readonly helpModeService: HelpModeService) {}
+    constructor(
+        readonly multiSelectService: MultiSelectService,
+        readonly helpModeService: HelpModeService,
+        readonly annotationReferencesService: AnnotationReferencesService,
+        private readonly _filterService: FilterService,
+    ) {}
 
     ngOnChanges(changes: SimpleChanges): void {
         if (changes.annotations && this.annotations) {
@@ -31,20 +39,27 @@ export class AnnotationsListComponent implements OnChanges {
     }
 
     annotationClicked(annotation: AnnotationWrapper, $event: MouseEvent): void {
-        if (($event.target as IqserEventTarget).localName === 'input') {
+        if (($event?.target as IqserEventTarget)?.localName === 'input') {
             return;
         }
         this.pagesPanelActive.emit(false);
         if (this.isSelected(annotation.annotationId)) {
             this.deselectAnnotations.emit([annotation]);
         } else {
-            if (this.canMultiSelect && ($event.ctrlKey || $event.metaKey) && this.selectedAnnotations.length > 0) {
+            if (this.canMultiSelect && ($event?.ctrlKey || $event?.metaKey) && this.selectedAnnotations.length > 0) {
                 this.multiSelectService.activate();
             }
             this.selectAnnotations.emit([annotation]);
         }
     }
 
+    referenceClicked(annotation: AnnotationWrapper): void {
+        this.annotationClicked(annotation, null);
+        if (this._filterService.filtersEnabled('primaryFilters')) {
+            this._filterService.toggleFilter('primaryFilters', annotation.superType, true);
+        }
+    }
+
     isSelected(annotationId: string): boolean {
         return !!this.selectedAnnotations?.find(a => a?.annotationId === annotationId);
     }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.html
index 8686a4b2e..427cebe5c 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.html
@@ -8,7 +8,7 @@
 
             

                 ;
-    @HostBinding('class.hidden') private _hidden = true;
+    @HostBinding('class.hidden') _hidden = true;
     @ViewChild(InputWithActionComponent) private readonly _input: InputWithActionComponent;
     private readonly _fileId: string;
     private readonly _dossierId: string;
@@ -28,49 +30,59 @@ export class CommentsComponent {
         readonly permissionsService: PermissionsService,
         private readonly _userService: UserService,
         private readonly _manualAnnotationService: ManualAnnotationService,
-        private readonly _changeDetectorRef: ChangeDetectorRef,
+        private readonly _commentingService: CommentingService,
+        private readonly _loadingService: LoadingService,
+        private readonly _changeRef: ChangeDetectorRef,
         readonly filesMapService: FilesMapService,
         activatedRoute: ActivatedRoute,
     ) {
+        super();
         this._fileId = activatedRoute.snapshot.paramMap.get('fileId');
         this._dossierId = activatedRoute.snapshot.paramMap.get('dossierId');
         this.file$ = filesMapService.watch$(this._dossierId, this._fileId);
     }
 
-    addComment(value: string): void {
+    ngOnChanges() {
+        this.addSubscription = this._commentingService
+            .isActive$(this.annotation.id)
+            .pipe(
+                tap(active => {
+                    this._hidden = !active;
+                }),
+            )
+            .subscribe();
+    }
+
+    async addComment(value: string): Promise {
         if (!value) {
             return;
         }
-        this._manualAnnotationService
-            .addComment(value, this.annotation.id, this._dossierId, this._fileId)
-            .toPromise()
-            .then(commentId => {
-                this.annotation.comments.push({
-                    text: value,
-                    id: commentId,
-                    annotationId: this.annotation.id,
-                    user: this._userService.currentUser.id,
-                });
-                this._input.reset();
-                this._changeDetectorRef.markForCheck();
-            });
+        this._loadingService.start();
+        const commentId = await firstValueFrom(
+            this._manualAnnotationService.addComment(value, this.annotation.id, this._dossierId, this._fileId),
+        );
+        this.annotation.comments.push({
+            text: value,
+            id: commentId,
+            annotationId: this.annotation.id,
+            user: this._userService.currentUser.id,
+        });
+        this._input.reset();
+        this._changeRef.markForCheck();
+        this._loadingService.stop();
     }
 
     toggleExpandComments($event?: MouseEvent): void {
         $event?.stopPropagation();
-        this._hidden = !this._hidden;
+        this._commentingService.toggle(this.annotation.id);
     }
 
-    deleteComment(comment: IComment): void {
-        this._manualAnnotationService
-            .deleteComment(comment.id, this.annotation.id, this._dossierId, this._fileId)
-            .toPromise()
-            .then(() => {
-                this.annotation.comments.splice(this.annotation.comments.indexOf(comment), 1);
-                if (!this.annotation.comments.length) {
-                    this._hidden = true;
-                }
-                this._changeDetectorRef.markForCheck();
-            });
+    async deleteComment($event: MouseEvent, comment: IComment): Promise {
+        $event.stopPropagation();
+        this._loadingService.start();
+        await firstValueFrom(this._manualAnnotationService.deleteComment(comment.id, this.annotation.id, this._dossierId, this._fileId));
+        this.annotation.comments.splice(this.annotation.comments.indexOf(comment), 1);
+        this._changeRef.markForCheck();
+        this._loadingService.stop();
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts
index 16d2e1f4d..0ab68a6d7 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts
@@ -5,7 +5,7 @@ import { AutoUnsubscribe } from '@iqser/common-ui';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { DocumentInfoService } from '../../services/document-info.service';
 import { Observable } from 'rxjs';
-import { PermissionsService } from '../../../../../../services/permissions.service';
+import { PermissionsService } from '@services/permissions.service';
 
 @Component({
     selector: 'redaction-document-info [file] [dossier]',
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html
index 7111f4d66..e87104673 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html
@@ -38,13 +38,6 @@
         

     

 
-    

-        

-            
-            
-        

-    

-
     

         

             
             

 
@@ -211,6 +203,7 @@
                     [annotationActionsTemplate]="annotationActionsTemplate"
                     [annotations]="(displayedAnnotations$ | async)?.get(activeViewerPage)"
                     [canMultiSelect]="!isReadOnly"
+                    [fileData]="fileData"
                     [file]="file"
                     [selectedAnnotations]="selectedAnnotations"
                     iqserHelpMode="workload-annotations-list"
@@ -224,9 +217,9 @@
 
 
     
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts
index 8f7c86e16..2420dba07 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts
@@ -28,10 +28,12 @@ import { PermissionsService } from '@services/permissions.service';
 import { WebViewerInstance } from '@pdftron/webviewer';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
-import { File, IViewedPage } from '@red/domain';
+import { File } from '@red/domain';
 import { ExcludedPagesService } from '../../services/excluded-pages.service';
 import { MultiSelectService } from '../../services/multi-select.service';
 import { DocumentInfoService } from '../../services/document-info.service';
+import { SkippedService } from '../../services/skipped.service';
+import { FileDataModel } from '../../../../../../models/file/file-data.model';
 
 const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape'];
 const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
@@ -51,16 +53,14 @@ export class FileWorkloadComponent {
     @Input() activeViewerPage: number;
     @Input() shouldDeselectAnnotationsOnPageChange: boolean;
     @Input() dialogRef: MatDialogRef;
-    @Input() viewedPages: IViewedPage[];
     @Input() file!: File;
-    @Input() hideSkipped: boolean;
     @Input() annotationActionsTemplate: TemplateRef;
     @Input() viewer: WebViewerInstance;
+    @Input() fileData: FileDataModel;
     @Output() readonly shouldDeselectAnnotationsOnPageChangeChange = new EventEmitter();
     @Output() readonly selectAnnotations = new EventEmitter();
     @Output() readonly deselectAnnotations = new EventEmitter();
     @Output() readonly selectPage = new EventEmitter();
-    @Output() readonly toggleSkipped = new EventEmitter();
     @Output() readonly annotationsChanged = new EventEmitter();
     displayedPages: number[] = [];
     pagesPanelActive = true;
@@ -76,6 +76,7 @@ export class FileWorkloadComponent {
         readonly excludedPagesService: ExcludedPagesService,
         readonly multiSelectService: MultiSelectService,
         readonly documentInfoService: DocumentInfoService,
+        readonly skippedService: SkippedService,
         private readonly _permissionsService: PermissionsService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
         private readonly _filterService: FilterService,
@@ -225,7 +226,7 @@ export class FileWorkloadComponent {
 
     scrollAnnotationsToPage(page: number, mode: 'always' | 'if-needed' = 'if-needed'): void {
         if (this._annotationsElement) {
-            const elements = this._annotationsElement.nativeElement.querySelectorAll(`div[anotation-page-header="${page}"]`);
+            const elements: HTMLElement[] = this._annotationsElement.nativeElement.querySelectorAll(`div[anotation-page-header="${page}"]`);
             FileWorkloadComponent._scrollToFirstElement(elements, mode);
         }
     }
@@ -235,7 +236,7 @@ export class FileWorkloadComponent {
         if (!this.selectedAnnotations || this.selectedAnnotations.length === 0 || !this._annotationsElement) {
             return;
         }
-        const elements = this._annotationsElement.nativeElement.querySelectorAll(
+        const elements: HTMLElement[] = this._annotationsElement.nativeElement.querySelectorAll(
             `div[annotation-id="${this._firstSelectedAnnotation?.id}"].active`,
         );
         FileWorkloadComponent._scrollToFirstElement(elements);
@@ -412,7 +413,7 @@ export class FileWorkloadComponent {
 
     private _scrollQuickNavigationToPage(page: number) {
         if (this._quickNavigationElement) {
-            const elements = this._quickNavigationElement.nativeElement.querySelectorAll(`#quick-nav-page-${page}`);
+            const elements: HTMLElement[] = this._quickNavigationElement.nativeElement.querySelectorAll(`#quick-nav-page-${page}`);
             FileWorkloadComponent._scrollToFirstElement(elements);
         }
     }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts
index ba2eb3b72..b4689a5e2 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts
@@ -5,6 +5,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { File, IPageRange } from '@red/domain';
 import { ReanalysisService } from '@services/reanalysis.service';
 import { ExcludedPagesService } from '../../services/excluded-pages.service';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-page-exclusion',
@@ -57,15 +58,15 @@ export class PageExclusionComponent implements OnChanges {
                     endPage,
                 };
             });
-            await this._reanalysisService
-                .excludePages(
+            await firstValueFrom(
+                this._reanalysisService.excludePages(
                     {
                         pageRanges: pageRanges,
                     },
                     this.file.dossierId,
                     this.file.fileId,
-                )
-                .toPromise();
+                ),
+            );
             this._inputComponent.reset();
         } catch (e) {
             this._toaster.error(_('file-preview.tabs.exclude-pages.error'));
@@ -75,15 +76,15 @@ export class PageExclusionComponent implements OnChanges {
 
     async includePagesRange(range: IPageRange): Promise {
         this._loadingService.start();
-        await this._reanalysisService
-            .includePages(
+        await firstValueFrom(
+            this._reanalysisService.includePages(
                 {
                     pageRanges: [range],
                 },
                 this.file.dossierId,
                 this.file.fileId,
-            )
-            .toPromise();
+            ),
+        );
         this._inputComponent.reset();
         this._loadingService.stop();
     }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts
index 2b217e9d4..d5e3227a7 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core';
 import { PermissionsService } from '@services/permissions.service';
 import { ConfigService } from '@services/config.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
@@ -6,6 +6,8 @@ import { ViewedPagesService } from '@services/entity-services/viewed-pages.servi
 import { File, IViewedPage } from '@red/domain';
 import { AutoUnsubscribe } from '@iqser/common-ui';
 import { FilesMapService } from '@services/entity-services/files-map.service';
+import { FilePreviewStateService } from '../../services/file-preview-state.service';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-page-indicator',
@@ -18,7 +20,6 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
     @Input() active = false;
     @Input() showDottedIcon = false;
     @Input() number: number;
-    @Input() viewedPages: IViewedPage[];
     @Input() activeSelection = false;
 
     @Output() readonly pageSelected = new EventEmitter();
@@ -31,22 +32,19 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
         private readonly _filesMapService: FilesMapService,
         private readonly _dossiersService: DossiersService,
         private readonly _configService: ConfigService,
+        private readonly _changeDetectorRef: ChangeDetectorRef,
         private readonly _permissionService: PermissionsService,
+        private readonly _stateService: FilePreviewStateService,
     ) {
         super();
     }
 
     get activePage() {
-        return this.viewedPages?.find(p => p.page === this.number);
+        return this._viewedPages.find(p => p.page === this.number);
     }
 
-    private _setReadState() {
-        const activePage = this.activePage;
-        if (!activePage) {
-            this.read = false;
-        } else {
-            this.read = !activePage.showAsUnseen;
-        }
+    private get _viewedPages(): IViewedPage[] {
+        return this._stateService.fileData?.viewedPages || [];
     }
 
     ngOnChanges() {
@@ -82,20 +80,33 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
         }
     }
 
+    private _setReadState() {
+        const readBefore = this.read;
+        const activePage = this.activePage;
+        if (!activePage) {
+            this.read = false;
+        } else {
+            //   console.log('setting read to',activePage.showAsUnseen, !activePage.showAsUnseen);
+            this.read = !activePage.showAsUnseen;
+        }
+        // console.log(this.number, readBefore, activePage, this.read);
+        this._changeDetectorRef.detectChanges();
+    }
+
     private async _markPageRead() {
-        await this._viewedPagesService.addPage({ page: this.number }, this.file.dossierId, this.file.fileId).toPromise();
+        await firstValueFrom(this._viewedPagesService.addPage({ page: this.number }, this.file.dossierId, this.file.fileId));
         if (this.activePage) {
             this.activePage.showAsUnseen = false;
         } else {
-            this.viewedPages?.push({ page: this.number, fileId: this.file.fileId });
+            this._viewedPages.push({ page: this.number, fileId: this.file.fileId });
         }
         this._setReadState();
     }
 
     private async _markPageUnread() {
         await this._viewedPagesService.removePage(this.file.dossierId, this.file.fileId, this.number).toPromise();
-        this.viewedPages?.splice(
-            this.viewedPages?.findIndex(p => p.page === this.number),
+        this._viewedPages.splice(
+            this._viewedPages.findIndex(p => p.page === this.number),
             1,
         );
         this._setReadState();
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts
index f2f467526..f0c0968a4 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts
@@ -22,12 +22,12 @@ import {
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { ManualAnnotationService } from '../../../../services/manual-annotation.service';
 import { environment } from '@environments/environment';
-import { AnnotationDrawService } from '../../../../services/annotation-draw.service';
-import { AnnotationActionsService } from '../../../../services/annotation-actions.service';
+import { AnnotationDrawService } from '../../services/annotation-draw.service';
+import { AnnotationActionsService } from '../../services/annotation-actions.service';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { BASE_HREF } from '../../../../../../tokens';
 import { ConfigService } from '@services/config.service';
-import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui';
+import { AutoUnsubscribe, ConfirmationDialogInput, LoadingService, shareDistinctLast } from '@iqser/common-ui';
 import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
 import { loadCompareDocumentWrapper } from '../../../../utils/compare-mode.utils';
 import { PdfViewerUtils } from '../../../../utils/pdf-viewer.utils';
@@ -36,11 +36,13 @@ import { ActivatedRoute } from '@angular/router';
 import { toPosition } from '../../../../utils/pdf-calculation.utils';
 import { ViewModeService } from '../../services/view-mode.service';
 import { MultiSelectService } from '../../services/multi-select.service';
+import { FilePreviewStateService } from '../../services/file-preview-state.service';
+import { filter, switchMap, tap } from 'rxjs/operators';
 import Tools = Core.Tools;
 import TextTool = Tools.TextTool;
 import Annotation = Core.Annotations.Annotation;
 
-const ALLOWED_KEYBOARD_SHORTCUTS = ['+', '-', 'p', 'r', 'Escape'] as const;
+const ALLOWED_KEYBOARD_SHORTCUTS: readonly string[] = ['+', '-', 'p', 'r', 'Escape'] as const;
 const dataElements = {
     ADD_REDACTION: 'add-redaction',
     ADD_DICTIONARY: 'add-dictionary',
@@ -61,8 +63,7 @@ const dataElements = {
     templateUrl: './pdf-viewer.component.html',
     styleUrls: ['./pdf-viewer.component.scss'],
 })
-export class PdfViewerComponent implements OnInit, OnChanges {
-    @Input() fileData: Blob;
+export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnChanges {
     @Input() file: File;
     @Input() dossier: Dossier;
     @Input() canPerformActions = false;
@@ -95,9 +96,12 @@ export class PdfViewerComponent implements OnInit, OnChanges {
         private readonly _annotationActionsService: AnnotationActionsService,
         private readonly _configService: ConfigService,
         private readonly _loadingService: LoadingService,
+        private readonly _stateService: FilePreviewStateService,
         readonly viewModeService: ViewModeService,
         readonly multiSelectService: MultiSelectService,
-    ) {}
+    ) {
+        super();
+    }
 
     private get _toggleTooltipsBtnTitle(): string {
         return this._translateService.instant(_('pdf-viewer.toggle-tooltips'), {
@@ -105,9 +109,27 @@ export class PdfViewerComponent implements OnInit, OnChanges {
         });
     }
 
+    private get _toggleTooltipsIcon(): string {
+        return this._convertPath(
+            this._userPreferenceService.getFilePreviewTooltipsPreference()
+                ? '/assets/icons/general/pdftron-action-enable-tooltips.svg'
+                : '/assets/icons/general/pdftron-action-disable-tooltips.svg',
+        );
+    }
+
     async ngOnInit() {
         this._setReadyAndInitialState = this._setReadyAndInitialState.bind(this);
-        await this.loadViewer();
+        await this._loadViewer();
+
+        this.addActiveScreenSubscription = this._stateService.fileData$
+            .pipe(
+                filter(fileData => !!fileData),
+                switchMap(fileData => fileData.blob$),
+                // Skip document reload if file content hasn't changed
+                shareDistinctLast(),
+                tap(() => this._loadDocument()),
+            )
+            .subscribe();
     }
 
     ngOnChanges(changes: SimpleChanges): void {
@@ -115,16 +137,12 @@ export class PdfViewerComponent implements OnInit, OnChanges {
             return;
         }
 
-        if (changes.fileData) {
-            this._loadDocument();
-        }
-
         if (changes.canPerformActions) {
             this._handleCustomActions();
         }
     }
 
-    uploadFile(files: any) {
+    uploadFile(files: FileList) {
         const fileToCompare = files[0];
         this.compareFileInput.nativeElement.value = null;
 
@@ -140,7 +158,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
             await pdfNet.initialize(environment.licenseKey ? atob(environment.licenseKey) : null);
 
             const compareDocument = await pdfNet.PDFDoc.createFromBuffer(fileReader.result as ArrayBuffer);
-            const currentDocument = await pdfNet.PDFDoc.createFromBuffer(await this.fileData.arrayBuffer());
+            const currentDocument = await pdfNet.PDFDoc.createFromBuffer(await this._stateService.fileData.blob$.value.arrayBuffer());
 
             const loadCompareDocument = async () => {
                 this._loadingService.start();
@@ -153,7 +171,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
                     this.instance,
                     this.file,
                     () => {
-                        this.viewModeService.set('COMPARE');
+                        this.viewModeService.compareMode = true;
                     },
                     () => {
                         this.utils.navigateToPage(1);
@@ -190,10 +208,10 @@ export class PdfViewerComponent implements OnInit, OnChanges {
     }
 
     async closeCompareMode() {
-        this.viewModeService.set('STANDARD');
+        this.viewModeService.compareMode = false;
         const pdfNet = this.instance.Core.PDFNet;
         await pdfNet.initialize(environment.licenseKey ? atob(environment.licenseKey) : null);
-        const currentDocument = await pdfNet.PDFDoc.createFromBuffer(await this.fileData.arrayBuffer());
+        const currentDocument = await pdfNet.PDFDoc.createFromBuffer(await this._stateService.fileData.blob$.value.arrayBuffer());
         this.instance.UI.loadDocument(currentDocument, {
             filename: this.file ? this.file.filename : 'document.pdf',
         });
@@ -202,7 +220,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
         this.utils.navigateToPage(1);
     }
 
-    async loadViewer() {
+    private async _loadViewer() {
         this.instance = await WebViewer(
             {
                 licenseKey: environment.licenseKey ? atob(environment.licenseKey) : null,
@@ -211,7 +229,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
                 css: this._convertPath('/assets/pdftron/stylesheet.css'),
                 backendType: 'ems',
             },
-            this.viewer.nativeElement,
+            this.viewer.nativeElement as HTMLElement,
         );
 
         this.documentViewer = this.instance.Core.documentViewer;
@@ -223,7 +241,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
         this.utils.disableHotkeys();
         this._configureTextPopup();
 
-        this.annotationManager.addEventListener('annotationSelected', (annotations, action) => {
+        this.annotationManager.addEventListener('annotationSelected', (annotations: Annotation[], action) => {
             this.annotationSelected.emit(this.annotationManager.getSelectedAnnotations().map(ann => ann.Id));
             if (action === 'deselected') {
                 this._toggleRectangleAnnotationAction(true);
@@ -233,7 +251,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
             }
         });
 
-        this.annotationManager.addEventListener('annotationChanged', annotations => {
+        this.annotationManager.addEventListener('annotationChanged', (annotations: Annotation[]) => {
             // when a rectangle is drawn,
             // it returns one annotation with tool name 'AnnotationCreateRectangle;
             // this will auto select rectangle after drawing
@@ -243,7 +261,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
             }
         });
 
-        this.documentViewer.addEventListener('pageNumberUpdated', pageNumber => {
+        this.documentViewer.addEventListener('pageNumberUpdated', (pageNumber: number) => {
             if (this.shouldDeselectAnnotationsOnPageChange) {
                 this.utils.deselectAllAnnotations();
             }
@@ -253,9 +271,9 @@ export class PdfViewerComponent implements OnInit, OnChanges {
 
         this.documentViewer.addEventListener('documentLoaded', this._setReadyAndInitialState);
 
-        this.documentViewer.addEventListener('keyUp', $event => {
+        this.documentViewer.addEventListener('keyUp', ($event: KeyboardEvent) => {
             // arrows and full-screen
-            if ($event.target?.tagName?.toLowerCase() !== 'input') {
+            if (($event.target as HTMLElement)?.tagName?.toLowerCase() !== 'input') {
                 if ($event.key.startsWith('Arrow') || $event.key === 'f') {
                     this._ngZone.run(() => {
                         this.keyUp.emit($event);
@@ -265,7 +283,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
                 }
             }
 
-            if (ALLOWED_KEYBOARD_SHORTCUTS.indexOf($event.key) < 0) {
+            if (!ALLOWED_KEYBOARD_SHORTCUTS.includes($event.key)) {
                 $event.preventDefault();
                 $event.stopPropagation();
             }
@@ -293,8 +311,6 @@ export class PdfViewerComponent implements OnInit, OnChanges {
                 }
             }
         });
-
-        this._loadDocument();
     }
 
     private _setInitialDisplayMode() {
@@ -354,13 +370,14 @@ export class PdfViewerComponent implements OnInit, OnChanges {
                 type: 'actionButton',
                 element: 'tooltips',
                 dataElement: dataElements.TOGGLE_TOOLTIPS,
-                img: this._convertPath('/assets/icons/general/pdftron-action-toggle-tooltips.svg'),
+                img: this._toggleTooltipsIcon,
                 title: this._toggleTooltipsBtnTitle,
                 onClick: async () => {
                     await this._userPreferenceService.toggleFilePreviewTooltipsPreference();
                     this._updateTooltipsVisibility();
                     this.instance.UI.updateElement(dataElements.TOGGLE_TOOLTIPS, {
                         title: this._toggleTooltipsBtnTitle,
+                        img: this._toggleTooltipsIcon,
                     });
                 },
             },
@@ -381,36 +398,34 @@ export class PdfViewerComponent implements OnInit, OnChanges {
             const originalHeaderItems = header.getItems();
             originalHeaderItems.splice(8, 0, ...headerItems);
 
-            if (this._userPreferenceService.areDevFeaturesEnabled) {
-                const devHeaderItems = [
-                    {
-                        type: 'actionButton',
-                        element: 'compare',
-                        dataElement: dataElements.COMPARE_BUTTON,
-                        img: this._convertPath('/assets/icons/general/pdftron-action-compare.svg'),
-                        title: 'Compare',
-                        onClick: () => {
-                            this.compareFileInput.nativeElement.click();
-                        },
+            const compareHeaderItems = [
+                {
+                    type: 'actionButton',
+                    element: 'compare',
+                    dataElement: dataElements.COMPARE_BUTTON,
+                    img: this._convertPath('/assets/icons/general/pdftron-action-compare.svg'),
+                    title: 'Compare',
+                    onClick: () => {
+                        this.compareFileInput.nativeElement.click();
                     },
-                    {
-                        type: 'actionButton',
-                        element: 'closeCompare',
-                        dataElement: dataElements.CLOSE_COMPARE_BUTTON,
-                        img: this._convertPath('/assets/icons/general/pdftron-action-close-compare.svg'),
-                        title: 'Leave Compare Mode',
-                        onClick: async () => {
-                            await this.closeCompareMode();
-                        },
+                },
+                {
+                    type: 'actionButton',
+                    element: 'closeCompare',
+                    dataElement: dataElements.CLOSE_COMPARE_BUTTON,
+                    img: this._convertPath('/assets/icons/general/pdftron-action-close-compare.svg'),
+                    title: 'Leave Compare Mode',
+                    onClick: async () => {
+                        await this.closeCompareMode();
                     },
-                    {
-                        type: 'divider',
-                        dataElement: dataElements.COMPARE_TOOL_DIVIDER,
-                    },
-                ];
+                },
+                {
+                    type: 'divider',
+                    dataElement: dataElements.COMPARE_TOOL_DIVIDER,
+                },
+            ];
 
-                originalHeaderItems.splice(9, 0, ...devHeaderItems);
-            }
+            originalHeaderItems.splice(9, 0, ...compareHeaderItems);
         });
 
         this.instance.UI.disableElements([dataElements.CLOSE_COMPARE_BUTTON]);
@@ -561,7 +576,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
     }
 
     private _addManualRedactionOfType(type: ManualRedactionEntryType) {
-        const selectedQuads = this.documentViewer.getSelectedTextQuads();
+        const selectedQuads: Readonly> = this.documentViewer.getSelectedTextQuads();
         const text = this.documentViewer.getSelectedText();
         const manualRedaction = this._getManualRedaction(selectedQuads, text, true);
         this.manualAnnotationRequested.emit(new ManualRedactionEntryWrapper(selectedQuads, manualRedaction, type));
@@ -583,7 +598,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
             try {
                 this.instance.UI.enableTools(['AnnotationCreateRectangle']);
             } catch (e) {
-                console.log(e);
+                // happens
             }
             this.instance.UI.enableElements(elements);
 
@@ -617,7 +632,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
             for (const quad of quads[key]) {
                 const page = parseInt(key, 10);
                 const pageHeight = this.documentViewer.getPageHeight(page);
-                entry.positions.push(toPosition(page, pageHeight, convertQuads ? this.utils.translateQuads(page, quad) : quad));
+                entry.positions.push(toPosition(page, pageHeight, convertQuads ? this.utils.translateQuad(page, quad) : quad));
             }
         }
 
@@ -627,11 +642,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
     }
 
     private _loadDocument() {
-        if (!this.fileData) {
-            return;
-        }
-
-        this.instance.UI.loadDocument(this.fileData, {
+        this.instance.UI.loadDocument(this._stateService.fileData.blob$.value, {
             filename: this.file ? this.file.filename : 'document.pdf',
         });
     }
@@ -640,7 +651,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
         this._ngZone.run(() => {
             this.utils.ready = true;
             this.viewerReady.emit(this.instance);
-            const routePageNumber = this._activatedRoute.snapshot.queryParams.page;
+            const routePageNumber: number = this._activatedRoute.snapshot.queryParams.page;
             this.pageChanged.emit(routePageNumber || 1);
             this._setInitialDisplayMode();
             this._updateTooltipsVisibility();
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.ts
index 7476a9027..b5d73dba2 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/type-annotation-icon/type-annotation-icon.component.ts
@@ -33,7 +33,7 @@ export class TypeAnnotationIconComponent implements OnChanges {
             this.type =
                 this.annotation.isSuggestion || this.annotation.isDeclinedSuggestion
                     ? 'rhombus'
-                    : this.annotation.isHint
+                    : this.annotation.isHint || this.annotation.isIgnoredHint
                     ? 'circle'
                     : this.annotation.isRecommendation
                     ? 'hexagon'
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts
index fdbe6d8f3..0101f238f 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts
@@ -8,6 +8,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { UserService } from '@services/user.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { TranslateService } from '@ngx-translate/core';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-user-management',
@@ -88,11 +89,11 @@ export class UserManagementComponent implements OnChanges {
         this.loadingService.start();
 
         if (!assigneeId) {
-            await this.filesService.setUnassigned([fileId], dossierId).toPromise();
+            await firstValueFrom(this.filesService.setUnassigned([fileId], dossierId));
         } else if (file.isNew || file.isUnderReview) {
-            await this.filesService.setReviewerFor([fileId], dossierId, assigneeId).toPromise();
+            await firstValueFrom(this.filesService.setReviewerFor([fileId], dossierId, assigneeId));
         } else if (file.isUnderApproval) {
-            await this.filesService.setUnderApprovalFor([fileId], dossierId, assigneeId).toPromise();
+            await firstValueFrom(this.filesService.setUnderApprovalFor([fileId], dossierId, assigneeId));
         }
 
         this.loadingService.stop();
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html
index 4daf4a4ee..c99ce4ba5 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html
@@ -1,5 +1,5 @@
 
-    

         {{ 'file-preview.standard' | translate }}
-    

+    
 
-    

         {{ 'file-preview.delta' | translate }}
-    

+    
 
-    

         {{ 'file-preview.redacted' | translate }}
-    

+    
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.ts
index 283aa7f62..b069922d9 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.ts
@@ -1,10 +1,12 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { File, ViewMode } from '@red/domain';
 import { ViewModeService } from '../../services/view-mode.service';
-import { FileDataModel } from '@models/file/file-data.model';
+import { FilePreviewStateService } from '../../services/file-preview-state.service';
+import { Observable } from 'rxjs';
+import { filter, switchMap } from 'rxjs/operators';
 
 @Component({
-    selector: 'redaction-view-switch [file] [fileData]',
+    selector: 'redaction-view-switch [file]',
     templateUrl: './view-switch.component.html',
     styleUrls: ['./view-switch.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -12,19 +14,18 @@ import { FileDataModel } from '@models/file/file-data.model';
 export class ViewSwitchComponent implements OnChanges {
     @Output() readonly switchView = new EventEmitter();
     @Input() file: File;
-    @Input() fileData: FileDataModel;
 
-    canSwitchToDeltaView = false;
+    readonly canSwitchToDeltaView$: Observable;
     canSwitchToRedactedView = false;
 
-    constructor(readonly viewModeService: ViewModeService) {}
+    constructor(readonly viewModeService: ViewModeService, private readonly _stateService: FilePreviewStateService) {
+        this.canSwitchToDeltaView$ = this._stateService.fileData$.pipe(
+            filter(fileData => !!fileData),
+            switchMap(fileData => fileData?.hasChangeLog$),
+        );
+    }
 
     ngOnChanges(changes: SimpleChanges) {
-        if (changes.fileData) {
-            const fileData = changes.fileData.currentValue as FileDataModel;
-            this.canSwitchToDeltaView = fileData?.hasChangeLog;
-        }
-
         if (changes.file) {
             const file = changes?.file.currentValue as File;
             this.canSwitchToRedactedView = !file.analysisRequired && !file.excluded;
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html
new file mode 100644
index 000000000..dfdbdfc8d
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.html
@@ -0,0 +1,47 @@
+

+    

+        

+
+        

+            

+                
+            

+            {{
+                data.annotations.length === 1
+                    ? format(data.annotations[0].value)
+                    : ('accept-recommendation-dialog.multiple-values' | translate)
+            }}
+
+            

+                
+
+                
+                    {{ displayedDictionaryLabel }}
+                    
+                        
+                            {{ dictionary.label }}
+                        
+                    
+                
+            

+
+            

+                
+                
+            

+        

+
+        

+            
+        

+    

+
+    
+

diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts
new file mode 100644
index 000000000..32392f6c8
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts
@@ -0,0 +1,93 @@
+import { Component, Inject, Injector, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { AppStateService } from '@state/app-state.service';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { PermissionsService } from '@services/permissions.service';
+import { Dictionary, Dossier, File } from '@red/domain';
+import { DossiersService } from '@services/entity-services/dossiers.service';
+import { BaseDialogComponent } from '@iqser/common-ui';
+import { DictionaryService } from '@shared/services/dictionary.service';
+import { ManualAnnotationService } from '../../../../services/manual-annotation.service';
+import { AnnotationWrapper } from '../../../../../../models/file/annotation.wrapper';
+
+export interface AcceptRecommendationData {
+    readonly annotations: AnnotationWrapper[];
+    readonly file: File;
+}
+
+export interface AcceptRecommendationReturnType {
+    readonly annotations: AnnotationWrapper[];
+    readonly comment: string;
+}
+
+@Component({
+    templateUrl: './accept-recommendation-dialog.component.html',
+})
+export class AcceptRecommendationDialogComponent extends BaseDialogComponent implements OnInit {
+    isDocumentAdmin: boolean;
+
+    possibleDictionaries: Dictionary[] = [];
+
+    private readonly _dossier: Dossier;
+
+    constructor(
+        private readonly _appStateService: AppStateService,
+        private readonly _formBuilder: FormBuilder,
+        private readonly _manualAnnotationService: ManualAnnotationService,
+        private readonly _permissionsService: PermissionsService,
+        private readonly _dossiersService: DossiersService,
+        private readonly _dictionaryService: DictionaryService,
+        protected readonly _injector: Injector,
+        protected readonly _dialogRef: MatDialogRef,
+        @Inject(MAT_DIALOG_DATA) readonly data: AcceptRecommendationData,
+    ) {
+        super(_injector, _dialogRef);
+        this._dossier = this._dossiersService.find(this.data.file.dossierId);
+        this.isDocumentAdmin = this._permissionsService.isApprover(this._dossier);
+        this.form = this._getForm();
+        this.initialFormValue = this.form.getRawValue();
+    }
+
+    get displayedDictionaryLabel() {
+        const dictType = this.form.get('dictionary').value as string;
+        if (dictType && this.possibleDictionaries.length) {
+            return this.possibleDictionaries.find(d => d.type === dictType).label;
+        }
+        return null;
+    }
+
+    async ngOnInit() {
+        super.ngOnInit();
+        this.possibleDictionaries = await this._appStateService.getDictionariesOptions(
+            this._dossier.dossierTemplateId,
+            this._dossier.dossierId,
+        );
+        this.form.patchValue({
+            dictionary: this.possibleDictionaries.find(dict => dict.type === this.data.annotations[0].recommendationType).type,
+        });
+    }
+
+    save() {
+        const recommendationType = this.form.get('dictionary').value;
+        this.data.annotations.forEach(a => (a.recommendationType = recommendationType));
+        this._dialogRef.close({
+            annotations: this.data.annotations,
+            comment: this.form.get('comment').value as string,
+        });
+    }
+
+    format(value: string) {
+        return value.replace(
+            // eslint-disable-next-line no-control-regex,max-len
+            /([^\s\d-]{2,})[-\u00AD]\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
+            '$1',
+        );
+    }
+
+    private _getForm(): FormGroup {
+        return this._formBuilder.group({
+            dictionary: [Validators.required],
+            comment: [null],
+        });
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
index b18e1c5fe..b8a4fe9b0 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
@@ -1,9 +1,9 @@
 
-    
+    
         

             

                 

-                    
+                    
                 

 
                 

@@ -26,12 +26,7 @@
 
                     

 
-                    
+                    
 
                     
@@ -107,17 +101,15 @@
                         (deselectAnnotations)="deselectAnnotations($event)"
                         (selectAnnotations)="selectAnnotations($event)"
                         (selectPage)="selectPage($event)"
-                        (toggleSkipped)="toggleSkipped($event)"
                         *ngIf="!file.excluded"
                         [(shouldDeselectAnnotationsOnPageChange)]="shouldDeselectAnnotationsOnPageChange"
                         [activeViewerPage]="activeViewerPage"
                         [annotationActionsTemplate]="annotationActionsTemplate"
-                        [annotations]="annotations"
+                        [annotations]="visibleAnnotations"
                         [dialogRef]="dialogRef"
+                        [fileData]="fileData"
                         [file]="file"
-                        [hideSkipped]="hideSkipped"
                         [selectedAnnotations]="selectedAnnotations"
-                        [viewedPages]="fileData?.viewedPages"
                         [viewer]="activeViewer"
                     >
                 

@@ -143,7 +135,7 @@
             
                 
                 
-                {{ filter.id | humanize: false }}
+                {{ filter.label | humanize: false }}
             
         
     
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
index bfbe391d2..49b83de09 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
@@ -53,10 +53,6 @@
     margin-right: 8px;
 }
 
-.ml-2 {
-    margin-left: 2px;
-}
-
 .analysis-progress {
     padding: 12px 20px;
     max-width: 400px;
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
index a2ee6f0f6..006d1700e 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
@@ -1,32 +1,30 @@
 import { ChangeDetectorRef, Component, HostListener, NgZone, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationExtras, Router } from '@angular/router';
-import { AppStateService } from '@state/app-state.service';
 import { Core, WebViewerInstance } from '@pdftron/webviewer';
 import { PdfViewerComponent } from './components/pdf-viewer/pdf-viewer.component';
 import {
     AutoUnsubscribe,
     CircleButtonTypes,
+    CustomError,
     Debounce,
+    ErrorService,
     FilterService,
     LoadingService,
     OnAttach,
     OnDetach,
     processFilters,
     shareDistinctLast,
-    shareLast,
 } from '@iqser/common-ui';
 import { MatDialogRef, MatDialogState } from '@angular/material/dialog';
 import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { ManualAnnotationResponse } from '@models/file/manual-annotation-response';
-import { AnnotationData, FileDataModel } from '@models/file/file-data.model';
-import { AnnotationDrawService } from '../../services/annotation-draw.service';
+import { AnnotationDrawService } from './services/annotation-draw.service';
 import { AnnotationProcessingService } from '../../services/annotation-processing.service';
 import { Dossier, File, ViewMode } from '@red/domain';
 import { PermissionsService } from '@services/permissions.service';
 import { combineLatest, Observable, timer } from 'rxjs';
 import { UserPreferenceService } from '@services/user-preference.service';
-import { UserService } from '@services/user.service';
 import { PdfViewerDataService } from '../../services/pdf-viewer-data.service';
 import { download } from '@utils/file-download-utils';
 import { FileWorkloadComponent } from './components/file-workload/file-workload.component';
@@ -37,7 +35,7 @@ import { handleFilterDelta } from '@utils/filter-utils';
 import { FilesService } from '@services/entity-services/files.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { FileManagementService } from '@services/entity-services/file-management.service';
-import { filter, map, switchMap, tap } from 'rxjs/operators';
+import { map, switchMap, tap } from 'rxjs/operators';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 import { WatermarkService } from '@shared/services/watermark.service';
 import { ExcludedPagesService } from './services/excluded-pages.service';
@@ -45,23 +43,35 @@ import { ViewModeService } from './services/view-mode.service';
 import { MultiSelectService } from './services/multi-select.service';
 import { DocumentInfoService } from './services/document-info.service';
 import { ReanalysisService } from '../../../../services/reanalysis.service';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { CommentingService } from './services/commenting.service';
+import { SkippedService } from './services/skipped.service';
+import { AnnotationActionsService } from './services/annotation-actions.service';
+import { FilePreviewStateService } from './services/file-preview-state.service';
+import { FileDataModel } from '../../../../models/file/file-data.model';
+import { AnnotationReferencesService } from './services/annotation-references.service';
 import Annotation = Core.Annotations.Annotation;
 import PDFNet = Core.PDFNet;
 
 const ALL_HOTKEY_ARRAY = ['Escape', 'F', 'f', 'ArrowUp', 'ArrowDown'];
 
-function diff(first: readonly T[], second: readonly T[]): T[] {
-    // symmetrical difference between two arrays
-    const a = new Set(first);
-    const b = new Set(second);
-
-    return [...first.filter(x => !b.has(x)), ...second.filter(x => !a.has(x))];
-}
-
 @Component({
     templateUrl: './file-preview-screen.component.html',
     styleUrls: ['./file-preview-screen.component.scss'],
-    providers: [FilterService, ExcludedPagesService, ViewModeService, MultiSelectService, DocumentInfoService],
+    providers: [
+        FilterService,
+        ExcludedPagesService,
+        ViewModeService,
+        MultiSelectService,
+        DocumentInfoService,
+        CommentingService,
+        SkippedService,
+        AnnotationDrawService,
+        AnnotationActionsService,
+        FilePreviewStateService,
+        PdfViewerDataService,
+        AnnotationReferencesService,
+    ],
 })
 export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnInit, OnDestroy, OnAttach, OnDetach {
     readonly circleButtonTypes = CircleButtonTypes;
@@ -69,22 +79,18 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     dialogRef: MatDialogRef;
     fullScreen = false;
     shouldDeselectAnnotationsOnPageChange = true;
-    fileData: FileDataModel;
-    annotationData: AnnotationData;
     selectedAnnotations: AnnotationWrapper[] = [];
-    hideSkipped = false;
     displayPdfViewer = false;
     activeViewerPage: number = null;
     @ViewChild(PdfViewerComponent) readonly viewerComponent: PdfViewerComponent;
     readonly dossierId: string;
     readonly canPerformAnnotationActions$: Observable;
     readonly dossier$: Observable;
-    readonly file$: Observable;
     readonly fileId: string;
     ready = false;
     private _instance: WebViewerInstance;
     private _lastPage: string;
-    private _reloadFileOnReanalysis = false;
+
     @ViewChild('fileWorkloadComponent') private readonly _workloadComponent: FileWorkloadComponent;
     @ViewChild('annotationFilterTemplate', {
         read: TemplateRef,
@@ -95,8 +101,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     constructor(
         readonly permissionsService: PermissionsService,
         readonly userPreferenceService: UserPreferenceService,
-        private readonly _appStateService: AppStateService,
-        private readonly _userService: UserService,
+        private readonly _stateService: FilePreviewStateService,
         private readonly _watermarkService: WatermarkService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
         private readonly _activatedRoute: ActivatedRoute,
@@ -104,7 +109,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         private readonly _router: Router,
         private readonly _annotationProcessingService: AnnotationProcessingService,
         private readonly _annotationDrawService: AnnotationDrawService,
-        private readonly _fileDownloadService: PdfViewerDataService,
+        private readonly _pdfViewerDataService: PdfViewerDataService,
         private readonly _filesService: FilesService,
         private readonly _ngZone: NgZone,
         private readonly _fileManagementService: FileManagementService,
@@ -114,6 +119,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         private readonly _filesMapService: FilesMapService,
         private readonly _dossiersService: DossiersService,
         private readonly _reanalysisService: ReanalysisService,
+        private readonly _errorService: ErrorService,
+        private readonly _skippedService: SkippedService,
         readonly excludedPagesService: ExcludedPagesService,
         readonly viewModeService: ViewModeService,
         readonly multiSelectService: MultiSelectService,
@@ -123,12 +130,6 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         this.dossierId = _activatedRoute.snapshot.paramMap.get('dossierId');
         this.dossier$ = _dossiersService.getEntityChanged$(this.dossierId);
         this.fileId = _activatedRoute.snapshot.paramMap.get('fileId');
-        this.file$ = _filesMapService.watch$(this.dossierId, this.fileId).pipe(
-            tap(async file => {
-                await this._reloadFile(file);
-            }),
-            shareLast(),
-        );
         this.canPerformAnnotationActions$ = this._canPerformAnnotationActions$;
 
         document.documentElement.addEventListener('fullscreenchange', () => {
@@ -138,38 +139,35 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         });
     }
 
-    get annotations(): AnnotationWrapper[] {
-        return this.annotationData ? this.annotationData.visibleAnnotations : [];
+    get visibleAnnotations(): AnnotationWrapper[] {
+        return this.fileData ? this.fileData.getVisibleAnnotations(this.viewModeService.viewMode) : [];
+    }
+
+    get allAnnotations(): AnnotationWrapper[] {
+        return this.fileData ? this.fileData.allAnnotations : [];
     }
 
     get activeViewer(): WebViewerInstance {
         return this._instance;
     }
 
-
-
-    private _setActiveViewerPage() {
-        const currentPage = this._instance?.Core.documentViewer?.getCurrentPage();
-        if (!currentPage) {
-            this.activeViewerPage = 1;
-        } else {
-            this.activeViewerPage = this.viewModeService.isCompare
-                ? currentPage % 2 === 0
-                    ? currentPage / 2
-                    : (currentPage + 1) / 2
-                : currentPage;
-        }
+    get fileData(): FileDataModel {
+        return this._stateService.fileData;
     }
 
     private get _canPerformAnnotationActions$() {
-        return combineLatest([this.file$, this.viewModeService.viewMode$]).pipe(
+        return combineLatest([
+            this._stateService.fileData$.pipe(switchMap(fileData => fileData.file$)),
+            this.viewModeService.viewMode$,
+            this.viewModeService.compareMode$,
+        ]).pipe(
             map(([file, viewMode]) => this.permissionsService.canPerformAnnotationActions(file) && viewMode === 'STANDARD'),
             shareDistinctLast(),
         );
     }
 
     async updateViewMode(): Promise {
-        const ocrAnnotationIds = this.annotationData.allAnnotations.filter(a => a.isOCR).map(a => a.id);
+        const ocrAnnotationIds = this.fileData.allAnnotations.filter(a => a.isOCR).map(a => a.id);
         const annotations = this._getAnnotations(a => a.getCustomData('redact-manager'));
         const redactions = annotations.filter(a => a.getCustomData('redaction'));
 
@@ -207,7 +205,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
 
     ngOnDetach(): void {
         this.displayPdfViewer = false;
-        super.ngOnDestroy();
+        super.ngOnDetach();
         this._changeDetectorRef.markForCheck();
     }
 
@@ -216,6 +214,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         if (!file.canBeOpened) {
             return this._router.navigate([this._dossiersService.find(this.dossierId)?.routerLink]);
         }
+        this.viewModeService.viewMode = 'STANDARD';
 
         await this.ngOnInit();
         this._lastPage = previousRoute.queryParams.page;
@@ -251,19 +250,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             console.log(`[REDACTION] Delete previous annotations time: ${new Date().getTime() - startTime} ms`);
         }
         const processStartTime = new Date().getTime();
-        const dossier = this._dossiersService.find(this.dossierId);
-        const newAnnotationsData = this.fileData.getAnnotations(
-            this._appStateService.dictionaryData[dossier.dossierTemplateId],
-            this._userService.currentUser,
-            this.viewModeService.viewMode,
-            this.userPreferenceService.areDevFeaturesEnabled,
-        );
-        if (this.annotationData) {
-            this._setHiddenPropertyToNewAnnotations(newAnnotationsData.visibleAnnotations, this.annotationData.visibleAnnotations);
-            this._setHiddenPropertyToNewAnnotations(newAnnotationsData.allAnnotations, this.annotationData.allAnnotations);
-        }
-        this.annotationData = newAnnotationsData;
-        const annotationFilters = this._annotationProcessingService.getAnnotationFilter(this.annotations);
+
+        const annotationFilters = this._annotationProcessingService.getAnnotationFilter(this.visibleAnnotations);
         const primaryFilters = this._filterService.getGroup('primaryFilters')?.filters;
         this._filterService.addFilterGroup({
             slug: 'primaryFilters',
@@ -278,13 +266,11 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         });
         console.log(`[REDACTION] Process time: ${new Date().getTime() - processStartTime} ms`);
         console.log(`[REDACTION] Filter rebuild time: ${new Date().getTime() - startTime}`);
-        console.log();
     }
 
     handleAnnotationSelected(annotationIds: string[]) {
-        // TODO: use includes() here
         this.selectedAnnotations = annotationIds
-            .map(id => this.annotations.find(annotationWrapper => annotationWrapper.id === id))
+            .map(id => this.visibleAnnotations.find(annotationWrapper => annotationWrapper.id === id))
             .filter(ann => ann !== undefined);
         if (this.selectedAnnotations.length > 1) {
             this.multiSelectService.activate();
@@ -296,7 +282,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     @Debounce(10)
     selectAnnotations(annotations?: AnnotationWrapper[]) {
         if (annotations) {
-            this.viewerComponent?.utils?.selectAnnotations(annotations, this.multiSelectService.isActive);
+            const annotationsToSelect = this.multiSelectService.isActive ? [...this.selectedAnnotations, ...annotations] : annotations;
+            this.viewerComponent?.utils?.selectAnnotations(annotationsToSelect, this.multiSelectService.isActive);
         } else {
             this.viewerComponent?.utils?.deselectAllAnnotations();
         }
@@ -324,7 +311,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
                             response.manualRedactionEntryWrapper.rectId,
                         );
                         this._instance.Core.annotationManager.deleteAnnotation(annotation);
-                       //  await this._filesService.reload(this.dossierId, this.fileId).toPromise();
+                        //  await this._filesService.reload(this.dossierId, this.fileId).toPromise();
                         const distinctPages = manualRedactionEntryWrapper.manualRedactionEntry.positions
                             .map(p => p.page)
                             .filter((item, pos, self) => self.indexOf(item) === pos);
@@ -346,6 +333,14 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         }
     }
 
+    handleArrowEvent($event: KeyboardEvent): void {
+        if (['ArrowUp', 'ArrowDown'].includes($event.key)) {
+            if (this.selectedAnnotations.length === 1) {
+                this._workloadComponent.navigateAnnotations($event);
+            }
+        }
+    }
+
     @HostListener('window:keyup', ['$event'])
     handleKeyEvent($event: KeyboardEvent) {
         if (this._router.url.indexOf('/file/') < 0) {
@@ -356,13 +351,6 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             return;
         }
 
-        if (['ArrowUp', 'ArrowDown'].includes($event.key)) {
-            if (this.selectedAnnotations.length === 1) {
-                this._workloadComponent.navigateAnnotations($event);
-            }
-            return;
-        }
-
         if (['Escape'].includes($event.key)) {
             this.fullScreen = false;
             this.closeFullScreen();
@@ -404,6 +392,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     async viewerReady($event: WebViewerInstance) {
         this._instance = $event;
         this.ready = true;
+
         await this._stampPDF();
         await this._reloadAnnotations();
         this._setExcludedPageStyles();
@@ -413,7 +402,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         });
 
         // Go to initial page from query params
-        const pageNumber = this._lastPage || this._activatedRoute.snapshot.queryParams.page;
+        const pageNumber: string = this._lastPage || this._activatedRoute.snapshot.queryParams.page;
         if (pageNumber) {
             setTimeout(() => {
                 this.selectPage(parseInt(pageNumber, 10));
@@ -425,16 +414,14 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         } else {
             this._loadingService.stop();
         }
+        this._changeDetectorRef.markForCheck();
     }
 
     async annotationsChangedByReviewAction(annotation: AnnotationWrapper) {
+        this.multiSelectService.deactivate();
         await this._reloadAnnotationsForPage(annotation?.pageNumber || this.activeViewerPage);
     }
 
-    ocredFile(): void {
-        this._reloadFileOnReanalysis = true;
-    }
-
     closeFullScreen() {
         if (!!document.fullscreenElement && document.exitFullscreen) {
             document.exitFullscreen().then();
@@ -442,7 +429,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     }
 
     async switchView(viewMode: ViewMode) {
-        this.viewModeService.set(viewMode);
+        this.viewModeService.viewMode = viewMode;
         await this.updateViewMode();
         this._scrollViews();
     }
@@ -454,14 +441,17 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         download(data, file.filename);
     }
 
-    toggleSkipped($event) {
-        $event.stopPropagation();
-        $event.preventDefault();
-        this.hideSkipped = !this.hideSkipped;
-
-        this._handleIgnoreAnnotationsDrawing();
-
-        return false;
+    private _setActiveViewerPage() {
+        const currentPage = this._instance?.Core.documentViewer?.getCurrentPage();
+        if (!currentPage) {
+            this.activeViewerPage = 1;
+        } else {
+            this.activeViewerPage = this.viewModeService.isCompare
+                ? currentPage % 2 === 0
+                    ? currentPage / 2
+                    : (currentPage + 1) / 2
+                : currentPage;
+        }
     }
 
     private _setExcludedPageStyles() {
@@ -480,36 +470,36 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
     }
 
     private async _reloadFile(file: File): Promise {
-        await this._loadFileData(file, true);
-        await this._stampPDF();
-    }
+        const previousFile = this.fileData?.file;
+        await this._loadFileData(file);
 
-    private _setHiddenPropertyToNewAnnotations(newAnnotations: AnnotationWrapper[], oldAnnotations: AnnotationWrapper[]) {
-        newAnnotations.forEach(newAnnotation => {
-            const oldAnnotation = oldAnnotations.find(a => a.annotationId === newAnnotation.annotationId);
-            if (oldAnnotation) {
-                newAnnotation.hidden = oldAnnotation.hidden;
+        // file already loaded at least once
+        if (previousFile) {
+            // If it has been OCRd, we need to wait for it to load into the viewer
+            if (previousFile.lastOCRTime !== this.fileData?.file?.lastOCRTime) {
+                return;
             }
-        });
+        }
     }
 
     private async _stampPDF() {
-        if (!this._instance) {
+        if (!this._instance?.Core.documentViewer.getDocument()) {
             return;
         }
+
         const pdfNet = this._instance.Core.PDFNet;
-        const document = await this._instance.Core.documentViewer.getDocument().getPDFDoc();
+        const pdfDoc = await this._instance.Core.documentViewer.getDocument().getPDFDoc();
         const file = this._filesMapService.get(this.dossierId, this.fileId);
         const allPages = [...Array(file.numberOfPages).keys()].map(page => page + 1);
-        await clearStamps(document, pdfNet, allPages);
+        await clearStamps(pdfDoc, pdfNet, allPages);
 
         if (this.viewModeService.viewMode === 'REDACTED') {
             const dossier = this._dossiersService.find(this.dossierId);
             if (dossier.watermarkPreviewEnabled) {
-                await this._stampPreview(document, dossier.dossierTemplateId);
+                await this._stampPreview(pdfDoc, dossier.dossierTemplateId);
             }
         } else {
-            await this._stampExcludedPages(document, file.excludedPages);
+            await this._stampExcludedPages(pdfDoc, file.excludedPages);
         }
         this._instance.Core.documentViewer.refreshAll();
         this._instance.Core.documentViewer.updateView([this.activeViewerPage], this.activeViewerPage);
@@ -536,7 +526,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             await stampPDFPage(
                 document,
                 this._instance.Core.PDFNet,
-                this._translateService.instant('file-preview.excluded-from-redaction'),
+                this._translateService.instant('file-preview.excluded-from-redaction') as string,
                 17,
                 'courier',
                 'TOP_LEFT',
@@ -547,43 +537,68 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         }
     }
 
-    private _subscribeToFileUpdates(): void {
-        this.addSubscription = timer(0, 5000)
-            .pipe(switchMap(() => this._filesService.reload(this.dossierId, this.fileId)))
-            .subscribe();
-        this.addSubscription = this._filesMapService.fileReanalysed$
-            .pipe(filter(file => file.fileId === this.fileId))
-            .subscribe(async file => {
-                await this._loadFileData(file, !this._reloadFileOnReanalysis);
-                this._reloadFileOnReanalysis = false;
-                await this._reloadAnnotations();
-                this._loadingService.stop();
-            });
+    private async _fileUpdated(file: File): Promise {
+        if (!this.fileData || file.lastProcessed === this.fileData.file.lastProcessed) {
+            await this._reloadFile(file);
+        } else {
+            // File reanalysed
+            const previousAnnotations = this.visibleAnnotations;
+            await this._loadFileData(file);
+            await this._reloadAnnotations(previousAnnotations);
+        }
+
+        return file;
     }
 
-    private async _loadFileData(file: File, performUpdate = false): Promise {
+    private _subscribeToFileUpdates(): void {
+        this.addActiveScreenSubscription = this._filesMapService
+            .watch$(this.dossierId, this.fileId)
+            .pipe(switchMap(file => this._fileUpdated(file)))
+            .subscribe();
+
+        this.addActiveScreenSubscription = timer(0, 5000)
+            .pipe(switchMap(() => this._filesService.reload(this.dossierId, this.fileId)))
+            .subscribe();
+
+        this.addActiveScreenSubscription = this._dossiersService
+            .getEntityDeleted$(this.dossierId)
+            .pipe(tap(() => this._handleDeletedDossier()))
+            .subscribe();
+
+        this.addActiveScreenSubscription = this._filesMapService
+            .watchDeleted$(this.fileId)
+            .pipe(tap(() => this._handleDeletedFile()))
+            .subscribe();
+
+        this.addActiveScreenSubscription = this._skippedService.hideSkipped$
+            .pipe(tap(hideSkipped => this._handleIgnoreAnnotationsDrawing(hideSkipped)))
+            .subscribe();
+    }
+
+    private _handleDeletedDossier(): void {
+        this._errorService.set(
+            new CustomError(_('error.deleted-entity.file-dossier.label'), _('error.deleted-entity.file-dossier.action'), 'iqser:expand'),
+        );
+    }
+
+    private _handleDeletedFile(): void {
+        this._errorService.set(
+            new CustomError(_('error.deleted-entity.file.label'), _('error.deleted-entity.file.action'), 'iqser:expand'),
+        );
+    }
+
+    private async _loadFileData(file: File): Promise {
         if (!file || file.isError) {
             return this._router.navigate([this._dossiersService.find(this.dossierId).routerLink]);
         }
 
-        const fileData = await this._fileDownloadService.loadDataFor(file).toPromise();
+        const fileData = await this._pdfViewerDataService.loadDataFor(file).toPromise();
 
         if (file.isPending) {
             return;
         }
 
-        if (performUpdate && !!this.fileData) {
-            this.fileData.redactionLog = fileData.redactionLog;
-            this.fileData.viewedPages = fileData.viewedPages;
-            const excludedOrIncludedPages = new Set(diff(this.fileData.file.excludedPages, file.excludedPages));
-            const currentPageAnnotations = this.annotations.filter(a => excludedOrIncludedPages.has(a.pageNumber));
-            this.fileData.file = file;
-            if (excludedOrIncludedPages?.size) {
-                await this._cleanupAndRedrawAnnotations(currentPageAnnotations, a => excludedOrIncludedPages.has(a.pageNumber));
-            }
-        } else {
-            this.fileData = fileData;
-        }
+        this._stateService.fileData = fileData;
     }
 
     @Debounce(0)
@@ -592,32 +607,57 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         this._workloadComponent?.scrollAnnotations();
     }
 
-    private async _reloadAnnotations() {
-        this.fileData.redactionLog = await this._fileDownloadService.loadRedactionLogFor(this.dossierId, this.fileId).toPromise();
-        await this._cleanupAndRedrawAnnotations(this.annotations);
+    private async _reloadAnnotations(previousAnnotations?: AnnotationWrapper[]) {
+        this._deleteAnnotations();
+        await this._cleanupAndRedrawAnnotations(previousAnnotations);
     }
 
     private async _reloadAnnotationsForPage(page: number) {
-        const currentPageAnnotations = this.annotations.filter(a => a.pageNumber === page);
+        this.fileData.file = await this._filesService.reload(this.dossierId, this.fileId).toPromise();
 
-        this.fileData.redactionLog = await this._fileDownloadService.loadRedactionLogFor(this.dossierId, this.fileId).toPromise();
+        // if this action triggered a re-processing,
+        // we don't want to redraw for this page since they will get redrawn as soon as processing ends;
+        if (this.fileData.file.isProcessing) {
+            return;
+        }
 
+        const currentPageAnnotations = this.visibleAnnotations.filter(a => a.pageNumber === page);
+        this.fileData.redactionLog = await this._pdfViewerDataService.loadRedactionLogFor(this.dossierId, this.fileId).toPromise();
+
+        this._deleteAnnotations(currentPageAnnotations);
         await this._cleanupAndRedrawAnnotations(currentPageAnnotations, annotation => annotation.pageNumber === page);
     }
 
+    private _deleteAnnotations(annotationsToDelete?: AnnotationWrapper[]) {
+        if (!this._instance?.Core.documentViewer.getDocument()) {
+            return;
+        }
+
+        if (!annotationsToDelete) {
+            this._instance.Core.annotationManager.deleteAnnotations(this._instance.Core.annotationManager.getAnnotationsList(), {
+                imported: true,
+                force: true,
+            });
+        }
+        annotationsToDelete?.forEach(annotation => {
+            this._findAndDeleteAnnotation(annotation.id);
+        });
+    }
+
     private async _cleanupAndRedrawAnnotations(
-        annotationsToDelete: AnnotationWrapper[],
+        currentAnnotations?: AnnotationWrapper[],
         newAnnotationsFilter?: (annotation: AnnotationWrapper) => boolean,
     ) {
+        if (!this._instance?.Core.documentViewer.getDocument()) {
+            return;
+        }
+
         this.rebuildFilters();
 
         if (this.viewModeService.viewMode === 'STANDARD') {
             const startTime = new Date().getTime();
-            annotationsToDelete?.forEach(annotation => {
-                this._findAndDeleteAnnotation(annotation.id);
-            });
-            const newAnnotations = newAnnotationsFilter ? this.annotations.filter(newAnnotationsFilter) : this.annotations;
-            this._handleDeltaAnnotationFilters(annotationsToDelete ?? [], newAnnotations);
+            const newAnnotations = newAnnotationsFilter ? this.visibleAnnotations.filter(newAnnotationsFilter) : this.visibleAnnotations;
+            this._handleDeltaAnnotationFilters(currentAnnotations ?? [], newAnnotations);
             await this._redrawAnnotations(newAnnotations);
             console.log(
                 `[REDACTION] Annotations redraw time: ${new Date().getTime() - startTime} ms for ${newAnnotations.length} annotations`,
@@ -625,13 +665,12 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         }
     }
 
-    private _redrawAnnotations(annotations = this.annotationData.allAnnotations) {
+    private _redrawAnnotations(annotations = this.allAnnotations) {
         return this._annotationDrawService.drawAnnotations(
             this._instance,
             annotations,
             this.fileId,
             this.dossierId,
-            this.hideSkipped,
             !!this.viewModeService.isCompare,
         );
     }
@@ -648,6 +687,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
 
         const oldPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(currentPageAnnotations);
         const newPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(newPageAnnotations);
+
         handleFilterDelta(oldPageSpecificFilters, newPageSpecificFilters, primaryFilters);
         this._filterService.addFilterGroup({
             ...primaryFilterGroup,
@@ -673,9 +713,13 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         }
     }
 
-    private _handleIgnoreAnnotationsDrawing() {
+    private _handleIgnoreAnnotationsDrawing(hideSkipped: boolean): void {
         const ignored = this._getAnnotations(a => a.getCustomData('skipped'));
-        return this.hideSkipped ? this._hide(ignored) : this._show(ignored);
+        if (hideSkipped) {
+            this._hide(ignored);
+        } else {
+            this._show(ignored);
+        }
     }
 
     private _getAnnotations(predicate: (value) => unknown) {
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview.module.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview.module.ts
index 6e9c902ae..386d9c254 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview.module.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview.module.ts
@@ -19,6 +19,10 @@ import { TypeAnnotationIconComponent } from './components/type-annotation-icon/t
 import { OverlayModule } from '@angular/cdk/overlay';
 import { ViewSwitchComponent } from './components/view-switch/view-switch.component';
 import { UserManagementComponent } from './components/user-management/user-management.component';
+import { AnnotationReferencesListComponent } from './components/annotation-references-list/annotation-references-list.component';
+import { AcceptRecommendationDialogComponent } from './dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component';
+import { AnnotationCardComponent } from './components/annotation-card/annotation-card.component';
+import { AnnotationReferencesPageIndicatorComponent } from './components/annotation-references-page-indicator/annotation-references-page-indicator.component';
 
 const routes: Routes = [
     {
@@ -44,6 +48,10 @@ const routes: Routes = [
         TypeAnnotationIconComponent,
         ViewSwitchComponent,
         UserManagementComponent,
+        AcceptRecommendationDialogComponent,
+        AnnotationReferencesListComponent,
+        AnnotationCardComponent,
+        AnnotationReferencesPageIndicatorComponent,
     ],
     imports: [
         RouterModule.forChild(routes),
diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts
similarity index 90%
rename from apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
rename to apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts
index 87f773043..0a33bd58c 100644
--- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts
@@ -1,19 +1,19 @@
 import { EventEmitter, Inject, Injectable, NgZone } from '@angular/core';
 import { PermissionsService } from '@services/permissions.service';
-import { ManualAnnotationService } from './manual-annotation.service';
+import { ManualAnnotationService } from '../../../services/manual-annotation.service';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Observable } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
 import { getFirstRelevantTextPart } from '@utils/functions';
 import { AnnotationPermissions } from '@models/file/annotation.permissions';
-import { DossiersDialogService } from './dossiers-dialog.service';
-import { BASE_HREF } from '../../../tokens';
+import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
+import { BASE_HREF } from '../../../../../tokens';
 import { UserService } from '@services/user.service';
 import { Core, WebViewerInstance } from '@pdftron/webviewer';
 import { Dossier, File, IAddRedactionRequest, ILegalBasisChangeRequest, IRectangle, IResizeRequest } from '@red/domain';
-import { toPosition } from '../utils/pdf-calculation.utils';
+import { toPosition } from '../../../utils/pdf-calculation.utils';
 import { AnnotationDrawService } from './annotation-draw.service';
-import { translateQuads } from '../../../utils';
+import { translateQuads } from '@utils/pdf-coordinates';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import Annotation = Core.Annotations.Annotation;
 
@@ -59,9 +59,15 @@ export class AnnotationActionsService {
         });
     }
 
-    forceRedaction($event: MouseEvent, annotations: AnnotationWrapper[], file: File, annotationsChanged: EventEmitter) {
-        const data = { dossier: this._dossier(file) };
-        this._dialogService.openDialog('forceRedaction', $event, data, (request: ILegalBasisChangeRequest) => {
+    forceAnnotation(
+        $event: MouseEvent,
+        annotations: AnnotationWrapper[],
+        file: File,
+        annotationsChanged: EventEmitter,
+        hint: boolean = false,
+    ) {
+        const data = { dossier: this._dossier(file), hint };
+        this._dialogService.openDialog('forceAnnotation', $event, data, (request: ILegalBasisChangeRequest) => {
             annotations.forEach(annotation => {
                 this._processObsAndEmit(
                     this._manualAnnotationService.force(
@@ -107,14 +113,19 @@ export class AnnotationActionsService {
         );
     }
 
-    suggestRemoveAnnotation(
+    removeOrSuggestRemoveAnnotation(
         $event: MouseEvent,
         annotations: AnnotationWrapper[],
         file: File,
         removeFromDictionary: boolean,
         annotationsChanged: EventEmitter,
     ) {
-        const data = { annotationsToRemove: annotations, removeFromDictionary, dossier: this._dossier(file) };
+        const data = {
+            annotationsToRemove: annotations,
+            removeFromDictionary,
+            dossier: this._dossier(file),
+            hint: annotations[0].hintDictionary,
+        };
         this._dialogService.openDialog('removeAnnotations', $event, data, (result: { comment: string }) => {
             annotations.forEach(annotation => {
                 this._processObsAndEmit(
@@ -173,11 +184,16 @@ export class AnnotationActionsService {
         annotations: AnnotationWrapper[],
         file: File,
         annotationsChanged: EventEmitter,
+        comment?: { text: string },
     ) {
         $event?.stopPropagation();
 
         annotations.forEach(annotation => {
-            this._processObsAndEmit(this._manualAnnotationService.addRecommendation(annotation, file), annotation, annotationsChanged);
+            this._processObsAndEmit(
+                this._manualAnnotationService.addRecommendation(annotation, file, comment),
+                annotation,
+                annotationsChanged,
+            );
         });
     }
 
@@ -279,7 +295,7 @@ export class AnnotationActionsService {
                 title: this._translateService.instant('annotation-actions.remove-annotation.remove-from-dict'),
                 onClick: () => {
                     this._ngZone.run(() => {
-                        this.suggestRemoveAnnotation(null, annotations, file, true, annotationsChanged);
+                        this.removeOrSuggestRemoveAnnotation(null, annotations, file, true, annotationsChanged);
                     });
                 },
             });
@@ -349,7 +365,21 @@ export class AnnotationActionsService {
                 title: this._translateService.instant('annotation-actions.force-redaction.label'),
                 onClick: () => {
                     this._ngZone.run(() => {
-                        this.forceRedaction(null, annotations, file, annotationsChanged);
+                        this.forceAnnotation(null, annotations, file, annotationsChanged);
+                    });
+                },
+            });
+        }
+
+        const canForceHint = annotationPermissions.reduce((acc, next) => acc && next.permissions.canForceHint, true);
+        if (canForceHint) {
+            availableActions.push({
+                type: 'actionButton',
+                img: this._convertPath('/assets/icons/general/thumb-up.svg'),
+                title: this._translateService.instant('annotation-actions.force-hint.label'),
+                onClick: () => {
+                    this._ngZone.run(() => {
+                        this.forceAnnotation(null, annotations, file, annotationsChanged, true);
                     });
                 },
             });
@@ -380,7 +410,7 @@ export class AnnotationActionsService {
                 title: this._translateService.instant('annotation-actions.remove-annotation.only-here'),
                 onClick: () => {
                     this._ngZone.run(() => {
-                        this.suggestRemoveAnnotation(null, annotations, file, false, annotationsChanged);
+                        this.removeOrSuggestRemoveAnnotation(null, annotations, file, false, annotationsChanged);
                     });
                 },
             });
@@ -416,7 +446,7 @@ export class AnnotationActionsService {
         viewer: WebViewerInstance,
         file: File,
         annotationWrapper: AnnotationWrapper,
-        annotationsChanged: EventEmitter,
+        annotationsChanged?: EventEmitter,
     ) {
         const data = { dossier: this._dossier(file) };
         this._dialogService.openDialog('resizeAnnotation', $event, data, async (result: { comment: string }) => {
@@ -461,15 +491,19 @@ export class AnnotationActionsService {
         return this._dossiersService.find(file.dossierId);
     }
 
-    private _processObsAndEmit(obs: Observable, annotation: AnnotationWrapper, annotationsChanged: EventEmitter) {
-        obs.subscribe(
-            () => {
+    private _processObsAndEmit(
+        obs: Observable,
+        annotation: AnnotationWrapper,
+        annotationsChanged: EventEmitter,
+    ) {
+        obs.subscribe({
+            next: () => {
                 annotationsChanged.emit(annotation);
             },
-            () => {
+            error: () => {
                 annotationsChanged.emit();
             },
-        );
+        });
     }
 
     private _getFalsePositiveText(annotation: AnnotationWrapper) {
diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts
similarity index 93%
rename from apps/red-ui/src/app/modules/dossier/services/annotation-draw.service.ts
rename to apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts
index ecdccdbc9..e7ce07d5f 100644
--- a/apps/red-ui/src/app/modules/dossier/services/annotation-draw.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts
@@ -5,10 +5,12 @@ import { AppStateService } from '@state/app-state.service';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
-import { RedactionLogService } from './redaction-log.service';
+import { RedactionLogService } from '../../../services/redaction-log.service';
 import { environment } from '@environments/environment';
 
 import { IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain';
+import { SkippedService } from './skipped.service';
+import { firstValueFrom } from 'rxjs';
 import Annotation = Core.Annotations.Annotation;
 
 @Injectable()
@@ -18,6 +20,7 @@ export class AnnotationDrawService {
         private readonly _dossiersService: DossiersService,
         private readonly _redactionLogService: RedactionLogService,
         private readonly _userPreferenceService: UserPreferenceService,
+        private readonly _skippedService: SkippedService,
     ) {}
 
     async drawAnnotations(
@@ -25,7 +28,6 @@ export class AnnotationDrawService {
         annotationWrappers: AnnotationWrapper[],
         fileId: string,
         dossierId: string,
-        hideSkipped = false,
         compareMode = false,
     ) {
         if (!activeViewer) {
@@ -36,7 +38,7 @@ export class AnnotationDrawService {
 
         await pdfNet.runWithCleanup(
             async () => {
-                await this._drawAnnotations(activeViewer, annotationWrappers, fileId, dossierId, hideSkipped, compareMode);
+                await this._drawAnnotations(activeViewer, annotationWrappers, fileId, dossierId, compareMode);
             },
             environment.licenseKey ? atob(environment.licenseKey) : null,
         );
@@ -82,21 +84,17 @@ export class AnnotationDrawService {
         annotationWrappers: AnnotationWrapper[],
         fileId: string,
         dossierId: string,
-        hideSkipped: boolean,
         compareMode: boolean,
     ) {
-        const annotations = annotationWrappers.map(annotation =>
-            this._computeAnnotation(activeViewer, annotation, dossierId, hideSkipped, compareMode),
-        );
+        const annotations = annotationWrappers.map(annotation => this._computeAnnotation(activeViewer, annotation, dossierId, compareMode));
         const annotationManager = activeViewer.Core.annotationManager;
         annotationManager.addAnnotations(annotations, { imported: true });
         await annotationManager.drawAnnotationsFromList(annotations);
 
         if (this._userPreferenceService.areDevFeaturesEnabled) {
-            const sectionsGrid = await this._redactionLogService
-                .getSectionGrid(dossierId, fileId)
-                .toPromise()
-                .catch(() => ({ rectanglesPerPage: {} }));
+            const sectionsGrid = await firstValueFrom(this._redactionLogService.getSectionGrid(dossierId, fileId)).catch(() => ({
+                rectanglesPerPage: {},
+            }));
             await this._drawSections(activeViewer, sectionsGrid, dossierId);
         }
     }
@@ -143,7 +141,6 @@ export class AnnotationDrawService {
         activeViewer: WebViewerInstance,
         annotationWrapper: AnnotationWrapper,
         dossierId: string,
-        hideSkipped: boolean,
         compareMode: boolean,
     ) {
         const pageNumber = compareMode ? annotationWrapper.pageNumber * 2 - 1 : annotationWrapper.pageNumber;
@@ -177,7 +174,7 @@ export class AnnotationDrawService {
 
         annotation.Hidden =
             annotationWrapper.isChangeLogRemoved ||
-            (hideSkipped && annotationWrapper.isSkipped) ||
+            (this._skippedService.hideSkipped && annotationWrapper.isSkipped) ||
             annotationWrapper.isOCR ||
             annotationWrapper.hidden;
         annotation.setCustomData('redact-manager', 'true');
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-references.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-references.service.ts
new file mode 100644
index 000000000..5cdca8162
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-references.service.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { shareDistinctLast } from '@iqser/common-ui';
+import { AnnotationWrapper } from '@models/file/annotation.wrapper';
+
+@Injectable()
+export class AnnotationReferencesService {
+    readonly annotation$: Observable;
+    private readonly _annotation$ = new BehaviorSubject(undefined);
+
+    constructor() {
+        this.annotation$ = this._annotation$.asObservable().pipe(shareDistinctLast());
+    }
+
+    show(annotation: AnnotationWrapper) {
+        this._annotation$.next(annotation);
+    }
+
+    hide() {
+        this._annotation$.next(undefined);
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/commenting.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/commenting.service.ts
new file mode 100644
index 000000000..523631f3a
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/commenting.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+import { shareDistinctLast } from '@iqser/common-ui';
+
+@Injectable()
+export class CommentingService {
+    private _activeAnnotations = new BehaviorSubject>(new Set());
+
+    isActive$(annotationId: string): Observable {
+        return this._activeAnnotations.pipe(
+            map(annotations => annotations.has(annotationId)),
+            startWith(false),
+            shareDistinctLast(),
+        );
+    }
+
+    toggle(annotationId: string): void {
+        if (this._activeAnnotations.value.has(annotationId)) {
+            this._deactivate(annotationId);
+        } else {
+            this._activate(annotationId);
+        }
+    }
+
+    private _activate(annotationId: string): void {
+        const currentValue = this._activeAnnotations.value;
+        const newSet = new Set(currentValue).add(annotationId);
+        this._activeAnnotations.next(newSet);
+    }
+
+    private _deactivate(annotationId: string): void {
+        const currentValue = this._activeAnnotations.value;
+        const newSet = new Set(currentValue);
+        newSet.delete(annotationId);
+        this._activeAnnotations.next(newSet);
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
new file mode 100644
index 000000000..f3175e96c
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { FileDataModel } from '@models/file/file-data.model';
+
+@Injectable()
+export class FilePreviewStateService {
+    readonly fileData$: Observable;
+    private readonly _fileData$ = new BehaviorSubject(undefined);
+
+    constructor() {
+        this.fileData$ = this._fileData$.asObservable();
+    }
+
+    get fileData(): FileDataModel {
+        return this._fileData$.value;
+    }
+
+    set fileData(fileDataModel: FileDataModel) {
+        this._fileData$.next(fileDataModel);
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/skipped.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/skipped.service.ts
new file mode 100644
index 000000000..9f1f6238f
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/skipped.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { skip } from 'rxjs/operators';
+import { shareDistinctLast } from '@iqser/common-ui';
+
+@Injectable()
+export class SkippedService {
+    readonly hideSkipped$: Observable;
+    private readonly _hideSkipped$ = new BehaviorSubject(false);
+
+    constructor() {
+        this.hideSkipped$ = this._hideSkipped$.pipe(shareDistinctLast(), skip(1));
+    }
+
+    get hideSkipped(): boolean {
+        return this._hideSkipped$.value;
+    }
+
+    toggleSkipped($event): void {
+        $event.stopPropagation();
+        $event.preventDefault();
+        this._hideSkipped$.next(!this.hideSkipped);
+    }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/view-mode.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/view-mode.service.ts
index a506d19aa..d38a0cc30 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/view-mode.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/view-mode.service.ts
@@ -5,10 +5,14 @@ import { ViewMode } from '@red/domain';
 @Injectable()
 export class ViewModeService {
     readonly viewMode$: Observable;
+    readonly compareMode$: Observable;
     private readonly _viewMode$ = new BehaviorSubject('STANDARD');
 
+    private readonly _compareMode$ = new BehaviorSubject(false);
+
     constructor() {
         this.viewMode$ = this._viewMode$.asObservable();
+        this.compareMode$ = this._compareMode$.asObservable();
     }
 
     get viewMode() {
@@ -23,15 +27,19 @@ export class ViewModeService {
         return this._viewMode$.value === 'DELTA';
     }
 
-    get isCompare() {
-        return this._viewMode$.value === 'COMPARE';
-    }
-
     get isRedacted() {
         return this._viewMode$.value === 'REDACTED';
     }
 
-    set(mode: ViewMode) {
+    set viewMode(mode: ViewMode) {
         this._viewMode$.next(mode);
     }
+
+    get isCompare() {
+        return this._compareMode$.value;
+    }
+
+    set compareMode(compareMode: boolean) {
+        this._compareMode$.next(compareMode);
+    }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts
index a8c467bd8..5c1ea0c65 100644
--- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts
@@ -42,27 +42,26 @@ export class AnnotationProcessingService {
         const filters: INestedFilter[] = [];
 
         annotations?.forEach(a => {
-            const topLevelFilter = !['hint', 'redaction', 'recommendation', 'skipped'].includes(a.superType);
-            const key = topLevelFilter ? a.superType : a.superType + a.type;
-            const filter = filterMap.get(key);
+            const topLevelFilter = a.topLevelFilter;
+            const filter = filterMap.get(a.filterKey);
             if (filter) {
                 filter.matches += 1;
             } else {
                 // top level filter
                 if (topLevelFilter) {
-                    this._createParentFilter(key, filterMap, filters);
+                    this._createParentFilter(a.superType, filterMap, filters);
                 } else {
                     let parentFilter = filterMap.get(a.superType);
                     if (!parentFilter) {
                         parentFilter = this._createParentFilter(a.superType, filterMap, filters);
                     }
                     const childFilter: IFilter = {
-                        id: a.type,
+                        id: a.filterKey,
                         label: a.type,
                         checked: false,
                         matches: 1,
                     };
-                    filterMap.set(key, childFilter);
+                    filterMap.set(a.filterKey, childFilter);
                     parentFilter.children.push(new Filter(childFilter));
                 }
             }
@@ -173,12 +172,7 @@ export class AnnotationProcessingService {
         return true;
     };
 
-    private _checkByFilterKey = (filter: INestedFilter, annotation: AnnotationWrapper) => {
-        const superType = annotation.superType;
-        const isNotTopLevelFilter = superType === 'hint' || superType === 'redaction' || superType === 'recommendation';
-
-        return filter.id === superType || (filter.id === annotation.type && isNotTopLevelFilter);
-    };
+    private _checkByFilterKey = (filter: NestedFilter | IFilter, annotation: AnnotationWrapper) => filter.id === annotation.filterKey;
 
     private _sortAnnotations(annotations: AnnotationWrapper[]): AnnotationWrapper[] {
         return annotations.sort((ann1, ann2) => {
diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
index 4e14a62ba..ca5aef32e 100644
--- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component';
 import { RemoveAnnotationsDialogComponent } from '../dialogs/remove-annotations-dialog/remove-annotations-dialog.component';
-import { ForceRedactionDialogComponent } from '../dialogs/force-redaction-dialog/force-redaction-dialog.component';
+import { ForceAnnotationDialogComponent } from '../dialogs/force-redaction-dialog/force-annotation-dialog.component';
 import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component';
 import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
 import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component';
@@ -22,7 +22,7 @@ type DialogType =
     | 'changeLegalBasis'
     | 'removeAnnotations'
     | 'resizeAnnotation'
-    | 'forceRedaction'
+    | 'forceAnnotation'
     | 'manualAnnotation';
 
 @Injectable()
@@ -30,6 +30,7 @@ export class DossiersDialogService extends DialogService {
     protected readonly _config: DialogConfig = {
         confirm: {
             component: ConfirmationDialogComponent,
+            dialogConfig: { disableClose: false },
         },
         documentInfo: {
             component: DocumentInfoDialogComponent,
@@ -45,6 +46,7 @@ export class DossiersDialogService extends DialogService {
         },
         assignFile: {
             component: AssignReviewerApproverDialogComponent,
+            dialogConfig: { disableClose: false },
         },
         recategorizeImage: {
             component: RecategorizeImageDialogComponent,
@@ -58,8 +60,8 @@ export class DossiersDialogService extends DialogService {
         resizeAnnotation: {
             component: ResizeAnnotationDialogComponent,
         },
-        forceRedaction: {
-            component: ForceRedactionDialogComponent,
+        forceAnnotation: {
+            component: ForceAnnotationDialogComponent,
         },
         manualAnnotation: {
             component: ManualAnnotationDialogComponent,
diff --git a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
index e633cfb30..4bd24fd9e 100644
--- a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
@@ -60,9 +60,9 @@ export class ManualAnnotationService extends GenericService
             : this[this.CONFIG[mode]](body, secondParam, file.dossierId, file.id);
 
         return obs.pipe(
-            tap(
-                () => this._toaster.success(this._getMessage(mode, modifyDictionary), { positionClass: 'toast-file-preview' }),
-                (error: HttpErrorResponse) => {
+            tap({
+                next: () => this._toaster.success(this._getMessage(mode, modifyDictionary), { positionClass: 'toast-file-preview' }),
+                error: (error: HttpErrorResponse) => {
                     const isConflict = error.status === HttpStatusCode.Conflict;
                     this._toaster.error(this._getMessage(mode, modifyDictionary, true, isConflict), {
                         error,
@@ -73,7 +73,7 @@ export class ManualAnnotationService extends GenericService
                         positionClass: 'toast-file-preview',
                     });
                 },
-            ),
+            }),
         );
     }
 
@@ -89,15 +89,15 @@ export class ManualAnnotationService extends GenericService
         return super.delete({}, url);
     }
 
-    addRecommendation(annotation: AnnotationWrapper, file: File) {
+    addRecommendation(annotation: AnnotationWrapper, file: File, comment = { text: 'Accepted Recommendation' }) {
         const manualRedactionEntry: IAddRedactionRequest = {};
         manualRedactionEntry.addToDictionary = true;
         // set the ID as reason, so we can hide the suggestion
-        manualRedactionEntry.reason = annotation.id;
+        manualRedactionEntry.reason = annotation.annotationId;
         manualRedactionEntry.value = annotation.value;
         manualRedactionEntry.positions = annotation.positions;
         manualRedactionEntry.type = annotation.recommendationType;
-        manualRedactionEntry.comment = { text: 'Accepted Recommendation' };
+        manualRedactionEntry.comment = comment;
         return this.addAnnotation(manualRedactionEntry, file);
     }
 
diff --git a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
index fb20bd16c..bdf4a81d6 100644
--- a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
@@ -3,18 +3,26 @@ import { forkJoin, Observable, of } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 import { FileDataModel } from '@models/file/file-data.model';
 import { PermissionsService } from '@services/permissions.service';
-import { File } from '@red/domain';
+import { File, IRedactionLog, IViewedPage } from '@red/domain';
 import { FileManagementService } from '@services/entity-services/file-management.service';
 import { RedactionLogService } from './redaction-log.service';
 import { ViewedPagesService } from '@services/entity-services/viewed-pages.service';
+import { AppStateService } from '../../../state/app-state.service';
+import { DossiersService } from '../../../services/entity-services/dossiers.service';
+import { UserPreferenceService } from '../../../services/user-preference.service';
+import { FilePreviewStateService } from '../screens/file-preview-screen/services/file-preview-state.service';
 
 @Injectable()
 export class PdfViewerDataService {
     constructor(
+        private readonly _dossiersService: DossiersService,
         private readonly _permissionsService: PermissionsService,
         private readonly _fileManagementService: FileManagementService,
         private readonly _redactionLogService: RedactionLogService,
         private readonly _viewedPagesService: ViewedPagesService,
+        private readonly _appStateService: AppStateService,
+        private readonly _userPreferenceService: UserPreferenceService,
+        private readonly _stateService: FilePreviewStateService,
     ) {}
 
     loadRedactionLogFor(dossierId: string, fileId: string) {
@@ -25,11 +33,24 @@ export class PdfViewerDataService {
     }
 
     loadDataFor(file: File): Observable {
-        const file$ = this.downloadOriginalFile(file);
-        const reactionLog$ = this.loadRedactionLogFor(file.dossierId, file.fileId);
+        const fileData = this._stateService.fileData;
+        const blob$ = fileData?.file.cacheIdentifier === file.cacheIdentifier ? of(fileData.blob$.value) : this.downloadOriginalFile(file);
+        const redactionLog$ = this.loadRedactionLogFor(file.dossierId, file.fileId);
         const viewedPages$ = this.getViewedPagesFor(file);
 
-        return forkJoin([file$, reactionLog$, viewedPages$]).pipe(map(data => new FileDataModel(file, ...data)));
+        const dossier = this._dossiersService.find(file.dossierId);
+
+        return forkJoin([blob$, redactionLog$, viewedPages$]).pipe(
+            map(
+                (data: [blob: Blob, redactionLog: IRedactionLog, viewedPages: IViewedPage[]]) =>
+                    new FileDataModel(
+                        file,
+                        ...data,
+                        this._appStateService.dictionaryData[dossier.dossierTemplateId],
+                        this._userPreferenceService.areDevFeaturesEnabled,
+                    ),
+            ),
+        );
     }
 
     getViewedPagesFor(file: File) {
diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
index 964825091..ae697a33e 100644
--- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
@@ -1,14 +1,13 @@
 import {
     ChangeDetectionStrategy,
+    ChangeDetectorRef,
     Component,
-    EventEmitter,
     HostBinding,
     Input,
     OnChanges,
     OnDestroy,
     OnInit,
     Optional,
-    Output,
     ViewChild,
 } from '@angular/core';
 import { PermissionsService } from '@services/permissions.service';
@@ -37,6 +36,7 @@ import { ExcludedPagesService } from '../../../screens/file-preview-screen/servi
 import { tap } from 'rxjs/operators';
 import { DocumentInfoService } from '../../../screens/file-preview-screen/services/document-info.service';
 import { ExpandableFileActionsComponent } from '@shared/components/expandable-file-actions/expandable-file-actions.component';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-file-actions [file] [type]',
@@ -51,7 +51,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
     @Input() file: File;
     @Input() type: 'file-preview' | 'dossier-overview-list' | 'dossier-overview-workflow';
     @Input() maxWidth: number;
-    @Output() readonly ocredFile = new EventEmitter();
 
     toggleTooltip?: string;
     assignTooltip?: string;
@@ -97,6 +96,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
         private readonly _userPreferenceService: UserPreferenceService,
         private readonly _reanalysisService: ReanalysisService,
         private readonly _router: Router,
+        private readonly _changeRef: ChangeDetectorRef,
     ) {
         super();
     }
@@ -158,7 +158,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
                 ariaExpanded: this._excludedPagesService?.shown$,
                 showDot: !!this.file.excludedPages?.length,
                 icon: 'red:exclude-pages',
-                show: !!this._excludedPagesService,
+                show: !!this._excludedPagesService && !this.file.excluded,
             },
             {
                 type: ActionTypes.circleBtn,
@@ -225,7 +225,10 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
     }
 
     ngOnInit() {
-        this._dossiersService.getEntityChanged$(this.file.dossierId).pipe(tap(() => this._setup()));
+        this.addSubscription = this._dossiersService
+            .getEntityChanged$(this.file.dossierId)
+            .pipe(tap(() => this._setup()))
+            .subscribe();
     }
 
     ngOnChanges() {
@@ -269,7 +272,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
                 this._loadingService.start();
                 try {
                     const dossier = this._dossiersService.find(this.file.dossierId);
-                    await this._fileManagementService.delete([this.file.fileId], this.file.dossierId).toPromise();
+                    await firstValueFrom(this._fileManagementService.delete([this.file.fileId], this.file.dossierId));
                     await this._router.navigate([dossier.routerLink]);
                 } catch (error) {
                     this._toaster.error(_('error.http.generic'), { params: error });
@@ -296,7 +299,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
         if ($event) {
             $event.stopPropagation();
         }
-        await this._reanalysisService.reanalyzeFilesForDossier([this.file.fileId], this.file.dossierId, true).toPromise();
+        await firstValueFrom(this._reanalysisService.reanalyzeFilesForDossier([this.file.fileId], this.file.dossierId, true));
     }
 
     private async _setFileUnderApproval($event: MouseEvent) {
@@ -307,8 +310,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
     private async _ocrFile($event: MouseEvent) {
         $event.stopPropagation();
         this._loadingService.start();
-        await this._reanalysisService.ocrFiles([this.file.fileId], this.file.dossierId).toPromise();
-        this.ocredFile.emit();
+        await firstValueFrom(this._reanalysisService.ocrFiles([this.file.fileId], this.file.dossierId));
         this._loadingService.stop();
     }
 
@@ -318,7 +320,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
 
     private async _toggleAnalysis() {
         this._loadingService.start();
-        await this._reanalysisService.toggleAnalysis(this.file.dossierId, this.file.fileId, !this.file.excluded).toPromise();
+        await firstValueFrom(this._reanalysisService.toggleAnalysis(this.file.dossierId, this.file.fileId, !this.file.excluded));
         this._loadingService.stop();
     }
 
@@ -355,11 +357,13 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
         this.showReanalyseDossierOverview = this.canReanalyse && this.isDossierOverview && this.analysisForced;
 
         this.buttons = this._buttons;
+
+        this._changeRef.markForCheck();
     }
 
     private async _setFileApproved() {
         this._loadingService.start();
-        await this._filesService.setApprovedFor([this.file.id], this.file.dossierId).toPromise();
+        await firstValueFrom(this._filesService.setApprovedFor([this.file.id], this.file.dossierId));
         this._loadingService.stop();
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts
index 0e1de1f66..0694e0588 100644
--- a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts
@@ -6,7 +6,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { FilesService } from '@services/entity-services/files.service';
 import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui';
 import { DossiersService } from '@services/entity-services/dossiers.service';
-import { Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 
 @Injectable()
@@ -29,14 +29,12 @@ export class FileAssignService {
                     question: _('confirmation-dialog.assign-file-to-me.question'),
                 });
                 this._dialogService.openDialog('confirm', null, data, () => {
-                    this._assignReviewerToCurrentUser(files)
-                        .toPromise()
+                    firstValueFrom(this._assignReviewerToCurrentUser(files))
                         .then(() => resolve())
                         .catch(() => reject());
                 });
             } else {
-                this._assignReviewerToCurrentUser(files)
-                    .toPromise()
+                firstValueFrom(this._assignReviewerToCurrentUser(files))
                     .then(() => resolve())
                     .catch(() => reject());
             }
@@ -83,28 +81,28 @@ export class FileAssignService {
         this._loadingService.start();
         try {
             if (!userId) {
-                await this._filesService
-                    .setUnassigned(
+                await firstValueFrom(
+                    this._filesService.setUnassigned(
                         files.map(f => f.fileId),
                         files[0].dossierId,
-                    )
-                    .toPromise();
+                    ),
+                );
             } else if (mode === 'reviewer') {
-                await this._filesService
-                    .setReviewerFor(
+                await firstValueFrom(
+                    this._filesService.setReviewerFor(
                         files.map(f => f.fileId),
                         files[0].dossierId,
                         userId,
-                    )
-                    .toPromise();
+                    ),
+                );
             } else {
-                await this._filesService
-                    .setUnderApprovalFor(
+                await firstValueFrom(
+                    this._filesService.setUnderApprovalFor(
                         files.map(f => f.fileId),
                         files[0].dossierId,
                         userId,
-                    )
-                    .toPromise();
+                    ),
+                );
             }
         } catch (error) {
             this._toaster.error(_('error.http.generic'), { params: error });
diff --git a/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts b/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts
index 6591e01a1..4649a8f47 100644
--- a/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts
+++ b/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts
@@ -14,9 +14,11 @@ export const processingFileStatusTranslations: { [key in ProcessingFileStatus]:
     DELETED: _('file-status.deleted'),
     ERROR: _('file-status.error'),
     FULLREPROCESS: _('file-status.full-reprocess'),
+    IMAGE_ANALYZING: _('file-status.image-analyzing'),
     INDEXING: _('file-status.indexing'),
     OCR_PROCESSING: _('file-status.ocr-processing'),
     PROCESSING: _('file-status.processing'),
     REPROCESS: _('file-status.reprocess'),
+    SURROUNDING_TEXT_PROCESSING: _('file-status.processing'),
     UNPROCESSED: _('file-status.unprocessed'),
 };
diff --git a/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts b/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts
index e441e1dd1..c903ad0c2 100644
--- a/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts
+++ b/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts
@@ -111,9 +111,9 @@ export class PdfViewerUtils {
         }
     }
 
-    translateQuads(page: number, quads: any) {
+    translateQuad(page: number, quad: Core.Math.Quad) {
         const rotation = this._documentViewer.getCompleteRotation(page);
-        return translateQuads(page, rotation, quads);
+        return translateQuads(page, rotation, quad);
     }
 
     deselectAllAnnotations() {
@@ -121,7 +121,7 @@ export class PdfViewerUtils {
     }
 
     selectAnnotations(annotations?: AnnotationWrapper[], multiSelectActive: boolean = false) {
-        if (!annotations){
+        if (!annotations) {
             return;
         }
         if (!multiSelectActive) {
diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts
index 0945fd73e..cf4598843 100644
--- a/apps/red-ui/src/app/modules/icons/icons.module.ts
+++ b/apps/red-ui/src/app/modules/icons/icons.module.ts
@@ -51,6 +51,7 @@ export class IconsModule {
             'reanalyse',
             'reason',
             'redaction-changes',
+            'reference',
             'remove-from-dict',
             'report',
             'resize',
diff --git a/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html b/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html
index 50fd141f2..4db38fa1d 100644
--- a/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html
@@ -28,5 +28,5 @@
 

 
 
-    
+    
 
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
index 2a3f107ab..8009960da 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
@@ -4,6 +4,7 @@ import { File } from '@red/domain';
 import { FileDownloadService } from '@upload-download/services/file-download.service';
 import { CircleButtonType, CircleButtonTypes, Toaster } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { firstValueFrom } from 'rxjs';
 
 export type MenuState = 'OPEN' | 'CLOSED';
 
@@ -38,7 +39,7 @@ export class FileDownloadBtnComponent implements OnChanges {
         $event.stopPropagation();
         const dossierId = this.files[0].dossierId;
         const filesIds = this.files.map(f => f.fileId);
-        await this._fileDownloadService.downloadFiles(filesIds, dossierId).toPromise();
+        await firstValueFrom(this._fileDownloadService.downloadFiles(filesIds, dossierId));
         this._toaster.info(_('download-status.queued'));
     }
 }
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
index d336757c6..f06bc81c8 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
@@ -1,5 +1,5 @@
 
 

diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss
index 76c347ec3..eb363230f 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss
@@ -3,6 +3,7 @@
 
 :host {
     @extend .user-button;
+    min-width: fit-content;
 
     button {
         padding: 0 10px 0 5px;
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
index 9ea892f02..8b54d5c02 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
@@ -76,9 +76,9 @@
         

     

 
-    

+    

         ();
     @ViewChild(EditorComponent) readonly editor: EditorComponent;
 
@@ -110,20 +111,18 @@ export class DictionaryManagerComponent implements OnChanges {
             return;
         }
 
-        this._dictionaryService
-            .getForType(this._dictionary.dossierTemplateId, this._dictionary.type)
-            .pipe(
+        firstValueFrom(
+            this._dictionaryService.getForType(this._dictionary.dossierTemplateId, this._dictionary.type).pipe(
                 tap(values => (this._dictionary.entries = [...values.entries] ?? [])),
                 catchError(() => {
                     this._dictionary.entries = [];
                     return of({});
                 }),
-            )
-            .toPromise()
-            .then(() => {
-                this.diffEditorText = this._toString([...this._dictionary.entries]);
-                this.showDiffEditor = true;
-            });
+            ),
+        ).then(() => {
+            this.diffEditorText = this._toString([...this._dictionary.entries]);
+            this.showDiffEditor = true;
+        });
     }
 
     get _dictionaries() {
@@ -177,8 +176,10 @@ export class DictionaryManagerComponent implements OnChanges {
         this._scrollToCurrentMatch();
     }
 
-    ngOnChanges(): void {
-        this.revert();
+    ngOnChanges(changes: SimpleChanges): void {
+        if (!changes.isLeavingPage) {
+            this.revert();
+        }
     }
 
     private _applySearchDecorations() {
diff --git a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
index 30f8d45d4..f2cdbe2f2 100644
--- a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
@@ -68,6 +68,7 @@ export class EditorComponent implements OnInit, OnChanges {
             glyphMargin: true,
             automaticLayout: true,
             readOnly: !this.canEdit,
+            extraEditorClassName: this.canEdit ? '' : 'disabled',
         };
     }
 
@@ -79,19 +80,12 @@ export class EditorComponent implements OnInit, OnChanges {
         this._diffEditor.getModifiedEditor().onDidChangeModelContent(() => {
             this.value = this._diffEditor.getModel().modified.getValue();
         });
+        this._setTheme();
     }
 
     onCodeEditorInit(editor: ICodeEditor): void {
         this.codeEditor = editor;
-        (window as any).monaco.editor.defineTheme('redaction', {
-            base: 'vs',
-            inherit: true,
-            rules: [],
-            colors: {
-                'editor.lineHighlightBackground': '#f4f5f7',
-            },
-        });
-        (window as any).monaco.editor.setTheme('redaction');
+        this._setTheme();
     }
 
     @Debounce()
@@ -107,6 +101,34 @@ export class EditorComponent implements OnInit, OnChanges {
         this._diffEditor?.getModifiedEditor().setValue(this.diffValue);
     }
 
+    private _defineThemes(): void {
+        (window as any).monaco.editor.defineTheme('redaction', {
+            base: 'vs',
+            inherit: true,
+            rules: [],
+            colors: {
+                'editor.lineHighlightBackground': '#f4f5f7',
+            },
+        });
+        (window as any).monaco.editor.defineTheme('redaction-disabled', {
+            base: 'vs',
+            inherit: true,
+            rules: [],
+            colors: {
+                'editor.background': '#f4f5f7',
+                'editor.foreground': '#9398a0',
+                'editor.lineHighlightBackground': '#f4f5f7',
+                'editorLineNumber.foreground': '#9398a0',
+                'editorActiveLineNumber.foreground': '#9398a0',
+            },
+        });
+    }
+
+    private _setTheme(): void {
+        this._defineThemes();
+        (window as any).monaco.editor.setTheme(this.canEdit ? 'redaction' : 'redaction-disabled');
+    }
+
     private _handleMarginButtonClick(event: IEditorMouseEvent) {
         const isMarginButtonClick = event.target.detail.glyphMarginWidth && event.target.detail.glyphMarginWidth !== 0;
         if (isMarginButtonClick) {
diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss
index 0bc36396d..822b7dc96 100644
--- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss
@@ -21,7 +21,3 @@ mat-slide-toggle {
         color: rgba(var(--iqser-accent-rgb), 0.3);
     }
 }
-
-.ml-0 {
-    margin-left: 0;
-}
diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts
index 1ccc95efe..8f37afc08 100644
--- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts
@@ -4,6 +4,7 @@ import { CircleButtonType, IqserTooltipPosition, Toaster } from '@iqser/common-u
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { FileDownloadService } from '@upload-download/services/file-download.service';
 import { PermissionsService } from '@services/permissions.service';
+import { firstValueFrom } from 'rxjs';
 
 @Component({
     selector: 'redaction-expandable-file-actions',
@@ -58,7 +59,7 @@ export class ExpandableFileActionsComponent implements OnChanges {
         $event.stopPropagation();
         const dossierId = files[0].dossierId;
         const filesIds = files.map(f => f.fileId);
-        await this._fileDownloadService.downloadFiles(filesIds, dossierId).toPromise();
+        await firstValueFrom(this._fileDownloadService.downloadFiles(filesIds, dossierId));
         this._toaster.info(_('download-status.queued'));
     }
 }
diff --git a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html
index 538181b7c..027c9a0dd 100644
--- a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html
@@ -6,7 +6,7 @@
     >
         {{ _user | name: { showInitials: true } }}
     

-    

+    

         {{ userName }}
     

 

diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.html b/apps/red-ui/src/app/modules/shared/components/select/select.component.html
index 1e85e12df..7145ff402 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.html
@@ -1,8 +1,13 @@
 

     
{{ label }}

     

-        

-        

+        

+        

     

 

 
@@ -15,8 +20,8 @@
         [value]="valueMapper(option)"
     >
         
     
 
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
index 1cc0bc590..6cda04188 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
@@ -69,3 +69,8 @@ mat-chip {
 .mat-standard-chip:focus::after {
     opacity: 0;
 }
+
+.disabled {
+    pointer-events: none;
+    color: variables.$grey-5;
+}
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
index 6344482e5..b2e107977 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
@@ -15,7 +15,7 @@ import { MatChip, MatChipList, MatChipSelectionChange } from '@angular/material/
     ],
 })
 export class SelectComponent implements AfterViewInit, ControlValueAccessor {
-    @Input() optionTemplate: TemplateRef;
+    @Input() optionTemplate?: TemplateRef;
     @Input() label: string;
     @Input() options: any[];
     @Input() disabled = false;
@@ -26,10 +26,10 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor {
     private _value: any[] = [];
     private _onChange: (value: any[]) => void;
 
-    @Input() valueMapper: (option: any) => any = option => option.key;
-
     constructor(private readonly _changeDetector: ChangeDetectorRef) {}
 
+    @Input() valueMapper: (option: any) => any = option => option.key;
+
     ngAfterViewInit(): void {
         setTimeout(() => {
             this._selectChips(this._value);
diff --git a/apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.html b/apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.html
index 8de42a9c4..2c08380b1 100644
--- a/apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.html
@@ -24,6 +24,12 @@
         label="S"
         type="square"
     >
+    
      {
-        const attributes = await this.getAttributes(dossier.id).toPromise();
-        const attributesConfig = await this.getConfig(dossier.dossierTemplateId).toPromise();
+        const attributes = await firstValueFrom(this.getAttributes(dossier.id));
+        const attributesConfig = await firstValueFrom(this.getConfig(dossier.dossierTemplateId));
 
         return attributesConfig.map(config => ({
             ...config,
diff --git a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts
index 5f953475a..0669dd3a3 100644
--- a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts
@@ -2,8 +2,9 @@ import { Injectable, Injector } from '@angular/core';
 import { Observable, throwError } from 'rxjs';
 import { EntitiesService, List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui';
 import { Dictionary, IColors, IDictionary, IUpdateDictionary } from '@red/domain';
-import { tap } from 'rxjs/operators';
+import { mapTo, switchMap, tap } from 'rxjs/operators';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service';
 
 const MIN_WORD_LENGTH = 2;
 
@@ -11,7 +12,11 @@ const MIN_WORD_LENGTH = 2;
     providedIn: 'root',
 })
 export class DictionaryService extends EntitiesService {
-    constructor(private readonly _toaster: Toaster, protected readonly _injector: Injector) {
+    constructor(
+        private readonly _toaster: Toaster,
+        protected readonly _injector: Injector,
+        private readonly _dossierTemplateStatsService: DossierTemplateStatsService,
+    ) {
         super(_injector, Dictionary, 'dictionary');
     }
 
@@ -31,7 +36,9 @@ export class DictionaryService extends EntitiesService
     deleteDictionaries(@RequiredParam() body: List, @RequiredParam() dossierTemplateId: string, dossierId?: string) {
         const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined;
         const url = `${this._defaultModelPath}/type/${dossierTemplateId}/delete`;
-        return this._post(body, url, queryParams);
+        return this._post(body, url, queryParams).pipe(
+            switchMap(dictionaries => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionaries))),
+        );
     }
 
     /**
@@ -63,7 +70,9 @@ export class DictionaryService extends EntitiesService
     ) {
         const url = `${this._defaultModelPath}/type/${type}/${dossierTemplateId}`;
         const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined;
-        return this._post(body, url, queryParams);
+        return this._post(body, url, queryParams).pipe(
+            switchMap(dictionary => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionary))),
+        );
     }
 
     /**
@@ -78,43 +87,11 @@ export class DictionaryService extends EntitiesService
      * Creates entry type with colors, hint and caseInsensitive
      */
     @Validate()
-    addDictionary(@RequiredParam() body: IDictionary, dossierId?: string) {
+    addDictionary(@RequiredParam() dictionary: IDictionary, dossierId?: string) {
         const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined;
-        return this._post(body, `${this._defaultModelPath}/type`, queryParams);
-    }
-
-    /**
-     * Add dictionary entries with entry type.
-     */
-    @Validate()
-    addEntry(
-        @RequiredParam() body: List,
-        @RequiredParam() dossierTemplateId: string,
-        @RequiredParam() type: string,
-        dossierId?: string,
-        removeCurrent?: boolean,
-    ) {
-        const queryParams: List = [
-            { key: 'dossierId', value: dossierId },
-            { key: 'removeCurrent', value: removeCurrent },
-        ];
-        const url = `${this._defaultModelPath}/${type}/${dossierTemplateId}`;
-        return this._post(body, url, queryParams);
-    }
-
-    /**
-     * Delete dictionary entries with entry type.
-     */
-    @Validate()
-    deleteEntries(
-        @RequiredParam() body: List,
-        @RequiredParam() dossierTemplateId: string,
-        @RequiredParam() type: string,
-        @RequiredParam() dossierId?: string,
-    ) {
-        const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined;
-        const url = `${this._defaultModelPath}/delete/${type}/${dossierTemplateId}`;
-        return this._post(body, url, queryParams);
+        return this._post(dictionary, `${this._defaultModelPath}/type`, queryParams).pipe(
+            switchMap(() => this._dossierTemplateStatsService.getFor([dictionary.dossierTemplateId])),
+        );
     }
 
     saveEntries(
@@ -134,14 +111,15 @@ export class DictionaryService extends EntitiesService
         const invalidRowsExist = entriesToAdd.filter(e => e.length < MIN_WORD_LENGTH);
         if (invalidRowsExist.length === 0) {
             // can add at least 1 - block UI
-            let obs: Observable;
+            let obs: Observable;
             if (entriesToAdd.length > 0) {
-                obs = this.addEntry(entriesToAdd, dossierTemplateId, type, dossierId, true);
+                obs = this._addEntry(entriesToAdd, dossierTemplateId, type, dossierId, true);
             } else {
-                obs = this.deleteEntries(initialEntries, dossierTemplateId, type, dossierId);
+                obs = this._deleteEntries(initialEntries, dossierTemplateId, type, dossierId);
             }
 
             return obs.pipe(
+                switchMap(dictionary => this._dossierTemplateStatsService.getFor([dossierTemplateId]).pipe(mapTo(dictionary))),
                 tap(
                     () => {
                         if (showToast) {
@@ -157,4 +135,38 @@ export class DictionaryService extends EntitiesService
             return throwError('Entries too short');
         }
     }
+
+    /**
+     * Add dictionary entries with entry type.
+     */
+    @Validate()
+    private _addEntry(
+        @RequiredParam() body: List,
+        @RequiredParam() dossierTemplateId: string,
+        @RequiredParam() type: string,
+        dossierId?: string,
+        removeCurrent?: boolean,
+    ) {
+        const queryParams: List = [
+            { key: 'dossierId', value: dossierId },
+            { key: 'removeCurrent', value: removeCurrent },
+        ];
+        const url = `${this._defaultModelPath}/${type}/${dossierTemplateId}`;
+        return this._post(body, url, queryParams);
+    }
+
+    /**
+     * Delete dictionary entries with entry type.
+     */
+    @Validate()
+    private _deleteEntries(
+        @RequiredParam() body: List,
+        @RequiredParam() dossierTemplateId: string,
+        @RequiredParam() type: string,
+        @RequiredParam() dossierId?: string,
+    ) {
+        const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined;
+        const url = `${this._defaultModelPath}/delete/${type}/${dossierTemplateId}`;
+        return this._post(body, url, queryParams);
+    }
 }
diff --git a/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts b/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts
index 5c546731c..9dee93185 100644
--- a/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts
+++ b/apps/red-ui/src/app/modules/upload-download/file-upload-download.module.ts
@@ -14,7 +14,6 @@ import { FileDropOverlayService } from './services/file-drop-overlay.service';
 @NgModule({
     imports: [CommonModule, SharedModule, OverlayModule],
     declarations: [FileDropComponent, UploadStatusOverlayComponent, OverwriteFilesDialogComponent],
-    entryComponents: [FileDropComponent, UploadStatusOverlayComponent],
     providers: [UploadDownloadDialogService, FileUploadService, FileDownloadService, StatusOverlayService, FileDropOverlayService],
     exports: [FileDropComponent, UploadStatusOverlayComponent],
 })
diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts
index ede23950a..f06acb081 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts
@@ -7,17 +7,15 @@ import {
     IPrepareDownloadRequest,
     IRemoveDownloadRequest,
 } from '@red/domain';
-import { interval, Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
 import { ConfigService } from '@services/config.service';
-import { filter, map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { map, switchMap, tap } from 'rxjs/operators';
 import { KeycloakService } from 'keycloak-angular';
 import { UserService } from '@services/user.service';
 import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui';
 
 @Injectable()
 export class FileDownloadService extends EntitiesService {
-    hasPendingDownloads = false;
-
     constructor(
         private readonly _userService: UserService,
         private readonly _keycloakService: KeycloakService,
@@ -25,13 +23,6 @@ export class FileDownloadService extends EntitiesService user.isUser),
-                switchMap(() => this.loadAll()),
-            )
-            .subscribe();
     }
 
     downloadFiles(fileIds: List, dossierId: string): Observable {
@@ -45,7 +36,6 @@ export class FileDownloadService extends EntitiesService new DownloadStatus(entity)),
             tap(entities => this.setEntities(entities)),
-            tap(() => (this.hasPendingDownloads = !!this.all.find(f => !f.lastDownload && f.isReady))),
         );
     }
 
@@ -54,11 +44,9 @@ export class FileDownloadService extends EntitiesService {
+        return this._post<{ value: string }>({ value: storageId }, `${this._defaultModelPath}/generate-ott`);
+    }
+
     @Validate()
     delete(@RequiredParam() body: IRemoveDownloadRequest): Observable {
         return super._post(body, `${this._defaultModelPath}/delete`);
diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
index ccf57e725..5494c0e81 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
@@ -41,7 +41,7 @@ export class FileUploadService extends GenericService impleme
     ) {
         super(_injector, 'upload');
         const fileFetch$ = this._fetchFiles$.pipe(
-            throttleTime(1500),
+            throttleTime(250),
             switchMap(dossierId => this._filesService.loadAll(dossierId)),
         );
         this._subscriptions.add(fileFetch$.subscribe());
diff --git a/apps/red-ui/src/app/modules/upload-download/services/upload-download-dialog.service.ts b/apps/red-ui/src/app/modules/upload-download/services/upload-download-dialog.service.ts
index 32d21f052..dfde1956a 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/upload-download-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/upload-download-dialog.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { OverwriteFilesDialogComponent } from '../dialogs/overwrite-files-dialog/overwrite-files-dialog.component';
+import { firstValueFrom } from 'rxjs';
 
 const dialogConfig = {
     width: '662px',
@@ -18,9 +19,6 @@ export class UploadDownloadDialogService {
             data: filename,
         });
 
-        return ref
-            .afterClosed()
-            .toPromise()
-            .then(res => res || { cancel: true });
+        return firstValueFrom(ref.afterClosed()).then(res => res || { cancel: true });
     }
 }
diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts
index 6dd0d9cae..118d0a754 100644
--- a/apps/red-ui/src/app/services/breadcrumbs.service.ts
+++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts
@@ -13,7 +13,7 @@ export type RouterLinkActiveOptions = { exact: boolean } | IsActiveMatchOptions;
 export interface Breadcrumb {
     readonly name$: Observable;
     readonly routerLink?: string[];
-    readonly routerLinkActiveOptions?: RouterLinkActiveOptions;
+    readonly routerLinkActiveOptions?: RouterLinkActiveOptions | undefined;
 }
 
 export type Breadcrumbs = List;
diff --git a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts
index aeb845a64..a475edf96 100644
--- a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts
@@ -1,48 +1,12 @@
-import { Injectable } from '@angular/core';
-import { HeadersConfiguration, mapEach, RequiredParam, Validate } from '@iqser/common-ui';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Injectable, Injector } from '@angular/core';
+import { StatsService } from '@iqser/common-ui';
 import { DossierStats, IDossierStats } from '@red/domain';
-import { HttpClient } from '@angular/common/http';
-import { tap } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root',
 })
-export class DossierStatsService {
-    private readonly _map = new Map>();
-
-    constructor(private readonly _http: HttpClient) {}
-
-    @Validate()
-    getFor(@RequiredParam() dossierIds: string[]): Observable {
-        const request = this._http.post(`/${encodeURI('dossier-stats')}`, dossierIds, {
-            headers: HeadersConfiguration.getHeaders(),
-            observe: 'body',
-        });
-
-        return request.pipe(
-            mapEach(entity => new DossierStats(entity)),
-            tap(entities => entities.forEach(entity => this.set(entity))),
-        );
-    }
-
-    get(key: string): DossierStats {
-        return this._map.get(key)?.value;
-    }
-
-    set(stats: DossierStats): void {
-        if (!this._map.has(stats.dossierId)) {
-            this._map.set(stats.dossierId, new BehaviorSubject(stats));
-            return;
-        }
-
-        const old = this.get(stats.dossierId);
-        if (JSON.stringify(old) !== JSON.stringify(stats)) {
-            this._map.get(stats.dossierId).next(stats);
-        }
-    }
-
-    watch$(key: string): Observable {
-        return this._map.get(key)?.asObservable();
+export class DossierStatsService extends StatsService {
+    constructor(protected readonly _injector: Injector) {
+        super(_injector, 'dossierId', DossierStats, 'dossier-stats');
     }
 }
diff --git a/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts
new file mode 100644
index 000000000..94f63af75
--- /dev/null
+++ b/apps/red-ui/src/app/services/entity-services/dossier-template-stats.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { StatsService } from '@iqser/common-ui';
+import { DossierTemplateStats, IDossierTemplateStats } from '@red/domain';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class DossierTemplateStatsService extends StatsService {
+    constructor(protected readonly _injector: Injector) {
+        super(_injector, 'dossierTemplateId', DossierTemplateStats, 'dossier-template-stats');
+    }
+}
diff --git a/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts
index 9847d6945..299578629 100644
--- a/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/dossier-templates.service.ts
@@ -1,11 +1,12 @@
-import { EntitiesService, List, RequiredParam, Validate } from '@iqser/common-ui';
+import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui';
 import { DossierTemplate, IDossierTemplate } from '@red/domain';
 import { Injectable, Injector } from '@angular/core';
 import { BehaviorSubject, forkJoin, Observable } from 'rxjs';
 import { FileAttributesService } from './file-attributes.service';
 import { ActivationEnd, Router } from '@angular/router';
 import { currentComponentRoute } from '@utils/functions';
-import { map, switchMap } from 'rxjs/operators';
+import { mapTo, switchMap, tap } from 'rxjs/operators';
+import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service';
 
 @Injectable({
     providedIn: 'root',
@@ -18,6 +19,7 @@ export class DossierTemplatesService extends EntitiesService {
         const getAttributes = (entities: DossierTemplate[]) => entities.map(e => this._fileAttributesService.getFileAttributesConfig(e.id));
-        return super.loadAll().pipe(
-            switchMap(entities => forkJoin(getAttributes(entities))),
-            map(() => this.all),
+        const dossierTemplateIds = (templates: DossierTemplate[]) => templates.map(d => d.id);
+        return this.getAll().pipe(
+            mapEach(entity => new DossierTemplate(entity)),
+            /* Load stats before updating entities */
+            switchMap(templates =>
+                forkJoin([this._dossierTemplateStatsService.getFor(dossierTemplateIds(templates)), ...getAttributes(templates)]).pipe(
+                    mapTo(templates),
+                ),
+            ),
+            tap(templates => this.setEntities(templates)),
         );
     }
 
     delete(body: List): Observable {
-        return super._post(body, `${this._defaultModelPath}/delete`);
+        return super._post(body, `${this._defaultModelPath}/delete`).pipe(switchMap(() => this.loadAll()));
     }
 
     @Validate()
     createOrUpdate(@RequiredParam() body: IDossierTemplate) {
-        return this._post(body);
+        return this._post(body).pipe(switchMap(() => this.loadAll()));
     }
 }
diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts
index 7f4bbdc68..a406e4350 100644
--- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts
@@ -2,16 +2,27 @@ import { Injectable, Injector } from '@angular/core';
 import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui';
 import { Dossier, IDossier, IDossierRequest } from '@red/domain';
 import { catchError, filter, map, mapTo, switchMap, tap } from 'rxjs/operators';
-import { combineLatest, iif, Observable, of, throwError } from 'rxjs';
+import { combineLatest, firstValueFrom, Observable, of, Subject, throwError, timer } from 'rxjs';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
+import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
 
 export interface IDossiersStats {
     totalPeople: number;
     totalAnalyzedPages: number;
 }
 
+interface ChangesDetails {
+    dossierChanges: [
+        {
+            dossierChanges: boolean;
+            dossierId: string;
+            fileChanges: boolean;
+        },
+    ];
+}
+
 const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists');
 const GENERIC_MGS = _('add-dossier-dialog.errors.generic');
 
@@ -20,6 +31,7 @@ const GENERIC_MGS = _('add-dossier-dialog.errors.generic');
 })
 export class DossiersService extends EntitiesService {
     readonly generalStats$ = this.all$.pipe(switchMap(entities => this._generalStats$(entities)));
+    readonly dossierFileChanges$ = new Subject();
 
     constructor(
         private readonly _toaster: Toaster,
@@ -27,10 +39,17 @@ export class DossiersService extends EntitiesService {
         private readonly _dossierStatsService: DossierStatsService,
     ) {
         super(_injector, Dossier, 'dossier');
+
+        timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL)
+            .pipe(
+                switchMap(() => this.loadAllIfChanged()),
+                tap(changes => this._emitFileChanges(changes)),
+            )
+            .subscribe();
     }
 
     loadAll(): Observable {
-        const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.dossierId);
+        const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.id);
         return this.getAll().pipe(
             mapEach(entity => new Dossier(entity)),
             /* Load stats before updating entities */
@@ -39,8 +58,15 @@ export class DossiersService extends EntitiesService {
         );
     }
 
-    loadAllIfChanged(): Observable {
-        return this.hasChanges$().pipe(switchMap(changed => iif(() => changed, this.loadAll()).pipe(mapTo(changed))));
+    loadAllIfChanged(): Observable {
+        return this.hasChangesDetails$().pipe(switchMap(changes => this.loadAll().pipe(mapTo(changes))));
+    }
+
+    hasChangesDetails$(): Observable {
+        const body = { value: this._lastCheckedForChanges.get('root') ?? '0' };
+        return this._post(body, `${this._defaultModelPath}/changes/details`).pipe(
+            filter(changes => changes.dossierChanges.length > 0),
+        );
     }
 
     @Validate()
@@ -57,7 +83,7 @@ export class DossiersService extends EntitiesService {
     }
 
     getDeleted(): Promise {
-        return this.getAll('deleted-dossiers').toPromise();
+        return firstValueFrom(this.getAll('deleted-dossiers'));
     }
 
     delete(dossier: Dossier): Observable {
@@ -73,13 +99,17 @@ export class DossiersService extends EntitiesService {
 
     @Validate()
     restore(@RequiredParam() dossierIds: List): Promise {
-        return this._post(dossierIds, 'deleted-dossiers/restore').toPromise();
+        return firstValueFrom(this._post(dossierIds, 'deleted-dossiers/restore'));
     }
 
     @Validate()
     hardDelete(@RequiredParam() dossierIds: List): Promise {
         const body = dossierIds.map(id => ({ key: 'dossierId', value: id }));
-        return super.delete(body, 'deleted-dossiers/hard-delete', body).toPromise();
+        return firstValueFrom(super.delete(body, 'deleted-dossiers/hard-delete', body));
+    }
+
+    private _emitFileChanges(changes: ChangesDetails): void {
+        changes.dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId));
     }
 
     private _computeStats(entities: List): IDossiersStats {
diff --git a/apps/red-ui/src/app/services/entity-services/files-map.service.ts b/apps/red-ui/src/app/services/entity-services/files-map.service.ts
index b861090da..6f3232221 100644
--- a/apps/red-ui/src/app/services/entity-services/files-map.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/files-map.service.ts
@@ -5,8 +5,8 @@ import { filter, startWith } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
 export class FilesMapService {
-    readonly fileReanalysed$ = new Subject();
     private readonly _entityChanged$ = new Subject();
+    private readonly _entityDeleted$ = new Subject();
     private readonly _map = new Map>();
 
     get$(dossierId: string) {
@@ -37,17 +37,13 @@ export class FilesMapService {
             return entities.forEach(entity => this._entityChanged$.next(entity));
         }
 
-        const reanalysedEntities = [];
         const changedEntities = [];
+        const deletedEntities = this.get(key).filter(oldEntity => !entities.find(newEntity => newEntity.id === oldEntity.id));
 
         // Keep old object references for unchanged entities
         const newEntities = entities.map(newEntity => {
             const oldEntity = this.get(key, newEntity.id);
 
-            if (oldEntity?.lastProcessed !== newEntity.lastProcessed) {
-                reanalysedEntities.push(newEntity);
-            }
-
             if (newEntity.isEqual(oldEntity)) {
                 return oldEntity;
             }
@@ -60,13 +56,13 @@ export class FilesMapService {
 
         // Emit observables only after entities have been updated
 
-        for (const file of reanalysedEntities) {
-            this.fileReanalysed$.next(file);
-        }
-
         for (const file of changedEntities) {
             this._entityChanged$.next(file);
         }
+
+        for (const file of deletedEntities) {
+            this._entityDeleted$.next(file);
+        }
     }
 
     replace(entity: File) {
@@ -83,4 +79,8 @@ export class FilesMapService {
             startWith(this.get(key, entityId)),
         );
     }
+
+    watchDeleted$(entityId: string): Observable {
+        return this._entityDeleted$.pipe(filter(entity => entity.id === entityId));
+    }
 }
diff --git a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts
index 752b6f07d..000d563c1 100644
--- a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts
@@ -15,7 +15,7 @@ export class PlatformSearchService extends GenericService {
         private readonly _dossiersService: DossiersService,
         private readonly _filesMapService: FilesMapService,
     ) {
-        super(_injector, 'search');
+        super(_injector, 'search-v2');
     }
 
     search({ dossierIds, query }: ISearchInput): Observable {
@@ -29,7 +29,7 @@ export class PlatformSearchService extends GenericService {
         const body: ISearchRequest = {
             dossierIds,
             queryString: query ?? '',
-            page: 1,
+            page: 0,
             returnSections: false,
             pageSize: 300,
         };
diff --git a/apps/red-ui/src/app/services/general-settings.service.ts b/apps/red-ui/src/app/services/general-settings.service.ts
index 10353d8c2..2f5b18de8 100644
--- a/apps/red-ui/src/app/services/general-settings.service.ts
+++ b/apps/red-ui/src/app/services/general-settings.service.ts
@@ -1,17 +1,17 @@
 import { Injectable, Injector } from '@angular/core';
 import { GenericService, RequiredParam, Validate } from '@iqser/common-ui';
 import { IGeneralConfiguration } from '@red/domain';
-import { UserService } from '@services/user.service';
+import { Observable } from 'rxjs';
 
 @Injectable({
     providedIn: 'root',
 })
 export class GeneralSettingsService extends GenericService {
-    constructor(protected readonly _injector: Injector, private readonly _userService: UserService) {
+    constructor(protected readonly _injector: Injector) {
         super(_injector, 'configuration');
     }
 
-    getGeneralConfigurations() {
+    getGeneralConfigurations(): Observable {
         return this._getOne(['general']);
     }
 
diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts
index 3425ca5c8..9d798fcb5 100644
--- a/apps/red-ui/src/app/services/notifications.service.ts
+++ b/apps/red-ui/src/app/services/notifications.service.ts
@@ -2,7 +2,7 @@ import { Injectable, Injector } from '@angular/core';
 import { GenericService, List, mapEach, QueryParam, RequiredParam, Validate } from '@iqser/common-ui';
 import * as moment from 'moment';
 import { TranslateService } from '@ngx-translate/core';
-import { iif, Observable } from 'rxjs';
+import { EMPTY, iif, Observable } from 'rxjs';
 import { INotification, Notification, NotificationTypes } from '@red/domain';
 import { map, switchMap } from 'rxjs/operators';
 import { notificationsTranslations } from '../translations/notifications-translations';
@@ -40,7 +40,7 @@ export class NotificationsService extends GenericService {
 
     @Validate()
     getNotificationsIfChanged(@RequiredParam() includeSeen: boolean): Observable {
-        return this.hasChanges$().pipe(switchMap(changed => iif(() => changed, this.getNotifications(includeSeen))));
+        return this.hasChanges$().pipe(switchMap(changed => iif(() => changed, this.getNotifications(includeSeen), EMPTY)));
     }
 
     @Validate()
@@ -54,7 +54,7 @@ export class NotificationsService extends GenericService {
     }
 
     private _new(notification: INotification) {
-        const message = this._translate(notification, notificationsTranslations[notification.notificationType]);
+        const message = this._translate(notification, notificationsTranslations[notification.notificationType] as string);
         const time = this._getTime(notification.creationDate);
         return new Notification(notification, message, time);
     }
@@ -64,7 +64,7 @@ export class NotificationsService extends GenericService {
         return moment(date).format('hh:mm A');
     }
 
-    private _translate(notification: INotification, translation: string) {
+    private _translate(notification: INotification, translation: string): string {
         const fileId = notification.target.fileId;
         const dossierId = notification.target.dossierId;
         const dossier = this._dossiersService.find(dossierId);
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index c982c699e..55eeaf96b 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -97,7 +97,7 @@ export class PermissionsService {
 
     // TODO: Remove '?', after we make sure file is loaded before page
     canPerformAnnotationActions(file: File): boolean {
-        return (file?.isUnderReview || file?.isUnderApproval) && this.isFileAssignee(file);
+        return !file.excluded && (file?.isUnderReview || file?.isUnderApproval) && this.isFileAssignee(file);
     }
 
     canUndoApproval(file: File | File[]): boolean {
@@ -122,6 +122,10 @@ export class PermissionsService {
         return dossier.ownerId === this._userService.currentUser.id;
     }
 
+    canEditDossier(user = this._userService.currentUser) {
+        return user.isManager;
+    }
+
     isAdmin(user = this._userService.currentUser): boolean {
         return user.isAdmin;
     }
@@ -131,7 +135,7 @@ export class PermissionsService {
     }
 
     canExcludePages(file: File): boolean {
-        return this.isFileAssignee(file);
+        return this.canPerformAnnotationActions(file);
     }
 
     canDeleteComment(comment: IComment, file: File) {
diff --git a/apps/red-ui/src/app/services/primary-file-attribute.service.ts b/apps/red-ui/src/app/services/primary-file-attribute.service.ts
new file mode 100644
index 000000000..5a8acdc18
--- /dev/null
+++ b/apps/red-ui/src/app/services/primary-file-attribute.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import { FileAttributesService } from './entity-services/file-attributes.service';
+import { IFile } from '@red/domain';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class PrimaryFileAttributeService {
+    constructor(private readonly _fileAttributesService: FileAttributesService) {}
+
+    getPrimaryFileAttributeValue(file: IFile, dossierTemplateId: string) {
+        const fileAttributesConfig = this._fileAttributesService.getFileAttributeConfig(dossierTemplateId);
+
+        let primaryAttribute;
+
+        if (fileAttributesConfig) {
+            const primary = fileAttributesConfig.fileAttributeConfigs?.find(c => c.primaryAttribute);
+            if (primary && file.fileAttributes?.attributeIdToValue) {
+                primaryAttribute = file.fileAttributes?.attributeIdToValue[primary.id];
+            }
+        }
+
+        if (!primaryAttribute) {
+            primaryAttribute = '-';
+        }
+
+        return primaryAttribute;
+    }
+}
diff --git a/apps/red-ui/src/app/services/report-template.service.ts b/apps/red-ui/src/app/services/report-template.service.ts
index 72083e60e..585f4c36a 100644
--- a/apps/red-ui/src/app/services/report-template.service.ts
+++ b/apps/red-ui/src/app/services/report-template.service.ts
@@ -43,6 +43,11 @@ export class ReportTemplateService extends GenericService {
         return this._getOne([dossierTemplateId], 'placeholders');
     }
 
+    @Validate()
+    getTemplatesByPlaceholder(@RequiredParam() dossierTemplateId: string, @RequiredParam() attributeId: string) {
+        return this._post({ value: attributeId }, `templates/${dossierTemplateId}`);
+    }
+
     downloadReportTemplate(dossierTemplateId: string, templateId: string, observe: 'response'): Observable>;
     downloadReportTemplate(dossierTemplateId: string, templateId: string, observe: 'body'): Observable;
     @Validate()
diff --git a/apps/red-ui/src/app/services/user-preference.service.ts b/apps/red-ui/src/app/services/user-preference.service.ts
index cc89c6b6e..7ae1d333d 100644
--- a/apps/red-ui/src/app/services/user-preference.service.ts
+++ b/apps/red-ui/src/app/services/user-preference.service.ts
@@ -1,5 +1,6 @@
 import { Injectable, Injector } from '@angular/core';
 import { GenericService, List, RequiredParam, Validate } from '@iqser/common-ui';
+import { firstValueFrom } from 'rxjs';
 
 type UserAttributes = Record;
 
@@ -36,7 +37,7 @@ export class UserPreferenceService extends GenericService {
     async saveLastOpenedFileForDossier(dossierId: string, fileId: string): Promise {
         const key = `${KEYS.dossierRecent}-${dossierId}`;
         this.userAttributes[key] = [fileId];
-        await this.savePreferences([fileId], key).toPromise();
+        await firstValueFrom(this.savePreferences([fileId], key));
     }
 
     getLanguage(): string {
@@ -47,7 +48,7 @@ export class UserPreferenceService extends GenericService {
     async saveLanguage(language: string): Promise {
         const key = KEYS.language;
         this.userAttributes[key] = [language];
-        await this.savePreferences([language], key).toPromise();
+        await firstValueFrom(this.savePreferences([language], key));
     }
 
     getFilePreviewTooltipsPreference(): boolean {
@@ -60,7 +61,7 @@ export class UserPreferenceService extends GenericService {
         const currentValue = this.getFilePreviewTooltipsPreference();
         const nextValue = [(!currentValue).toString()];
         this.userAttributes[key] = nextValue;
-        await this.savePreferences(nextValue, key).toPromise();
+        await firstValueFrom(this.savePreferences(nextValue, key));
     }
 
     toggleDevFeatures(): void {
@@ -69,7 +70,7 @@ export class UserPreferenceService extends GenericService {
     }
 
     async reload(): Promise {
-        const attributes = await this.getAll().toPromise();
+        const attributes = await firstValueFrom(this.getAll());
         this._userAttributes = attributes ?? {};
     }
 
diff --git a/apps/red-ui/src/app/services/user.service.ts b/apps/red-ui/src/app/services/user.service.ts
index fe2626696..21bcd5fc4 100644
--- a/apps/red-ui/src/app/services/user.service.ts
+++ b/apps/red-ui/src/app/services/user.service.ts
@@ -50,15 +50,17 @@ export class UserService extends EntitiesService {
         );
     }
 
-    async loadCurrentUser() {
+    async loadCurrentUser(): Promise {
         const token = await this._keycloakService.getToken();
         const decoded = jwt_decode(token);
         const userId = (<{ sub: string }>decoded).sub;
 
         const roles = this._keycloakService.getUserRoles(true).filter(role => role.startsWith('RED_'));
-        this.replace(new User(await this._keycloakService.loadUserProfile(true), roles, userId));
+        const user = new User(await this._keycloakService.loadUserProfile(true), roles, userId);
+        this.replace(user);
 
         this._currentUser$.next(this.find(userId));
+        return user;
     }
 
     getNameForId(userId: string): string | undefined {
diff --git a/apps/red-ui/src/app/state/app-state.guard.ts b/apps/red-ui/src/app/state/app-state.guard.ts
index 9071e2db3..33c94556b 100644
--- a/apps/red-ui/src/app/state/app-state.guard.ts
+++ b/apps/red-ui/src/app/state/app-state.guard.ts
@@ -3,6 +3,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
 import { AppStateService } from './app-state.service';
 import { UserService } from '@services/user.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
+import { firstValueFrom } from 'rxjs';
 
 @Injectable({
     providedIn: 'root',
@@ -17,11 +18,11 @@ export class AppStateGuard implements CanActivate {
 
     async canActivate(route: ActivatedRouteSnapshot): Promise {
         if (this._userService.currentUser.isUserAdmin) {
-            await this._userService.loadAll().toPromise();
+            await firstValueFrom(this._userService.loadAll());
         }
 
         if (this._userService.currentUser.isUser || this._userService.currentUser.isAdmin) {
-            await this._userService.loadAll().toPromise();
+            await firstValueFrom(this._userService.loadAll());
             await this._dossierTemplatesService.loadAllIfEmpty();
             await this._appStateService.loadDictionaryDataIfNecessary();
         }
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index 1e16193d8..8a313372b 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Dictionary, DossierTemplate, IColors } from '@red/domain';
 import { Router } from '@angular/router';
-import { forkJoin, Observable, of } from 'rxjs';
+import { firstValueFrom, forkJoin, Observable, of } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 import { FALLBACK_COLOR, hexToRgb } from '@utils/functions';
 import { DictionaryService } from '@shared/services/dictionary.service';
@@ -46,6 +46,30 @@ export class AppStateService {
             : undefined;
     }
 
+    async getDictionariesOptions(dossierTemplateId: string, dossierId: string): Promise {
+        const possibleDictionaries: Dictionary[] = [];
+
+        const dossierDictionary = await firstValueFrom(
+            this._dictionaryService.getForType(dossierTemplateId, 'dossier_redaction', dossierId),
+        );
+
+        for (const key of Object.keys(this.dictionaryData[dossierTemplateId])) {
+            const dictionaryData = this.getDictionary(key, dossierTemplateId);
+            if (!dictionaryData.virtual && dictionaryData.addToDictionaryAction) {
+                possibleDictionaries.push(dictionaryData);
+            }
+        }
+
+        if (dossierDictionary.addToDictionaryAction) {
+            // TODO fix this in the backend
+            possibleDictionaries.push(new Dictionary({ ...dossierDictionary, type: 'dossier_redaction' }));
+        }
+
+        possibleDictionaries.sort((a, b) => a.label.localeCompare(b.label));
+
+        return possibleDictionaries;
+    }
+
     getDictionaryColor(type: string, dossierTemplateId: string) {
         return !this._dictionaryData
             ? '#cccccc'
@@ -79,9 +103,9 @@ export class AppStateService {
     }
 
     async refreshDossierTemplate(dossierTemplateId: string) {
-        const dossierTemplate = await this._dossierTemplatesService.get(dossierTemplateId).toPromise();
+        const dossierTemplate = await firstValueFrom(this._dossierTemplatesService.get(dossierTemplateId));
 
-        await this._fileAttributesService.getFileAttributesConfig(dossierTemplateId).toPromise();
+        await firstValueFrom(this._fileAttributesService.getFileAttributesConfig(dossierTemplateId));
 
         const newDossierTemplate = new DossierTemplate(dossierTemplate);
         this._dossierTemplatesService.replace(newDossierTemplate);
@@ -102,7 +126,7 @@ export class AppStateService {
         for (const dossierTemplate of this.dossierTemplates) {
             observables.push(this._getDictionaryDataForDossierTemplate$(dossierTemplate.dossierTemplateId));
         }
-        const result = await forkJoin(observables).toPromise();
+        const result = await firstValueFrom(forkJoin(observables));
 
         const dictionaryData = {};
         for (let i = 0; i < this.dossierTemplates.length; i++) {
@@ -113,7 +137,7 @@ export class AppStateService {
     }
 
     async refreshDossierTemplateDictionaryData(dossierTemplateId: string) {
-        this._dictionaryData[dossierTemplateId] = await this._getDictionaryDataForDossierTemplate$(dossierTemplateId).toPromise();
+        this._dictionaryData[dossierTemplateId] = await firstValueFrom(this._getDictionaryDataForDossierTemplate$(dossierTemplateId));
     }
 
     loadColors(dossierTemplateId: string) {
@@ -160,6 +184,16 @@ export class AppStateService {
                     }
                 }
 
+                dictionaryData['dossier_redaction'] = new Dictionary(
+                    {
+                        hexColor: colors.manualRedactionColor || FALLBACK_COLOR,
+                        type: 'dossier_redaction',
+                        hint: false,
+                        recommendation: false,
+                    },
+                    true,
+                );
+
                 dictionaryData['declined-suggestion'] = new Dictionary(
                     {
                         hexColor: colors.notRedacted || FALLBACK_COLOR,
@@ -176,6 +210,14 @@ export class AppStateService {
                     true,
                 );
 
+                dictionaryData['ignored-hint'] = new Dictionary(
+                    {
+                        hexColor: colors.ignoredHintColor || FALLBACK_COLOR,
+                        type: 'ignored-hint',
+                    },
+                    true,
+                );
+
                 dictionaryData['manual-redaction'] = new Dictionary(
                     {
                         hexColor: colors.manualRedactionColor || FALLBACK_COLOR,
diff --git a/apps/red-ui/src/app/translations/annotation-types-translations.ts b/apps/red-ui/src/app/translations/annotation-types-translations.ts
index 25bc736f1..c8113674f 100644
--- a/apps/red-ui/src/app/translations/annotation-types-translations.ts
+++ b/apps/red-ui/src/app/translations/annotation-types-translations.ts
@@ -4,6 +4,7 @@ import { AnnotationSuperType } from '../models/file/annotation.wrapper';
 export const annotationTypesTranslations: { [key in AnnotationSuperType]: string } = {
     'declined-suggestion': _('annotation-type.declined-suggestion'),
     hint: _('annotation-type.hint'),
+    'ignored-hint': _('annotation-type.ignored-hint'),
     'manual-redaction': _('annotation-type.manual-redaction'),
     recommendation: _('annotation-type.recommendation'),
     redaction: _('annotation-type.redaction'),
diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts
index 2f4bc4faf..32240e222 100644
--- a/apps/red-ui/src/app/utils/configuration.initializer.ts
+++ b/apps/red-ui/src/app/utils/configuration.initializer.ts
@@ -1,11 +1,12 @@
 import { catchError, filter, mergeMap, switchMap, take, tap } from 'rxjs/operators';
 import { ConfigService } from '@services/config.service';
 import { Title } from '@angular/platform-browser';
-import { from, of, throwError } from 'rxjs';
+import { firstValueFrom, from, of, throwError } from 'rxjs';
 import { KeycloakEventType, KeycloakService } from 'keycloak-angular';
 import { GeneralSettingsService } from '@services/general-settings.service';
 import { LanguageService } from '@i18n/language.service';
 import { UserPreferenceService } from '@services/user-preference.service';
+import { UserService } from '@services/user.service';
 
 export function configurationInitializer(
     keycloakService: KeycloakService,
@@ -13,23 +14,26 @@ export function configurationInitializer(
     configService: ConfigService,
     generalSettingsService: GeneralSettingsService,
     languageService: LanguageService,
+    userService: UserService,
     userPreferenceService: UserPreferenceService,
 ) {
     return () =>
-        keycloakService.keycloakEvents$
-            .pipe(
+        firstValueFrom(
+            keycloakService.keycloakEvents$.pipe(
                 filter(event => event.type === KeycloakEventType.OnReady),
                 switchMap(() => from(keycloakService.isLoggedIn())),
                 switchMap(loggedIn => (!loggedIn ? throwError('Not Logged In') : of({}))),
+                switchMap(() => from(userService.loadCurrentUser())),
+                switchMap(user => (!user.hasAnyREDRoles ? throwError('Not user has no red roles') : of({}))),
                 mergeMap(() => generalSettingsService.getGeneralConfigurations()),
                 tap(configuration => configService.updateDisplayName(configuration.displayName)),
                 switchMap(() => userPreferenceService.reload()),
-                tap(() => languageService.chooseAndSetInitialLanguage()),
                 catchError(() => {
                     title.setTitle('RedactManager');
                     return of({});
                 }),
+                tap(() => languageService.chooseAndSetInitialLanguage()),
                 take(1),
-            )
-            .toPromise();
+            ),
+        );
 }
diff --git a/apps/red-ui/src/app/utils/constants.ts b/apps/red-ui/src/app/utils/constants.ts
index 454c91719..63ba0e493 100644
--- a/apps/red-ui/src/app/utils/constants.ts
+++ b/apps/red-ui/src/app/utils/constants.ts
@@ -1 +1 @@
-export const CHANGED_CHECK_INTERVAL = 3000;
+export const CHANGED_CHECK_INTERVAL = 5000;
diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts
index 80d4222b5..1a8b3d270 100644
--- a/apps/red-ui/src/app/utils/functions.ts
+++ b/apps/red-ui/src/app/utils/functions.ts
@@ -98,9 +98,9 @@ export function removeBraces(str: any): string {
     return str.replace(/[{}]/g, '');
 }
 
-export function toKebabCase(str: string): string {
+export function toSnakeCase(str: string): string {
     return str
         .replace(/([a-z])([A-Z])/g, '$1-$2')
-        .replace(/[\s_]+/g, '-')
+        .replace(/[\s_]+/g, '_')
         .toLowerCase();
 }
diff --git a/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts b/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts
index 1be4b46d7..4c04efa20 100644
--- a/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts
+++ b/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts
@@ -10,6 +10,7 @@ export const SuperTypeSorter: { [key in AnnotationSuperType]: number } = {
     'suggestion-remove-dictionary': 13,
     'suggestion-add': 10,
     'suggestion-remove': 11,
+    'ignored-hint': 45,
     skipped: 50,
     redaction: 1,
     'manual-redaction': 2,
diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json
index 6befaaf58..01c7d5793 100644
--- a/apps/red-ui/src/assets/config/config.json
+++ b/apps/red-ui/src/assets/config/config.json
@@ -1,9 +1,9 @@
 {
   "ADMIN_CONTACT_NAME": null,
   "ADMIN_CONTACT_URL": null,
-  "API_URL": "https://dev-03.iqser.cloud/redaction-gateway-v1",
+  "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1",
   "APP_NAME": "RedactManager",
-  "AUTO_READ_TIME": 1.5,
+  "AUTO_READ_TIME": 3,
   "BACKEND_APP_VERSION": "4.4.40",
   "DELETE_RETENTION_HOURS": 96,
   "EULA_URL": "EULA_URL",
@@ -17,7 +17,7 @@
   "MAX_RETRIES_ON_SERVER_ERROR": 3,
   "OAUTH_CLIENT_ID": "redaction",
   "OAUTH_IDP_HINT": null,
-  "OAUTH_URL": "https://dev-03.iqser.cloud/auth/realms/redaction",
+  "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction",
   "RECENT_PERIOD_IN_HOURS": 24,
   "SELECTION_MODE": "structural"
 }
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index d480549e2..5ab3ee049 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -88,8 +88,10 @@
     "form": {
       "column-header": "CSV-Spaltenüberschrift",
       "column-header-placeholder": "Spaltenüberschrift für CSV eingeben",
+      "displayed-disabled": "Die maximale Anzahl angezeigter Attribute ({maxNumber}) wurde erreicht.",
       "displayedInFileList": "Wird in der Dokumentenliste angezeigt",
       "filterable": "Filterbar",
+      "filterable-disabled": "Die maximale Anzahl filterbarer Attribute ({maxNumber}) wurde erreicht.",
       "name": "Name des Attributs",
       "name-placeholder": "Namen eingeben",
       "primary": "Zum Primärattribut machen",
@@ -139,6 +141,10 @@
     "settings": "Einstellungen"
   },
   "annotation": "Anmerkung",
+  "references": {
+    "singular": "",
+    "plural": ""
+  },
   "annotation-actions": {
     "resize": {
       "label": "Größe ändern"
@@ -161,6 +167,12 @@
     "force-redaction": {
       "label": "Schwärzung erzwingen"
     },
+    "see-references": {
+      "label": ""
+    },
+    "force-hint": {
+      "label": "Hinweis erzwingen"
+    },
     "hide": "Ausblenden",
     "message": {
       "dictionary": {
@@ -256,22 +268,38 @@
       "only-here": "nur hier entfernen",
       "remove-from-dict": "Aus dem Wörterbuch entfernen"
     },
+    "resize-accept": {
+      "label": "Größe speichern"
+    },
+    "resize-cancel": {
+      "label": "Größenänderung abbrechen"
+    },
+    "resize": {
+      "label": "Größe ändern"
+    },
     "show": "Zeigen",
     "undo": "Rückgängig"
   },
+  "annotation-changes": {
+    "forced": "Redaktion erzwungen",
+    "header": "Manuelle Änderungen:",
+    "legal-basis": "Grund geändert",
+    "recategorized": "Bildkategorie geändert",
+    "removed-manual": "Schwärzung/Hinweis entfernt",
+    "resized": "Schwärzungsbereich wurde geändert"
+  },
   "annotation-engines": {
     "dictionary": "{isHint, select, true{Hint} other{Redaction}} basierend auf Wörterbuch",
     "ner": "Redaktion basierend auf KI",
     "rule": "Schwärzung basierend auf Regel {rule}"
   },
   "annotation-type": {
-    "suggestion-resize": "Vorgeschlagene Größenänderung",
     "declined-suggestion": "Abgelehnter Vorschlag",
     "hint": "Hinweis",
+    "ignored-hint": "Ignorierter Hinweis",
     "manual-redaction": "Manuelle Schwärzung",
     "recommendation": "Empfehlung",
     "redaction": "Schwärzung",
-    "remove-only-here": "Ausstehende Löschung (nur hier)",
     "skipped": "Übersprungen",
     "suggestion-add": "Vorschlag für Schwärzung",
     "suggestion-add-dictionary": "Vorschlag für neuen Wörterbucheintrag",
@@ -279,7 +307,8 @@
     "suggestion-force-redaction": "Vorschlag für erzwungene Schwärzung",
     "suggestion-recategorize-image": "Vorschlag für Rekategorisierung eines Bilds",
     "suggestion-remove": "Vorschlagen, die Schwärzung zu entfernen",
-    "suggestion-remove-dictionary": "Vorschlag für Löschung eines Wörterbucheintrags"
+    "suggestion-remove-dictionary": "Vorschlag für Löschung eines Wörterbucheintrags",
+    "suggestion-resize": "Vorgeschlagene Größenänderung"
   },
   "annotations": "Anmerkungen",
   "archived": "Archiviert",
@@ -287,10 +316,10 @@
     "dialog": {
       "approvers": "Genehmiger",
       "make-approver": "Zum Genehmiger ernennen",
-      "no-approvers": "Es gibt noch keine Genehmiger. Bitte aus der Listen unten auswählen.",
       "no-reviewers": "Es gibt noch keine Reviewer.\nBitte aus der Liste unten auswählen.",
       "reviewers": "Reviewer",
       "search": "Suche ...",
+      "select-below": "Wählen Sie aus der Liste unten aus.",
       "single-user": "Besitzer"
     }
   },
@@ -349,26 +378,18 @@
     "logout": "Ausloggen"
   },
   "by": "von",
-  "resize-annotation-dialog": {
-    "actions": {
-      "cancel": "Abbrechen",
-      "save": "Änderungen speichern"
-    },
-    "content": {
-      "comment": "Kommentar"
-    },
-    "header": "Schwärzung ändern"
-  },
   "change-legal-basis-dialog": {
     "actions": {
       "cancel": "Abbrechen",
       "save": "Änderungen speichern"
     },
     "content": {
+      "classification": "Wert / Klassifizierung",
       "comment": "Kommentar",
       "legalBasis": "Rechtsgrundlage",
       "reason": "Begründung für die Schwärzung auswählen",
-      "reason-placeholder": "Wählen Sie eine Begründung aus ..."
+      "reason-placeholder": "Wählen Sie eine Begründung aus ...",
+      "section": "Absatz / Ort"
     },
     "header": "Begründung für die Schwärzung bearbeiten"
   },
@@ -390,11 +411,14 @@
   "confirm-delete-file-attribute": {
     "cancel": "{type, select, single{Attribut} bulk{Attribute} other{}} behalten",
     "delete": "{type, select, single{Attribut} bulk{Attribute} other{}} löschen",
-    "impacted-documents": "Alle Dokumente {type, select, single{ist} bulk{sind} other{}} betroffen",
-    "lost-details": "Alle in die Dokumente eingegebenen Daten gehen verloren",
+    "file-impacted-documents": "Alle Dokumente {type, select, single{ist} bulk{sind} other{}} betroffen",
+    "dossier-impacted-documents": "",
+    "file-lost-details": "Alle in die Dokumente eingegebenen Daten gehen verloren",
+    "dossier-lost-details": "",
     "title": "{type, select, single{{name}} bulk{Datei-Attribute} other{}} löschen",
     "toast-error": "Bitte bestätigen Sie, dass Ihnen die Konsequenzen dieser Aktion bewusst sind!",
-    "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!"
+    "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!",
+    "impacted-report": "{count}"
   },
   "confirm-delete-users": {
     "cancel": "{usersCount, plural, one{Benutzer} other{Benutzer}} behalten",
@@ -449,6 +473,12 @@
       "deny-text": "Uploads abbrechen",
       "question": "Wählen Sie bitte aus, ob {fileName} eine Berichtsvorlage für eine oder für mehrere Dateien ist",
       "title": "Upload der Berichtsvorlage"
+    },
+    "report-template-same-name": {
+      "confirmation-text": "Ja. Hochladen fortsetzen",
+      "deny-text": "Nein. Hochladen abbrechen",
+      "question": "{fileName}",
+      "title": "Hochladen von Berichtsvorlagen"
     }
   },
   "content": "Begründung",
@@ -468,6 +498,7 @@
       "analysisColor": "Analyse",
       "defaultColor": "Standardfarbe",
       "dictionaryRequestColor": "Wörterbuch",
+      "ignoredHintColor": "Ignorierter Hinweis",
       "manualRedactionColor": "Manuelle Schwärzung",
       "notRedacted": "Übersprungen",
       "previewColor": "Vorschau",
@@ -631,6 +662,9 @@
       "action": "Dossier löschen",
       "delete-failed": "Das Dossier {dossierName} konnte nicht gelöscht werden"
     },
+    "dossier-info": {
+      "action": "Dossier-Info"
+    },
     "edit": {
       "action": "Dossier bearbeiten"
     },
@@ -702,7 +736,8 @@
         "deleted": "{count} gelöschte Dateien",
         "documents": "{count} {count, plural, one{Dokument} other{Dokumente}}",
         "due-date": "Fällig am {date}",
-        "people": "{count} {count, plural, one{Benutzer} other{Benutzer}}"
+        "people": "{count} {count, plural, one{Benutzer} other{Benutzer}}",
+        "processing-documents": "{count} Verarbeitung von {count, plural, one{document} other{documents}}"
       }
     },
     "download-file": "Herunterladen",
@@ -710,8 +745,7 @@
     "file-listing": {
       "file-entry": {
         "file-error": "Reanalyse erforderlich",
-        "file-pending": "Ausstehend ...",
-        "file-processing": "Wird analysiert"
+        "file-pending": "Ausstehend ..."
       }
     },
     "filters": {
@@ -739,7 +773,6 @@
     },
     "ocr-file": "OCR-Dokument",
     "ocr-performed": "Diese Datei wurde mithilfe von OCR konvertiert.",
-    "open-document": "Dokument öffnen",
     "quick-filters": {
       "assigned-to-me": "Mir zuweisen",
       "assigned-to-others": "Anderen zugewiesen",
@@ -768,7 +801,14 @@
     "under-review": "In Review",
     "upload-files": "Sie können Dateien überall per Drag and Drop platzieren..."
   },
-  "dossier-templates": "Dossier-Vorlagen",
+  "dossier-templates": {
+    "label": "Dossier-Vorlagen",
+    "status": {
+      "label": "",
+      "active": "",
+      "incomplete": ""
+    }
+  },
   "dossier-templates-listing": {
     "action": {
       "delete": "Dossier-Vorlage",
@@ -794,7 +834,8 @@
       "created-by": "Erstellt von",
       "created-on": "Erstellt am",
       "modified-on": "Geändert am",
-      "name": "Name"
+      "name": "Name",
+      "status": ""
     },
     "table-header": {
       "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}"
@@ -851,6 +892,9 @@
     "attributes": {
       "custom-attributes": "Benutzerdefinierte Dossier-Attribute",
       "delete-image": "Bild löschen",
+      "error": {
+        "generic": "Als Bilddossierattribute sind nur PNG-, JPG- und JPEG-Dateien zulässig."
+      },
       "image-attributes": "Bild-Attribute",
       "no-custom-attributes": "Es sind keine Text-Attribute vorhanden",
       "no-image-attributes": "Es sind keine Bild-Attribute vorhanden",
@@ -872,9 +916,11 @@
         "title": "Es sind keine gelöschten Dokumente vorhanden."
       },
       "table-col-names": {
+        "assignee": "Bevollmächtigter",
         "deleted-on": "Gelöscht am",
         "name": "Name",
         "pages": "Seiten",
+        "status": "Status",
         "time-to-restore": "Verbleibende Zeit für Wiederherstellung"
       },
       "table-header": {
@@ -885,8 +931,10 @@
       "display-name": {
         "cancel": "Abbrechen",
         "edit": "Anzeigenamen bearbeiten",
+        "error": "Anzeigename des Wörterbuchs konnte nicht aktualisiert werden.",
         "placeholder": "Anzeigenamen eingeben",
-        "save": "Anzeigenamen speichern"
+        "save": "Anzeigenamen speichern",
+        "success": "Anzeigename des Wörterbuchs erfolgreich aktualisiert."
       },
       "entries": "{length} {length, plural, one{entry} other{entries}}"
     },
@@ -923,7 +971,20 @@
     "unsaved-changes": "Sie haben nicht gespeicherte Änderungen. Speichern Sie oder machen Sie die Änderungen rückgängig, bevor Sie die Registerkarte wechseln."
   },
   "error": {
-    "close": "Nah dran",
+    "deleted-entity": {
+      "dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Dieses Dossier wurde gelöscht!"
+      },
+      "file-dossier": {
+        "action": "Zurück zur Übersicht",
+        "label": "Das Dossier dieser Datei wurde gelöscht!"
+      },
+      "file": {
+        "action": "Zurück zum Dossier",
+        "label": "Diese Datei wurde gelöscht!"
+      }
+    },
     "http": {
       "generic": "Aktion mit Code {status} fehlgeschlagen"
     },
@@ -997,10 +1058,6 @@
     "total-rows": "{rows} Zeilen insgesamt"
   },
   "file-attributes-listing": {
-    "error": {
-      "generic": "Attribute konnte nicht erstellt werden!",
-      "conflict": "Es gibt bereits ein Attribute mit diesem Name!"
-    },
     "action": {
       "delete": "Attribut löschen",
       "edit": "Attribute bearbeiten"
@@ -1009,6 +1066,10 @@
     "bulk-actions": {
       "delete": "Ausgewählte Attribute löschen"
     },
+    "error": {
+      "conflict": "Es gibt bereits ein Attribute mit diesem Name!",
+      "generic": "Attribute konnte nicht erstellt werden!"
+    },
     "no-data": {
       "title": "Es sind noch keine Datei-Attribute vorhanden."
     },
@@ -1099,10 +1160,12 @@
     "approved": "Genehmigt",
     "deleted": "Gelöscht",
     "error": "Reanalyse erforderlich",
-    "excluded": "Ausgeschlossen",
     "full-reprocess": "Wird analysiert",
+    "image-analyzing": "Bildanalyse",
     "indexing": "Wird analysiert",
+    "new": "Neu",
     "ocr-processing": "OCR-Analyse",
+    "processed": "Verarbeitet",
     "processing": "Wird analysiert...",
     "reprocess": "Wird analysiert",
     "unassigned": "Nicht zugewiesen",
@@ -1114,8 +1177,9 @@
     "filter-options": "Filteroptionen",
     "filter-types": "Filter",
     "label": "Filter",
-    "with-comments": "Nur Anmerkungen mit Kommentaren",
-    "with-reason-changes": "Nur Schwärzungen, deren Begründungen geändert wurden"
+    "redaction-changes": "Nur Anmerkungen mit Schwärzungsänderungen",
+    "unseen-pages": "Nur Anmerkungen auf unsichtbaren Seiten",
+    "with-comments": "Nur Anmerkungen mit Kommentaren"
   },
   "filter": {
     "analysis": "Analyse erforderlich",
@@ -1258,18 +1322,21 @@
         "save": "Speichern"
       },
       "content": {
+        "classification": "Wert / Klassifizierung",
         "comment": "Kommentar",
         "dictionary": "Wörterbuch",
         "legalBasis": "Rechtsgrundlage",
         "reason": "Begründung",
         "reason-placeholder": "Wählen Sie eine Begründung aus ...",
         "rectangle": "Benutzerdefinierter Bereich",
+        "section": "Absatz / Ort",
         "text": "Ausgewählter Text:"
       },
       "header": {
         "dictionary": "Zum Wörterbuch hinzufügen",
         "false-positive": "Als Falsch-Positiv definieren",
-        "force": "Schwärzung erzwingen",
+        "force-hint": "Hinweis erzwingen",
+        "force-redaction": "Schwärzung erzwingen",
         "redaction": "Schwärzung",
         "request-dictionary": "Neuen Wörterbucheintrag vorschlagen",
         "request-false-positive": "Als Falsch-Positiv vorschlagen",
@@ -1277,6 +1344,10 @@
       }
     }
   },
+  "accept-recommendation-dialog": {
+    "header": "",
+    "multiple-values": ""
+  },
   "months": {
     "apr": "Apr.",
     "aug": "August",
@@ -1292,14 +1363,14 @@
     "sep": "Sept."
   },
   "notification": {
-    "no-data": "Du hast aktuell keine Benachrichtigungen",
     "assign-approver": "Sie wurden dem Dokument {fileName} im Dossier {dossierName} als Genehmiger zugewiesen!",
     "assign-reviewer": "Sie wurden dem Dokument {fileName} im Dossier {dossierName} als Reviewer zugewiesen!",
     "document-approved": "{fileName} wurde genehmigt!",
     "dossier-deleted": "Dossier: {dossierName} wurde gelöscht!",
-    "dossier-owner-deleted": "Der Dossier-Owner von {dossierName} wurde entfernt!",
     "dossier-owner-removed": "Der Dossier-Owner von {dossierName} wurde entfernt!",
     "dossier-owner-set": "Eigentümer von {dossierName} geändert zu {user}!",
+    "download-ready": "Ihr Download ist fertig!",
+    "no-data": "Du hast aktuell keine Benachrichtigungen",
     "unassigned-from-file": "Sie wurden vom Dokument {fileName} im Dossier {dossierName} entfernt!",
     "user-becomes-dossier-member": "{user} ist jetzt Mitglied des Dossiers {dossierName}!",
     "user-demoted-to-reviewer": "{user} wurde im Dossier {dossierName} auf die Reviewer-Berechtigung heruntergestuft!",
@@ -1316,22 +1387,27 @@
       "generic": "Ein Fehler ist aufgetreten... Aktualisierung der Einstellungen fehlgeschlagen!"
     },
     "groups": {
-      "approver": "Dossiers, für die Sie genehmigend sind",
-      "own": "Dossiers, die Sie besitzen",
-      "reviewer": "Dossiers, für die Sie Bewerter sind"
+      "document": "Dokumentbezogene Benachrichtigungen",
+      "dossier": "Dossierbezogene Benachrichtigungen",
+      "other": "Andere Benachrichtigungen"
     },
     "options-title": "Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten",
     "options": {
-      "document-is-sent-for-approval": "Dokument wird zur Genehmigung gesendet",
-      "document-status-changes": "Dokumentstatusänderungen",
-      "dossier-status-changes": "Änderungen des Dossierstatus",
-      "request-to-join-the-dossier": "Antrag auf Beitritt zum Dossier",
-      "when-a-document-is-approved": "Wenn ein Dokument genehmigt wird",
-      "when-a-document-is-assigned-to-a-reviewer": "Wenn ein Dokument einem Prüfer zugewiesen wird",
-      "when-a-document-is-sent-for-approval": "Wenn ein Dokument zur Genehmigung gesendet wird",
-      "when-a-reviewer-is-unassigned-from-a-document": "Wenn die Zuweisung eines Prüfers zu einem Dokument aufgehoben wird",
-      "when-i-am-assigned-on-a-document": "Wenn ich einem Dokument zugewiesen bin",
-      "when-i-am-unassigned-from-a-document": "Wenn ich einem Dokument nicht zugewiesen bin"
+      "ASSIGN_APPROVER": "Wenn ich einem Dokument als Genehmiger zugewiesen bin",
+      "ASSIGN_REVIEWER": "Wenn ich einem Dokument als Überprüfer zugewiesen bin",
+      "DOCUMENT_APPROVED": "Wenn sich der Dokumentstatus in Genehmigt ändert",
+      "DOCUMENT_UNDER_APPROVAL": "Wenn sich der Dokumentstatus in „In Genehmigung“ ändert",
+      "DOCUMENT_UNDER_REVIEW": "Wenn sich der Dokumentstatus in Wird überprüft ändert",
+      "DOSSIER_DELETED": "Wenn ein Dossier gelöscht wurde",
+      "DOSSIER_OWNER_DELETED": "Wenn der Eigentümer eines Dossiers gelöscht wurde",
+      "DOSSIER_OWNER_REMOVED": "Wenn ich den Besitz des Dossiers verliere",
+      "DOSSIER_OWNER_SET": "Wenn ich der Besitzer des Dossiers werde",
+      "DOWNLOAD_READY": "Wenn ein Download bereit ist",
+      "UNASSIGNED_FROM_FILE": "Wenn die Zuweisung zu einem Dokument aufgehoben wird",
+      "USER_BECOMES_DOSSIER_MEMBER": "Wenn ein Benutzer zu meinem Dossier hinzugefügt wurde",
+      "USER_DEGRADED_TO_REVIEWER": "Wenn ich Gutachter in einem Dossier werde",
+      "USER_PROMOTED_TO_APPROVER": "Wenn ich Genehmiger in einem Dossier werde",
+      "USER_REMOVED_AS_DOSSIER_MEMBER": "Wenn ich die Dossier-Mitgliedschaft verliere"
     },
     "schedule": {
       "daily": "Tägliche Zusammenfassung",
@@ -1360,7 +1436,8 @@
       "actions": {
         "search": "Nach Auswahl suchen"
       }
-    }
+    },
+    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen"
   },
   "pending-changes-guard": "ACHTUNG: Sie haben ungespeicherte Änderungen. Klicken Sie auf „Abbrechen“, wenn Sie zurückkehren und die Änderungen speichern möchten. Klicken Sie auf „OK“, um die Änderungen zu speichern.",
   "readonly": "Lesemodus",
@@ -1444,11 +1521,24 @@
       "cancel": "Abbrechen",
       "save": "Speichern"
     },
+    "error": {
+      "password-policy": "Kennwort konnte nicht zurückgesetzt werden. Das neue Passwort entspricht nicht der Passwortrichtlinie."
+    },
     "form": {
       "password": "Temporäres Passwort"
     },
     "header": "Temporäres Passwort für {userName} festlegen"
   },
+  "resize-annotation-dialog": {
+    "actions": {
+      "cancel": "Abbrechen",
+      "save": "Änderungen speichern"
+    },
+    "content": {
+      "comment": "Kommentar"
+    },
+    "header": "Schwärzung ändern"
+  },
   "roles": {
     "inactive": "Inaktiv",
     "manager-admin": "Manager & Admin",
@@ -1472,6 +1562,7 @@
   },
   "search-screen": {
     "cols": {
+      "assignee": "Bevollmächtigter",
       "document": "Dokument",
       "dossier": "Dossier",
       "pages": "Seiten",
@@ -1484,6 +1575,7 @@
     "missing": "Fehlt",
     "must-contain": "Muss enthalten",
     "no-data": "Geben Sie einen Suchbegriff in die Suchleiste, um nach Dokumenten oder Inhalten von Dokumenten zu suchen.",
+    "no-match": "Keine Dokumente entsprechen Ihren aktuellen Filtern.",
     "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}"
   },
   "search": {
@@ -1557,6 +1649,15 @@
   },
   "type": "Typ",
   "unknown": "Unbekannt",
+  "upload-dictionary-dialog": {
+    "options": {
+      "cancel": "Abbrechen",
+      "merge": "Einträge zusammenführen",
+      "overwrite": "Überschreiben"
+    },
+    "question": "Wählen Sie, wie Sie fortfahren möchten:",
+    "title": "Das Wörterbuch hat bereits Einträge!"
+  },
   "upload-status": {
     "dialog": {
       "actions": {
@@ -1640,5 +1741,13 @@
     },
     "title": "Wasserzeichen"
   },
+  "workflow": {
+    "selection": {
+      "all": "Alle",
+      "count": "{count} ausgewählt",
+      "none": "Keiner",
+      "select": "Wählen"
+    }
+  },
   "yesterday": "Gestern"
 }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index f3f85be72..22ff9d8f2 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -141,6 +141,10 @@
     "settings": "Settings"
   },
   "annotation": "Annotation",
+  "references": {
+    "singular": "REFERENCE",
+    "plural": "REFERENCES"
+  },
   "annotation-actions": {
     "accept-recommendation": {
       "label": "Accept Recommendation"
@@ -151,9 +155,15 @@
     "edit-reason": {
       "label": "Edit Reason"
     },
+    "force-hint": {
+      "label": "Force Hint"
+    },
     "force-redaction": {
       "label": "Force Redaction"
     },
+    "see-references": {
+      "label": "See References"
+    },
     "hide": "Hide",
     "message": {
       "dictionary": {
@@ -277,6 +287,7 @@
   "annotation-type": {
     "declined-suggestion": "Declined Suggestion",
     "hint": "Hint",
+    "ignored-hint": "Ignored Hint",
     "manual-redaction": "Manual Redaction",
     "recommendation": "Recommendation",
     "redaction": "Redaction",
@@ -286,7 +297,7 @@
     "suggestion-change-legal-basis": "Suggested change legal basis",
     "suggestion-force-redaction": "Suggestion force redaction",
     "suggestion-recategorize-image": "Suggested recategorize image",
-    "suggestion-remove": "Suggested redaction removal",
+    "suggestion-remove": "Suggested hint removal",
     "suggestion-remove-dictionary": "Suggested dictionary removal",
     "suggestion-resize": "Suggested Resize"
   },
@@ -296,10 +307,10 @@
     "dialog": {
       "approvers": "Approvers",
       "make-approver": "Make Approver",
-      "no-approvers": "No approvers yet.\nSelect from the list below.",
-      "no-reviewers": "No reviewers yet.\nSelect from the list below.",
+      "no-reviewers": "No members with \"review only\" permission.",
       "reviewers": "Reviewers",
       "search": "Search...",
+      "select-below": "Select from the list below.",
       "single-user": "Owner"
     }
   },
@@ -351,10 +362,10 @@
     "to": "to"
   },
   "auth-error": {
-    "heading": "Your user doesn't have the required RED-* roles to access this application. Please contact your admin for access!",
-    "heading-with-link": "Your user doesn't have the required RED-* roles to access this application. Please contact your admin for access!",
-    "heading-with-name": "Your user doesn't have the required RED-* roles to access this application. Please contact {adminName} for access!",
-    "heading-with-name-and-link": "Your user doesn't have the required RED-* roles to access this application. Please contact {adminName} for access!",
+    "heading": "Your user is successfully logged in but has no role assigned yet. Please contact your RedactManager administrator to assign appropriate roles.",
+    "heading-with-link": "Your user is successfully logged in but has no role assigned yet. Please contact your RedactManager administrator to assign appropriate roles!",
+    "heading-with-name": "Your user is successfully logged in but has no role assigned yet. Please contact {adminName} to assign appropriate roles.",
+    "heading-with-name-and-link": "Your user is successfully logged in but has no role assigned yet. Please contact {adminName} to assign appropriate roles.",
     "logout": "Logout"
   },
   "by": "by",
@@ -391,11 +402,14 @@
   "confirm-delete-file-attribute": {
     "cancel": "Keep {type, select, single{Attribute} bulk{Attributes} other{}}",
     "delete": "Delete {type, select, single{Attribute} bulk{Attributes} other{}}",
-    "impacted-documents": "All documents {type, select, single{it is} bulk{they are} other{}} used on will be impacted",
-    "lost-details": "All inputted details on the documents will be lost",
+    "file-impacted-documents": "All documents {type, select, single{it is} bulk{they are} other{}} used on will be impacted",
+    "dossier-impacted-documents": "All dossiers based on this template will be affected",
+    "file-lost-details": "All inputted details on the documents will be lost",
+    "dossier-lost-details": "All values for this attribute will be lost",
     "title": "Delete {type, select, single{{name}} bulk{File Attributes} other{}}",
     "toast-error": "Please confirm that you understand the ramifications of your action!",
-    "warning": "Warning: this cannot be undone!"
+    "warning": "Warning: this cannot be undone!",
+    "impacted-report": "{count} reports use the placeholder for this attribute and need to be adjusted"
   },
   "confirm-delete-users": {
     "cancel": "Keep {usersCount, plural, one{User} other{Users}}",
@@ -444,12 +458,25 @@
       "question": "Are you sure you want to delete {filesCount, plural, one{this document} other{these documents}}?",
       "title": "Delete {filesCount, plural, one{{fileName}} other{Selected Documents}}"
     },
+    "unsaved-changes": {
+      "confirmation-text": "Save and Leave",
+      "details": "If you leave the tab without saving, all the unsaved changes will be lost.",
+      "discard-changes-text": "DISCARD CHANGES",
+      "question": "Are you sure you want to leave the tab? You have unsaved changes.",
+      "title": "You have unsaved changes"
+    },
     "upload-report-template": {
       "alternate-confirmation-text": "Upload as multi-file report",
       "confirmation-text": "Upload as single-file report",
       "deny-text": "Cancel Upload",
       "question": "Please choose if {fileName} is a single or multi-file report template",
       "title": "Report Template Upload"
+    },
+    "report-template-same-name": {
+      "confirmation-text": "Yes. Continue upload",
+      "deny-text": "No. Cancel Upload",
+      "question": "There is already a Report Template with the name: {fileName}. Do you wish to continue?",
+      "title": "Report Template Upload"
     }
   },
   "content": "Reason",
@@ -469,6 +496,7 @@
       "analysisColor": "Analysis",
       "defaultColor": "Default Color",
       "dictionaryRequestColor": "Dictionary Request",
+      "ignoredHintColor": "Ignored Hint",
       "manualRedactionColor": "Manual Redaction",
       "notRedacted": "Skipped",
       "previewColor": "Preview",
@@ -632,6 +660,9 @@
       "action": "Delete Dossier",
       "delete-failed": "Failed to delete dossier: {dossierName}"
     },
+    "dossier-info": {
+      "action": "Dossier Info"
+    },
     "edit": {
       "action": "Edit Dossier"
     },
@@ -768,7 +799,25 @@
     "under-review": "Under Review",
     "upload-files": "Drag & drop files anywhere..."
   },
-  "dossier-templates": "Dossier Templates",
+  "dossier-template-info": "Info",
+  "dossier-template-info-screen": {
+    "created-by": "Created by",
+    "created-on": "Created on: {date}",
+    "valid-from": "Valid from: {date}",
+    "valid-to": "Valid to: {date}",
+    "description": "Description",
+    "dictionaries": "{count} {count, plural, one{dictionary} other{dictionaries}}",
+    "entries": "{count} {count, plural, one{entry} other{entries}}",
+    "modified-on": "Modified on: {date}"
+  },
+  "dossier-templates": {
+    "label": "Dossier Templates",
+    "status": {
+      "label": "Status",
+      "active": "Active",
+      "incomplete": "Incomplete"
+    }
+  },
   "dossier-templates-listing": {
     "action": {
       "delete": "Delete Template",
@@ -794,7 +843,8 @@
       "created-by": "Created by",
       "created-on": "Created on",
       "modified-on": "Modified on",
-      "name": "Name"
+      "name": "Name",
+      "status": "Status"
     },
     "table-header": {
       "title": "{length} dossier {length, plural, one{template} other{templates}}"
@@ -875,9 +925,11 @@
         "title": "There are no deleted documents."
       },
       "table-col-names": {
+        "assignee": "Assignee",
         "deleted-on": "Deleted On",
         "name": "Name",
         "pages": "Pages",
+        "status": "Status",
         "time-to-restore": "Time To Restore"
       },
       "table-header": {
@@ -924,10 +976,23 @@
       "members": "Members",
       "team-members": "Team Members"
     },
-    "side-nav-title": "Configurations",
-    "unsaved-changes": "You have unsaved changes. Save or revert before changing the tab."
+    "side-nav-title": "Configurations"
   },
   "error": {
+    "deleted-entity": {
+      "dossier": {
+        "action": "Back to overview",
+        "label": "This dossier has been deleted!"
+      },
+      "file-dossier": {
+        "action": "Back to overview",
+        "label": "The dossier of this file has been deleted!"
+      },
+      "file": {
+        "action": "Back to dossier",
+        "label": "This file has been deleted!"
+      }
+    },
     "http": {
       "generic": "Action failed with code {status}"
     },
@@ -1058,7 +1123,7 @@
     "assign-reviewer": "Assign User",
     "change-reviewer": "Change User",
     "delta": "Delta",
-    "delta-tooltip": "Delta View shows only the changes since last re-analysis. This view is only available if there is at least 1 change",
+    "delta-tooltip": "The Delta View shows the unseen changes since your last visit to the page. This view is only available if there is at least 1 change.",
     "document-info": "Your Document Info lives here. This includes metadata required on each document.",
     "download-original-file": "Download Original File",
     "exclude-pages": "Exclude pages from redaction",
@@ -1121,6 +1186,7 @@
     "deleted": "Deleted",
     "error": "Re-processing required",
     "full-reprocess": "Processing",
+    "image-analyzing": "Image Analyzing",
     "indexing": "Processing",
     "new": "New",
     "ocr-processing": "OCR Processing",
@@ -1294,7 +1360,8 @@
       "header": {
         "dictionary": "Add to dictionary",
         "false-positive": "Set false positive",
-        "force": "Force Redaction",
+        "force-hint": "Force Hint",
+        "force-redaction": "Force Redaction",
         "redaction": "Redaction",
         "request-dictionary": "Request add to dictionary",
         "request-false-positive": "Request false positive",
@@ -1302,6 +1369,10 @@
       }
     }
   },
+  "accept-recommendation-dialog": {
+    "header": "Accept recommendation",
+    "multiple-values": "Multiple recommendations selected"
+  },
   "months": {
     "apr": "Apr.",
     "aug": "Aug.",
@@ -1317,19 +1388,19 @@
     "sep": "Sep."
   },
   "notification": {
-    "assign-approver": "You have been assigned as approver for {fileName} in the {dossierName}!",
-    "assign-reviewer": "You have been assigned as reviewer for {fileName} in the {dossierName}!",
+    "assign-approver": "You have been assigned as approver for {fileName} in dossier: {dossierName}!",
+    "assign-reviewer": "You have been assigned as reviewer for {fileName} in dossier: {dossierName}!",
     "document-approved": " {fileName} has been approved!",
     "dossier-deleted": "Dossier: {dossierName} has been deleted!",
     "dossier-owner-removed": "{dossierName} owner removed!",
     "dossier-owner-set": " {dossierName} owner changed to {user}!",
-    "download-ready": "Your download is ready!",
+    "download-ready": "Your download is ready!",
     "no-data": "You currently have no notifications",
-    "unassigned-from-file": "You have been unassigned from {fileName} in the {dossierName}!",
-    "user-becomes-dossier-member": "{user} joined dossier: {dossierName}!",
-    "user-demoted-to-reviewer": "{user} demoted to reviewer in dossier: {dossierName}!",
-    "user-promoted-to-approver": "{user} promoted to approver in dossier: {dossierName}!",
-    "user-removed-as-dossier-member": "{user} removed as a member of: {dossierName} !"
+    "unassigned-from-file": "You have been unassigned from {fileName} in dossier: {dossierName}!",
+    "user-becomes-dossier-member": "You have been added to dossier: {dossierName}!",
+    "user-demoted-to-reviewer": "You have been demoted to reviewer in dossier: {dossierName}!",
+    "user-promoted-to-approver": "You have been promoted to approver in dossier: {dossierName}!",
+    "user-removed-as-dossier-member": "You have been removed as a member from dossier: {dossierName} !"
   },
   "notifications": "Notifications",
   "notifications-screen": {
diff --git a/apps/red-ui/src/assets/icons/general/pdftron-action-disable-tooltips.svg b/apps/red-ui/src/assets/icons/general/pdftron-action-disable-tooltips.svg
new file mode 100644
index 000000000..08a743375
--- /dev/null
+++ b/apps/red-ui/src/assets/icons/general/pdftron-action-disable-tooltips.svg
@@ -0,0 +1,12 @@
+
+
+    
+        
+            
+            
+        
+    
+
diff --git a/apps/red-ui/src/assets/icons/general/pdftron-action-toggle-tooltips.svg b/apps/red-ui/src/assets/icons/general/pdftron-action-enable-tooltips.svg
similarity index 100%
rename from apps/red-ui/src/assets/icons/general/pdftron-action-toggle-tooltips.svg
rename to apps/red-ui/src/assets/icons/general/pdftron-action-enable-tooltips.svg
diff --git a/apps/red-ui/src/assets/icons/general/reference.svg b/apps/red-ui/src/assets/icons/general/reference.svg
new file mode 100644
index 000000000..77e985170
--- /dev/null
+++ b/apps/red-ui/src/assets/icons/general/reference.svg
@@ -0,0 +1,12 @@
+
+
+    
+        
+            
+                
+                    
+                
+            
+        
+    
+
diff --git a/apps/red-ui/src/assets/styles/red-editor.scss b/apps/red-ui/src/assets/styles/red-editor.scss
index 1150600de..447ecdc50 100644
--- a/apps/red-ui/src/assets/styles/red-editor.scss
+++ b/apps/red-ui/src/assets/styles/red-editor.scss
@@ -1,5 +1,39 @@
 @use 'variables';
 
+.monaco-diff-editor {
+    .editor.original {
+        right: 30px !important; // diffOverviewRuler size
+        left: unset !important;
+    }
+
+    .editor.modified {
+        left: 0 !important;
+        width: unset !important;
+    }
+
+    .diffOverview {
+        .diffOverviewRuler.original {
+            left: 15px !important;
+        }
+
+        .diffOverviewRuler.modified {
+            right: 15px !important;
+        }
+    }
+}
+
+.monaco-editor.disabled {
+    cursor: default;
+
+    .monaco-mouse-cursor-text {
+        cursor: default;
+    }
+
+    .cursors-layer > .cursor {
+        display: none !important;
+    }
+}
+
 .changed-row-marker {
     background: rgba(variables.$primary, 0.1);
 }
diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss
index 91c598cbb..4b83d585b 100644
--- a/apps/red-ui/src/styles.scss
+++ b/apps/red-ui/src/styles.scss
@@ -32,25 +32,3 @@
     $iqser-yellow-2: vars.$yellow-2,
     $iqser-helpmode-primary: vars.$green-2
 );
-
-.monaco-diff-editor {
-    .editor.original {
-        right: 30px !important; // diffOverviewRuler size
-        left: unset !important;
-    }
-
-    .editor.modified {
-        left: 0 !important;
-        width: unset !important;
-    }
-
-    .diffOverview {
-        .diffOverviewRuler.original {
-            left: 15px !important;
-        }
-
-        .diffOverviewRuler.modified {
-            right: 15px !important;
-        }
-    }
-}
diff --git a/bamboo-specs/bamboo-specs.iml b/bamboo-specs/bamboo-specs.iml
deleted file mode 100644
index c6a124a72..000000000
--- a/bamboo-specs/bamboo-specs.iml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-  
-    
-    
-    
-      
-      
-      
-      
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
\ No newline at end of file
diff --git a/bamboo-specs/pom.xml b/bamboo-specs/pom.xml
index b32dbf5f6..5be92c2cb 100644
--- a/bamboo-specs/pom.xml
+++ b/bamboo-specs/pom.xml
@@ -5,7 +5,7 @@
   
     com.atlassian.bamboo
     bamboo-specs-parent
-    8.0.2
+    8.1.1
     
   
 
diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
index a6d1eb83f..2ca8f1b37 100644
--- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java
+++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
@@ -59,7 +59,8 @@ public class PlanSpec {
     public Plan createDockerBuildPlan() {
         return new Plan(project(), "Redaction UI", new BambooKey("UI"))
             .description("Docker build for Redaction UI.")
-            .stages(new Stage("Build Stage").jobs(creatGinCloudPlatformImagesJob("red-ui")))
+            .stages(new Stage("UI Build Stage")
+                .jobs(creatGinCloudPlatformImagesJob("red-ui")))
             .stages(new Stage("Release")
                 .manual(true)
                 .jobs(createRelease()))
@@ -70,14 +71,12 @@ public class PlanSpec {
     }
 
     public Job creatGinCloudPlatformImagesJob(String project) {
-        return new Job("Build Job: " + project, new BambooKey(project.toUpperCase().replaceAll("-", "")))
+        return new Job("Build Job UI" , new BambooKey("UIBUILD"))
             .tasks(
           		new CleanWorkingDirectoryTask().description("My clean working directory task"),
                 // Checkout
                 new VcsCheckoutTask().description("Checkout Default Repository")
                     .checkoutItems(new CheckoutItem().defaultRepository().path("redaction-ui")),
-                new VcsCheckoutTask().description("Checkout UI Shared Lib")
-                    .checkoutItems(new CheckoutItem().repository("Shared Libraries / common-ui").path("common-ui")),
 
                 // Build
                 new ScriptTask().description("Build")
@@ -96,7 +95,6 @@ public class PlanSpec {
                 new VcsTagTask().tagName("${bamboo.inject.APP_VERSION}").repository("RED / ui")
             ).dockerConfiguration(
                 new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:4.2.0")
-                    .volume("/var/lib/docker", "/var/lib/docker")
                     .volume("/var/run/docker.sock", "/var/run/docker.sock"))
             .artifacts(new Artifact("version").location(".").copyPattern("**/version.properties").shared(true),
                 new Artifact("paligo-theme.tar.gz").location(".").copyPattern("**/paligo-theme.tar.gz").shared(true));
diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh
index d145c55e2..14c9597bc 100755
--- a/bamboo-specs/src/main/resources/scripts/build.sh
+++ b/bamboo-specs/src/main/resources/scripts/build.sh
@@ -5,13 +5,8 @@ set -e
 imageName="nexus.iqser.com:5001/red/$PROJECT"
 dockerfileLocation="docker/$PROJECT/Dockerfile"
 
+echo "submodule status"
 git submodule status
-commonUIVersion=$(git submodule status | awk '{ print $1 }' | sed 's|-||g')
-echo $commonUIVersion
-cd ../common-ui
-git checkout $commonUIVersion
-cd ../redaction-ui
-mv ../common-ui ./libs/
 
 echo "On branch $bamboo_planRepository_branchName building project $PROJECT"
 # shellcheck disable=SC2154
diff --git a/cypress.env.json b/cypress.env.json
deleted file mode 100644
index 4d776336f..000000000
--- a/cypress.env.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "reporter": "junit",
-  "baseUrl": "http://localhost:4200",
-  "env": {
-    "api_url": "https://timo-redaction-dev.iqser.cloud",
-    "auth_base_url": "https://redkc-staging.iqser.cloud/auth",
-    "auth_realm": "redaction",
-    "auth_client_id": "redaction"
-  },
-  "reporterOptions": {
-    "mochaFile": "cypress/test-reports/test-[hash].xml"
-  }
-}
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index 68104c293..000000000
--- a/cypress.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "reporter": "junit",
-  "baseUrl": "https://app-ui-automated.iqser.cloud",
-  "env": {
-    "api_url": "https://api-ui-automated.iqser.cloud",
-    "auth_base_url": "https://keycloak-ui-automated.iqser.cloud/auth",
-    "auth_realm": "redaction",
-    "auth_client_id": "redaction"
-  },
-  "reporterOptions": {
-    "mochaFile": "cypress/test-reports/test-[hash].xml"
-  }
-}
diff --git a/cypress/.gitignore b/cypress/.gitignore
deleted file mode 100644
index f638ce500..000000000
--- a/cypress/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/videos
-/screenshots
-/results
-/test-reports
\ No newline at end of file
diff --git a/cypress/fixtures/users/manager.json b/cypress/fixtures/users/manager.json
deleted file mode 100644
index 740e65f97..000000000
--- a/cypress/fixtures/users/manager.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "username": "manager",
-    "password": "OsloImWinter"
-}
diff --git a/cypress/fixtures/users/user.json b/cypress/fixtures/users/user.json
deleted file mode 100644
index 0fcb3ce05..000000000
--- a/cypress/fixtures/users/user.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "username": "user",
-    "password": "OsloImWinter"
-}
diff --git a/cypress/integration/base/no-op.spec.ts b/cypress/integration/base/no-op.spec.ts
deleted file mode 100644
index ed9fec437..000000000
--- a/cypress/integration/base/no-op.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/// 
-/// 
-
-describe('it should only test login/logout flow', () => {
-    before(() => {
-        //    cy.init('user');
-    });
-
-    after(() => {
-        //   cy.cleanup();
-    });
-
-    it('it should land on homepage with no projects', () => {
-        console.log('no-op');
-        // cy.visit('/main/projects');
-        // cy.get('redaction-project-listing-empty', { timeout: 30000 });
-    });
-});
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
deleted file mode 100644
index 0f13eafa2..000000000
--- a/cypress/plugins/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/// 
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = (on, config) => {
-    return config;
-};
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
deleted file mode 100644
index 0e91187b1..000000000
--- a/cypress/support/commands.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'cypress-localstorage-commands';
-import 'cypress-file-upload';
-import 'cypress-keycloak-commands';
-
-Cypress.Commands.add('cleanup', () => {
-    localStorage.clear();
-    cy.clearLocalStorageSnapshot();
-    cy.kcLogout();
-});
-
-Cypress.Commands.add('init', (user) => {
-    cy.kcLogin('manager').as('tokens');
-    cy.deleteAllProjects();
-    cy.kcLogout();
-    cy.kcLogin(user).as('tokens');
-});
-
-Cypress.Commands.add('deleteAllProjects', () => {
-    cy.get('@tokens').then((tokens) => {
-        const projectListRequest = {
-            method: 'GET',
-            url: Cypress.env('api_url') + '/project',
-            headers: {
-                Authorization: 'bearer ' + tokens.access_token
-            }
-        };
-
-        cy.request(projectListRequest).then((projects) => {
-            projects.body.forEach((project) => {
-                const deleteProjectRequest = {
-                    method: 'DELETE',
-                    url: Cypress.env('api_url') + '/project/' + project.projectId,
-                    headers: {
-                        Authorization: 'bearer ' + tokens.access_token
-                    }
-                };
-                cy.request(deleteProjectRequest).then((response) => {
-                    console.log('Project Deleted', project.projectId, response);
-                });
-            });
-        });
-    });
-});
diff --git a/cypress/support/index.d.ts b/cypress/support/index.d.ts
deleted file mode 100644
index db6925276..000000000
--- a/cypress/support/index.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/// 
-
-declare namespace Cypress {
-    interface Chainable {
-        /**
-         * Should run before each spec!
-         */
-        init(user?: string): Chainable;
-
-        /**
-         * Should run after each spec!
-         */
-        cleanup(): Chainable;
-
-        /**
-         * Deletes user uploads before tests
-         */
-        deleteAllProjects(): Chainable;
-    }
-}
diff --git a/cypress/support/index.js b/cypress/support/index.js
deleted file mode 100644
index 37a498fb5..000000000
--- a/cypress/support/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands';
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
deleted file mode 100644
index dee68d8cf..000000000
--- a/cypress/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es5",
-        "lib": ["es5", "dom"],
-        "types": ["cypress"]
-    },
-    "include": ["**/*.ts"]
-}
diff --git a/docker/cypress/Dockerfile b/docker/cypress/Dockerfile
deleted file mode 100644
index 9be8e71ef..000000000
--- a/docker/cypress/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM cypress/included:5.6.0
-COPY package.json yarn.lock ./
-RUN yarn install
-COPY . .
diff --git a/docker/red-ui/docker-entrypoint.sh b/docker/red-ui/docker-entrypoint.sh
index 396003f96..afc21cb06 100755
--- a/docker/red-ui/docker-entrypoint.sh
+++ b/docker/red-ui/docker-entrypoint.sh
@@ -25,6 +25,7 @@ RECENT_PERIOD_IN_HOURS="${RECENT_PERIOD_IN_HOURS:-24}"
 SELECTION_MODE="${SELECTION_MODE:-structural}"
 
 
+
 echo '{
           "ADMIN_CONTACT_NAME":"'"$ADMIN_CONTACT_NAME"'",
           "ADMIN_CONTACT_URL":"'"$ADMIN_CONTACT_URL"'",
diff --git a/libs/common-ui b/libs/common-ui
index 45a12070b..31b60ff11 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 45a12070bfe5c9aa36f24c4e08da157796e881ab
+Subproject commit 31b60ff117a8d8ecb9617be3b0c9e1822d437034
diff --git a/libs/red-domain/src/lib/dictionaries/colors.ts b/libs/red-domain/src/lib/dictionaries/colors.ts
index 8e7f10800..bb34f3369 100644
--- a/libs/red-domain/src/lib/dictionaries/colors.ts
+++ b/libs/red-domain/src/lib/dictionaries/colors.ts
@@ -9,4 +9,5 @@ export interface IColors {
     requestAdd?: string;
     requestRemove?: string;
     updatedColor?: string;
+    ignoredHintColor?: string;
 }
diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.model.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.model.ts
new file mode 100644
index 000000000..ad19e2a82
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.model.ts
@@ -0,0 +1,23 @@
+import { DictionarySummary, IDossierTemplateStats } from './dossier-template-stats';
+
+export class DossierTemplateStats implements IDossierTemplateStats {
+    readonly dossierTemplateId: string;
+    readonly dictionarySummaryList: DictionarySummary[];
+    readonly numberOfDictionaries: number;
+
+    readonly numberOfEntries: number;
+    private readonly _dictionarySummaryMap = new Map();
+
+    constructor(stats: IDossierTemplateStats) {
+        this.dossierTemplateId = stats.dossierTemplateId;
+        this.dictionarySummaryList = stats.dictionarySummaryList;
+        this.numberOfDictionaries = stats.numberOfDictionaries;
+
+        this.numberOfEntries = this.dictionarySummaryList.reduce((counter, summary) => counter + summary.entriesCount, 0);
+        this.dictionarySummaryList.forEach(summary => this._dictionarySummaryMap.set(summary.type, summary));
+    }
+
+    dictionarySummary(type: string): DictionarySummary | undefined {
+        return this._dictionarySummaryMap.get(type);
+    }
+}
diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.ts
new file mode 100644
index 000000000..2bd8b9cda
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-templates/dossier-template-stats.ts
@@ -0,0 +1,12 @@
+export interface DictionarySummary {
+    readonly entriesCount: number;
+    readonly id: string;
+    readonly name: string;
+    readonly type: string;
+}
+
+export interface IDossierTemplateStats {
+    readonly dossierTemplateId: string;
+    readonly dictionarySummaryList: DictionarySummary[];
+    readonly numberOfDictionaries: number;
+}
diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts
index f47b5bed9..703853f39 100644
--- a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts
+++ b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts
@@ -1,6 +1,7 @@
 import { IListable, List } from '@iqser/common-ui';
 import { IDossierTemplate } from './dossier-template';
 import { DownloadFileType } from '../shared';
+import { DossierTemplateStatus, DossierTemplateStatuses } from './types';
 
 export class DossierTemplate implements IDossierTemplate, IListable {
     readonly createdBy: string;
@@ -14,8 +15,7 @@ export class DossierTemplate implements IDossierTemplate, IListable {
     readonly reportTemplateIds?: List;
     readonly validFrom?: string;
     readonly validTo?: string;
-    dictionariesCount = 0;
-    totalDictionaryEntries = 0;
+    readonly dossierTemplateStatus: DossierTemplateStatus;
 
     constructor(dossierTemplate: IDossierTemplate) {
         this.createdBy = dossierTemplate.createdBy;
@@ -29,6 +29,11 @@ export class DossierTemplate implements IDossierTemplate, IListable {
         this.reportTemplateIds = dossierTemplate.reportTemplateIds;
         this.validFrom = dossierTemplate.validFrom;
         this.validTo = dossierTemplate.validTo;
+        this.dossierTemplateStatus = dossierTemplate.dossierTemplateStatus;
+    }
+
+    get isActive(): boolean {
+        return this.dossierTemplateStatus === DossierTemplateStatuses.ACTIVE;
     }
 
     get id(): string {
@@ -40,6 +45,6 @@ export class DossierTemplate implements IDossierTemplate, IListable {
     }
 
     get routerLink(): string {
-        return `/main/admin/dossier-templates/${this.dossierTemplateId}/dictionaries`;
+        return `/main/admin/dossier-templates/${this.dossierTemplateId}`;
     }
 }
diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template.ts
index 5dd184b39..f05c44084 100644
--- a/libs/red-domain/src/lib/dossier-templates/dossier-template.ts
+++ b/libs/red-domain/src/lib/dossier-templates/dossier-template.ts
@@ -1,5 +1,6 @@
 import { List } from '@iqser/common-ui';
 import { DownloadFileType } from '../shared';
+import { DossierTemplateStatus } from './types';
 
 export interface IDossierTemplate {
     /**
@@ -46,4 +47,5 @@ export interface IDossierTemplate {
      * Validity of end this dossierTemplate.
      */
     readonly validTo?: string;
+    readonly dossierTemplateStatus: DossierTemplateStatus;
 }
diff --git a/libs/red-domain/src/lib/dossier-templates/index.ts b/libs/red-domain/src/lib/dossier-templates/index.ts
index 24c0bba3f..cf815ad22 100644
--- a/libs/red-domain/src/lib/dossier-templates/index.ts
+++ b/libs/red-domain/src/lib/dossier-templates/index.ts
@@ -1,2 +1,5 @@
 export * from './dossier-template';
 export * from './dossier-template.model';
+export * from './dossier-template-stats';
+export * from './dossier-template-stats.model';
+export * from './types';
diff --git a/libs/red-domain/src/lib/dossier-templates/types.ts b/libs/red-domain/src/lib/dossier-templates/types.ts
new file mode 100644
index 000000000..cf3d4e675
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-templates/types.ts
@@ -0,0 +1,6 @@
+export const DossierTemplateStatuses = {
+    ACTIVE: 'ACTIVE',
+    INCOMPLETE: 'INCOMPLETE',
+} as const;
+
+export type DossierTemplateStatus = keyof typeof DossierTemplateStatuses;
diff --git a/libs/red-domain/src/lib/file-attributes/file-attributes-config.ts b/libs/red-domain/src/lib/file-attributes/file-attributes-config.ts
index e3363aebe..7aa96c500 100644
--- a/libs/red-domain/src/lib/file-attributes/file-attributes-config.ts
+++ b/libs/red-domain/src/lib/file-attributes/file-attributes-config.ts
@@ -2,6 +2,8 @@ import { IFileAttributeConfig } from './file-attribute-config';
 
 export interface IFileAttributesConfig {
     delimiter?: string;
-    fileAttributeConfigs?: IFileAttributeConfig[];
+    encoding?: string;
     filenameMappingColumnHeaderName?: string;
+
+    fileAttributeConfigs?: IFileAttributeConfig[];
 }
diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts
index 81148059e..f57b0131a 100644
--- a/libs/red-domain/src/lib/files/file.model.ts
+++ b/libs/red-domain/src/lib/files/file.model.ts
@@ -39,7 +39,6 @@ export class File extends Entity implements IFile {
     readonly processingStatus: ProcessingFileStatus;
     readonly workflowStatus: WorkflowFileStatus;
 
-    readonly primaryAttribute?: string;
     readonly statusSort: number;
     readonly cacheIdentifier?: string;
     readonly hintsOnly: boolean;
@@ -93,9 +92,7 @@ export class File extends Entity implements IFile {
         this.hasSuggestions = !!file.hasSuggestions;
 
         this.statusSort = StatusSorter[this.workflowStatus];
-        if (this.lastUpdated && this.lastOCRTime) {
-            this.cacheIdentifier = btoa((this.lastUploaded ?? '') + this.lastOCRTime);
-        }
+        this.cacheIdentifier = btoa((this.lastUploaded ?? '') + (this.lastOCRTime ?? ''));
         this.hintsOnly = this.hasHints && !this.hasRedactions;
         this.hasNone = !this.hasRedactions && !this.hasHints && !this.hasSuggestions;
         this.isPending = this.processingStatus === ProcessingFileStatuses.UNPROCESSED;
diff --git a/libs/red-domain/src/lib/files/types.ts b/libs/red-domain/src/lib/files/types.ts
index dce23e0a1..70155c11f 100644
--- a/libs/red-domain/src/lib/files/types.ts
+++ b/libs/red-domain/src/lib/files/types.ts
@@ -14,6 +14,8 @@ export const ProcessingFileStatuses = {
     DELETED: 'DELETED',
     ERROR: 'ERROR',
     FULLREPROCESS: 'FULLREPROCESS',
+    IMAGE_ANALYZING: 'IMAGE_ANALYZING',
+    SURROUNDING_TEXT_PROCESSING: 'SURROUNDING_TEXT_PROCESSING',
     INDEXING: 'INDEXING',
     OCR_PROCESSING: 'OCR_PROCESSING',
     PROCESSED: 'PROCESSED',
@@ -27,7 +29,9 @@ export type ProcessingFileStatus = keyof typeof ProcessingFileStatuses;
 export const isProcessingStatuses: List = [
     ProcessingFileStatuses.REPROCESS,
     ProcessingFileStatuses.FULLREPROCESS,
+    ProcessingFileStatuses.SURROUNDING_TEXT_PROCESSING,
     ProcessingFileStatuses.OCR_PROCESSING,
+    ProcessingFileStatuses.IMAGE_ANALYZING,
     ProcessingFileStatuses.INDEXING,
     ProcessingFileStatuses.PROCESSING,
 ] as const;
diff --git a/libs/red-domain/src/lib/notifications-preferences/types.ts b/libs/red-domain/src/lib/notifications-preferences/types.ts
index 31c6061e1..a0e1a2d23 100644
--- a/libs/red-domain/src/lib/notifications-preferences/types.ts
+++ b/libs/red-domain/src/lib/notifications-preferences/types.ts
@@ -6,3 +6,47 @@ export const EmailNotificationScheduleTypes = {
 
 export type EmailNotificationScheduleType = keyof typeof EmailNotificationScheduleTypes;
 export const EmailNotificationScheduleTypesValues = Object.values(EmailNotificationScheduleTypes);
+
+export const NotificationCategories = {
+    inAppNotifications: 'inAppNotifications',
+    // emailNotifications: 'emailNotifications',
+} as const;
+
+export const NotificationCategoriesValues = Object.values(NotificationCategories);
+
+export const DossierNotificationsTypes = {
+    dossierOwnerSet: 'DOSSIER_OWNER_SET',
+    dossierOwnerRemoved: 'DOSSIER_OWNER_REMOVED',
+    userBecomseDossierMember: 'USER_BECOMES_DOSSIER_MEMBER',
+    userRemovedAsDossierMember: 'USER_REMOVED_AS_DOSSIER_MEMBER',
+    userPromotedToApprover: 'USER_PROMOTED_TO_APPROVER',
+    userDegradedToReviewer: 'USER_DEGRADED_TO_REVIEWER',
+    dossierOwnerDeleted: 'DOSSIER_OWNER_DELETED',
+    dossierDeleted: 'DOSSIER_DELETED',
+} as const;
+
+export const DossierNotificationsTypesValues = Object.values(DossierNotificationsTypes);
+
+export const DocumentNotificationsTypes = {
+    assignReviewer: 'ASSIGN_REVIEWER',
+    assignApprover: 'ASSIGN_APPROVER',
+    unassignedFromFile: 'UNASSIGNED_FROM_FILE',
+    // documentUnderReview: 'DOCUMENT_UNDER_REVIEW',
+    // documentUnderApproval: 'DOCUMENT_UNDER_APPROVAL',
+    documentApproved: 'DOCUMENT_APPROVED',
+} as const;
+
+export const DocumentNotificationsTypesValues = Object.values(DocumentNotificationsTypes);
+
+export const OtherNotificationsTypes = {
+    downloadReady: 'DOWNLOAD_READY',
+} as const;
+
+export const OtherNotificationsTypesValues = Object.values(OtherNotificationsTypes);
+
+export const NotificationGroupsKeys = ['dossier', 'document', 'other'] as const;
+export const NotificationGroupsValues = [
+    DossierNotificationsTypesValues,
+    DocumentNotificationsTypesValues,
+    OtherNotificationsTypesValues,
+] as const;
diff --git a/libs/red-domain/src/lib/redaction-log/change.ts b/libs/red-domain/src/lib/redaction-log/change.ts
index 341b4cfb9..27b3ee0f4 100644
--- a/libs/red-domain/src/lib/redaction-log/change.ts
+++ b/libs/red-domain/src/lib/redaction-log/change.ts
@@ -1,5 +1,6 @@
 export interface IChange {
     dateTime?: string;
+    analysisNumber?: number;
     type?: ChangeType;
 }
 
diff --git a/libs/red-domain/src/lib/redaction-log/redaction-log.ts b/libs/red-domain/src/lib/redaction-log/redaction-log.ts
index b5de4258e..9f7952929 100644
--- a/libs/red-domain/src/lib/redaction-log/redaction-log.ts
+++ b/libs/red-domain/src/lib/redaction-log/redaction-log.ts
@@ -3,6 +3,7 @@ import { IRedactionLogEntry } from './redaction-log-entry';
 
 export interface IRedactionLog {
     analysisVersion?: number;
+    analysisNumber?: number;
     dictionaryVersion?: number;
     dossierDictionaryVersion?: number;
     legalBasis?: ILegalBasis[];
diff --git a/libs/red-domain/src/lib/reports/types.ts b/libs/red-domain/src/lib/reports/types.ts
index b1f811a33..b269dab0d 100644
--- a/libs/red-domain/src/lib/reports/types.ts
+++ b/libs/red-domain/src/lib/reports/types.ts
@@ -3,6 +3,7 @@ export const ReportStatuses = {
     DELETED: 'DELETED',
     ERROR: 'ERROR',
     FULLREPROCESS: 'FULLREPROCESS',
+    SURROUNDING_TEXT_PROCESSING: 'SURROUNDING_TEXT_PROCESSING',
     OCR_PROCESSING: 'OCR_PROCESSING',
     PROCESSING: 'PROCESSING',
     REPROCESS: 'REPROCESS',
diff --git a/libs/red-domain/src/lib/shared/default-color-type.ts b/libs/red-domain/src/lib/shared/default-color-type.ts
index 086eade16..de948c164 100644
--- a/libs/red-domain/src/lib/shared/default-color-type.ts
+++ b/libs/red-domain/src/lib/shared/default-color-type.ts
@@ -3,6 +3,7 @@ export type DefaultColorType =
     | 'defaultColor'
     | 'dictionaryRequestColor'
     | 'manualRedactionColor'
+    | 'ignoredHintColor'
     | 'notRedacted'
     | 'previewColor'
     | 'requestAdd'
diff --git a/libs/red-domain/src/lib/shared/view-mode.ts b/libs/red-domain/src/lib/shared/view-mode.ts
index 268023956..e4f649334 100644
--- a/libs/red-domain/src/lib/shared/view-mode.ts
+++ b/libs/red-domain/src/lib/shared/view-mode.ts
@@ -1 +1 @@
-export type ViewMode = 'STANDARD' | 'DELTA' | 'REDACTED' | 'COMPARE';
+export type ViewMode = 'STANDARD' | 'DELTA' | 'REDACTED';
diff --git a/nx.json b/nx.json
index b7f156c8e..0ad31e2c6 100644
--- a/nx.json
+++ b/nx.json
@@ -39,8 +39,7 @@
   "generators": {
     "@nrwl/angular:application": {
       "linter": "eslint",
-      "unitTestRunner": "jest",
-      "e2eTestRunner": "cypress"
+      "unitTestRunner": "jest"
     },
     "@nrwl/angular:library": {
       "linter": "eslint",
diff --git a/package.json b/package.json
index 63e4bbe64..60f715f8a 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "redaction",
-  "version": "3.115.0",
+  "version": "3.193.0",
   "private": true,
   "license": "MIT",
   "scripts": {
     "build": "nx build",
-    "build-lint-all": "ng lint --project=red-ui --fix && ng lint --project=common-ui --fix  && ng build --project=red-ui --configuration production --base-href /ui/",
+    "build-lint-all": "ng build --project=red-ui --configuration production --base-href /ui/",
     "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css",
     "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write",
     "postinstall": "ngcc --properties es2015 browser module main",
@@ -23,96 +23,91 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "13.0.2",
-    "@angular/cdk": "13.0.2",
-    "@angular/common": "13.0.2",
-    "@angular/compiler": "13.0.2",
-    "@angular/core": "13.0.2",
-    "@angular/forms": "13.0.2",
-    "@angular/material": "13.0.2",
-    "@angular/material-moment-adapter": "^13.0.2",
-    "@angular/platform-browser": "13.0.2",
-    "@angular/platform-browser-dynamic": "13.0.2",
-    "@angular/router": "13.0.2",
-    "@angular/service-worker": "13.0.2",
+    "@angular/animations": "13.2.0",
+    "@angular/cdk": "13.2.0",
+    "@angular/common": "13.2.0",
+    "@angular/compiler": "13.2.0",
+    "@angular/core": "13.2.0",
+    "@angular/forms": "13.2.0",
+    "@angular/material": "13.2.0",
+    "@angular/material-moment-adapter": "^13.2.0",
+    "@angular/platform-browser": "13.2.0",
+    "@angular/platform-browser-dynamic": "13.2.0",
+    "@angular/router": "13.2.0",
+    "@angular/service-worker": "13.2.0",
     "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-    "@materia-ui/ngx-monaco-editor": "^6.0.0-beta.1",
-    "@ngx-translate/core": "^13.0.0",
-    "@ngx-translate/http-loader": "^6.0.0",
-    "@nrwl/angular": "13.2.3",
+    "@materia-ui/ngx-monaco-editor": "^6.0.0",
+    "@ngx-translate/core": "^14.0.0",
+    "@ngx-translate/http-loader": "^7.0.0",
+    "@nrwl/angular": "13.6.1",
     "@pdftron/webviewer": "8.2.0",
-    "@swimlane/ngx-charts": "^17.0.1",
+    "@swimlane/ngx-charts": "^20.0.1",
     "file-saver": "^2.0.5",
     "jwt-decode": "^3.1.2",
-    "keycloak-angular": "^8.4.0",
-    "keycloak-js": "15.0.2",
+    "keycloak-angular": "^9.1.0",
+    "keycloak-js": "^16.1.1",
     "lodash.orderby": "^4.6.0",
     "messageformat": "^2.3.0",
     "moment": "^2.29.1",
-    "monaco-editor": "^0.30.1",
+    "monaco-editor": "^0.31.1",
     "ngx-color-picker": "^11.0.0",
     "ngx-toastr": "^14.1.3",
-    "ngx-translate-messageformat-compiler": "^4.10.0",
+    "ngx-translate-messageformat-compiler": "^5.0.1",
     "papaparse": "^5.3.1",
-    "rxjs": "~6.6.7",
-    "sass": "^1.39.2",
+    "rxjs": "~7.5.2",
+    "sass": "^1.49.0",
     "scroll-into-view-if-needed": "^2.2.28",
     "streamsaver": "^2.0.5",
     "tslib": "^2.3.1",
     "zone.js": "0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "13.0.3",
+    "@angular-devkit/build-angular": "13.2.0",
     "@angular-eslint/eslint-plugin": "13.0.1",
     "@angular-eslint/eslint-plugin-template": "13.0.1",
     "@angular-eslint/template-parser": "13.0.1",
-    "@angular/cli": "13.0.3",
-    "@angular/compiler-cli": "13.0.2",
-    "@angular/language-service": "13.0.2",
-    "@nrwl/cli": "13.2.3",
-    "@nrwl/cypress": "13.2.3",
-    "@nrwl/eslint-plugin-nx": "13.2.3",
-    "@nrwl/jest": "13.2.3",
-    "@nrwl/linter": "13.2.3",
-    "@nrwl/tao": "13.2.3",
-    "@nrwl/workspace": "13.2.3",
-    "@types/cypress": "^1.1.3",
-    "@types/jest": "27.0.3",
-    "@types/lodash": "^4.14.177",
-    "@types/node": "16.11.10",
-    "@typescript-eslint/eslint-plugin": "4.33.0",
-    "@typescript-eslint/parser": "4.33.0",
-    "axios": "^0.24.0",
-    "@bartholomej/ngx-translate-extract": "^8.0.1",
-    "cypress": "^6.9.1",
-    "cypress-file-upload": "^5.0.8",
-    "cypress-keycloak": "^1.7.0",
-    "cypress-keycloak-commands": "^1.2.0",
-    "cypress-localstorage-commands": "^1.5.0",
-    "dotenv": "10.0.0",
-    "eslint": "7.32.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-airbnb-typescript": "^14.0.0",
+    "@angular/cli": "13.2.0",
+    "@angular/compiler-cli": "13.2.0",
+    "@angular/language-service": "13.2.0",
+    "@bartholomej/ngx-translate-extract": "^8.0.2",
+    "@nrwl/cli": "13.6.1",
+    "@nrwl/eslint-plugin-nx": "13.6.1",
+    "@nrwl/jest": "13.6.1",
+    "@nrwl/linter": "13.6.1",
+    "@nrwl/tao": "13.6.1",
+    "@nrwl/workspace": "13.6.1",
+    "@types/jest": "27.4.0",
+    "@types/lodash": "^4.14.178",
+    "@types/node": "17.0.13",
+    "@types/puppeteer": "^5.4.4",
+    "@typescript-eslint/eslint-plugin": "5.10.1",
+    "@typescript-eslint/parser": "5.3.1",
+    "axios": "^0.25.0",
+    "dotenv": "14.3.2",
+    "eslint": "8.7.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
     "google-translate-api-browser": "^1.1.71",
     "husky": "4.3.8",
-    "jest": "27.3.1",
-    "jest-preset-angular": "11.0.1",
-    "ng-packagr": "13.0.8",
-    "postcss": "^8.3.9",
+    "jest": "27.4.7",
+    "jest-preset-angular": "11.1.0",
+    "ng-packagr": "13.2.0",
+    "postcss": "^8.4.5",
     "postcss-import": "^14.0.2",
-    "postcss-preset-env": "^7.0.1",
+    "postcss-preset-env": "^7.2.3",
     "postcss-url": "^10.1.1",
-    "prettier": "2.5.0",
-    "pretty-quick": "^3.1.1",
+    "prettier": "2.5.1",
+    "pretty-quick": "^3.1.3",
     "sonarqube-scanner": "^2.8.1",
-    "superagent": "^6.1.0",
+    "superagent": "^7.1.1",
     "superagent-promise": "^1.1.0",
-    "ts-jest": "27.0.7",
+    "ts-jest": "27.1.3",
     "ts-node": "10.4.0",
-    "typescript": "4.4.4",
-    "webpack": "^4.18.1"
+    "typescript": "4.5.5",
+    "webpack": "^4.18.1",
+    "xliff": "^6.0.0"
   }
 }
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index 99fc58a10..3d8695ac1 100644
Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ
diff --git a/paligo-theme/paligo-styles/redacto-theme.css b/paligo-theme/paligo-styles/redacto-theme.css
index 5ceef3777..fc5511db6 100644
--- a/paligo-theme/paligo-styles/redacto-theme.css
+++ b/paligo-theme/paligo-styles/redacto-theme.css
@@ -324,6 +324,7 @@ li.searchresultitem {
   --iqser-green-2: #5ce594;
   --iqser-yellow-1: #ffb83b;
   --iqser-yellow-2: #fdbd00;
+  --iqser-yellow-rgb: 253, 189, 0;
   --iqser-red-1: #dd4d50;
   --iqser-blue-5: #c5d3eb;
   --iqser-helpmode-primary: green;
diff --git a/tools/auto-i18n/i18n-cleanup.ts b/tools/auto-i18n/i18n-cleanup.ts
index 96feb5476..a134b005d 100644
--- a/tools/auto-i18n/i18n-cleanup.ts
+++ b/tools/auto-i18n/i18n-cleanup.ts
@@ -1,6 +1,9 @@
 import * as fs from 'fs';
 import axios from 'axios';
-import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler';
+// @ts-ignore
+import * as xliff from 'xliff';
+
+// import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler';
 
 function flatten(data: any) {
     const result: any = {};
@@ -55,7 +58,7 @@ async function execute() {
 
     const apiKey = 'AIzaSyBiqNTundSKFjAJnSb4wSVLDU6w0Kv651M';
 
-    const tmfc = new TranslateMessageFormatCompiler();
+    // const tmfc = new TranslateMessageFormatCompiler();
 
     for (const key of Object.keys(flatEnglish)) {
         if (!flatGerman[key]) {
@@ -80,8 +83,8 @@ async function execute() {
 
     for (let key of Object.keys(flatGerman)) {
         try {
-            const result = tmfc.compile(flatGerman[key], 'de');
-            //console.log(result);
+            //   const result = tmfc.compile(flatGerman[key], 'de');
+            //   console.log(result);
         } catch (e) {
             console.error('ERROR AT: ', flatGerman[key]);
         }
@@ -89,8 +92,8 @@ async function execute() {
 
     for (let key of Object.keys(flatEnglish)) {
         try {
-            const result = tmfc.compile(flatEnglish[key], 'de');
-            console.log(result);
+            //   const result = tmfc.compile(flatEnglish[key], 'de');
+            //   console.log(result);
         } catch (e) {
             console.error('ERROR AT: ', flatEnglish[key]);
         }
@@ -101,6 +104,44 @@ async function execute() {
     const finalGerman = unflatten(mergedGerman);
 
     fs.writeFileSync('./../../apps/red-ui/src/assets/i18n/de.json', JSON.stringify(finalGerman));
+
+    const js: any = {
+        resources: {
+            redaction: {},
+        },
+        sourceLanguage: 'en-US',
+        targetLanguage: 'de-DE',
+    };
+
+    for (const key of Object.keys(flatEnglish)) {
+        js.resources.redaction[`${key}`] = {
+            source: flatEnglish[`${key}`],
+            target: flatGerman[`${key}`],
+        };
+    }
+
+    xliff.jsToXliff12(js, (err: any, res: any) => {
+        fs.writeFileSync('./redaction-en-to-de.xliff', res);
+    });
+
+    const xliffImport = fs.readFileSync('./import.xliff', 'utf-8');
+    xliff.xliff12ToJs(xliffImport, (err: any, res: any) => {
+        const ns = res.resources.redaction;
+
+        const importGerman: any = {};
+        const importEnglish: any = {};
+
+        for (let key of Object.keys(ns)) {
+            importGerman[key] = ns[key].target;
+            importEnglish[key] = ns[key].source;
+        }
+
+        const importReadyEnglish = unflatten(importEnglish);
+        const importReadyGerman = unflatten(importGerman);
+
+        console.log(importReadyEnglish);
+        console.log(importReadyGerman);
+    });
 }
 
 execute().then();
diff --git a/tools/auto-i18n/import.xliff b/tools/auto-i18n/import.xliff
new file mode 100644
index 000000000..f89e69300
--- /dev/null
+++ b/tools/auto-i18n/import.xliff
@@ -0,0 +1,4127 @@
+
+
+  
+    
+      
+        Account Settings
+        Account Einstellungen
+      
+      
+        All
+        Alle
+      
+      
+        None
+        Keine
+      
+      
+        Active
+        Aktiv
+      
+      
+        Save
+        Speichern
+      
+      
+        Save and Edit Team
+        Speichern und Team zusammenstellen
+      
+      
+        Dossier with this name already exists!
+        Dieser Dossier-Name ist bereits vergeben!
+      
+      
+        Failed to save dossier.
+        Dossier konnte nicht gespeichert werden.
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Bitte geben Sie eine Beschreibung ein.
+      
+      
+        Due Date
+        Termin
+      
+      
+        Dossier Name
+        Dossier-Name
+      
+      
+        Enter Name
+        Geben Sie einen Namen ein.
+      
+      
+        Dossier Template
+        Dossier-Vorlage
+      
+      
+        Watermark application on redacted documents
+        Geschwärzte Dokumente mit Wasserzeichen versehen
+      
+      
+        Watermark application on preview documents
+        Vorschau Dokumente mit Wasserzeichen versehen
+      
+      
+        Create Dossier
+        Dossier erstellen
+      
+      
+        Dictionary with this name already exists!
+        Ein Wörterbuch mit diesem Namen existiert bereits!
+      
+      
+        Failed to save dictionary!
+        Wörterbuch konnte nicht gespeichert werden!
+      
+      
+        Invalid color or rank! Rank is already used by another dictionary or the color is not a valid hexColor!
+        Ungültige Farbe oder Rang! Der Rang wird bereits von einem anderen Wörterbuch verwendet oder die Farbe ist kein gültiger Hex-Farbcode!
+      
+      
+        Enable 'Add to dictionary'
+        Anwender können Einträge hinzufügen
+      
+      
+        Case Sensitive
+        Groß-/Kleinschreibung berücksichtigen
+      
+      
+        Hex Color
+        Hex-Farbcode
+      
+      
+        #
+        #
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Hint
+        Hinweis
+      
+      
+        Display Name
+        Name des Wörterbuches
+      
+      
+        Cannot be edited after saving.
+        Kann nach dem Speichern nicht mehr bearbeitet werden.
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Rank
+        Rang
+      
+      
+        1000
+        1000
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Technical Name
+        Technischer Name
+      
+      
+        Save Dictionary
+        Wörterbuch speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Create} other{}} Dictionary
+        {type, select, edit{Wörterbuch {name} bearbeiten} create{Wörterbuch erstellen} other{}}
+      
+      
+        Failed to save attribute!
+        Attribut konnte nicht gespeichert werden!
+      
+      
+        Attribute Name
+        Name des Attributs
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Attribute Placeholder
+        Platzhalter für Attribut
+      
+      
+        Attribute Type
+        Attributtyp
+      
+      
+        Save Attribute
+        Attribut speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Add New} other{}} Dossier Attribute
+        {type, select, edit{Dossier-Attribut {name} bearbeiten} create{Neues Dossier-Attribut hinzufügen} other{}}
+      
+      
+        Failed to create dossier template: a dossier template with the same name already exists.
+        Dossiervorlage konnte nicht erstellt werden: Es existiert bereits eine Dossiervorlage mit demselben Namen.
+      
+      
+        Failed to create dossier template.
+        Fehler beim Erstellen der Dossiervorlage.
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Dossier Template Name
+        Name der Dossier-Vorlage
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Valid from
+        Gültig ab
+      
+      
+        Valid to
+        Gültig bis
+      
+      
+        Save Dossier Template
+        Dossier-Vorlage speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Create} other{}} Dossier Template
+        {type, select, edit{Dossier-Vorlage {name} bearbeiten} create{Dossier-Vorlage erstellen} other{}}
+      
+      
+        CSV Column Header
+        CSV-Spaltenüberschrift
+      
+      
+        Enter CSV Column Header
+        Spaltenüberschrift für CSV eingeben
+      
+      
+        The maximum number of displayed attributes ({maxNumber}) has been reached.
+        Die maximale Anzahl angezeigter Attribute ({maxNumber}) wurde erreicht.
+      
+      
+        Displayed In File List
+        Wird in der Dokumentenliste angezeigt
+      
+      
+        Filterable
+        Filterbar
+      
+      
+        The maximum number of filterable attributes ({maxNumber}) has been reached.
+        Die maximale Anzahl filterbarer Attribute ({maxNumber}) wurde erreicht.
+      
+      
+        Attribute Name
+        Name des Attributs
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Set as Primary
+        Zum Primärattribut machen
+      
+      
+        Make Read-Only
+        Schreibgeschützt
+      
+      
+        Type
+        Typ
+      
+      
+        Save Attribute
+        Attribut speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Add New} other{}} File Attribute
+        {type, select, edit{Edit {name}} create{Add New} other{}} Datei-Attribut
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Justification
+        Begründung speichern
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Name
+        Name
+      
+      
+        Enter Name
+        Name eingeben
+      
+      
+        Legal Basis
+        Rechtliche Grundlage
+      
+      
+        Enter Legal Basis
+        Rechtsgrundlage eingeben
+      
+      
+        {type, select, edit{Edit {name}} create{Add New} other{}} Justification
+        {type, select, edit{Edit {name}} create{Add New} other{}} Begründung
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Delete User
+        Benutzer löschen
+      
+      
+        Save User
+        Benutzer speichern
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        This e-mail address is already in use by a different user!
+        Diese E-Mail-Adresse wird bereits von einem anderen Benutzer verwendet!
+      
+      
+        Failed to save user!
+        Benutzer konnte nicht gespeichert werden!
+      
+      
+        Email
+        E-Mail
+      
+      
+        First Name
+        Vorname
+      
+      
+        Last Name
+        Nachname
+      
+      
+        Reset Password
+        Passwort zurücksetzen
+      
+      
+        Role
+        Rolle
+      
+      
+        {type, select, edit{Edit} create{Add New} other{}} User
+        {type, select, edit{Benutzer bearbeiten} create{Neuen Benutzer hinzufügen} other{}}
+      
+      
+        Dossier Templates
+        Dossier-Vorlage
+      
+      
+        Settings
+        Einstellungen
+      
+      
+        Annotation
+        Anmerkung
+      
+      
+        Accept Recommendation
+        Empfehlung annehmen
+      
+      
+        Approve Suggestion
+        Genehmigen und zum Wörterbuch hinzufügen
+      
+      
+        Edit Reason
+        Begründung bearbeiten
+      
+      
+        Force Hint
+        Hinweis erzwingen
+      
+      
+        Force Redaction
+        Schwärzung erzwingen
+      
+      
+        Hide
+        Ausblenden
+      
+      
+        Cannot add ''{content}'' to the {dictionaryName} dictionary because it was recognized as a general term that appears too often in texts.
+        &#39;&#39;{content}&#39;&#39; kann nicht zum {dictionaryName}-Wörterbuch hinzugefügt werden, da es als allgemeiner Begriff erkannt wurde, der zu oft in Texten vorkommt.
+      
+      
+        Failed to add entry to dictionary: {error}
+        Fehler beim Hinzufügen des neuen Wörterbucheintrags: {error}
+      
+      
+        Entry added to dictionary. Changes will be visible after reanalysis.
+        Eintrag zum Wörterbuch hinzugefügt. Änderungen nach der Reanalyse sichtbar.
+      
+      
+        Failed to approve dictionary entry: {error}
+        Fehler beim Genehmigen des Wörterbucheintrags: {error}
+      
+      
+        Dictionary entry approved. Changes will be visible after reanalysis.
+        Neuer Wörterbucheintrag wurde genehmigt. Änderungen sind nach der Reanalyse sichtbar.
+      
+      
+        Failed to decline dictionary suggestion: {error}
+        Fehler beim Ablehnen des neuen Wörterbucheintrags: {error}
+      
+      
+        Dictionary suggestion declined.
+        Vorschlag für das Wörterbuch abgelehnt.
+      
+      
+        Failed to remove dictionary entry: {error}
+        Fehler beim Entfernen des Wörterbucheintrags: {error}
+      
+      
+        Dictionary entry removed!
+        Wörterbucheintrag wurde gelöscht!
+      
+      
+        Failed to request removal of dictionary entry: {error}
+        Dossier-Vorlage
+      
+      
+        Requested to remove dictionary entry!
+        Löschung des Wörterbucheintrags wurde vorgeschlagen!
+      
+      
+        Failed to save suggestion for dictionary modification: {error}
+        Vorschlag für Änderung des Wörterbuchs konnte nicht gespeichert werden: {error}
+      
+      
+        Suggestion for dictionary modification saved!
+        Vorschlag für die Änderung des Wörterbuchs gespeichert!
+      
+      
+        Failed to undo: {error}
+        Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}
+      
+      
+        Undo successful
+        Rückgängigmachen erfolgreich
+      
+      
+        Failed to save redaction: {error}
+        Fehler beim Speichern der Schwärzung: {error}
+      
+      
+        Redaction added!
+        Schwärzung hinzugefügt!
+      
+      
+        Failed to approve suggestion: {error}
+        Fehler beim Genehmigen des Vorschlags: {error}
+      
+      
+        Suggestion approved.
+        Vorschlag genehmigt
+      
+      
+        Failed to edit annotation reason: {error}
+        Fehler beim Bearbeiten der in der Anmerkung genannten Begründung: {error}
+      
+      
+        Annotation reason was edited.
+        In der Anmerkung genannte Begründung wurde bearbeitet.
+      
+      
+        Failed to decline suggestion: {error}
+        Fehler beim Ablehnen des Vorschlags: {error}
+      
+      
+        Suggestion declined.
+        Vorschlag abgelehnt
+      
+      
+        Failed to save redaction: {error}
+        Die Schwärzung konnte nicht gespeichert werden!
+      
+      
+        Redaction added!
+        Schwärzung eingefügt!
+      
+      
+        Failed to recategorize image: {error}
+        Rekategorisierung des Bildes gescheitert: {error}
+      
+      
+        Image recategorized.
+        Bild wurde einer neuen Kategorie zugeordnet.
+      
+      
+        Failed to remove redaction: {error}
+        Fehler beim Entfernen der Schwärzung: {error}
+      
+      
+        Redaction removed!
+        Schwärzung entfernt!
+      
+      
+        Failed to request annotation reason change: {error}
+        Fehler beim Vorschlagen der Änderung der Begründung:
+      
+      
+        Annotation reason change requested.
+        Die Änderung der in der Anmerkung genannten Begründung wurde beantragt.
+      
+      
+        Failed to save redaction suggestion: {error}
+        Fehler beim Speichern des Schwärzungsvorschlags: {error}
+      
+      
+        Redaction suggestion saved
+        Vorschlag einer Schwärzung gespeichert
+      
+      
+        Failed to request image recategorization: {error}
+        Fehler beim Vorschlagen der Neukategorisierung des Bilds: {error}
+      
+      
+        Image recategorization requested.
+        Bild-Neuklassifizierung angefordert.
+      
+      
+        Failed to request removal of redaction: {error}
+        Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}
+      
+      
+        Requested to remove redaction!
+        Entfernen der Schwärzung wurde vorgeschlagen!
+      
+      
+        Failed to save redaction suggestion: {error}
+        Vorschlag einer Schwärzung wurde nicht gespeichert: {error}
+      
+      
+        Redaction suggestion saved
+        Vorschlag einer Schwärzung gespeichert
+      
+      
+        Failed to undo: {error}
+        Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}
+      
+      
+        Undo successful
+        erfolgreich Rückgängig gemacht
+      
+      
+        Recategorize
+        neu kategorisieren
+      
+      
+        Reject Suggestion
+        Vorschlag ablehnen
+      
+      
+        False Positive
+        Falsch positiv
+      
+      
+        Remove only here
+        nur hier entfernen
+      
+      
+        Remove from dictionary
+        Aus dem Wörterbuch entfernen
+      
+      
+        Save Resize
+        Größe speichern
+      
+      
+        Abort Resize
+        Größenänderung abbrechen
+      
+      
+        Resize
+        Größe ändern
+      
+      
+        Show
+        Zeigen
+      
+      
+        Undo
+        Rückgängig
+      
+      
+        Redaction forced
+        Redaktion erzwungen
+      
+      
+        Manual changes:
+        Manuelle Änderungen:
+      
+      
+        Reason changed
+        Grund geändert
+      
+      
+        Image category changed
+        Bildkategorie geändert
+      
+      
+        Redaction/Hint removed
+        Schwärzung/Hinweis entfernt
+      
+      
+        Redaction area has been modified
+        Schwärzungsbereich wurde geändert
+      
+      
+        {isHint, select, true{Hint} other{Redaction}} based on dictionary
+        {isHint, select, true{Hint} other{Redaction}} basierend auf Wörterbuch
+      
+      
+        Redaction based on AI
+        Redaktion basierend auf KI
+      
+      
+        Redaction based on rule {rule}
+        Schwärzung basierend auf Regel {rule}
+      
+      
+        Declined Suggestion
+        Abgelehnter Vorschlag
+      
+      
+        Hint
+        Hinweis
+      
+      
+        Ignored Hint
+        Ignorierter Hinweis
+      
+      
+        Manual Redaction
+        Manuelle Schwärzung
+      
+      
+        Recommendation
+        Empfehlung
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Skipped
+        Übersprungen
+      
+      
+        Suggested redaction
+        Vorschlag für Schwärzung
+      
+      
+        Suggested dictionary add
+        Vorschlag für neuen Wörterbucheintrag
+      
+      
+        Suggested change legal basis
+        Vorschlag für Änderung der Rechtsgrundlage
+      
+      
+        Suggestion force redaction
+        Vorschlag für erzwungene Schwärzung
+      
+      
+        Suggested recategorize image
+        Vorschlag für Rekategorisierung eines Bilds
+      
+      
+        Suggested redaction removal
+        Vorschlagen, die Schwärzung zu entfernen
+      
+      
+        Suggested dictionary removal
+        Vorschlag für Löschung eines Wörterbucheintrags
+      
+      
+        Suggested Resize
+        Vorgeschlagene Größenänderung
+      
+      
+        Annotations
+        Anmerkungen
+      
+      
+        Archived
+        Archiviert
+      
+      
+        Approvers
+        Genehmiger
+      
+      
+        Make Approver
+        Zum Genehmiger ernennen
+      
+      
+        No members with "review only" permission.
+        Es gibt noch keine Reviewer.Bitte aus der Liste unten auswählen.
+      
+      
+        Reviewers
+        Reviewer
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Select from the list below.
+        Wählen Sie aus der Liste unten aus.
+      
+      
+        Owner
+        Besitzer
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        {type, select, approver{Approver} reviewer{Reviewer} other{}}
+        {type, select, approver{Genehmiger} reviewer{Reviewer} other{}}
+      
+      
+        Save
+        Speichern
+      
+      
+        Manage File {type, select, approver{Approver} reviewer{Reviewer} other{}}
+        Datei verwalten: {type, select, approver{Genehmiger} reviewer{Reviewer} other{}}
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save
+        Speichern
+      
+      
+        Successfully assigned {ownerName} to dossier: {dossierName}.
+        {ownerName} wurde erfolgreich zum Dossier {dossierName} hinzugefügt.
+      
+      
+        Successfully {reviewerName, select, undefined{unassigned user from} other{assigned {reviewerName} to file:}} {filename}.
+        {reviewerName} wurde erfolgreich zum Dokument {filename} hinzugefügt.
+      
+      
+        Audit
+        Aktivitätenprotokoll
+      
+      
+        All Users
+        Alle Benutzer
+      
+      
+        All Categories
+        Alle Bereiche
+      
+      
+        Audit
+        Aktivitätenprotokoll
+      
+      
+        Audit Log
+        Aktivitätenprotokoll
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Document
+        Dokument
+      
+      
+        Dossier
+        Dossier
+      
+      
+        Dossier Template
+        Dossier-Vorlage
+      
+      
+        Download
+        Download
+      
+      
+        License
+        Lizenz
+      
+      
+        Project
+        Projekt
+      
+      
+        Project Template
+        Projekt-Vorlage
+      
+      
+        User
+        Nutzer
+      
+      
+        No available logs.
+        Keine Protokolle verfügbar.
+      
+      
+        Category
+        Kategorie
+      
+      
+        Date
+        Datum
+      
+      
+        Message
+        Nachricht
+      
+      
+        User
+        Nutzer
+      
+      
+        {length} {length, plural, one{Log} other{Logs}}
+        {length} {length, plural, one{Log} other{Logs}}
+      
+      
+        to
+        bis
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact your RedactManager administrator to assign appropriate roles.
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie Ihren Admin, um den Zugang anzufordern!
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact <a href={adminUrl}  target=_blank >your RedactManager administrator</a> to assign appropriate roles!
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie <a href={adminUrl} target=_blank >Ihren Admin</a>, um den Zugang anzufordern!
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact {adminName} to assign appropriate roles.
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie {adminName}, um den Zugang anzufordern!
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact <a href={adminUrl} target=_blank >{adminName}</a> to assign appropriate roles.
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie <a href={adminUrl} target=_blank >{adminName}</a>, um den Zugang anzufordern!
+      
+      
+        Logout
+        Ausloggen
+      
+      
+        by
+        von
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Value / Classification
+        Wert / Klassifizierung
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Legal Basis
+        Rechtsgrundlage
+      
+      
+        Select redaction reason
+        Begründung für die Schwärzung auswählen
+      
+      
+        Select a reason...
+        Wählen Sie eine Begründung aus ...
+      
+      
+        Paragraph / Location
+        Absatz / Ort
+      
+      
+        Edit Redaction Reason
+        Begründung für die Schwärzung bearbeiten
+      
+      
+        Enter comment
+        Kommentar eingeben
+      
+      
+        {count} {count, plural, one{comment} other{comments}}
+        {count} {count, plural, one{Kommentar} other{Kommentare}}
+      
+      
+        Hide comments
+        Kommentare verbergen
+      
+      
+        Close View
+        Ansicht schließen
+      
+      
+        Yes
+        Ja
+      
+      
+        No
+        Nein
+      
+      
+        This action requires confirmation, do you wish to proceed?
+        Diese Aktion erfordert eine Bestätigung. Möchten Sie fortfahren?
+      
+      
+        Confirm Action
+        Aktion bestätigen
+      
+      
+        Configurations
+        Einstellungen
+      
+      
+        Keep {type, select, single{Attribute} bulk{Attributes} other{}}
+        {type, select, single{Attribut} bulk{Attribute} other{}} behalten
+      
+      
+        Delete {type, select, single{Attribute} bulk{Attributes} other{}}
+        {type, select, single{Attribut} bulk{Attribute} other{}} löschen
+      
+      
+        All documents {type, select, single{it is} bulk{they are} other{}} used on will be impacted
+        Alle Dokumente {type, select, single{ist} bulk{sind} other{}} betroffen
+      
+      
+        All inputted details on the documents will be lost
+        Alle in die Dokumente eingegebenen Daten gehen verloren
+      
+      
+        Delete {type, select, single{{name}} bulk{File Attributes} other{}}
+        {type, select, single{{name}} bulk{Datei-Attribute} other{}} löschen
+      
+      
+        Please confirm that you understand the ramifications of your action!
+        Bitte bestätigen Sie, dass Ihnen die Konsequenzen dieser Aktion bewusst sind!
+      
+      
+        Warning: this cannot be undone!
+        Achtung: Diese Aktion kann nicht rückgängig gemacht werden!
+      
+      
+        Keep {usersCount, plural, one{User} other{Users}}
+        {usersCount, plural, one{Benutzer} other{Benutzer}} behalten
+      
+      
+        Delete {usersCount, plural, one{User} other{Users}}
+        {usersCount, plural, one{Benutzer} other{Benutzer}} löschen
+      
+      
+        All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted
+        Betroffen sind alle Dokumente, deren Review durch den/die {usersCount, plural, one{user} other{users}} noch aussteht
+      
+      
+        {dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted
+        {dossiersCount} {dossiersCount, plural, one{Dossier} other{Dossiers}} sind betroffen
+      
+      
+        Delete {usersCount, plural, one{User} other{Users}} from Workspace
+        {usersCount, plural, one{Benutzer} other{Benutzer}} aus dem Arbeitsbereich entfernen
+      
+      
+        Please confirm that you understand the ramifications of your action!
+        Bitte bestätigen Sie, dass Ihnen die Konsequenzen dieser Aktion bewusst sind!
+      
+      
+        Warning: this cannot be undone!
+        Achtung: Diese Aktion kann nicht rückgängig gemacht werden!
+      
+      
+        This document has unseen changes, do you wish to approve it anyway?
+        Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?
+      
+      
+        Warning!
+        Warnung!
+      
+      
+        At least one of the files you selected has unseen changes, do you wish to approve them anyway?
+        Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?
+      
+      
+        Warning!
+        Warnung!
+      
+      
+        This document is currently reviewed by someone else. Do you want to become the reviewer and assign yourself to this document?
+        Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?
+      
+      
+        Re-assign user
+        Neuen Reviewer zuweisen
+      
+      
+        <strong>Warning!</strong> <br><br> Number of pages does not match, current document has <strong>{currentDocumentPageCount} page(s)</strong>. Uploaded document has <strong>{compareDocumentPageCount} page(s)</strong>. <br><br> Do you wish to proceed?
+        <strong>Achtung!</strong> <br><br> Seitenzahl stimmt nicht überein, aktuelles Dokument hat <strong>{currentDocumentPageCount} Seite(n)</strong>. Das hochgeladene Dokument hat <strong>{compareDocumentPageCount} Seite(n)</strong>. <br><br> Möchten Sie fortfahren?
+      
+      
+        Compare with file: {fileName}
+        Vergleichen mit: {fileName}
+      
+      
+        Delete {dossiersCount, plural, one{Dossier} other{Dossiers}}
+        Dossier löschen
+      
+      
+        Keep {dossiersCount, plural, one{Dossier} other{Dossiers}}
+        Dossier behalten
+      
+      
+        Are you sure you want to delete {dossiersCount, plural, one{this dossier} other{these dossiers}}?
+        Möchten Sie dieses Dokument wirklich löschen?
+      
+      
+        Delete {dossiersCount, plural, one{{dossierName}} other{Selected Dossiers}}
+        {dossierName} löschen
+      
+      
+        Do you wish to proceed?
+        Möchten Sie fortfahren?
+      
+      
+        Delete Document
+        Dokument löschen
+      
+      
+        Are you sure you want to delete {count, plural, one{this justification} other{these justifications}}?
+        Möchten Sie {count, plural, one{diese Begründung} other{diese Begründung}} wirklich löschen?
+      
+      
+        Delete {count, plural, one{{justificationName}} other{Selected Justifications}}
+        {count, plural, one{{justificationName}} other{ausgewählte Begründungen}} löschen
+      
+      
+        To proceed please type below
+        Bitte geben Sie unten Folgendes ein, um fortzufahren
+      
+      
+        Delete {filesCount, plural, one{Document} other{Documents}}
+        {filesCount, plural, one{Document} other{Documents}} löschen
+      
+      
+        Keep {filesCount, plural, one{Document} other{Documents}}
+        {filesCount, plural, one{Dokument} other{Dokumente}} behalten
+      
+      
+        Are you sure you want to delete {filesCount, plural, one{this document} other{these documents}}?
+        Möchten Sie {filesCount, plural, one{dieses Dokument} other{diese Dokumente}} wirklich löschen?
+      
+      
+        Delete {filesCount, plural, one{{fileName}} other{Selected Documents}}
+        {filesCount, plural, one{{fileName}} other{ausgewählte Dokumente}} löschen
+      
+      
+        Upload as multi-file report
+        Als Bericht für mehrere Dokumente hochladen
+      
+      
+        Upload as single-file report
+        Als Bericht für ein Dokument hochladen
+      
+      
+        Cancel Upload
+        Uploads abbrechen
+      
+      
+        Please choose if <b>{fileName}</b> is a single or multi-file report template
+        Wählen Sie bitte aus, ob <b>{fileName}</b> eine Berichtsvorlage für eine oder für mehrere Dateien ist
+      
+      
+        Report Template Upload
+        Upload der Berichtsvorlage
+      
+      
+        Yes. Continue upload
+        Ja. Hochladen fortsetzen
+      
+      
+        No. Cancel Upload
+        Nein. Hochladen abbrechen
+      
+      
+        There is already a Report Template with the name: <b>{fileName}</b>. Do you wish to continue?
+        <b>{fileName}</b>
+      
+      
+        Report Template Upload
+        Hochladen von Berichtsvorlagen
+      
+      
+        Reason
+        Begründung
+      
+      
+        Default Colors
+        Farbeinstellungen
+      
+      
+        Edit Color
+        Farbe bearbeiten
+      
+      
+        Color
+        Farbe
+      
+      
+        Type
+        Typ
+      
+      
+        {length} Default {length, plural, one{Color} other{Colors}}
+        {length} Standard{length, plural, one{farbe} other{farben}}
+      
+      
+        Analysis
+        Analyse
+      
+      
+        Default Color
+        Standardfarbe
+      
+      
+        Dictionary Request
+        Wörterbuch
+      
+      
+        Ignored Hint
+        Ignorierter Hinweis
+      
+      
+        Manual Redaction
+        Manuelle Schwärzung
+      
+      
+        Skipped
+        Übersprungen
+      
+      
+        Preview
+        Vorschau
+      
+      
+        Request Add
+        Neuen Wörterbucheintrag vorschlagen
+      
+      
+        Request Remove
+        Anfrage entfernt
+      
+      
+        Updated
+        Aktualisiert
+      
+      
+        DEV
+        DEV
+      
+      
+        Dictionaries
+        Wörterbücher
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Delete Dictionary
+        Wörterbuch löschen
+      
+      
+        Edit Dictionary
+        Wörterbuch bearbeiten
+      
+      
+        New Dictionary
+        Neues Wörterbuch
+      
+      
+        Delete Selected Dictionaries
+        Ausgewählte Wörterbücher löschen
+      
+      
+        Case Sensitive
+        Klein-/Großschreibung berücksichtigen
+      
+      
+        New Dictionary
+        Neues Wörterbuch
+      
+      
+        There are no dictionaries yet.
+        Es gibt noch keine Wörterbücher.
+      
+      
+        No dictionaries match your current filters.
+        Die ausgewählten Filter treffen auf kein Wörterbuch zu.
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Entries
+        Einträge
+      
+      
+        Types
+        Typen
+      
+      
+        Hint/Redaction
+        Hinweis/Schwärzung
+      
+      
+        Rank
+        Rang
+      
+      
+        Type
+        Typ
+      
+      
+        {length} {length, plural, one{dictionary} other{dictionaries}}
+        {length} {length, plural, one{Wörterbuch} other{Wörterbücher}}
+      
+      
+        Delete Dictionary
+        Wörterbuch löschen
+      
+      
+        Download Dictionary
+        Wörterbuch herunterladen
+      
+      
+        Edit Dictionary
+        Wörterbuch bearbeiten
+      
+      
+        Upload Dictionary
+        Wörterbuch hochladen
+      
+      
+        Compare
+        Vergleichen
+      
+      
+        Select Dictionary
+        Wörterbuch auswählen
+      
+      
+        Select Dossier
+        Dossier auswählen
+      
+      
+        Select Dossier Template
+        Dossiervorlage auswählen
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Some entries of the dictionary are below the minimum length of 2. These are highlighted with red!
+        Einige Einträge im Wörterbuch unterschreiten die Mindestlänge von 2 Zeichen. Diese sind rot markiert.
+      
+      
+        Something went wrong... Dictionary update failed!
+        Es ist ein Fehler aufgetreten ... Das Wörterbuch konnte nicht aktualisiert werden!
+      
+      
+        Revert
+        Rückgängig machen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Select a dictionary above to compare with the current one.
+        Wählen Sie oben das Wörterbuch aus, das Sie mit dem aktuellen Wörterbuch vergleichen möchten.
+      
+      
+        Dictionary updated!
+        Wörterbuch aktualisiert!
+      
+      
+        Digital Signature
+        Digitale Signatur
+      
+      
+        Uploaded Certificate is not valid for signing PDFs. PCKS.12 format is required.
+        Das hochgeladene Zertifikat eignet sich nicht zum Signieren von PDF-Dokumenten. Sie benötigen das Format PCKS#12.
+      
+      
+        Delete Digital Signature
+        Digitale Signatur löschen
+      
+      
+        Failed to remove digital signature, please try again.
+        Die digitale Signatur konnte nicht entfernt werden, bitte versuchen Sie es erneut.
+      
+      
+        Digital signature removed. Redacted files will no longer be signed!
+        Die digitale Signatur wurde gelöscht. Geschwärzte Dateien werden nicht länger mit einer Signatur versehen!
+      
+      
+        Reset
+        Zurücksetzen
+      
+      
+        Save Digital Signature
+        Digitale Signatur speichern
+      
+      
+        Failed to save digital signature
+        Fehler beim Speichern der digitalen Signatur
+      
+      
+        Digital signature saved successfully
+        Digitale Signatur erfolgreich gespeichert
+      
+      
+        Certificate Name
+        Name des Zertifikats
+      
+      
+        Certificate Name
+        Name des Zertifikats
+      
+      
+        Contact Information
+        Kontaktdaten
+      
+      
+        Contact Information
+        Kontaktdaten
+      
+      
+        Location
+        Ort
+      
+      
+        Location
+        Ort
+      
+      
+        Upload Certificate
+        Zertifikat hochladen
+      
+      
+        No Digital Signature certificate is configured. For signing redacted documents please upload a PCKS.12 certificate.
+        Es ist kein Zertifikat für die digitale Signatur konfiguriert. Laden Sie ein PCKS#12-Zertifikat hoch, um Ihre geschwärzten Dokumente zu signieren.
+      
+      
+        Certificate Password/Key
+        Zertifikatspasswort/-schlüssel
+      
+      
+        Password
+        Passwort
+      
+      
+        Reason
+        Begründung
+      
+      
+        Reason
+        Begründung
+      
+      
+        Save Document Info
+        Dokumenteninformation speichern
+      
+      
+        Introduce File Attributes
+        Datei-Attribute anlegen
+      
+      
+        Dossier
+        Dossier
+      
+      
+        Date
+        Datum
+      
+      
+        Image
+        Bild
+      
+      
+        Number
+        Nummer
+      
+      
+        Free Text
+        Text
+      
+      
+        Dossier Attributes
+        Dossier-Attribut
+      
+      
+        Delete Attribute
+        Attribut löschen
+      
+      
+        Edit Attribute
+        Attribut bearbeiten
+      
+      
+        New Attribute
+        Neues Attribut
+      
+      
+        Delete Selected Attributes
+        Ausgewähltes Attribut löschen
+      
+      
+        New Attribute
+        Neues Attribut
+      
+      
+        There are no dossier attributes.
+        Es sind keine Dossier-Attribute vorhanden
+      
+      
+        No attributes match your current filters.
+        Die ausgewählten Filter treffen auf kein Attribut zu.
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Label
+        Label
+      
+      
+        Placeholder
+        Platzhalter
+      
+      
+        Type
+        Typ
+      
+      
+        {length} dossier {length, plural, one{attribute} other{attributes}}
+        {length} {length, plural, one{Dossier-Attribut} other{Dossier-Attribute}}
+      
+      
+        Assign Members
+        Mitglieder zuweisen
+      
+      
+        Hide Details
+        Details ausblenden
+      
+      
+        Edit Owner
+        Eigentümer bearbeiten
+      
+      
+        Show Details
+        Details zeigen
+      
+      
+        Members
+        Mitglieder
+      
+      
+        Owner
+        Eigentümer
+      
+      
+        See less
+        Weniger anzeigen
+      
+      
+        Dossier Details
+        Dossier-Details
+      
+      
+        New Dossier
+        Neues Dossier
+      
+      
+        Delete Dossier
+        Dossier löschen
+      
+      
+        Failed to delete dossier: {dossierName}
+        Das Dossier {dossierName} konnte nicht gelöscht werden
+      
+      
+        Dossier Info
+        Dossier-Info
+      
+      
+        Edit Dossier
+        Dossier bearbeiten
+      
+      
+        Dossier Name
+        Dossiername
+      
+      
+        Dossier name...
+        Dossiername...
+      
+      
+        New Dossier
+        Neues Dossier
+      
+      
+        You currently have no dossiers.
+        Sie haben momentan keine Dossiers.
+      
+      
+        No dossiers match your current filters.
+        Die ausgewählten Filter treffen auf kein Dossier zu.
+      
+      
+        My Dossiers
+        Meine Dossiers
+      
+      
+        Other
+        Sonstige
+      
+      
+        To Approve
+        Zu Genehmigen
+      
+      
+        To Review
+        Zu Überprüfen
+      
+      
+        Analyze entire dossier
+        Gesamtes Dossier analysieren
+      
+      
+        {count, plural, one{Page} other{Pages}}
+        Seiten
+      
+      
+        {count, plural, one{Dossier} other{Dossiers}}
+        Dossiers
+      
+      
+        Total Documents
+        Anzahl der Dokumente
+      
+      
+        Total users
+        Anzahl der Benutzer
+      
+      
+        Name
+        Name
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        Owner
+        Besitzer
+      
+      
+        Status
+        Status
+      
+      
+        {length} active {length, plural, one{Dossier} other{Dossiers}}
+        {length} {length, plural, one{aktives Dossier} other{aktive Dossiers}}
+      
+      
+        Approve
+        Genehmigen
+      
+      
+        File can only be approved once it has been analysed with the latest dictionaries and all suggestions have been processed.
+        Das Dokument kann erst genehmigt werden, wenn eine Analyse auf Basis der aktuellen Wörterbücher durchgeführt wurde und die Vorschläge bearbeitet wurden.
+      
+      
+        Assign Approver
+        Genehmiger zuordnen
+      
+      
+        Assign To Me
+        Mir zuteilen
+      
+      
+        Assign User
+        Überprüfer zuordnen
+      
+      
+        Delete Documents
+        Dokumente löschen
+      
+      
+        Analyze Documents
+        Dokumente analysieren
+      
+      
+        Delete File
+        Datei löschen
+      
+      
+        {count} custom {count, plural, one{attribute} other{attributes}}
+        {count} {count, plural, one{benutzerdefiniertes Attribut} other{benutzerdefinierte Attribute}}
+      
+      
+        Image uploaded
+        Bild hochgeladen
+      
+      
+        show less
+        weniger anzeigen
+      
+      
+        Documents in Dossier
+        Dokumente im Dossier
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Dossier Dictionary
+        Dossier-Wörterbuch
+      
+      
+        {count} {count, plural, one{page} other{pages}}
+        {count} {count, plural, one{Seite} other{Seiten}}
+      
+      
+        Created on {date}
+        Erstellt am {date}
+      
+      
+        {count} deleted files
+        {count} gelöschte Dateien
+      
+      
+        {count} {count, plural, one{document} other{documents}}
+        {count} {count, plural, one{Dokument} other{Dokumente}}
+      
+      
+        Due {date}
+        Fällig am {date}
+      
+      
+        {count} {count, plural, one{user} other{users}}
+        {count} {count, plural, one{Benutzer} other{Benutzer}}
+      
+      
+        {count} processing {count, plural, one{document} other{documents}}
+        {count} Verarbeitung von {count, plural, one{document} other{documents}}
+      
+      
+        Download
+        Herunterladen
+      
+      
+        You need to be approver in the dossier and the {count, plural, one{file needs} other{files need}} to be approved in order to download.
+        Nur genehmigte Dateien können heruntergeladen werden
+      
+      
+        Re-processing required
+        Reanalyse erforderlich
+      
+      
+        Pending...
+        Ausstehend ...
+      
+      
+        Document Name
+        Dokumentname
+      
+      
+        Document name...
+        Dokumentname...
+      
+      
+        Download CSV File Report
+        CSV-Dateibericht herunterladen
+      
+      
+        Edit Dossier
+        Dossier bearbeiten
+      
+      
+        Upload Document
+        Dokument hochgeladen
+      
+      
+        Analyze all
+        Alle analysieren
+      
+      
+        Upload Document
+        Dokument hochladen
+      
+      
+        There are no documents yet.
+        Noch gibt es keine Dokumente.
+      
+      
+        No documents match your current filters.
+        Die ausgewählten Filter treffen auf kein Dokument zu.
+      
+      
+        OCR Document
+        OCR-Dokument
+      
+      
+        OCR was performed for this file.
+        Diese Datei wurde mithilfe von OCR konvertiert.
+      
+      
+        Assigned to me
+        Mir zuweisen
+      
+      
+        Assigned to others
+        Anderen zugewiesen
+      
+      
+        Recent ({hours} h)
+        Neu ({hours} h)
+      
+      
+        Unassigned
+        Niemandem zugewiesen
+      
+      
+        Failed to schedule files for reanalysis. Please try again.
+        Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.
+      
+      
+        Files scheduled for reanalysis.
+        Dateien für Reanalyse vorgesehen.
+      
+      
+        Analyze File
+        Datei analysieren
+      
+      
+        Added
+        Hinzugefügt
+      
+      
+        Assigned to
+        Zugewiesen an
+      
+      
+        Name
+        Name
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        Pages
+        Seiten
+      
+      
+        Status
+        Status
+      
+      
+        {length} {length, plural, one{document} other{documents}}
+        {length} {length, plural, one{document} other{documents}}
+      
+      
+        For Approval
+        Zur Genehmigung
+      
+      
+        Under Review
+        In Review
+      
+      
+        Drag & drop files anywhere...
+        Sie können Dateien überall per Drag and Drop platzieren...
+      
+      
+        Dossier Templates
+        Dossier-Vorlagen
+      
+      
+        Delete Template
+        Dossier-Vorlage
+      
+      
+        Edit Template
+        Vorlage bearbeiten
+      
+      
+        New Dossier Template
+        Neue Dossier-Vorlage
+      
+      
+        Delete Selected Dossier Templates
+        Ausgewählte Dossier-Vorlagen löschen
+      
+      
+        {length} {length, plural, one{dictionary} other{dictionaries}}
+        {length} {length, plural, one{dictionary} other{dictionaries}}
+      
+      
+        Cannot delete this DossierTemplate! At least one Dossier uses this template!
+        Dieses DossierTemplate kann nicht gelöscht werden! Zumindest auf Dossier wird diese Vorlage verwendet!
+      
+      
+        Cannot delete this DossierTemplate!
+        Dieses DossierTemplate kann nicht gelöscht werden!
+      
+      
+        There are no dossier templates yet.
+        Es gibt noch keine Dossier-Vorlagen.
+      
+      
+        No dossier templates match your current filters.
+        Die ausgewählten Filter treffen auf keine Dossier-Vorlage zu.
+      
+      
+        Search...
+        Suchen ...
+      
+      
+        Created by
+        Erstellt von
+      
+      
+        Created on
+        Erstellt am
+      
+      
+        Modified on
+        Geändert am
+      
+      
+        Name
+        Name
+      
+      
+        {length} dossier {length, plural, one{template} other{templates}}
+        {length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}
+      
+      
+        Choose what is included at download:
+        Wählen Sie die Dokumente für Ihr Download-Paket aus
+      
+      
+        Your download has been queued, you can see all your requested downloads here: <a href='/ui/main/downloads'>My Downloads<a/>.
+        Ihr Download wurde zur Warteschlange hinzugefügt. Hier finden Sie alle angeforderten Downloads: <a href='/main/downloads'>My Downloads<a/>.
+      
+      
+        Annotated PDF
+        PDF mit Anmerkungen
+      
+      
+        Flatten PDF
+        PDF verflachen
+      
+      
+        {length} document {length, plural, one{version} other{versions}}
+        {length} Dokumenten{length, plural, one{version} other{versionen}}
+      
+      
+        Optimized PDF
+        Optimiertes PDF
+      
+      
+        Preview PDF
+        PDF-Vorschau
+      
+      
+        Redacted PDF
+        geschwärztes PDF
+      
+      
+        Delete
+        Löschen
+      
+      
+        Download
+        Herunterladen
+      
+      
+        Delete Selected Downloads
+        Ausgewählte Downloads löschen
+      
+      
+        No active downloads.
+        Keine aktiven Downloads.
+      
+      
+        Date
+        Datum
+      
+      
+        Name
+        Name
+      
+      
+        Size
+        Größe
+      
+      
+        Status
+        Status
+      
+      
+        {length} {length, plural, one{download} other{downloads}}
+        {length} {length, plural, one{download} other{downloads}}
+      
+      
+        Failed to update colors.
+        Fehler beim Aktualisieren der Farben.
+      
+      
+        Color
+        Farbe
+      
+      
+        Color
+        Farbe
+      
+      
+        Save
+        Speichern
+      
+      
+        Successfully updated color for {color}.
+        Farbe erfolgreich aktualisiert auf {color}.
+      
+      
+        Revert
+        Rückgängig machen
+      
+      
+        Save
+        Änderungen speichern
+      
+      
+        Save & Close
+        Speichern
+      
+      
+        Custom Dossier Attributes
+        Benutzerdefinierte Dossier-Attribute
+      
+      
+        Delete Image
+        Bild löschen
+      
+      
+        Only PNG, JPG and JPEG files are allowed as image dossier attributes.
+        Als Bilddossierattribute sind nur PNG-, JPG- und JPEG-Dateien zulässig.
+      
+      
+        Image Attributes
+        Bild-Attribute
+      
+      
+        There are no text attributes
+        Es sind keine Text-Attribute vorhanden
+      
+      
+        There are no image attributes
+        Es sind keine Bild-Attribute vorhanden
+      
+      
+        Upload Image
+        Bild hochladen
+      
+      
+        Dossier {dossierName} was updated.
+        Dossier wurde aktualisiert.
+      
+      
+        Dossier {dossierName} was deleted.
+        Dossier wurde gelöscht.
+      
+      
+        Delete Forever
+        Endgültig löschen
+      
+      
+        Restore
+        Wiederherstellen
+      
+      
+        Forever Delete Selected Documents
+        Ausgewählte Dokumente endgültig löschen
+      
+      
+        Restore Selected Documents
+        Ausgewählte Dokumente wiederherstellen
+      
+      
+        Deleted items can be restored up to {hours} hours from their deletion
+        Gelöschte Objekte können bis zu {hours} Stunden nach ihrer Löschung wiederhergestellt werden
+      
+      
+        There are no deleted documents.
+        Es sind keine gelöschten Dokumente vorhanden.
+      
+      
+        Assignee
+        Bevollmächtigter
+      
+      
+        Deleted On
+        Gelöscht am
+      
+      
+        Name
+        Name
+      
+      
+        Pages
+        Seiten
+      
+      
+        Status
+        Status
+      
+      
+        Time To Restore
+        Verbleibende Zeit für Wiederherstellung
+      
+      
+        {length} deleted {length, plural, one{document} other{documents}}
+        {length} {length, plural, one{gelöschtes Dokument} other{gelöschte Dokumente}}
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Edit Display Name
+        Anzeigenamen bearbeiten
+      
+      
+        Failed to update dictionary display name.
+        Anzeigename des Wörterbuchs konnte nicht aktualisiert werden.
+      
+      
+        Enter Display Name
+        Anzeigenamen eingeben
+      
+      
+        Save Display Name
+        Anzeigenamen speichern
+      
+      
+        Successfully updated dictionary display name.
+        Anzeigename des Wörterbuchs erfolgreich aktualisiert.
+      
+      
+        {length} {length, plural, one{entry} other{entries}}
+        {length} {length, plural, one{entry} other{entries}}
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Due Date
+        Termin
+      
+      
+        Dossier Name
+        Dossier-Name
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Dossier Template
+        Dossier-Vorlage
+      
+      
+        Watermark application on redacted documents
+        Geschwärzte Dokumente mit Wasserzeichen versehen
+      
+      
+        Watermark application on preview documents
+        Vorschau Dokumente mit Wasserzeichen versehen
+      
+      
+        Edit {dossierName}
+        {dossierName} bearbeiten
+      
+      
+        Choose what is included at download:
+        Wählen Sie die Dokumente für Ihr Download-Paket aus:
+      
+      
+        Deleted Documents
+        Gelöschte Dokumente
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Dossier Attributes
+        Dossier-Attribute
+      
+      
+        Dossier Dictionary
+        Dossier-Wörterbuch
+      
+      
+        Dossier Info
+        Dossier-Info
+      
+      
+        Download Package
+        Download-Paket
+      
+      
+        General Information
+        Allgemeine Informationen
+      
+      
+        Members
+        Mitglieder
+      
+      
+        Team Members
+        Team-Mitglieder
+      
+      
+        Configurations
+        Konfiguration
+      
+      
+        You have unsaved changes. Save or revert before changing the tab.
+        Sie haben nicht gespeicherte Änderungen. Speichern Sie oder machen Sie die Änderungen rückgängig, bevor Sie die Registerkarte wechseln.
+      
+      
+        Back to overview
+        Zurück zur Übersicht
+      
+      
+        This dossier has been deleted!
+        Dieses Dossier wurde gelöscht!
+      
+      
+        Back to overview
+        Zurück zur Übersicht
+      
+      
+        The dossier of this file has been deleted!
+        Das Dossier dieser Datei wurde gelöscht!
+      
+      
+        Back to dossier
+        Zurück zum Dossier
+      
+      
+        This file has been deleted!
+        Diese Datei wurde gelöscht!
+      
+      
+        Action failed with code {status}
+        Aktion mit Code {status} fehlgeschlagen
+      
+      
+        Disconnected
+        Du bist offline
+      
+      
+        Reconnected
+        Du bist online
+      
+      
+        Reload
+        Neu laden
+      
+      
+        Oops! Something went wrong...
+        Hoppla! Etwas ist schief gelaufen...
+      
+      
+        {day} {month} {year} at {hour}:{minute}
+        {day} {month} {year} um {hour}:{minute} Uhr
+      
+      
+        File
+        Datei
+      
+      
+        Date
+        Datum
+      
+      
+        Number
+        Nummer
+      
+      
+        Free Text
+        Freier Text
+      
+      
+        File Attributes
+        Datei-Attribute
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Edit Name
+        Namen bearbeiten
+      
+      
+        Remove
+        Entfernen
+      
+      
+        Save
+        Speichern
+      
+      
+        {value} available
+        {value} verfügbar
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        CSV Column
+        CSV-Spalte
+      
+      
+        Delimiter
+        Trennzeichen
+      
+      
+        ,
+        ,
+      
+      
+        Encoding
+        Wird verschlüsselt
+      
+      
+        UTF-8
+        UTF-8
+      
+      
+        File:
+        Datei:
+      
+      
+        Key Column
+        Schlüsselspalte
+      
+      
+        Select column...
+        Spalte auswählen ...
+      
+      
+        No file attributes defined. Select a column from the left panel to start defining file attributes.
+        Keine Datei-Attribute definiert. Wählen Sie links eine Spalte aus, um Datei-Attribute zu definieren.
+      
+      
+        Preview CSV column by hovering the entry.
+        Fahren Sie mit der Maus über den Eintrag, um eine Vorschau der CSV-Spalte zu sehen.
+      
+      
+        No sample data for {column}.
+        Keine Beispieldaten für {column}.
+      
+      
+        Parse CSV with new options
+        CSV-Datei mit neuen Optionen parsen
+      
+      
+        All
+        Alle
+      
+      
+        None
+        Keine
+      
+      
+        Failed to create File Attributes!
+        Fehler beim Erstellen der Datei-Attribute!
+      
+      
+        Save Attributes
+        Attribute speichern
+      
+      
+        {count} file {count, plural, one{attribute} other{attributes}} created successfully!
+        {count} Datei-{count, plural, one{Attribut} other{Attribute}} erfolgreich erstellt!
+      
+      
+        Search by column name...
+        Nach Spaltennamen suchen ...
+      
+      
+        {value} selected
+        {value} ausgewählt
+      
+      
+        Name
+        Name
+      
+      
+        primary
+        Primärattribut
+      
+      
+        The value of the attribute set as primary shows up under the file name in the documents list.
+        Der Wert des Attributs, das als Primärattribut ausgewählt wurde, wird in der Dokumentenliste unter dem Dateinamen angezeigt.
+      
+      
+        Read-Only
+        Schreibgeschützt
+      
+      
+        Type
+        Typ
+      
+      
+        Disable Read-only for all attributes
+        Schreibschutz für alle Attribute aufheben
+      
+      
+        Enable Read-only for all attributes
+        Schreibschutz für alle Attribute aktivieren
+      
+      
+        Make Read-only
+        Schreibschutz aktivieren
+      
+      
+        Remove Selected
+        Ausgewählte entfernen
+      
+      
+        Type
+        Typ
+      
+      
+        {length} file {length, plural, one{attribute} other{attributes}}
+        {length} Datei-{length, plural, one{Attribut} other{Attribute}}
+      
+      
+        Select CSV columns to use as File Attributes
+        CSV-Spalten auswählen, die als Datei-Attribute verwendet werden sollen
+      
+      
+        {rows} rows in total
+        {rows} Zeilen insgesamt
+      
+      
+        Delete Attribute
+        Attribut löschen
+      
+      
+        Edit Attribute
+        Attribute bearbeiten
+      
+      
+        New Attribute
+        Neue Attribute
+      
+      
+        Delete Selected Attributes
+        Ausgewählte Attribute löschen
+      
+      
+        File-Attribute with this name already exists!
+        Es gibt bereits ein Attribute mit diesem Name!
+      
+      
+        Failed to add File-Attribute
+        Attribute konnte nicht erstellt werden!
+      
+      
+        There are no file attributes yet.
+        Es sind noch keine Datei-Attribute vorhanden.
+      
+      
+        No file attributes match your current filters.
+        Die aktuell ausgewählten Filter treffen auf kein Datei-Attribut zu.
+      
+      
+        Read-only
+        Schreibgeschützt
+      
+      
+        Search by attribute name...
+        Nach Attribut-Namen suchen ...
+      
+      
+        CSV Column
+        CSV-Spalte
+      
+      
+        Displayed in File List
+        In Dokumentenliste anzeigen
+      
+      
+        Filterable
+        Filterbar
+      
+      
+        Name
+        Name
+      
+      
+        Primary
+        Primärattribut
+      
+      
+        The value of the attribute set as primary shows up under the file name in the documents list.
+        Der Wert des Attributs, das als Primärattribut ausgewählt wurde, wird in der Dokumentenliste unter dem Dateinamen angezeigt.
+      
+      
+        Read-Only
+        Schreibgeschützt
+      
+      
+        Input Type
+        Eingabetyp
+      
+      
+        {length} file {length, plural, one{attribute} other{attributes}}
+        {length} {length, plural, one{Datei-Attribut} other{Datei-Attribute}}
+      
+      
+        Upload File Attributes Configuration
+        Datei-Attribute hochladen
+      
+      
+        Assign to me
+        Mir zuweisen
+      
+      
+        Assign User
+        Reviewer zuweisen
+      
+      
+        Change User
+        Reviewer wechseln
+      
+      
+        Delta
+        Delta
+      
+      
+        Delta View shows only the changes since last re-analysis. This view is only available if there is at least 1 change
+        Die Delta-Ansicht zeigt nur die Änderungen seit der letzten Reanalyse an. Die Ansicht ist nur verfügbar, wenn es seit der letzten Analyse mindestens 1 Änderung gab
+      
+      
+        Your Document Info lives here. This includes metadata required on each document.
+        Dok-Infos: Hier finden Sie die zu Ihrem Dokument hinterlegten Informationen; u. a. die für das Dokument erforderlichen Metadaten.
+      
+      
+        Download Original File
+        Originaldatei herunterladen
+      
+      
+        Exclude pages from redaction
+        Seiten von Schwärzung ausschließen
+      
+      
+        excluded
+        Von Schwärzung ausgeschlossen
+      
+      
+        Full Screen (F)
+        Vollbildmodus
+      
+      
+        Last Reviewed by:
+        Zuletzt überprüft von:
+      
+      
+        There are no annotations on this page.
+        Auf dieser Seite gibt es keine Anmerkungen.
+      
+      
+        Jump to first page
+        Zur ersten Seite springen
+      
+      
+        Jump to last page
+        Zur letzten Seite springen
+      
+      
+        This document was not processed with the latest rule/dictionary set. Analyze now to get updated annotations.
+        Dieses Dokument wurde nicht auf Basis des neuesten Regel-/Wörterbuchsatzes bearbeitet. Analysieren Sie es jetzt, um die Anmerkungen zu analysieren.
+      
+      
+        Preview
+        Vorschau
+      
+      
+        Redaction preview shows only redactions. Consider this a preview for the final redacted version. This view is only available if the file has no pending changes & doesn't require a reanalysis
+        In der Schwärzungsvorschau sehen Sie nur die Schwärzungen. Es handelt sich also um eine Vorschau der endgültigen geschwärzten Version. Diese Ansicht ist nur verfügbar, wenn für die Datei keine Änderungen ausstehen und keine Reanalyse erforderlich ist
+      
+      
+        Standard
+        Standard
+      
+      
+        Standard Workload view shows all hints, redactions, recommendations & suggestions. This view allows editing.
+        In der Standard-Ansicht des Workloads werden alle Hinweise, Schwärzungen, Empfehlungen und Vorschläge angezeigt. In dieser Ansicht ist die Bearbeitung möglich.
+      
+      
+        Jump to Next
+        Springe zu Nächster
+      
+      
+        Jump to Previous
+        Springe zu Vorheriger
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        This page is
+        Diese Seite ist
+      
+      
+        Select
+        Auswählen
+      
+      
+        All
+        Alle
+      
+      
+        None
+        Keine
+      
+      
+        Close Document Info
+        Dokumenteninformation schließen
+      
+      
+        Created on: {date}
+        Erstellt am: {date}
+      
+      
+        in {dossierName}
+        in {dossierName}
+      
+      
+        Due: {date}
+        Termin: {date}
+      
+      
+        {pages} pages
+        {pages} Seiten
+      
+      
+        Edit Document Info
+        Infos zum Dokument bearbeiten
+      
+      
+        Document Info
+        Infos zum Dokument
+      
+      
+        Close
+        Schließen
+      
+      
+        Error! Invalid page selection.
+        Fehler! Seitenauswahl ungültig.
+      
+      
+        Minus (-) for range and comma (,) for enumeration.
+        Minus (-) für Bereich und Komma (,) für Aufzählung.
+      
+      
+        e.g. 1-20,22,32
+        z. B. 1-20,22,32
+      
+      
+        Exclude Pages
+        Seiten ausschließen
+      
+      
+        No excluded pages.
+        Es sind keine Seiten ausgeschlossen.
+      
+      
+        Undo
+        Rückgängig machen
+      
+      
+        Removed from redaction
+        Von der Schwärzung ausgeschlossen
+      
+      
+        Redaction is disabled for this document.
+        Schwärzungen für dieses Dokument deaktiviert.
+      
+      
+        Disable redaction
+        Schwärzen deaktivieren
+      
+      
+        Enable for redaction
+        Schwärzen aktivieren
+      
+      
+        Enabling / disabling is permitted only for managers
+        Aktivieren/deaktivieren ist nur Managern gestattet
+      
+      
+        Approved
+        Genehmigt
+      
+      
+        Deleted
+        Gelöscht
+      
+      
+        Re-processing required
+        Reanalyse erforderlich
+      
+      
+        Processing
+        Wird analysiert
+      
+      
+        Image Analyzing
+        Bildanalyse
+      
+      
+        Processing
+        Wird analysiert
+      
+      
+        New
+        Neu
+      
+      
+        OCR Processing
+        OCR-Analyse
+      
+      
+        Processed
+        Verarbeitet
+      
+      
+        Processing...
+        Wird analysiert...
+      
+      
+        Processing
+        Wird analysiert
+      
+      
+        Unassigned
+        Nicht zugewiesen
+      
+      
+        Under Approval
+        In Genehmigung
+      
+      
+        Under Review
+        In Review
+      
+      
+        Unprocessed
+        Unbearbeitet
+      
+      
+        Filter options
+        Filteroptionen
+      
+      
+        Filter
+        Filter
+      
+      
+        Filter
+        Filter
+      
+      
+        Only annotations with redaction changes
+        Nur Anmerkungen mit Schwärzungsänderungen
+      
+      
+        Only annotations on unseen pages
+        Nur Anmerkungen auf unsichtbaren Seiten
+      
+      
+        Only annotations with comments
+        Nur Anmerkungen mit Kommentaren
+      
+      
+        Analysis pending
+        Analyse erforderlich
+      
+      
+        Comments
+        Kommentare
+      
+      
+        Hints only
+        Nut Hinweise
+      
+      
+        Images
+        Bilder
+      
+      
+        No Annotations
+        Keine Anmerkungen
+      
+      
+        Redacted
+        Geschwärzt
+      
+      
+        Suggested Redaction
+        Vorgeschlagene Schwärzung
+      
+      
+        Updated
+        Aktualisiert
+      
+      
+        Assignee(s)
+        Beauftragt
+      
+      
+        Dossier Templates
+        Regelsätze
+      
+      
+        Empty
+        Leer
+      
+      
+        Filter:
+        Filter:
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        Dossier Member(s)
+        Dossier-Mitglied(er)
+      
+      
+        Status
+        Status
+      
+      
+        Save Configurations
+        Einstellungen speichern
+      
+      
+        Test Connection
+        Verbindung testen
+      
+      
+        Environment
+        Name der Applikation
+      
+      
+        RedactManager
+        RedactManager
+      
+      
+        Enable Authentication
+        Authentifizierung aktivieren
+      
+      
+        Change Credentials
+        Zugangsdaten ändern
+      
+      
+        Envelope From
+        Ausgangsadresse
+      
+      
+        Info text regarding envelope from field.
+        Infotext zum Feld „Ausgangsadresse“.
+      
+      
+        Sender Envelope Email Address
+        Ausgangsadresse
+      
+      
+        From
+        Von
+      
+      
+        Name for Sender
+        Antworten an
+      
+      
+        Info text regarding the name for sender.
+        Info-Text zum Absendernamen.
+      
+      
+        Display Name for Sender Email Address
+        Anzeigename zur Ausgangsadresse
+      
+      
+        Sender Email Address
+        E-Mail-Adresse des Absenders
+      
+      
+        Host
+        Host
+      
+      
+        SMTP Host
+        SMTP-Host
+      
+      
+        Port
+        Port
+      
+      
+        Reply To
+        Antwortadresse
+      
+      
+        Name for Reply To
+        Name für Antwortadresse
+      
+      
+        Display Name for Reply To Email Address
+        Anzeigename zu Antwort-E-Mail
+      
+      
+        Reply To Email Address
+        Antwort-E-Mail
+      
+      
+        Enable SSL
+        SSL aktivieren
+      
+      
+        Enable StartTLS
+        StartTLS aktivieren
+      
+      
+        Show Forgot password link on Login screen
+        „Passwort vergessen?“-Link auf der Login-Seite anzeigen
+      
+      
+         
+         
+      
+      
+        General Configurations
+        Allgemeine Einstellungen
+      
+      
+        SMTP (Simple Mail Transfer Protocol) enables you to send your emails through the specified server settings.
+        SMTP (Simple Mail Transfer Protocol) ermöglicht es Ihnen, Ihre E-Mails über die angegebenen Servereinstellungen zu versenden.
+      
+      
+        Test email could not be sent! Please revise the email address.
+        Die Test-E-Mail konnte nicht gesendet werden! Bitte überprüfen Sie die E-Mail-Adresse.
+      
+      
+        Test email was sent successfully!
+        Die Test-E-Mail wurde erfolgreich versendet!
+      
+      
+        Configure SMTP Account
+        SMTP-Konto konfigurieren
+      
+      
+        Help Mode (H)
+        Hilfe-Modus (H)
+      
+      
+        <b> Clicking anywhere on the screen </b> will show you which areas are interactive. Hovering an interactive area will <b> change the mouse cursor </b> to let you know if the element is interactive.
+        <b>Klicken Sie auf eine beliebige Stelle des Bildschirms </b> um zu sehen, welche Bereiche interaktiv sind. Wenn Sie mit der Maus über einen interaktiven Bereich fahren, <b>verändert sich der Mauszeiger</b>, um Ihnen zu zeigen, ob ein Element interaktiv ist.
+      
+      
+        Open Help Mode Instructions
+        Hilfe-Modus-Anleitungen öffnen
+      
+      
+        Help Mode
+        Hilfe-Modus
+      
+      
+        <b> Welcome to Help Mode! <br> Clicking on interactive elements will open info about them in new tab. </b>
+        <b> Willkommen im Hilfe-Modus! <br> Klicken Sie auf interaktive Elemente, um in einem neuen Tab Infos dazu zu erhalten. </b>
+      
+      
+        Hint
+        Hinweis
+      
+      
+        Formula
+        Formel
+      
+      
+        Image
+        Bild
+      
+      
+      
+        Signature
+        Signatur
+      
+      
+        Unassigned
+        Unbekannt
+      
+      
+        You
+        Sie
+      
+      
+        Justifications
+        Begründungen
+      
+      
+        Delete Justification
+        Begründung löschen
+      
+      
+        Edit Justification
+        Begründung bearbeiten
+      
+      
+        Add New Justification
+        Neue Begründung hinzufügen
+      
+      
+        Delete Selected Justifications
+        Ausgewählte Begründungen löschen
+      
+      
+        There are no justifications yet.
+        Es gibt noch keine Begründungen.
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Name
+        Name
+      
+      
+        Legal Basis
+        Rechtliche Grundlage
+      
+      
+        {length} {length, plural, one{justification} other{justifications}}
+        {length} {length, plural, one{Begründung} other{Begründung}}
+      
+      
+        Analyzed Pages
+        Analysierte Seiten
+      
+      
+        Backend Application Version
+        Backend-Version der Anwendung
+      
+      
+        Cumulative Pages
+        Seiten insgesamt
+      
+      
+        Legend
+        Legende
+      
+      
+        Licensed Total
+        Insgesamt lizensiert
+      
+      
+        Pages per Month
+        Seiten pro Monat
+      
+      
+        Total Pages
+        Gesamtzahl der Seiten
+      
+      
+        Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)
+        Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)
+      
+      
+        Copyright Claim
+        Copyright
+      
+      
+        Analyzed Pages in Current Licensing Period
+        In aktuellem Lizenzzeitraum analysierte Seiten
+      
+      
+        Custom Application Title
+        Name der Anwendung
+      
+      
+        Email Report
+        E-Mail-Bericht
+      
+      
+        Total Analyzed Pages in current license period: {pages}.
+        Im aktuellen Lizenzzeitraum insgesamt analysierte Seiten: {pages}.
+      
+      
+        Licensed Pages: {pages}.
+        Lizenzierte Seiten: {pages}.
+      
+      
+        License Report {licenseCustomer}
+        Lizenzbericht {licenseCustomer}
+      
+      
+        The use of this product is subject to the terms of the Redaction End User Agreement, unless otherwise specified therein.
+        Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.
+      
+      
+        End User License Agreement
+        Endbenutzer-Lizenzvereinbarung
+      
+      
+        Number of licensed pages
+        Anzahl der lizenzierten Seiten
+      
+      
+        Licensed to
+        Lizenziert für
+      
+      
+        Licensing Details
+        Lizenzdetails
+      
+      
+        Licensing Period
+        Laufzeit der Lizenz
+      
+      
+        OCR Analyzed Pages
+        Mit OCR konvertierte Seiten
+      
+      
+        Total Analyzed Pages Since {date}
+        Seit {date} insgesamt analysierte Seiten
+      
+      
+        Unlicensed Analyzed Pages
+        Über Lizenz hinaus analysierte Seiten
+      
+      
+        Usage Details
+        Nutzungsdetails
+      
+      
+        License Information
+        Lizenzinformationen
+      
+      
+        Save
+        Speichern
+      
+      
+        Value / Classification
+        Wert / Klassifizierung
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Legal Basis
+        Rechtsgrundlage
+      
+      
+        Reason
+        Begründung
+      
+      
+        Select a reason ...
+        Wählen Sie eine Begründung aus ...
+      
+      
+        Custom Rectangle
+        Benutzerdefinierter Bereich
+      
+      
+        Paragraph / Location
+        Absatz / Ort
+      
+      
+        Selected text:
+        Ausgewählter Text:
+      
+      
+        Add to dictionary
+        Zum Wörterbuch hinzufügen
+      
+      
+        Set false positive
+        Als Falsch-Positiv definieren
+      
+      
+        Force Hint
+        Hinweis erzwingen
+      
+      
+        Force Redaction
+        Schwärzung erzwingen
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Request add to dictionary
+        Neuen Wörterbucheintrag vorschlagen
+      
+      
+        Request false positive
+        Als Falsch-Positiv vorschlagen
+      
+      
+        Request Redaction
+        Schwärzung vorschlagen
+      
+      
+        Apr.
+        Apr.
+      
+      
+        Aug.
+        August
+      
+      
+        Dec.
+        Dez.
+      
+      
+        Feb.
+        Feb.
+      
+      
+        Jan.
+        Jan.
+      
+      
+        Jul.
+        Jul.
+      
+      
+        Jun.
+        März
+      
+      
+        Mar.
+        März
+      
+      
+        May
+        Nov.
+      
+      
+        Nov.
+        Nov.
+      
+      
+        Oct.
+        Okt.
+      
+      
+        Sep.
+        Sept.
+      
+      
+        You have been assigned as approver for <b><a href="{fileHref}" target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+        Sie wurden dem Dokument <b><a href="{fileHref}" target="_blank">{fileName}</a></b> im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b> als Genehmiger zugewiesen!
+      
+      
+        You have been assigned as reviewer for <b><a href="{fileHref}" target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+        Sie wurden dem Dokument <b><a href="{fileHref}" target="_blank">{fileName}</a></b> im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b> als Reviewer zugewiesen!
+      
+      
+         <b><a href="{fileHref}" target="_blank">{fileName}</a></b> has been approved!
+        <b><a href="{fileHref}" target="_blank">{fileName}</a></b> wurde genehmigt!
+      
+      
+        Dossier: <b>{dossierName}</b> has been deleted!
+        Dossier: <b>{dossierName}</b> wurde gelöscht!
+      
+      
+        <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> owner removed!
+        Der Dossier-Owner von <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> wurde entfernt!
+      
+      
+         <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> owner changed to <b>{user}</b>!
+        Eigentümer von <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> geändert zu <b>{user}</b>!
+      
+      
+        Your <b><a href='/ui/main/downloads', target="_blank">download</a></b> is ready!
+        Ihr <b><a href='/ui/main/downloads', target="_blank">Download</a></b> ist fertig!
+      
+      
+        You currently have no notifications
+        Du hast aktuell keine Benachrichtigungen
+      
+      
+        You have been unassigned from <b><a href="{fileHref}" target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+        Sie wurden vom Dokument <b><a href="{fileHref}" target="_blank">{fileName}</a></b> im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b> entfernt!
+      
+      
+        You have been added to dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+        <b>{user}</b> ist jetzt Mitglied des Dossiers <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+      
+      
+        You have been demoted to reviewer in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+        <b>{user}</b> wurde im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> auf die Reviewer-Berechtigung heruntergestuft!
+      
+      
+        You have been promoted to approver in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+        <b>{user}</b> wurde im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> zum Genehmiger ernannt!
+      
+      
+        You have been removed as a member from dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> !
+        <b>{user}</b> wurde als Mitglied von: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>  entfernt!
+      
+      
+        Notifications
+        Benachrichtigungen
+      
+      
+        Email Notifications
+        E-Mail Benachrichtigungen
+      
+      
+        In-App Notifications
+        In-App-Benachrichtigungen
+      
+      
+        Something went wrong... Preferences update failed!
+        Ein Fehler ist aufgetreten... Aktualisierung der Einstellungen fehlgeschlagen!
+      
+      
+        Document related notifications
+        Dokumentbezogene Benachrichtigungen
+      
+      
+        Dossier related notifications
+        Dossierbezogene Benachrichtigungen
+      
+      
+        Other notifications
+        Andere Benachrichtigungen
+      
+      
+        Choose on which action you want to be notified
+        Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten
+      
+      
+        When I am assigned to a document as Approver
+        Wenn ich einem Dokument als Genehmiger zugewiesen bin
+      
+      
+        When I am assigned to a document as Reviewer
+        Wenn ich einem Dokument als Überprüfer zugewiesen bin
+      
+      
+        When the document status changes to Approved
+        Wenn sich der Dokumentstatus in Genehmigt ändert
+      
+      
+        When the document status changes to Under Approval
+        Wenn sich der Dokumentstatus in „In Genehmigung“ ändert
+      
+      
+        When the document status changes to Under Review
+        Wenn sich der Dokumentstatus in Wird überprüft ändert
+      
+      
+        When a dossier was deleted
+        Wenn ein Dossier gelöscht wurde
+      
+      
+        When the owner of a dossier got deleted
+        Wenn der Eigentümer eines Dossiers gelöscht wurde
+      
+      
+        When I loose dossier ownership
+        Wenn ich den Besitz des Dossiers verliere
+      
+      
+        When I become the dossier owner
+        Wenn ich der Besitzer des Dossiers werde
+      
+      
+        When a download is ready
+        Wenn ein Download bereit ist
+      
+      
+        When I am unassigned from a document
+        Wenn die Zuweisung zu einem Dokument aufgehoben wird
+      
+      
+        When a user was added to my dossier
+        Wenn ein Benutzer zu meinem Dossier hinzugefügt wurde
+      
+      
+        When I become a Reviewer in a dossier
+        Wenn ich Gutachter in einem Dossier werde
+      
+      
+        When I become an Approver in a dossier
+        Wenn ich Genehmiger in einem Dossier werde
+      
+      
+        When I loose dossier membership
+        Wenn ich die Dossier-Mitgliedschaft verliere
+      
+      
+        Daily Summary
+        Tägliche Zusammenfassung
+      
+      
+        Instant
+        Sofortig
+      
+      
+        Weekly Summary
+        Wöchentliche Zusammenfassung
+      
+      
+        Notifications Preferences
+        Benachrichtigungseinstellungen
+      
+      
+        Cancel all uploads
+        Alle Uploads abbrechen
+      
+      
+        Replace existing document
+        Vorhandenes Dokument ersetzen
+      
+      
+        Remember choice and don't ask me again
+        Auswahl speichern und nicht noch einmal fragen
+      
+      
+        Keep existing document
+        Vorhandenes Dokument behalten
+      
+      
+        <b>{filename}</b> already exists. Choose how to proceed:
+        <b>{filename}</b> ist bereits vorhanden. Wie möchten Sie fortfahren?
+      
+      
+        Document already exists!
+        Das Dokument existiert bereits!
+      
+      
+        Page
+        Seite
+      
+      
+        Next
+        Nächste
+      
+      
+        Prev
+        Vorherige
+      
+      
+        Search for selection
+        Nach Auswahl suchen
+      
+      
+        {active, select, true{Disable} false{Enable} other{}} annotation tooltips
+        {active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen
+      
+      
+        WARNING: You have unsaved changes. Press Cancel to go back and save these changes, or OK to lose these changes.
+        ACHTUNG: Sie haben ungespeicherte Änderungen. Klicken Sie auf „Abbrechen“, wenn Sie zurückkehren und die Änderungen speichern möchten. Klicken Sie auf „OK“, um die Änderungen zu speichern.
+      
+      
+        Read only
+        Lesemodus
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Select image type
+        Ausgewählter Bildtyp
+      
+      
+        Select a type...
+        Einen Typ auswählen ...
+      
+      
+        Edit Image Type
+        Bildtypen bearbeiten
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Yes, proceed and remove!
+        Ja, fortfahren und löschen!
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Image: {typeLabel}
+        Bild: {typeLabel}
+      
+      
+        Following entries will be removed from their respective dictionaries:
+        Folgende Einträge werden aus den jeweiligen Wörterbüchern gelöscht:
+      
+      
+        Remove From Dictionary
+        Aus dem Wörterbuch löschen
+      
+      
+        Following redactions will be removed only here:
+        Folgende Schwärzungen werden nur hier entfernt:
+      
+      
+        Remove Redaction
+        Schwärzung entfernen
+      
+      
+        Value
+        Wert
+      
+      
+        {length} report {length, plural, one{type} other{types}}
+        {length} {length, plural, one{Berichtstyp} other{Berichtstypen}}
+      
+      
+        Reports
+        Berichte
+      
+      
+        A short text explaining how to create report documents. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
+        Ein kurzer Text, der erläutert, was Platzhalter sind und wie Sie sie in Ihrer Berichtsvorlage einsetzen können. Es ist bekannt, dass ein Leser vom lesbaren Inhalt einer Seite abgelenkt wird, wenn er sich das Layout ansieht.
+      
+      
+        This placeholder gets replaced with the value of the dossier attribute <code>{attribute}</code>.
+        Dieser Platzhalter wird durch den Wert des Dossier-Attributs <code>{attribute}</code> ersetzt.
+      
+      
+        This placeholder gets replaced with the value of the file attribute <code>{attribute}</code>.
+        Dieser Platzhalter wird durch den Wert des Dateiattributs <code>{attribute}</code> ersetzt.
+      
+      
+        This placeholder is replaced by the creation date of the report in the common day-month-year notation (dd.MM.yyyy), e.g. 15.10.2021.
+        Dieser Platzhalter wird durch das Erstellungsdatum des Berichts in der üblichen Tag-Monat-Jahr-Notation (TT.MM.JJJJ) ersetzt, zB 15.10.2021.
+      
+      
+        This placeholder gets replaced by the creation date of the report in the American all-numeric date format (MM/dd/yyyy), e.g. 10/15/2021.
+        Dieser Platzhalter wird durch das Erstellungsdatum des Berichts im amerikanischen rein numerischen Datumsformat (MM/dd/yyyy) ersetzt, zB 15.10.2021.
+      
+      
+        This placeholder is replaced by the creation date of the report in the international ISO 8601 format (yyyy-MM-dd), e.g. 2021-10-15.
+        Dieser Platzhalter wird durch das Erstellungsdatum des Berichts im internationalen ISO 8601-Format (yyyy-MM-dd) ersetzt, zB 2021-10-15.
+      
+      
+        This placeholder is replaced by the name of the dossier in which the redacted files are stored.
+        Dieser Platzhalter wird durch den Namen des Dossiers ersetzt, in dem die geschwärzten Dateien gespeichert sind.
+      
+      
+        This placeholder is replaced by the file name.
+        Dieser Platzhalter wird durch den Dateinamen ersetzt.
+      
+      
+        This placeholder is replaced by a text snippet that contains the redaction.
+        Dieser Platzhalter wird durch einen Textausschnitt ersetzt, der die Schwärzung enthält.
+      
+      
+        This placeholder is replaced by the justification of the redaction. It is a combination of the legal reference (justificationParagraph) and the justification text (justificationReason).
+        Dieser Platzhalter wird durch die Begründung der Schwärzung ersetzt. Es ist eine Kombination aus dem Rechtsverweis (justificationParagraph) und dem Begründungstext (justificationReason).
+      
+      
+        This placeholder is replaced by the legal reference of the justification of the redaction.
+        Dieser Platzhalter wird durch den Rechtshinweis der Begründung der Redaktion ersetzt.
+      
+      
+        This placeholder is replaced by the justification text of the redaction.
+        Dieser Platzhalter wird durch den Begründungstext der Schwärzung ersetzt.
+      
+      
+        This placeholder is replaced by the page number of the redaction.
+        Dieser Platzhalter wird durch die Seitenzahl der Redaktion ersetzt.
+      
+      
+        This placeholder is replaced by the paragraph that contains the redaction.
+        Dieser Platzhalter wird durch den Absatz ersetzt, der die Schwärzung enthält.
+      
+      
+        This placeholder is replaced by the time the report was created.
+        Dieser Platzhalter wird durch den Zeitpunkt ersetzt, zu dem der Bericht erstellt wurde.
+      
+      
+        A short text explaining what placeholders are and how to use them in your report template. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
+        Ein kurzer Text, der erläutert, was Platzhalter sind und wie Sie sie in Ihrer Berichtsvorlage einsetzen können. Es ist bekannt, dass ein Leser vom lesbaren Inhalt einer Seite abgelenkt wird, wenn er sich das Layout ansieht.
+      
+      
+        Document Setup
+        Dokumenten-Konfiguration
+      
+      
+        Invalid format selected for Upload! Supported formats are XLSX and DOCX
+        Ungültiges Upload-Format ausgewählt! Unterstützt werden Dokumente im .xlsx- und im .docx-Format
+      
+      
+        (Multi-file)
+        (Mehrere Dateien)
+      
+      
+        Report Documents
+        Dokumente für den Bericht
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Placeholders
+        Platzhalter
+      
+      
+        Reports
+        Berichte
+      
+      
+        Upload a Document
+        Ein Dokument hochladen
+      
+      
+        Reset
+        Zurücksetzen
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save
+        Speichern
+      
+      
+        Failed to reset password. The new password doesn't match the password policy.
+        Kennwort konnte nicht zurückgesetzt werden. Das neue Passwort entspricht nicht der Passwortrichtlinie.
+      
+      
+        Temporary password
+        Temporäres Passwort
+      
+      
+        Set Temporary Password for {userName}
+        Temporäres Passwort für {userName} festlegen
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Resize Redaction
+        Schwärzung ändern
+      
+      
+        Inactive
+        Inaktiv
+      
+      
+        Manager & Admin
+        Manager & Admin
+      
+      
+        No role defined
+        Keine Rolle definiert
+      
+      
+        Application Admin
+        Anwendungsadministrator
+      
+      
+        Manager
+        Manager
+      
+      
+        User
+        Benutzer
+      
+      
+        Users Admin
+        Benutzer-Admin
+      
+      
+        Regular
+        Regulär
+      
+      
+        Rule Editor
+        Regel-Editor
+      
+      
+        Something went wrong... Rules update failed!
+        Es ist ein Fehler aufgetreten ... Die Regeln konnten nicht aktualisiert werden!
+      
+      
+        Revert
+        Anmeldedaten speichern
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Rules updated!
+        Die Regeln wurden aktualisiert!
+      
+      
+        Assignee
+        Bevollmächtigter
+      
+      
+        Document
+        Dokument
+      
+      
+        Dossier
+        Dossier
+      
+      
+        Pages
+        Seiten
+      
+      
+        Status
+        Status
+      
+      
+        Filter by Dossier
+        Nach Dossier filtern
+      
+      
+        Dossier name...
+        Dossiername...
+      
+      
+        Missing
+        Fehlt
+      
+      
+        Must contain
+        Muss enthalten
+      
+      
+        Please enter a keyword into the search bar to look for documents or document content.
+        Geben Sie einen Suchbegriff in die Suchleiste, um nach Dokumenten oder Inhalten von Dokumenten zu suchen.
+      
+      
+        No documents match your current filters.
+        Keine Dokumente entsprechen Ihren aktuellen Filtern.
+      
+      
+        {length} search {length, plural, one{result} other{results}}
+        {length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}
+      
+      
+        across all dossiers
+        ganze Plattform
+      
+      
+        Search documents...
+        Nach Dokumenten oder Dokumenteninhalt suchen
+      
+      
+        in this dossier
+        in diesem Dossier
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Credentials
+        Anmeldedaten speichern
+      
+      
+        Password
+        Passwort
+      
+      
+        Username
+        Benutzername
+      
+      
+        Login Username
+        Login-Benutzername
+      
+      
+        Enable Authentication
+        Authentifizierung aktivieren
+      
+      
+        {days} {days, plural, one{day} other{days}}
+        {days} {days, plural, one{Tag} other{Tage}}
+      
+      
+        {hours} {hours, plural, one{hour} other{hours}}
+        {hours} {hours, plural, one{Stunde} other{Stunden}}
+      
+      
+        < 1 hour
+        < 1 Stunde
+      
+      
+        Time to restore already passed
+        Frist für Wiederherstellung verstrichen
+      
+      
+        Back
+        Zurück
+      
+      
+        Active Dossiers
+        Aktives Dossier
+      
+      
+        Account
+        Konto
+      
+      
+        Settings
+        Einstellungen
+      
+      
+        My Downloads
+        Meine Downloads
+      
+      
+        German
+        Deutsch
+      
+      
+        English
+        Englisch
+      
+      
+        Language
+        Sprache
+      
+      
+        Logout
+        Abmelden
+      
+      
+        Trash
+        Papierkorb
+      
+      
+        Delete Forever
+        Endgültig löschen
+      
+      
+        Restore
+        Wiederherstellen
+      
+      
+        Forever Delete Selected Dossiers
+        Ausgewählte Dossiert endgültig löschen
+      
+      
+        Restore Selected Dossiers
+        Ausgewählte Dossiers wiederherstellen
+      
+      
+        Trash
+        Papierkorb
+      
+      
+        There are no dossiers yet.
+        Es wurde noch kein Dossier angelegt.
+      
+      
+        No dossiers match your current filters.
+        Die ausgewählten Filter treffen auf kein Dossier zu.
+      
+      
+        Deleted on
+        Gelöscht am
+      
+      
+        Name
+        Name
+      
+      
+        Owner
+        Eigentümer
+      
+      
+        Time to restore
+        Verbleibende Zeit für Wiederherstellung
+      
+      
+        {length} deleted {length, plural, one{dossier} other{dossiers}}
+        {length} {length, plural, one{gelöschtes Dossier} other{gelöschte Dossiers}}
+      
+      
+        Type
+        Typ
+      
+      
+        Unknown
+        Unbekannt
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Merge entries
+        Einträge zusammenführen
+      
+      
+        Overwrite
+        Überschreiben
+      
+      
+        Choose how you want to proceed:
+        Wählen Sie, wie Sie fortfahren möchten:
+      
+      
+        The dictionary already has entries!
+        Das Wörterbuch hat bereits Einträge!
+      
+      
+        Cancel Upload
+        Upload abbrechen
+      
+      
+        Retry Upload
+        Upload erneut versuchen
+      
+      
+        File Uploads ({len})
+        Datei-Uploads ({len})
+      
+      
+        File too large. Limit is {size}MB.
+        Datei zu groß. Die maximal zulässige Größe beträgt {size} MB.
+      
+      
+        Failed to upload file. 
+        Fehler beim Hochladen des Dokuments
+      
+      
+        Delete User
+        Benutzer löschen
+      
+      
+        Edit User
+        Benutzer bearbeiten
+      
+      
+        New User
+        Neuer Benutzer
+      
+      
+        Delete Users
+        Benutzer löschen
+      
+      
+        You cannot delete your own account.
+        Sie können Ihr eigenes Konto nicht löschen.
+      
+      
+        No users match your current filters.
+        Die ausgewählten Filter treffen auf keinen Benutzer zu.
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Active
+        Aktiv
+      
+      
+        Email
+        E-Mail-Adresse
+      
+      
+        Name
+        Name
+      
+      
+        Roles
+        Rollen
+      
+      
+        {length} {length, plural, one{user} other{users}}
+        {length} {length, plural, one{user} other{users}}
+      
+      
+        User Management
+        Benutzerverwaltung
+      
+      
+        My Profile
+        Mein Profil
+      
+      
+        Change Password
+        Passwort ändern
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Email
+        Email
+      
+      
+        First name
+        Vorname
+      
+      
+        Last name
+        Nachname
+      
+      
+        Edit Profile
+        Profil bearbeiten
+      
+      
+        Users in Workspace
+        Benutzer im Arbeitsbereich
+      
+      
+        Hide Details
+        Details ausblenden
+      
+      
+        Show Details
+        Details anzeigen
+      
+      
+        Users
+        Benutzer
+      
+      
+        List
+        Liste
+      
+      
+        View as:
+        Ansicht als:
+      
+      
+        Workflow
+        Arbeitsablauf
+      
+      
+        Watermark
+        Wasserzeichen
+      
+      
+        Watermark updated!
+        Das Wasserzeichen wurde aktualisiert!
+      
+      
+        Watermark deleted.
+        Das Wasserzeichen wurde gelöscht.
+      
+      
+        Failed to update Watermark
+        Fehler beim Aktualisieren des Wasserzeichens
+      
+      
+        Revert
+        Rückgängig machen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Color
+        Farbe
+      
+      
+        Font Size
+        Schriftgröße
+      
+      
+        Font Type
+        Schriftart
+      
+      
+        Opacity
+        Deckkraft
+      
+      
+        Orientation
+        Ausrichtung
+      
+      
+        Enter text
+        Text eingeben
+      
+      
+        Watermark
+        Wasserzeichen
+      
+      
+        All
+        Alle
+      
+      
+        {count} selected
+        {count} ausgewählt
+      
+      
+        None
+        Keiner
+      
+      
+        Select
+        Wählen
+      
+      
+        Yesterday
+        Gestern
+      
+    
+  
+
diff --git a/tools/auto-i18n/redaction-en-to-de.xliff b/tools/auto-i18n/redaction-en-to-de.xliff
new file mode 100644
index 000000000..0e75c7033
--- /dev/null
+++ b/tools/auto-i18n/redaction-en-to-de.xliff
@@ -0,0 +1,4127 @@
+
+  
+    
+      
+        Account Settings
+        Account Einstellungen
+      
+      
+        All
+        Alle
+      
+      
+        None
+        Keine
+      
+      
+        Active
+        Aktiv
+      
+      
+        Save
+        Speichern
+      
+      
+        Save and Edit Team
+        Speichern und Team zusammenstellen
+      
+      
+        Dossier with this name already exists!
+        Dieser Dossier-Name ist bereits vergeben!
+      
+      
+        Failed to save dossier.
+        Dossier konnte nicht gespeichert werden.
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Bitte geben Sie eine Beschreibung ein.
+      
+      
+        Due Date
+        Termin
+      
+      
+        Dossier Name
+        Dossier-Name
+      
+      
+        Enter Name
+        Geben Sie einen Namen ein.
+      
+      
+        Dossier Template
+        Dossier-Vorlage
+      
+      
+        Watermark application on redacted documents
+        Geschwärzte Dokumente mit Wasserzeichen versehen
+      
+      
+        Watermark application on preview documents
+        Vorschau Dokumente mit Wasserzeichen versehen
+      
+      
+        Create Dossier
+        Dossier erstellen
+      
+      
+        Dictionary with this name already exists!
+        Ein Wörterbuch mit diesem Namen existiert bereits!
+      
+      
+        Failed to save dictionary!
+        Wörterbuch konnte nicht gespeichert werden!
+      
+      
+        Invalid color or rank! Rank is already used by another dictionary or the color is not a valid hexColor!
+        Ungültige Farbe oder Rang! Der Rang wird bereits von einem anderen Wörterbuch verwendet oder die Farbe ist kein gültiger Hex-Farbcode!
+      
+      
+        Enable 'Add to dictionary'
+        Anwender können Einträge hinzufügen
+      
+      
+        Case Sensitive
+        Groß-/Kleinschreibung berücksichtigen
+      
+      
+        Hex Color
+        Hex-Farbcode
+      
+      
+        #
+        #
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Hint
+        Hinweis
+      
+      
+        Display Name
+        Name des Wörterbuches
+      
+      
+        Cannot be edited after saving.
+        Kann nach dem Speichern nicht mehr bearbeitet werden.
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Rank
+        Rang
+      
+      
+        1000
+        1000
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Technical Name
+        Technischer Name
+      
+      
+        Save Dictionary
+        Wörterbuch speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Create} other{}} Dictionary
+        {type, select, edit{Wörterbuch {name} bearbeiten} create{Wörterbuch erstellen} other{}}
+      
+      
+        Failed to save attribute!
+        Attribut konnte nicht gespeichert werden!
+      
+      
+        Attribute Name
+        Name des Attributs
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Attribute Placeholder
+        Platzhalter für Attribut
+      
+      
+        Attribute Type
+        Attributtyp
+      
+      
+        Save Attribute
+        Attribut speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Add New} other{}} Dossier Attribute
+        {type, select, edit{Dossier-Attribut {name} bearbeiten} create{Neues Dossier-Attribut hinzufügen} other{}}
+      
+      
+        Failed to create dossier template: a dossier template with the same name already exists.
+        Dossiervorlage konnte nicht erstellt werden: Es existiert bereits eine Dossiervorlage mit demselben Namen.
+      
+      
+        Failed to create dossier template.
+        Fehler beim Erstellen der Dossiervorlage.
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Dossier Template Name
+        Name der Dossier-Vorlage
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Valid from
+        Gültig ab
+      
+      
+        Valid to
+        Gültig bis
+      
+      
+        Save Dossier Template
+        Dossier-Vorlage speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Create} other{}} Dossier Template
+        {type, select, edit{Dossier-Vorlage {name} bearbeiten} create{Dossier-Vorlage erstellen} other{}}
+      
+      
+        CSV Column Header
+        CSV-Spaltenüberschrift
+      
+      
+        Enter CSV Column Header
+        Spaltenüberschrift für CSV eingeben
+      
+      
+        The maximum number of displayed attributes ({maxNumber}) has been reached.
+        Die maximale Anzahl angezeigter Attribute ({maxNumber}) wurde erreicht.
+      
+      
+        Displayed In File List
+        Wird in der Dokumentenliste angezeigt
+      
+      
+        Filterable
+        Filterbar
+      
+      
+        The maximum number of filterable attributes ({maxNumber}) has been reached.
+        Die maximale Anzahl filterbarer Attribute ({maxNumber}) wurde erreicht.
+      
+      
+        Attribute Name
+        Name des Attributs
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Set as Primary
+        Zum Primärattribut machen
+      
+      
+        Make Read-Only
+        Schreibgeschützt
+      
+      
+        Type
+        Typ
+      
+      
+        Save Attribute
+        Attribut speichern
+      
+      
+        {type, select, edit{Edit {name}} create{Add New} other{}} File Attribute
+        {type, select, edit{Edit {name}} create{Add New} other{}} Datei-Attribut
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Justification
+        Begründung speichern
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Name
+        Name
+      
+      
+        Enter Name
+        Name eingeben
+      
+      
+        Legal Basis
+        Rechtliche Grundlage
+      
+      
+        Enter Legal Basis
+        Rechtsgrundlage eingeben
+      
+      
+        {type, select, edit{Edit {name}} create{Add New} other{}} Justification
+        {type, select, edit{Edit {name}} create{Add New} other{}} Begründung
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Delete User
+        Benutzer löschen
+      
+      
+        Save User
+        Benutzer speichern
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        This e-mail address is already in use by a different user!
+        Diese E-Mail-Adresse wird bereits von einem anderen Benutzer verwendet!
+      
+      
+        Failed to save user!
+        Benutzer konnte nicht gespeichert werden!
+      
+      
+        Email
+        E-Mail
+      
+      
+        First Name
+        Vorname
+      
+      
+        Last Name
+        Nachname
+      
+      
+        Reset Password
+        Passwort zurücksetzen
+      
+      
+        Role
+        Rolle
+      
+      
+        {type, select, edit{Edit} create{Add New} other{}} User
+        {type, select, edit{Benutzer bearbeiten} create{Neuen Benutzer hinzufügen} other{}}
+      
+      
+        Dossier Templates
+        Dossier-Vorlage
+      
+      
+        Settings
+        Einstellungen
+      
+      
+        Annotation
+        Anmerkung
+      
+      
+        Accept Recommendation
+        Empfehlung annehmen
+      
+      
+        Approve Suggestion
+        Genehmigen und zum Wörterbuch hinzufügen
+      
+      
+        Edit Reason
+        Begründung bearbeiten
+      
+      
+        Force Hint
+        Hinweis erzwingen
+      
+      
+        Force Redaction
+        Schwärzung erzwingen
+      
+      
+        Hide
+        Ausblenden
+      
+      
+        Cannot add ''{content}'' to the {dictionaryName} dictionary because it was recognized as a general term that appears too often in texts.
+        &#39;&#39;{content}&#39;&#39; kann nicht zum {dictionaryName}-Wörterbuch hinzugefügt werden, da es als allgemeiner Begriff erkannt wurde, der zu oft in Texten vorkommt.
+      
+      
+        Failed to add entry to dictionary: {error}
+        Fehler beim Hinzufügen des neuen Wörterbucheintrags: {error}
+      
+      
+        Entry added to dictionary. Changes will be visible after reanalysis.
+        Eintrag zum Wörterbuch hinzugefügt. Änderungen nach der Reanalyse sichtbar.
+      
+      
+        Failed to approve dictionary entry: {error}
+        Fehler beim Genehmigen des Wörterbucheintrags: {error}
+      
+      
+        Dictionary entry approved. Changes will be visible after reanalysis.
+        Neuer Wörterbucheintrag wurde genehmigt. Änderungen sind nach der Reanalyse sichtbar.
+      
+      
+        Failed to decline dictionary suggestion: {error}
+        Fehler beim Ablehnen des neuen Wörterbucheintrags: {error}
+      
+      
+        Dictionary suggestion declined.
+        Vorschlag für das Wörterbuch abgelehnt.
+      
+      
+        Failed to remove dictionary entry: {error}
+        Fehler beim Entfernen des Wörterbucheintrags: {error}
+      
+      
+        Dictionary entry removed!
+        Wörterbucheintrag wurde gelöscht!
+      
+      
+        Failed to request removal of dictionary entry: {error}
+        Dossier-Vorlage
+      
+      
+        Requested to remove dictionary entry!
+        Löschung des Wörterbucheintrags wurde vorgeschlagen!
+      
+      
+        Failed to save suggestion for dictionary modification: {error}
+        Vorschlag für Änderung des Wörterbuchs konnte nicht gespeichert werden: {error}
+      
+      
+        Suggestion for dictionary modification saved!
+        Vorschlag für die Änderung des Wörterbuchs gespeichert!
+      
+      
+        Failed to undo: {error}
+        Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}
+      
+      
+        Undo successful
+        Rückgängigmachen erfolgreich
+      
+      
+        Failed to save redaction: {error}
+        Fehler beim Speichern der Schwärzung: {error}
+      
+      
+        Redaction added!
+        Schwärzung hinzugefügt!
+      
+      
+        Failed to approve suggestion: {error}
+        Fehler beim Genehmigen des Vorschlags: {error}
+      
+      
+        Suggestion approved.
+        Vorschlag genehmigt
+      
+      
+        Failed to edit annotation reason: {error}
+        Fehler beim Bearbeiten der in der Anmerkung genannten Begründung: {error}
+      
+      
+        Annotation reason was edited.
+        In der Anmerkung genannte Begründung wurde bearbeitet.
+      
+      
+        Failed to decline suggestion: {error}
+        Fehler beim Ablehnen des Vorschlags: {error}
+      
+      
+        Suggestion declined.
+        Vorschlag abgelehnt
+      
+      
+        Failed to save redaction: {error}
+        Die Schwärzung konnte nicht gespeichert werden!
+      
+      
+        Redaction added!
+        Schwärzung eingefügt!
+      
+      
+        Failed to recategorize image: {error}
+        Rekategorisierung des Bildes gescheitert: {error}
+      
+      
+        Image recategorized.
+        Bild wurde einer neuen Kategorie zugeordnet.
+      
+      
+        Failed to remove redaction: {error}
+        Fehler beim Entfernen der Schwärzung: {error}
+      
+      
+        Redaction removed!
+        Schwärzung entfernt!
+      
+      
+        Failed to request annotation reason change: {error}
+        Fehler beim Vorschlagen der Änderung der Begründung:
+      
+      
+        Annotation reason change requested.
+        Die Änderung der in der Anmerkung genannten Begründung wurde beantragt.
+      
+      
+        Failed to save redaction suggestion: {error}
+        Fehler beim Speichern des Schwärzungsvorschlags: {error}
+      
+      
+        Redaction suggestion saved
+        Vorschlag einer Schwärzung gespeichert
+      
+      
+        Failed to request image recategorization: {error}
+        Fehler beim Vorschlagen der Neukategorisierung des Bilds: {error}
+      
+      
+        Image recategorization requested.
+        Bild-Neuklassifizierung angefordert.
+      
+      
+        Failed to request removal of redaction: {error}
+        Fehler beim Erstellen des Vorschlags für das Entfernen der Schwärzung: {error}
+      
+      
+        Requested to remove redaction!
+        Entfernen der Schwärzung wurde vorgeschlagen!
+      
+      
+        Failed to save redaction suggestion: {error}
+        Vorschlag einer Schwärzung wurde nicht gespeichert: {error}
+      
+      
+        Redaction suggestion saved
+        Vorschlag einer Schwärzung gespeichert
+      
+      
+        Failed to undo: {error}
+        Die Aktion konnte nicht rückgängig gemacht werden. Fehler: {error}
+      
+      
+        Undo successful
+        erfolgreich Rückgängig gemacht
+      
+      
+        Recategorize
+        neu kategorisieren
+      
+      
+        Reject Suggestion
+        Vorschlag ablehnen
+      
+      
+        False Positive
+        Falsch positiv
+      
+      
+        Remove only here
+        nur hier entfernen
+      
+      
+        Remove from dictionary
+        Aus dem Wörterbuch entfernen
+      
+      
+        Save Resize
+        Größe speichern
+      
+      
+        Abort Resize
+        Größenänderung abbrechen
+      
+      
+        Resize
+        Größe ändern
+      
+      
+        Show
+        Zeigen
+      
+      
+        Undo
+        Rückgängig
+      
+      
+        Redaction forced
+        Redaktion erzwungen
+      
+      
+        Manual changes:
+        Manuelle Änderungen:
+      
+      
+        Reason changed
+        Grund geändert
+      
+      
+        Image category changed
+        Bildkategorie geändert
+      
+      
+        Redaction/Hint removed
+        Schwärzung/Hinweis entfernt
+      
+      
+        Redaction area has been modified
+        Schwärzungsbereich wurde geändert
+      
+      
+        {isHint, select, true{Hint} other{Redaction}} based on dictionary
+        {isHint, select, true{Hint} other{Redaction}} basierend auf Wörterbuch
+      
+      
+        Redaction based on AI
+        Redaktion basierend auf KI
+      
+      
+        Redaction based on rule {rule}
+        Schwärzung basierend auf Regel {rule}
+      
+      
+        Declined Suggestion
+        Abgelehnter Vorschlag
+      
+      
+        Hint
+        Hinweis
+      
+      
+        Ignored Hint
+        Ignorierter Hinweis
+      
+      
+        Manual Redaction
+        Manuelle Schwärzung
+      
+      
+        Recommendation
+        Empfehlung
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Skipped
+        Übersprungen
+      
+      
+        Suggested redaction
+        Vorschlag für Schwärzung
+      
+      
+        Suggested dictionary add
+        Vorschlag für neuen Wörterbucheintrag
+      
+      
+        Suggested change legal basis
+        Vorschlag für Änderung der Rechtsgrundlage
+      
+      
+        Suggestion force redaction
+        Vorschlag für erzwungene Schwärzung
+      
+      
+        Suggested recategorize image
+        Vorschlag für Rekategorisierung eines Bilds
+      
+      
+        Suggested redaction removal
+        Vorschlagen, die Schwärzung zu entfernen
+      
+      
+        Suggested dictionary removal
+        Vorschlag für Löschung eines Wörterbucheintrags
+      
+      
+        Suggested Resize
+        Vorgeschlagene Größenänderung
+      
+      
+        Annotations
+        Anmerkungen
+      
+      
+        Archived
+        Archiviert
+      
+      
+        Approvers
+        Genehmiger
+      
+      
+        Make Approver
+        Zum Genehmiger ernennen
+      
+      
+        No members with "review only" permission.
+        Es gibt noch keine Reviewer.
+Bitte aus der Liste unten auswählen.
+      
+      
+        Reviewers
+        Reviewer
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Select from the list below.
+        Wählen Sie aus der Liste unten aus.
+      
+      
+        Owner
+        Besitzer
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        {type, select, approver{Approver} reviewer{Reviewer} other{}}
+        {type, select, approver{Genehmiger} reviewer{Reviewer} other{}}
+      
+      
+        Save
+        Speichern
+      
+      
+        Manage File {type, select, approver{Approver} reviewer{Reviewer} other{}}
+        Datei verwalten: {type, select, approver{Genehmiger} reviewer{Reviewer} other{}}
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save
+        Speichern
+      
+      
+        Successfully assigned {ownerName} to dossier: {dossierName}.
+        {ownerName} wurde erfolgreich zum Dossier {dossierName} hinzugefügt.
+      
+      
+        Successfully {reviewerName, select, undefined{unassigned user from} other{assigned {reviewerName} to file:}} {filename}.
+        {reviewerName} wurde erfolgreich zum Dokument {filename} hinzugefügt.
+      
+      
+        Audit
+        Aktivitätenprotokoll
+      
+      
+        All Users
+        Alle Benutzer
+      
+      
+        All Categories
+        Alle Bereiche
+      
+      
+        Audit
+        Aktivitätenprotokoll
+      
+      
+        Audit Log
+        Aktivitätenprotokoll
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Document
+        Dokument
+      
+      
+        Dossier
+        Dossier
+      
+      
+        Dossier Template
+        Dossier-Vorlage
+      
+      
+        Download
+        Download
+      
+      
+        License
+        Lizenz
+      
+      
+        Project
+        Projekt
+      
+      
+        Project Template
+        Projekt-Vorlage
+      
+      
+        User
+        Nutzer
+      
+      
+        No available logs.
+        Keine Protokolle verfügbar.
+      
+      
+        Category
+        Kategorie
+      
+      
+        Date
+        Datum
+      
+      
+        Message
+        Nachricht
+      
+      
+        User
+        Nutzer
+      
+      
+        {length} {length, plural, one{Log} other{Logs}}
+        {length} {length, plural, one{Log} other{Logs}}
+      
+      
+        to
+        bis
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact your RedactManager administrator to assign appropriate roles.
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie Ihren Admin, um den Zugang anzufordern!
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact <a href={adminUrl}  target=_blank >your RedactManager administrator</a> to assign appropriate roles!
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie <a href={adminUrl} target=_blank >Ihren Admin</a>, um den Zugang anzufordern!
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact {adminName} to assign appropriate roles.
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie {adminName}, um den Zugang anzufordern!
+      
+      
+        Your user is successfully logged in but has no role assigned yet. Please contact <a href={adminUrl} target=_blank >{adminName}</a> to assign appropriate roles.
+        Ihr Benutzer verfügt nicht über die erforderlichen RED-*-Rollen, um auf diese Applikation zugreifen zu können. Bitte kontaktieren Sie <a href={adminUrl} target=_blank >{adminName}</a>, um den Zugang anzufordern!
+      
+      
+        Logout
+        Ausloggen
+      
+      
+        by
+        von
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Value / Classification
+        Wert / Klassifizierung
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Legal Basis
+        Rechtsgrundlage
+      
+      
+        Select redaction reason
+        Begründung für die Schwärzung auswählen
+      
+      
+        Select a reason...
+        Wählen Sie eine Begründung aus ...
+      
+      
+        Paragraph / Location
+        Absatz / Ort
+      
+      
+        Edit Redaction Reason
+        Begründung für die Schwärzung bearbeiten
+      
+      
+        Enter comment
+        Kommentar eingeben
+      
+      
+        {count} {count, plural, one{comment} other{comments}}
+        {count} {count, plural, one{Kommentar} other{Kommentare}}
+      
+      
+        Hide comments
+        Kommentare verbergen
+      
+      
+        Close View
+        Ansicht schließen
+      
+      
+        Yes
+        Ja
+      
+      
+        No
+        Nein
+      
+      
+        This action requires confirmation, do you wish to proceed?
+        Diese Aktion erfordert eine Bestätigung. Möchten Sie fortfahren?
+      
+      
+        Confirm Action
+        Aktion bestätigen
+      
+      
+        Configurations
+        Einstellungen
+      
+      
+        Keep {type, select, single{Attribute} bulk{Attributes} other{}}
+        {type, select, single{Attribut} bulk{Attribute} other{}} behalten
+      
+      
+        Delete {type, select, single{Attribute} bulk{Attributes} other{}}
+        {type, select, single{Attribut} bulk{Attribute} other{}} löschen
+      
+      
+        All documents {type, select, single{it is} bulk{they are} other{}} used on will be impacted
+        Alle Dokumente {type, select, single{ist} bulk{sind} other{}} betroffen
+      
+      
+        All inputted details on the documents will be lost
+        Alle in die Dokumente eingegebenen Daten gehen verloren
+      
+      
+        Delete {type, select, single{{name}} bulk{File Attributes} other{}}
+        {type, select, single{{name}} bulk{Datei-Attribute} other{}} löschen
+      
+      
+        Please confirm that you understand the ramifications of your action!
+        Bitte bestätigen Sie, dass Ihnen die Konsequenzen dieser Aktion bewusst sind!
+      
+      
+        Warning: this cannot be undone!
+        Achtung: Diese Aktion kann nicht rückgängig gemacht werden!
+      
+      
+        Keep {usersCount, plural, one{User} other{Users}}
+        {usersCount, plural, one{Benutzer} other{Benutzer}} behalten
+      
+      
+        Delete {usersCount, plural, one{User} other{Users}}
+        {usersCount, plural, one{Benutzer} other{Benutzer}} löschen
+      
+      
+        All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted
+        Betroffen sind alle Dokumente, deren Review durch den/die {usersCount, plural, one{user} other{users}} noch aussteht
+      
+      
+        {dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted
+        {dossiersCount} {dossiersCount, plural, one{Dossier} other{Dossiers}} sind betroffen
+      
+      
+        Delete {usersCount, plural, one{User} other{Users}} from Workspace
+        {usersCount, plural, one{Benutzer} other{Benutzer}} aus dem Arbeitsbereich entfernen
+      
+      
+        Please confirm that you understand the ramifications of your action!
+        Bitte bestätigen Sie, dass Ihnen die Konsequenzen dieser Aktion bewusst sind!
+      
+      
+        Warning: this cannot be undone!
+        Achtung: Diese Aktion kann nicht rückgängig gemacht werden!
+      
+      
+        This document has unseen changes, do you wish to approve it anyway?
+        Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?
+      
+      
+        Warning!
+        Warnung!
+      
+      
+        At least one of the files you selected has unseen changes, do you wish to approve them anyway?
+        Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?
+      
+      
+        Warning!
+        Warnung!
+      
+      
+        This document is currently reviewed by someone else. Do you want to become the reviewer and assign yourself to this document?
+        Dieses Dokument wird gerade von einer anderen Person geprüft. Möchten Sie Reviewer werden und sich selbst dem Dokument zuweisen?
+      
+      
+        Re-assign user
+        Neuen Reviewer zuweisen
+      
+      
+        <strong>Warning!</strong> <br><br> Number of pages does not match, current document has <strong>{currentDocumentPageCount} page(s)</strong>. Uploaded document has <strong>{compareDocumentPageCount} page(s)</strong>. <br><br> Do you wish to proceed?
+        <strong>Achtung!</strong> <br><br> Seitenzahl stimmt nicht überein, aktuelles Dokument hat <strong>{currentDocumentPageCount} Seite(n)</strong>. Das hochgeladene Dokument hat <strong>{compareDocumentPageCount} Seite(n)</strong>. <br><br> Möchten Sie fortfahren?
+      
+      
+        Compare with file: {fileName}
+        Vergleichen mit: {fileName}
+      
+      
+        Delete {dossiersCount, plural, one{Dossier} other{Dossiers}}
+        Dossier löschen
+      
+      
+        Keep {dossiersCount, plural, one{Dossier} other{Dossiers}}
+        Dossier behalten
+      
+      
+        Are you sure you want to delete {dossiersCount, plural, one{this dossier} other{these dossiers}}?
+        Möchten Sie dieses Dokument wirklich löschen?
+      
+      
+        Delete {dossiersCount, plural, one{{dossierName}} other{Selected Dossiers}}
+        {dossierName} löschen
+      
+      
+        Do you wish to proceed?
+        Möchten Sie fortfahren?
+      
+      
+        Delete Document
+        Dokument löschen
+      
+      
+        Are you sure you want to delete {count, plural, one{this justification} other{these justifications}}?
+        Möchten Sie {count, plural, one{diese Begründung} other{diese Begründung}} wirklich löschen?
+      
+      
+        Delete {count, plural, one{{justificationName}} other{Selected Justifications}}
+        {count, plural, one{{justificationName}} other{ausgewählte Begründungen}} löschen
+      
+      
+        To proceed please type below
+        Bitte geben Sie unten Folgendes ein, um fortzufahren
+      
+      
+        Delete {filesCount, plural, one{Document} other{Documents}}
+        {filesCount, plural, one{Document} other{Documents}} löschen
+      
+      
+        Keep {filesCount, plural, one{Document} other{Documents}}
+        {filesCount, plural, one{Dokument} other{Dokumente}} behalten
+      
+      
+        Are you sure you want to delete {filesCount, plural, one{this document} other{these documents}}?
+        Möchten Sie {filesCount, plural, one{dieses Dokument} other{diese Dokumente}} wirklich löschen?
+      
+      
+        Delete {filesCount, plural, one{{fileName}} other{Selected Documents}}
+        {filesCount, plural, one{{fileName}} other{ausgewählte Dokumente}} löschen
+      
+      
+        Upload as multi-file report
+        Als Bericht für mehrere Dokumente hochladen
+      
+      
+        Upload as single-file report
+        Als Bericht für ein Dokument hochladen
+      
+      
+        Cancel Upload
+        Uploads abbrechen
+      
+      
+        Please choose if <b>{fileName}</b> is a single or multi-file report template
+        Wählen Sie bitte aus, ob <b>{fileName}</b> eine Berichtsvorlage für eine oder für mehrere Dateien ist
+      
+      
+        Report Template Upload
+        Upload der Berichtsvorlage
+      
+      
+        Yes. Continue upload
+        Ja. Hochladen fortsetzen
+      
+      
+        No. Cancel Upload
+        Nein. Hochladen abbrechen
+      
+      
+        There is already a Report Template with the name: <b>{fileName}</b>. Do you wish to continue?
+        <b>{fileName}</b>
+      
+      
+        Report Template Upload
+        Hochladen von Berichtsvorlagen
+      
+      
+        Reason
+        Begründung
+      
+      
+        Default Colors
+        Farbeinstellungen
+      
+      
+        Edit Color
+        Farbe bearbeiten
+      
+      
+        Color
+        Farbe
+      
+      
+        Type
+        Typ
+      
+      
+        {length} Default {length, plural, one{Color} other{Colors}}
+        {length} Standard{length, plural, one{farbe} other{farben}}
+      
+      
+        Analysis
+        Analyse
+      
+      
+        Default Color
+        Standardfarbe
+      
+      
+        Dictionary Request
+        Wörterbuch
+      
+      
+        Ignored Hint
+        Ignorierter Hinweis
+      
+      
+        Manual Redaction
+        Manuelle Schwärzung
+      
+      
+        Skipped
+        Übersprungen
+      
+      
+        Preview
+        Vorschau
+      
+      
+        Request Add
+        Neuen Wörterbucheintrag vorschlagen
+      
+      
+        Request Remove
+        Anfrage entfernt
+      
+      
+        Updated
+        Aktualisiert
+      
+      
+        DEV
+        DEV
+      
+      
+        Dictionaries
+        Wörterbücher
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Delete Dictionary
+        Wörterbuch löschen
+      
+      
+        Edit Dictionary
+        Wörterbuch bearbeiten
+      
+      
+        New Dictionary
+        Neues Wörterbuch
+      
+      
+        Delete Selected Dictionaries
+        Ausgewählte Wörterbücher löschen
+      
+      
+        Case Sensitive
+        Klein-/Großschreibung berücksichtigen
+      
+      
+        New Dictionary
+        Neues Wörterbuch
+      
+      
+        There are no dictionaries yet.
+        Es gibt noch keine Wörterbücher.
+      
+      
+        No dictionaries match your current filters.
+        Die ausgewählten Filter treffen auf kein Wörterbuch zu.
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Entries
+        Einträge
+      
+      
+        Types
+        Typen
+      
+      
+        Hint/Redaction
+        Hinweis/Schwärzung
+      
+      
+        Rank
+        Rang
+      
+      
+        Type
+        Typ
+      
+      
+        {length} {length, plural, one{dictionary} other{dictionaries}}
+        {length} {length, plural, one{Wörterbuch} other{Wörterbücher}}
+      
+      
+        Delete Dictionary
+        Wörterbuch löschen
+      
+      
+        Download Dictionary
+        Wörterbuch herunterladen
+      
+      
+        Edit Dictionary
+        Wörterbuch bearbeiten
+      
+      
+        Upload Dictionary
+        Wörterbuch hochladen
+      
+      
+        Compare
+        Vergleichen
+      
+      
+        Select Dictionary
+        Wörterbuch auswählen
+      
+      
+        Select Dossier
+        Dossier auswählen
+      
+      
+        Select Dossier Template
+        Dossiervorlage auswählen
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Some entries of the dictionary are below the minimum length of 2. These are highlighted with red!
+        Einige Einträge im Wörterbuch unterschreiten die Mindestlänge von 2 Zeichen. Diese sind rot markiert.
+      
+      
+        Something went wrong... Dictionary update failed!
+        Es ist ein Fehler aufgetreten ... Das Wörterbuch konnte nicht aktualisiert werden!
+      
+      
+        Revert
+        Rückgängig machen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Select a dictionary above to compare with the current one.
+        Wählen Sie oben das Wörterbuch aus, das Sie mit dem aktuellen Wörterbuch vergleichen möchten.
+      
+      
+        Dictionary updated!
+        Wörterbuch aktualisiert!
+      
+      
+        Digital Signature
+        Digitale Signatur
+      
+      
+        Uploaded Certificate is not valid for signing PDFs. PCKS.12 format is required.
+        Das hochgeladene Zertifikat eignet sich nicht zum Signieren von PDF-Dokumenten. Sie benötigen das Format PCKS#12.
+      
+      
+        Delete Digital Signature
+        Digitale Signatur löschen
+      
+      
+        Failed to remove digital signature, please try again.
+        Die digitale Signatur konnte nicht entfernt werden, bitte versuchen Sie es erneut.
+      
+      
+        Digital signature removed. Redacted files will no longer be signed!
+        Die digitale Signatur wurde gelöscht. Geschwärzte Dateien werden nicht länger mit einer Signatur versehen!
+      
+      
+        Reset
+        Zurücksetzen
+      
+      
+        Save Digital Signature
+        Digitale Signatur speichern
+      
+      
+        Failed to save digital signature
+        Fehler beim Speichern der digitalen Signatur
+      
+      
+        Digital signature saved successfully
+        Digitale Signatur erfolgreich gespeichert
+      
+      
+        Certificate Name
+        Name des Zertifikats
+      
+      
+        Certificate Name
+        Name des Zertifikats
+      
+      
+        Contact Information
+        Kontaktdaten
+      
+      
+        Contact Information
+        Kontaktdaten
+      
+      
+        Location
+        Ort
+      
+      
+        Location
+        Ort
+      
+      
+        Upload Certificate
+        Zertifikat hochladen
+      
+      
+        No Digital Signature certificate is configured. For signing redacted documents please upload a PCKS.12 certificate.
+        Es ist kein Zertifikat für die digitale Signatur konfiguriert. Laden Sie ein PCKS#12-Zertifikat hoch, um Ihre geschwärzten Dokumente zu signieren.
+      
+      
+        Certificate Password/Key
+        Zertifikatspasswort/-schlüssel
+      
+      
+        Password
+        Passwort
+      
+      
+        Reason
+        Begründung
+      
+      
+        Reason
+        Begründung
+      
+      
+        Save Document Info
+        Dokumenteninformation speichern
+      
+      
+        Introduce File Attributes
+        Datei-Attribute anlegen
+      
+      
+        Dossier
+        Dossier
+      
+      
+        Date
+        Datum
+      
+      
+        Image
+        Bild
+      
+      
+        Number
+        Nummer
+      
+      
+        Free Text
+        Text
+      
+      
+        Dossier Attributes
+        Dossier-Attribut
+      
+      
+        Delete Attribute
+        Attribut löschen
+      
+      
+        Edit Attribute
+        Attribut bearbeiten
+      
+      
+        New Attribute
+        Neues Attribut
+      
+      
+        Delete Selected Attributes
+        Ausgewähltes Attribut löschen
+      
+      
+        New Attribute
+        Neues Attribut
+      
+      
+        There are no dossier attributes.
+        Es sind keine Dossier-Attribute vorhanden
+      
+      
+        No attributes match your current filters.
+        Die ausgewählten Filter treffen auf kein Attribut zu.
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Label
+        Label
+      
+      
+        Placeholder
+        Platzhalter
+      
+      
+        Type
+        Typ
+      
+      
+        {length} dossier {length, plural, one{attribute} other{attributes}}
+        {length} {length, plural, one{Dossier-Attribut} other{Dossier-Attribute}}
+      
+      
+        Assign Members
+        Mitglieder zuweisen
+      
+      
+        Hide Details
+        Details ausblenden
+      
+      
+        Edit Owner
+        Eigentümer bearbeiten
+      
+      
+        Show Details
+        Details zeigen
+      
+      
+        Members
+        Mitglieder
+      
+      
+        Owner
+        Eigentümer
+      
+      
+        See less
+        Weniger anzeigen
+      
+      
+        Dossier Details
+        Dossier-Details
+      
+      
+        New Dossier
+        Neues Dossier
+      
+      
+        Delete Dossier
+        Dossier löschen
+      
+      
+        Failed to delete dossier: {dossierName}
+        Das Dossier {dossierName} konnte nicht gelöscht werden
+      
+      
+        Dossier Info
+        Dossier-Info
+      
+      
+        Edit Dossier
+        Dossier bearbeiten
+      
+      
+        Dossier Name
+        Dossiername
+      
+      
+        Dossier name...
+        Dossiername...
+      
+      
+        New Dossier
+        Neues Dossier
+      
+      
+        You currently have no dossiers.
+        Sie haben momentan keine Dossiers.
+      
+      
+        No dossiers match your current filters.
+        Die ausgewählten Filter treffen auf kein Dossier zu.
+      
+      
+        My Dossiers
+        Meine Dossiers
+      
+      
+        Other
+        Sonstige
+      
+      
+        To Approve
+        Zu Genehmigen
+      
+      
+        To Review
+        Zu Überprüfen
+      
+      
+        Analyze entire dossier
+        Gesamtes Dossier analysieren
+      
+      
+        {count, plural, one{Page} other{Pages}}
+        Seiten
+      
+      
+        {count, plural, one{Dossier} other{Dossiers}}
+        Dossiers
+      
+      
+        Total Documents
+        Anzahl der Dokumente
+      
+      
+        Total users
+        Anzahl der Benutzer
+      
+      
+        Name
+        Name
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        Owner
+        Besitzer
+      
+      
+        Status
+        Status
+      
+      
+        {length} active {length, plural, one{Dossier} other{Dossiers}}
+        {length} {length, plural, one{aktives Dossier} other{aktive Dossiers}}
+      
+      
+        Approve
+        Genehmigen
+      
+      
+        File can only be approved once it has been analysed with the latest dictionaries and all suggestions have been processed.
+        Das Dokument kann erst genehmigt werden, wenn eine Analyse auf Basis der aktuellen Wörterbücher durchgeführt wurde und die Vorschläge bearbeitet wurden.
+      
+      
+        Assign Approver
+        Genehmiger zuordnen
+      
+      
+        Assign To Me
+        Mir zuteilen
+      
+      
+        Assign User
+        Überprüfer zuordnen
+      
+      
+        Delete Documents
+        Dokumente löschen
+      
+      
+        Analyze Documents
+        Dokumente analysieren
+      
+      
+        Delete File
+        Datei löschen
+      
+      
+        {count} custom {count, plural, one{attribute} other{attributes}}
+        {count} {count, plural, one{benutzerdefiniertes Attribut} other{benutzerdefinierte Attribute}}
+      
+      
+        Image uploaded
+        Bild hochgeladen
+      
+      
+        show less
+        weniger anzeigen
+      
+      
+        Documents in Dossier
+        Dokumente im Dossier
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Dossier Dictionary
+        Dossier-Wörterbuch
+      
+      
+        {count} {count, plural, one{page} other{pages}}
+        {count} {count, plural, one{Seite} other{Seiten}}
+      
+      
+        Created on {date}
+        Erstellt am {date}
+      
+      
+        {count} deleted files
+        {count} gelöschte Dateien
+      
+      
+        {count} {count, plural, one{document} other{documents}}
+        {count} {count, plural, one{Dokument} other{Dokumente}}
+      
+      
+        Due {date}
+        Fällig am {date}
+      
+      
+        {count} {count, plural, one{user} other{users}}
+        {count} {count, plural, one{Benutzer} other{Benutzer}}
+      
+      
+        {count} processing {count, plural, one{document} other{documents}}
+        {count} Verarbeitung von {count, plural, one{document} other{documents}}
+      
+      
+        Download
+        Herunterladen
+      
+      
+        You need to be approver in the dossier and the {count, plural, one{file needs} other{files need}} to be approved in order to download.
+        Nur genehmigte Dateien können heruntergeladen werden
+      
+      
+        Re-processing required
+        Reanalyse erforderlich
+      
+      
+        Pending...
+        Ausstehend ...
+      
+      
+        Document Name
+        Dokumentname
+      
+      
+        Document name...
+        Dokumentname...
+      
+      
+        Download CSV File Report
+        CSV-Dateibericht herunterladen
+      
+      
+        Edit Dossier
+        Dossier bearbeiten
+      
+      
+        Upload Document
+        Dokument hochgeladen
+      
+      
+        Analyze all
+        Alle analysieren
+      
+      
+        Upload Document
+        Dokument hochladen
+      
+      
+        There are no documents yet.
+        Noch gibt es keine Dokumente.
+      
+      
+        No documents match your current filters.
+        Die ausgewählten Filter treffen auf kein Dokument zu.
+      
+      
+        OCR Document
+        OCR-Dokument
+      
+      
+        OCR was performed for this file.
+        Diese Datei wurde mithilfe von OCR konvertiert.
+      
+      
+        Assigned to me
+        Mir zuweisen
+      
+      
+        Assigned to others
+        Anderen zugewiesen
+      
+      
+        Recent ({hours} h)
+        Neu ({hours} h)
+      
+      
+        Unassigned
+        Niemandem zugewiesen
+      
+      
+        Failed to schedule files for reanalysis. Please try again.
+        Die Dateien konnten nicht für eine Reanalyse eingeplant werden. Bitte versuchen Sie es erneut.
+      
+      
+        Files scheduled for reanalysis.
+        Dateien für Reanalyse vorgesehen.
+      
+      
+        Analyze File
+        Datei analysieren
+      
+      
+        Added
+        Hinzugefügt
+      
+      
+        Assigned to
+        Zugewiesen an
+      
+      
+        Name
+        Name
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        Pages
+        Seiten
+      
+      
+        Status
+        Status
+      
+      
+        {length} {length, plural, one{document} other{documents}}
+        {length} {length, plural, one{document} other{documents}}
+      
+      
+        For Approval
+        Zur Genehmigung
+      
+      
+        Under Review
+        In Review
+      
+      
+        Drag & drop files anywhere...
+        Sie können Dateien überall per Drag and Drop platzieren...
+      
+      
+        Dossier Templates
+        Dossier-Vorlagen
+      
+      
+        Delete Template
+        Dossier-Vorlage
+      
+      
+        Edit Template
+        Vorlage bearbeiten
+      
+      
+        New Dossier Template
+        Neue Dossier-Vorlage
+      
+      
+        Delete Selected Dossier Templates
+        Ausgewählte Dossier-Vorlagen löschen
+      
+      
+        {length} {length, plural, one{dictionary} other{dictionaries}}
+        {length} {length, plural, one{dictionary} other{dictionaries}}
+      
+      
+        Cannot delete this DossierTemplate! At least one Dossier uses this template!
+        Dieses DossierTemplate kann nicht gelöscht werden! Zumindest auf Dossier wird diese Vorlage verwendet!
+      
+      
+        Cannot delete this DossierTemplate!
+        Dieses DossierTemplate kann nicht gelöscht werden!
+      
+      
+        There are no dossier templates yet.
+        Es gibt noch keine Dossier-Vorlagen.
+      
+      
+        No dossier templates match your current filters.
+        Die ausgewählten Filter treffen auf keine Dossier-Vorlage zu.
+      
+      
+        Search...
+        Suchen ...
+      
+      
+        Created by
+        Erstellt von
+      
+      
+        Created on
+        Erstellt am
+      
+      
+        Modified on
+        Geändert am
+      
+      
+        Name
+        Name
+      
+      
+        {length} dossier {length, plural, one{template} other{templates}}
+        {length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}
+      
+      
+        Choose what is included at download:
+        Wählen Sie die Dokumente für Ihr Download-Paket aus
+      
+      
+        Your download has been queued, you can see all your requested downloads here: <a href='/ui/main/downloads'>My Downloads<a/>.
+        Ihr Download wurde zur Warteschlange hinzugefügt. Hier finden Sie alle angeforderten Downloads: <a href='/main/downloads'>My Downloads<a/>.
+      
+      
+        Annotated PDF
+        PDF mit Anmerkungen
+      
+      
+        Flatten PDF
+        PDF verflachen
+      
+      
+        {length} document {length, plural, one{version} other{versions}}
+        {length} Dokumenten{length, plural, one{version} other{versionen}}
+      
+      
+        Optimized PDF
+        Optimiertes PDF
+      
+      
+        Preview PDF
+        PDF-Vorschau
+      
+      
+        Redacted PDF
+        geschwärztes PDF
+      
+      
+        Delete
+        Löschen
+      
+      
+        Download
+        Herunterladen
+      
+      
+        Delete Selected Downloads
+        Ausgewählte Downloads löschen
+      
+      
+        No active downloads.
+        Keine aktiven Downloads.
+      
+      
+        Date
+        Datum
+      
+      
+        Name
+        Name
+      
+      
+        Size
+        Größe
+      
+      
+        Status
+        Status
+      
+      
+        {length} {length, plural, one{download} other{downloads}}
+        {length} {length, plural, one{download} other{downloads}}
+      
+      
+        Failed to update colors.
+        Fehler beim Aktualisieren der Farben.
+      
+      
+        Color
+        Farbe
+      
+      
+        Color
+        Farbe
+      
+      
+        Save
+        Speichern
+      
+      
+        Successfully updated color for {color}.
+        Farbe erfolgreich aktualisiert auf {color}.
+      
+      
+        Revert
+        Rückgängig machen
+      
+      
+        Save
+        Änderungen speichern
+      
+      
+        Save & Close
+        Speichern
+      
+      
+        Custom Dossier Attributes
+        Benutzerdefinierte Dossier-Attribute
+      
+      
+        Delete Image
+        Bild löschen
+      
+      
+        Only PNG, JPG and JPEG files are allowed as image dossier attributes.
+        Als Bilddossierattribute sind nur PNG-, JPG- und JPEG-Dateien zulässig.
+      
+      
+        Image Attributes
+        Bild-Attribute
+      
+      
+        There are no text attributes
+        Es sind keine Text-Attribute vorhanden
+      
+      
+        There are no image attributes
+        Es sind keine Bild-Attribute vorhanden
+      
+      
+        Upload Image
+        Bild hochladen
+      
+      
+        Dossier {dossierName} was updated.
+        Dossier wurde aktualisiert.
+      
+      
+        Dossier {dossierName} was deleted.
+        Dossier wurde gelöscht.
+      
+      
+        Delete Forever
+        Endgültig löschen
+      
+      
+        Restore
+        Wiederherstellen
+      
+      
+        Forever Delete Selected Documents
+        Ausgewählte Dokumente endgültig löschen
+      
+      
+        Restore Selected Documents
+        Ausgewählte Dokumente wiederherstellen
+      
+      
+        Deleted items can be restored up to {hours} hours from their deletion
+        Gelöschte Objekte können bis zu {hours} Stunden nach ihrer Löschung wiederhergestellt werden
+      
+      
+        There are no deleted documents.
+        Es sind keine gelöschten Dokumente vorhanden.
+      
+      
+        Assignee
+        Bevollmächtigter
+      
+      
+        Deleted On
+        Gelöscht am
+      
+      
+        Name
+        Name
+      
+      
+        Pages
+        Seiten
+      
+      
+        Status
+        Status
+      
+      
+        Time To Restore
+        Verbleibende Zeit für Wiederherstellung
+      
+      
+        {length} deleted {length, plural, one{document} other{documents}}
+        {length} {length, plural, one{gelöschtes Dokument} other{gelöschte Dokumente}}
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Edit Display Name
+        Anzeigenamen bearbeiten
+      
+      
+        Failed to update dictionary display name.
+        Anzeigename des Wörterbuchs konnte nicht aktualisiert werden.
+      
+      
+        Enter Display Name
+        Anzeigenamen eingeben
+      
+      
+        Save Display Name
+        Anzeigenamen speichern
+      
+      
+        Successfully updated dictionary display name.
+        Anzeigename des Wörterbuchs erfolgreich aktualisiert.
+      
+      
+        {length} {length, plural, one{entry} other{entries}}
+        {length} {length, plural, one{entry} other{entries}}
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Enter Description
+        Beschreibung eingeben
+      
+      
+        Due Date
+        Termin
+      
+      
+        Dossier Name
+        Dossier-Name
+      
+      
+        Enter Name
+        Namen eingeben
+      
+      
+        Dossier Template
+        Dossier-Vorlage
+      
+      
+        Watermark application on redacted documents
+        Geschwärzte Dokumente mit Wasserzeichen versehen
+      
+      
+        Watermark application on preview documents
+        Vorschau Dokumente mit Wasserzeichen versehen
+      
+      
+        Edit {dossierName}
+        {dossierName} bearbeiten
+      
+      
+        Choose what is included at download:
+        Wählen Sie die Dokumente für Ihr Download-Paket aus:
+      
+      
+        Deleted Documents
+        Gelöschte Dokumente
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Dossier Attributes
+        Dossier-Attribute
+      
+      
+        Dossier Dictionary
+        Dossier-Wörterbuch
+      
+      
+        Dossier Info
+        Dossier-Info
+      
+      
+        Download Package
+        Download-Paket
+      
+      
+        General Information
+        Allgemeine Informationen
+      
+      
+        Members
+        Mitglieder
+      
+      
+        Team Members
+        Team-Mitglieder
+      
+      
+        Configurations
+        Konfiguration
+      
+      
+        You have unsaved changes. Save or revert before changing the tab.
+        Sie haben nicht gespeicherte Änderungen. Speichern Sie oder machen Sie die Änderungen rückgängig, bevor Sie die Registerkarte wechseln.
+      
+      
+        Back to overview
+        Zurück zur Übersicht
+      
+      
+        This dossier has been deleted!
+        Dieses Dossier wurde gelöscht!
+      
+      
+        Back to overview
+        Zurück zur Übersicht
+      
+      
+        The dossier of this file has been deleted!
+        Das Dossier dieser Datei wurde gelöscht!
+      
+      
+        Back to dossier
+        Zurück zum Dossier
+      
+      
+        This file has been deleted!
+        Diese Datei wurde gelöscht!
+      
+      
+        Action failed with code {status}
+        Aktion mit Code {status} fehlgeschlagen
+      
+      
+        Disconnected
+        Du bist offline
+      
+      
+        Reconnected
+        Du bist online
+      
+      
+        Reload
+        Neu laden
+      
+      
+        Oops! Something went wrong...
+        Hoppla! Etwas ist schief gelaufen...
+      
+      
+        {day} {month} {year} at {hour}:{minute}
+        {day} {month} {year} um {hour}:{minute} Uhr
+      
+      
+        File
+        Datei
+      
+      
+        Date
+        Datum
+      
+      
+        Number
+        Nummer
+      
+      
+        Free Text
+        Freier Text
+      
+      
+        File Attributes
+        Datei-Attribute
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Edit Name
+        Namen bearbeiten
+      
+      
+        Remove
+        Entfernen
+      
+      
+        Save
+        Speichern
+      
+      
+        {value} available
+        {value} verfügbar
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        CSV Column
+        CSV-Spalte
+      
+      
+        Delimiter
+        Trennzeichen
+      
+      
+        ,
+        ,
+      
+      
+        Encoding
+        Wird verschlüsselt
+      
+      
+        UTF-8
+        UTF-8
+      
+      
+        File:
+        Datei:
+      
+      
+        Key Column
+        Schlüsselspalte
+      
+      
+        Select column...
+        Spalte auswählen ...
+      
+      
+        No file attributes defined. Select a column from the left panel to start defining file attributes.
+        Keine Datei-Attribute definiert. Wählen Sie links eine Spalte aus, um Datei-Attribute zu definieren.
+      
+      
+        Preview CSV column by hovering the entry.
+        Fahren Sie mit der Maus über den Eintrag, um eine Vorschau der CSV-Spalte zu sehen.
+      
+      
+        No sample data for {column}.
+        Keine Beispieldaten für {column}.
+      
+      
+        Parse CSV with new options
+        CSV-Datei mit neuen Optionen parsen
+      
+      
+        All
+        Alle
+      
+      
+        None
+        Keine
+      
+      
+        Failed to create File Attributes!
+        Fehler beim Erstellen der Datei-Attribute!
+      
+      
+        Save Attributes
+        Attribute speichern
+      
+      
+        {count} file {count, plural, one{attribute} other{attributes}} created successfully!
+        {count} Datei-{count, plural, one{Attribut} other{Attribute}} erfolgreich erstellt!
+      
+      
+        Search by column name...
+        Nach Spaltennamen suchen ...
+      
+      
+        {value} selected
+        {value} ausgewählt
+      
+      
+        Name
+        Name
+      
+      
+        primary
+        Primärattribut
+      
+      
+        The value of the attribute set as primary shows up under the file name in the documents list.
+        Der Wert des Attributs, das als Primärattribut ausgewählt wurde, wird in der Dokumentenliste unter dem Dateinamen angezeigt.
+      
+      
+        Read-Only
+        Schreibgeschützt
+      
+      
+        Type
+        Typ
+      
+      
+        Disable Read-only for all attributes
+        Schreibschutz für alle Attribute aufheben
+      
+      
+        Enable Read-only for all attributes
+        Schreibschutz für alle Attribute aktivieren
+      
+      
+        Make Read-only
+        Schreibschutz aktivieren
+      
+      
+        Remove Selected
+        Ausgewählte entfernen
+      
+      
+        Type
+        Typ
+      
+      
+        {length} file {length, plural, one{attribute} other{attributes}}
+        {length} Datei-{length, plural, one{Attribut} other{Attribute}}
+      
+      
+        Select CSV columns to use as File Attributes
+        CSV-Spalten auswählen, die als Datei-Attribute verwendet werden sollen
+      
+      
+        {rows} rows in total
+        {rows} Zeilen insgesamt
+      
+      
+        Delete Attribute
+        Attribut löschen
+      
+      
+        Edit Attribute
+        Attribute bearbeiten
+      
+      
+        New Attribute
+        Neue Attribute
+      
+      
+        Delete Selected Attributes
+        Ausgewählte Attribute löschen
+      
+      
+        File-Attribute with this name already exists!
+        Es gibt bereits ein Attribute mit diesem Name!
+      
+      
+        Failed to add File-Attribute
+        Attribute konnte nicht erstellt werden!
+      
+      
+        There are no file attributes yet.
+        Es sind noch keine Datei-Attribute vorhanden.
+      
+      
+        No file attributes match your current filters.
+        Die aktuell ausgewählten Filter treffen auf kein Datei-Attribut zu.
+      
+      
+        Read-only
+        Schreibgeschützt
+      
+      
+        Search by attribute name...
+        Nach Attribut-Namen suchen ...
+      
+      
+        CSV Column
+        CSV-Spalte
+      
+      
+        Displayed in File List
+        In Dokumentenliste anzeigen
+      
+      
+        Filterable
+        Filterbar
+      
+      
+        Name
+        Name
+      
+      
+        Primary
+        Primärattribut
+      
+      
+        The value of the attribute set as primary shows up under the file name in the documents list.
+        Der Wert des Attributs, das als Primärattribut ausgewählt wurde, wird in der Dokumentenliste unter dem Dateinamen angezeigt.
+      
+      
+        Read-Only
+        Schreibgeschützt
+      
+      
+        Input Type
+        Eingabetyp
+      
+      
+        {length} file {length, plural, one{attribute} other{attributes}}
+        {length} {length, plural, one{Datei-Attribut} other{Datei-Attribute}}
+      
+      
+        Upload File Attributes Configuration
+        Datei-Attribute hochladen
+      
+      
+        Assign to me
+        Mir zuweisen
+      
+      
+        Assign User
+        Reviewer zuweisen
+      
+      
+        Change User
+        Reviewer wechseln
+      
+      
+        Delta
+        Delta
+      
+      
+        Delta View shows only the changes since last re-analysis. This view is only available if there is at least 1 change
+        Die Delta-Ansicht zeigt nur die Änderungen seit der letzten Reanalyse an. Die Ansicht ist nur verfügbar, wenn es seit der letzten Analyse mindestens 1 Änderung gab
+      
+      
+        Your Document Info lives here. This includes metadata required on each document.
+        Dok-Infos: Hier finden Sie die zu Ihrem Dokument hinterlegten Informationen; u. a. die für das Dokument erforderlichen Metadaten.
+      
+      
+        Download Original File
+        Originaldatei herunterladen
+      
+      
+        Exclude pages from redaction
+        Seiten von Schwärzung ausschließen
+      
+      
+        excluded
+        Von Schwärzung ausgeschlossen
+      
+      
+        Full Screen (F)
+        Vollbildmodus
+      
+      
+        Last Reviewed by:
+        Zuletzt überprüft von:
+      
+      
+        There are no annotations on this page.
+        Auf dieser Seite gibt es keine Anmerkungen.
+      
+      
+        Jump to first page
+        Zur ersten Seite springen
+      
+      
+        Jump to last page
+        Zur letzten Seite springen
+      
+      
+        This document was not processed with the latest rule/dictionary set. Analyze now to get updated annotations.
+        Dieses Dokument wurde nicht auf Basis des neuesten Regel-/Wörterbuchsatzes bearbeitet. Analysieren Sie es jetzt, um die Anmerkungen zu analysieren.
+      
+      
+        Preview
+        Vorschau
+      
+      
+        Redaction preview shows only redactions. Consider this a preview for the final redacted version. This view is only available if the file has no pending changes & doesn't require a reanalysis
+        In der Schwärzungsvorschau sehen Sie nur die Schwärzungen. Es handelt sich also um eine Vorschau der endgültigen geschwärzten Version. Diese Ansicht ist nur verfügbar, wenn für die Datei keine Änderungen ausstehen und keine Reanalyse erforderlich ist
+      
+      
+        Standard
+        Standard
+      
+      
+        Standard Workload view shows all hints, redactions, recommendations & suggestions. This view allows editing.
+        In der Standard-Ansicht des Workloads werden alle Hinweise, Schwärzungen, Empfehlungen und Vorschläge angezeigt. In dieser Ansicht ist die Bearbeitung möglich.
+      
+      
+        Jump to Next
+        Springe zu Nächster
+      
+      
+        Jump to Previous
+        Springe zu Vorheriger
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        This page is
+        Diese Seite ist
+      
+      
+        Select
+        Auswählen
+      
+      
+        All
+        Alle
+      
+      
+        None
+        Keine
+      
+      
+        Close Document Info
+        Dokumenteninformation schließen
+      
+      
+        Created on: {date}
+        Erstellt am: {date}
+      
+      
+        in {dossierName}
+        in {dossierName}
+      
+      
+        Due: {date}
+        Termin: {date}
+      
+      
+        {pages} pages
+        {pages} Seiten
+      
+      
+        Edit Document Info
+        Infos zum Dokument bearbeiten
+      
+      
+        Document Info
+        Infos zum Dokument
+      
+      
+        Close
+        Schließen
+      
+      
+        Error! Invalid page selection.
+        Fehler! Seitenauswahl ungültig.
+      
+      
+        Minus (-) for range and comma (,) for enumeration.
+        Minus (-) für Bereich und Komma (,) für Aufzählung.
+      
+      
+        e.g. 1-20,22,32
+        z. B. 1-20,22,32
+      
+      
+        Exclude Pages
+        Seiten ausschließen
+      
+      
+        No excluded pages.
+        Es sind keine Seiten ausgeschlossen.
+      
+      
+        Undo
+        Rückgängig machen
+      
+      
+        Removed from redaction
+        Von der Schwärzung ausgeschlossen
+      
+      
+        Redaction is disabled for this document.
+        Schwärzungen für dieses Dokument deaktiviert.
+      
+      
+        Disable redaction
+        Schwärzen deaktivieren
+      
+      
+        Enable for redaction
+        Schwärzen aktivieren
+      
+      
+        Enabling / disabling is permitted only for managers
+        Aktivieren/deaktivieren ist nur Managern gestattet
+      
+      
+        Approved
+        Genehmigt
+      
+      
+        Deleted
+        Gelöscht
+      
+      
+        Re-processing required
+        Reanalyse erforderlich
+      
+      
+        Processing
+        Wird analysiert
+      
+      
+        Image Analyzing
+        Bildanalyse
+      
+      
+        Processing
+        Wird analysiert
+      
+      
+        New
+        Neu
+      
+      
+        OCR Processing
+        OCR-Analyse
+      
+      
+        Processed
+        Verarbeitet
+      
+      
+        Processing...
+        Wird analysiert...
+      
+      
+        Processing
+        Wird analysiert
+      
+      
+        Unassigned
+        Nicht zugewiesen
+      
+      
+        Under Approval
+        In Genehmigung
+      
+      
+        Under Review
+        In Review
+      
+      
+        Unprocessed
+        Unbearbeitet
+      
+      
+        Filter options
+        Filteroptionen
+      
+      
+        Filter
+        Filter
+      
+      
+        Filter
+        Filter
+      
+      
+        Only annotations with redaction changes
+        Nur Anmerkungen mit Schwärzungsänderungen
+      
+      
+        Only annotations on unseen pages
+        Nur Anmerkungen auf unsichtbaren Seiten
+      
+      
+        Only annotations with comments
+        Nur Anmerkungen mit Kommentaren
+      
+      
+        Analysis pending
+        Analyse erforderlich
+      
+      
+        Comments
+        Kommentare
+      
+      
+        Hints only
+        Nut Hinweise
+      
+      
+        Images
+        Bilder
+      
+      
+        No Annotations
+        Keine Anmerkungen
+      
+      
+        Redacted
+        Geschwärzt
+      
+      
+        Suggested Redaction
+        Vorgeschlagene Schwärzung
+      
+      
+        Updated
+        Aktualisiert
+      
+      
+        Assignee(s)
+        Beauftragt
+      
+      
+        Dossier Templates
+        Regelsätze
+      
+      
+        Empty
+        Leer
+      
+      
+        Filter:
+        Filter:
+      
+      
+        Workload
+        Arbeitsvorrat
+      
+      
+        Dossier Member(s)
+        Dossier-Mitglied(er)
+      
+      
+        Status
+        Status
+      
+      
+        Save Configurations
+        Einstellungen speichern
+      
+      
+        Test Connection
+        Verbindung testen
+      
+      
+        Environment
+        Name der Applikation
+      
+      
+        RedactManager
+        RedactManager
+      
+      
+        Enable Authentication
+        Authentifizierung aktivieren
+      
+      
+        Change Credentials
+        Zugangsdaten ändern
+      
+      
+        Envelope From
+        Ausgangsadresse
+      
+      
+        Info text regarding envelope from field.
+        Infotext zum Feld „Ausgangsadresse“.
+      
+      
+        Sender Envelope Email Address
+        Ausgangsadresse
+      
+      
+        From
+        Von
+      
+      
+        Name for Sender
+        Antworten an
+      
+      
+        Info text regarding the name for sender.
+        Info-Text zum Absendernamen.
+      
+      
+        Display Name for Sender Email Address
+        Anzeigename zur Ausgangsadresse
+      
+      
+        Sender Email Address
+        E-Mail-Adresse des Absenders
+      
+      
+        Host
+        Host
+      
+      
+        SMTP Host
+        SMTP-Host
+      
+      
+        Port
+        Port
+      
+      
+        Reply To
+        Antwortadresse
+      
+      
+        Name for Reply To
+        Name für Antwortadresse
+      
+      
+        Display Name for Reply To Email Address
+        Anzeigename zu Antwort-E-Mail
+      
+      
+        Reply To Email Address
+        Antwort-E-Mail
+      
+      
+        Enable SSL
+        SSL aktivieren
+      
+      
+        Enable StartTLS
+        StartTLS aktivieren
+      
+      
+        Show Forgot password link on Login screen
+        „Passwort vergessen?“-Link auf der Login-Seite anzeigen
+      
+      
+         
+        
+      
+      
+        General Configurations
+        Allgemeine Einstellungen
+      
+      
+        SMTP (Simple Mail Transfer Protocol) enables you to send your emails through the specified server settings.
+        SMTP (Simple Mail Transfer Protocol) ermöglicht es Ihnen, Ihre E-Mails über die angegebenen Servereinstellungen zu versenden.
+      
+      
+        Test email could not be sent! Please revise the email address.
+        Die Test-E-Mail konnte nicht gesendet werden! Bitte überprüfen Sie die E-Mail-Adresse.
+      
+      
+        Test email was sent successfully!
+        Die Test-E-Mail wurde erfolgreich versendet!
+      
+      
+        Configure SMTP Account
+        SMTP-Konto konfigurieren
+      
+      
+        Help Mode (H)
+        Hilfe-Modus (H)
+      
+      
+        <b> Clicking anywhere on the screen </b> will show you which areas are interactive. Hovering an interactive area will <b> change the mouse cursor </b> to let you know if the element is interactive.
+        <b>Klicken Sie auf eine beliebige Stelle des Bildschirms </b> um zu sehen, welche Bereiche interaktiv sind. Wenn Sie mit der Maus über einen interaktiven Bereich fahren, <b>verändert sich der Mauszeiger</b>, um Ihnen zu zeigen, ob ein Element interaktiv ist.
+      
+      
+        Open Help Mode Instructions
+        Hilfe-Modus-Anleitungen öffnen
+      
+      
+        Help Mode
+        Hilfe-Modus
+      
+      
+        <b> Welcome to Help Mode! <br> Clicking on interactive elements will open info about them in new tab. </b>
+        <b> Willkommen im Hilfe-Modus! <br> Klicken Sie auf interaktive Elemente, um in einem neuen Tab Infos dazu zu erhalten. </b>
+      
+      
+        Hint
+        Hinweis
+      
+      
+        Formula
+        Formel
+      
+      
+        Image
+        Bild
+      
+      
+      
+        Signature
+        Signatur
+      
+      
+        Unassigned
+        Unbekannt
+      
+      
+        You
+        Sie
+      
+      
+        Justifications
+        Begründungen
+      
+      
+        Delete Justification
+        Begründung löschen
+      
+      
+        Edit Justification
+        Begründung bearbeiten
+      
+      
+        Add New Justification
+        Neue Begründung hinzufügen
+      
+      
+        Delete Selected Justifications
+        Ausgewählte Begründungen löschen
+      
+      
+        There are no justifications yet.
+        Es gibt noch keine Begründungen.
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Name
+        Name
+      
+      
+        Legal Basis
+        Rechtliche Grundlage
+      
+      
+        {length} {length, plural, one{justification} other{justifications}}
+        {length} {length, plural, one{Begründung} other{Begründung}}
+      
+      
+        Analyzed Pages
+        Analysierte Seiten
+      
+      
+        Backend Application Version
+        Backend-Version der Anwendung
+      
+      
+        Cumulative Pages
+        Seiten insgesamt
+      
+      
+        Legend
+        Legende
+      
+      
+        Licensed Total
+        Insgesamt lizensiert
+      
+      
+        Pages per Month
+        Seiten pro Monat
+      
+      
+        Total Pages
+        Gesamtzahl der Seiten
+      
+      
+        Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)
+        Copyright © 2020 - {currentYear} knecon AG (powered by IQSER)
+      
+      
+        Copyright Claim
+        Copyright
+      
+      
+        Analyzed Pages in Current Licensing Period
+        In aktuellem Lizenzzeitraum analysierte Seiten
+      
+      
+        Custom Application Title
+        Name der Anwendung
+      
+      
+        Email Report
+        E-Mail-Bericht
+      
+      
+        Total Analyzed Pages in current license period: {pages}.
+        Im aktuellen Lizenzzeitraum insgesamt analysierte Seiten: {pages}.
+      
+      
+        Licensed Pages: {pages}.
+        Lizenzierte Seiten: {pages}.
+      
+      
+        License Report {licenseCustomer}
+        Lizenzbericht {licenseCustomer}
+      
+      
+        The use of this product is subject to the terms of the Redaction End User Agreement, unless otherwise specified therein.
+        Die Nutzung dieses Produkts unterliegt den Bedingungen der Endbenutzer-Lizenzvereinbarung für den RedactManager, sofern darin nichts anderweitig festgelegt.
+      
+      
+        End User License Agreement
+        Endbenutzer-Lizenzvereinbarung
+      
+      
+        Number of licensed pages
+        Anzahl der lizenzierten Seiten
+      
+      
+        Licensed to
+        Lizenziert für
+      
+      
+        Licensing Details
+        Lizenzdetails
+      
+      
+        Licensing Period
+        Laufzeit der Lizenz
+      
+      
+        OCR Analyzed Pages
+        Mit OCR konvertierte Seiten
+      
+      
+        Total Analyzed Pages Since {date}
+        Seit {date} insgesamt analysierte Seiten
+      
+      
+        Unlicensed Analyzed Pages
+        Über Lizenz hinaus analysierte Seiten
+      
+      
+        Usage Details
+        Nutzungsdetails
+      
+      
+        License Information
+        Lizenzinformationen
+      
+      
+        Save
+        Speichern
+      
+      
+        Value / Classification
+        Wert / Klassifizierung
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Legal Basis
+        Rechtsgrundlage
+      
+      
+        Reason
+        Begründung
+      
+      
+        Select a reason ...
+        Wählen Sie eine Begründung aus ...
+      
+      
+        Custom Rectangle
+        Benutzerdefinierter Bereich
+      
+      
+        Paragraph / Location
+        Absatz / Ort
+      
+      
+        Selected text:
+        Ausgewählter Text:
+      
+      
+        Add to dictionary
+        Zum Wörterbuch hinzufügen
+      
+      
+        Set false positive
+        Als Falsch-Positiv definieren
+      
+      
+        Force Hint
+        Hinweis erzwingen
+      
+      
+        Force Redaction
+        Schwärzung erzwingen
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Request add to dictionary
+        Neuen Wörterbucheintrag vorschlagen
+      
+      
+        Request false positive
+        Als Falsch-Positiv vorschlagen
+      
+      
+        Request Redaction
+        Schwärzung vorschlagen
+      
+      
+        Apr.
+        Apr.
+      
+      
+        Aug.
+        August
+      
+      
+        Dec.
+        Dez.
+      
+      
+        Feb.
+        Feb.
+      
+      
+        Jan.
+        Jan.
+      
+      
+        Jul.
+        Jul.
+      
+      
+        Jun.
+        März
+      
+      
+        Mar.
+        März
+      
+      
+        May
+        Nov.
+      
+      
+        Nov.
+        Nov.
+      
+      
+        Oct.
+        Okt.
+      
+      
+        Sep.
+        Sept.
+      
+      
+        You have been assigned as approver for <b><a href="{fileHref}" target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+        Sie wurden dem Dokument <b><a href="{fileHref}" target="_blank">{fileName}</a></b> im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b> als Genehmiger zugewiesen!
+      
+      
+        You have been assigned as reviewer for <b><a href="{fileHref}" target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+        Sie wurden dem Dokument <b><a href="{fileHref}" target="_blank">{fileName}</a></b> im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b> als Reviewer zugewiesen!
+      
+      
+         <b><a href="{fileHref}" target="_blank">{fileName}</a></b> has been approved!
+        <b><a href="{fileHref}" target="_blank">{fileName}</a></b> wurde genehmigt!
+      
+      
+        Dossier: <b>{dossierName}</b> has been deleted!
+        Dossier: <b>{dossierName}</b> wurde gelöscht!
+      
+      
+        <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> owner removed!
+        Der Dossier-Owner von <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> wurde entfernt!
+      
+      
+         <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> owner changed to <b>{user}</b>!
+        Eigentümer von <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> geändert zu <b>{user}</b>!
+      
+      
+        Your <b><a href='/ui/main/downloads', target="_blank">download</a></b> is ready!
+        Ihr <b><a href='/ui/main/downloads', target="_blank">Download</a></b> ist fertig!
+      
+      
+        You currently have no notifications
+        Du hast aktuell keine Benachrichtigungen
+      
+      
+        You have been unassigned from <b><a href="{fileHref}" target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+        Sie wurden vom Dokument <b><a href="{fileHref}" target="_blank">{fileName}</a></b> im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b> entfernt!
+      
+      
+        You have been added to dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+        <b>{user}</b> ist jetzt Mitglied des Dossiers <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+      
+      
+        You have been demoted to reviewer in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+        <b>{user}</b> wurde im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> auf die Reviewer-Berechtigung heruntergestuft!
+      
+      
+        You have been promoted to approver in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>!
+        <b>{user}</b> wurde im Dossier <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> zum Genehmiger ernannt!
+      
+      
+        You have been removed as a member from dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> !
+        <b>{user}</b> wurde als Mitglied von: <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b>  entfernt!
+      
+      
+        Notifications
+        Benachrichtigungen
+      
+      
+        Email Notifications
+        E-Mail Benachrichtigungen
+      
+      
+        In-App Notifications
+        In-App-Benachrichtigungen
+      
+      
+        Something went wrong... Preferences update failed!
+        Ein Fehler ist aufgetreten... Aktualisierung der Einstellungen fehlgeschlagen!
+      
+      
+        Document related notifications
+        Dokumentbezogene Benachrichtigungen
+      
+      
+        Dossier related notifications
+        Dossierbezogene Benachrichtigungen
+      
+      
+        Other notifications
+        Andere Benachrichtigungen
+      
+      
+        Choose on which action you want to be notified
+        Wählen Sie aus, in welcher Kategorie Sie benachrichtigt werden möchten
+      
+      
+        When I am assigned to a document as Approver
+        Wenn ich einem Dokument als Genehmiger zugewiesen bin
+      
+      
+        When I am assigned to a document as Reviewer
+        Wenn ich einem Dokument als Überprüfer zugewiesen bin
+      
+      
+        When the document status changes to Approved
+        Wenn sich der Dokumentstatus in Genehmigt ändert
+      
+      
+        When the document status changes to Under Approval
+        Wenn sich der Dokumentstatus in „In Genehmigung“ ändert
+      
+      
+        When the document status changes to Under Review
+        Wenn sich der Dokumentstatus in Wird überprüft ändert
+      
+      
+        When a dossier was deleted
+        Wenn ein Dossier gelöscht wurde
+      
+      
+        When the owner of a dossier got deleted
+        Wenn der Eigentümer eines Dossiers gelöscht wurde
+      
+      
+        When I loose dossier ownership
+        Wenn ich den Besitz des Dossiers verliere
+      
+      
+        When I become the dossier owner
+        Wenn ich der Besitzer des Dossiers werde
+      
+      
+        When a download is ready
+        Wenn ein Download bereit ist
+      
+      
+        When I am unassigned from a document
+        Wenn die Zuweisung zu einem Dokument aufgehoben wird
+      
+      
+        When a user was added to my dossier
+        Wenn ein Benutzer zu meinem Dossier hinzugefügt wurde
+      
+      
+        When I become a Reviewer in a dossier
+        Wenn ich Gutachter in einem Dossier werde
+      
+      
+        When I become an Approver in a dossier
+        Wenn ich Genehmiger in einem Dossier werde
+      
+      
+        When I loose dossier membership
+        Wenn ich die Dossier-Mitgliedschaft verliere
+      
+      
+        Daily Summary
+        Tägliche Zusammenfassung
+      
+      
+        Instant
+        Sofortig
+      
+      
+        Weekly Summary
+        Wöchentliche Zusammenfassung
+      
+      
+        Notifications Preferences
+        Benachrichtigungseinstellungen
+      
+      
+        Cancel all uploads
+        Alle Uploads abbrechen
+      
+      
+        Replace existing document
+        Vorhandenes Dokument ersetzen
+      
+      
+        Remember choice and don't ask me again
+        Auswahl speichern und nicht noch einmal fragen
+      
+      
+        Keep existing document
+        Vorhandenes Dokument behalten
+      
+      
+        <b>{filename}</b> already exists. Choose how to proceed:
+        <b>{filename}</b> ist bereits vorhanden. Wie möchten Sie fortfahren?
+      
+      
+        Document already exists!
+        Das Dokument existiert bereits!
+      
+      
+        Page
+        Seite
+      
+      
+        Next
+        Nächste
+      
+      
+        Prev
+        Vorherige
+      
+      
+        Search for selection
+        Nach Auswahl suchen
+      
+      
+        {active, select, true{Disable} false{Enable} other{}} annotation tooltips
+        {active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen
+      
+      
+        WARNING: You have unsaved changes. Press Cancel to go back and save these changes, or OK to lose these changes.
+        ACHTUNG: Sie haben ungespeicherte Änderungen. Klicken Sie auf „Abbrechen“, wenn Sie zurückkehren und die Änderungen speichern möchten. Klicken Sie auf „OK“, um die Änderungen zu speichern.
+      
+      
+        Read only
+        Lesemodus
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Select image type
+        Ausgewählter Bildtyp
+      
+      
+        Select a type...
+        Einen Typ auswählen ...
+      
+      
+        Edit Image Type
+        Bildtypen bearbeiten
+      
+      
+        Redaction
+        Schwärzung
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Yes, proceed and remove!
+        Ja, fortfahren und löschen!
+      
+      
+        Dictionary
+        Wörterbuch
+      
+      
+        Image: {typeLabel}
+        Bild: {typeLabel}
+      
+      
+        Following entries will be removed from their respective dictionaries:
+        Folgende Einträge werden aus den jeweiligen Wörterbüchern gelöscht:
+      
+      
+        Remove From Dictionary
+        Aus dem Wörterbuch löschen
+      
+      
+        Following redactions will be removed only here:
+        Folgende Schwärzungen werden nur hier entfernt:
+      
+      
+        Remove Redaction
+        Schwärzung entfernen
+      
+      
+        Value
+        Wert
+      
+      
+        {length} report {length, plural, one{type} other{types}}
+        {length} {length, plural, one{Berichtstyp} other{Berichtstypen}}
+      
+      
+        Reports
+        Berichte
+      
+      
+        A short text explaining how to create report documents. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
+        Ein kurzer Text, der erläutert, was Platzhalter sind und wie Sie sie in Ihrer Berichtsvorlage einsetzen können. Es ist bekannt, dass ein Leser vom lesbaren Inhalt einer Seite abgelenkt wird, wenn er sich das Layout ansieht.
+      
+      
+        This placeholder gets replaced with the value of the dossier attribute <code>{attribute}</code>.
+        Dieser Platzhalter wird durch den Wert des Dossier-Attributs <code>{attribute}</code> ersetzt.
+      
+      
+        This placeholder gets replaced with the value of the file attribute <code>{attribute}</code>.
+        Dieser Platzhalter wird durch den Wert des Dateiattributs <code>{attribute}</code> ersetzt.
+      
+      
+        This placeholder is replaced by the creation date of the report in the common day-month-year notation (dd.MM.yyyy), e.g. 15.10.2021.
+        Dieser Platzhalter wird durch das Erstellungsdatum des Berichts in der üblichen Tag-Monat-Jahr-Notation (TT.MM.JJJJ) ersetzt, zB 15.10.2021.
+      
+      
+        This placeholder gets replaced by the creation date of the report in the American all-numeric date format (MM/dd/yyyy), e.g. 10/15/2021.
+        Dieser Platzhalter wird durch das Erstellungsdatum des Berichts im amerikanischen rein numerischen Datumsformat (MM/dd/yyyy) ersetzt, zB 15.10.2021.
+      
+      
+        This placeholder is replaced by the creation date of the report in the international ISO 8601 format (yyyy-MM-dd), e.g. 2021-10-15.
+        Dieser Platzhalter wird durch das Erstellungsdatum des Berichts im internationalen ISO 8601-Format (yyyy-MM-dd) ersetzt, zB 2021-10-15.
+      
+      
+        This placeholder is replaced by the name of the dossier in which the redacted files are stored.
+        Dieser Platzhalter wird durch den Namen des Dossiers ersetzt, in dem die geschwärzten Dateien gespeichert sind.
+      
+      
+        This placeholder is replaced by the file name.
+        Dieser Platzhalter wird durch den Dateinamen ersetzt.
+      
+      
+        This placeholder is replaced by a text snippet that contains the redaction.
+        Dieser Platzhalter wird durch einen Textausschnitt ersetzt, der die Schwärzung enthält.
+      
+      
+        This placeholder is replaced by the justification of the redaction. It is a combination of the legal reference (justificationParagraph) and the justification text (justificationReason).
+        Dieser Platzhalter wird durch die Begründung der Schwärzung ersetzt. Es ist eine Kombination aus dem Rechtsverweis (justificationParagraph) und dem Begründungstext (justificationReason).
+      
+      
+        This placeholder is replaced by the legal reference of the justification of the redaction.
+        Dieser Platzhalter wird durch den Rechtshinweis der Begründung der Redaktion ersetzt.
+      
+      
+        This placeholder is replaced by the justification text of the redaction.
+        Dieser Platzhalter wird durch den Begründungstext der Schwärzung ersetzt.
+      
+      
+        This placeholder is replaced by the page number of the redaction.
+        Dieser Platzhalter wird durch die Seitenzahl der Redaktion ersetzt.
+      
+      
+        This placeholder is replaced by the paragraph that contains the redaction.
+        Dieser Platzhalter wird durch den Absatz ersetzt, der die Schwärzung enthält.
+      
+      
+        This placeholder is replaced by the time the report was created.
+        Dieser Platzhalter wird durch den Zeitpunkt ersetzt, zu dem der Bericht erstellt wurde.
+      
+      
+        A short text explaining what placeholders are and how to use them in your report template. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
+        Ein kurzer Text, der erläutert, was Platzhalter sind und wie Sie sie in Ihrer Berichtsvorlage einsetzen können. Es ist bekannt, dass ein Leser vom lesbaren Inhalt einer Seite abgelenkt wird, wenn er sich das Layout ansieht.
+      
+      
+        Document Setup
+        Dokumenten-Konfiguration
+      
+      
+        Invalid format selected for Upload! Supported formats are XLSX and DOCX
+        Ungültiges Upload-Format ausgewählt! Unterstützt werden Dokumente im .xlsx- und im .docx-Format
+      
+      
+        (Multi-file)
+        (Mehrere Dateien)
+      
+      
+        Report Documents
+        Dokumente für den Bericht
+      
+      
+        Description
+        Beschreibung
+      
+      
+        Placeholders
+        Platzhalter
+      
+      
+        Reports
+        Berichte
+      
+      
+        Upload a Document
+        Ein Dokument hochladen
+      
+      
+        Reset
+        Zurücksetzen
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save
+        Speichern
+      
+      
+        Failed to reset password. The new password doesn't match the password policy.
+        Kennwort konnte nicht zurückgesetzt werden. Das neue Passwort entspricht nicht der Passwortrichtlinie.
+      
+      
+        Temporary password
+        Temporäres Passwort
+      
+      
+        Set Temporary Password for {userName}
+        Temporäres Passwort für {userName} festlegen
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Comment
+        Kommentar
+      
+      
+        Resize Redaction
+        Schwärzung ändern
+      
+      
+        Inactive
+        Inaktiv
+      
+      
+        Manager & Admin
+        Manager & Admin
+      
+      
+        No role defined
+        Keine Rolle definiert
+      
+      
+        Application Admin
+        Anwendungsadministrator
+      
+      
+        Manager
+        Manager
+      
+      
+        User
+        Benutzer
+      
+      
+        Users Admin
+        Benutzer-Admin
+      
+      
+        Regular
+        Regulär
+      
+      
+        Rule Editor
+        Regel-Editor
+      
+      
+        Something went wrong... Rules update failed!
+        Es ist ein Fehler aufgetreten ... Die Regeln konnten nicht aktualisiert werden!
+      
+      
+        Revert
+        Anmeldedaten speichern
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Rules updated!
+        Die Regeln wurden aktualisiert!
+      
+      
+        Assignee
+        Bevollmächtigter
+      
+      
+        Document
+        Dokument
+      
+      
+        Dossier
+        Dossier
+      
+      
+        Pages
+        Seiten
+      
+      
+        Status
+        Status
+      
+      
+        Filter by Dossier
+        Nach Dossier filtern
+      
+      
+        Dossier name...
+        Dossiername...
+      
+      
+        Missing
+        Fehlt
+      
+      
+        Must contain
+        Muss enthalten
+      
+      
+        Please enter a keyword into the search bar to look for documents or document content.
+        Geben Sie einen Suchbegriff in die Suchleiste, um nach Dokumenten oder Inhalten von Dokumenten zu suchen.
+      
+      
+        No documents match your current filters.
+        Keine Dokumente entsprechen Ihren aktuellen Filtern.
+      
+      
+        {length} search {length, plural, one{result} other{results}}
+        {length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}
+      
+      
+        across all dossiers
+        ganze Plattform
+      
+      
+        Search documents...
+        Nach Dokumenten oder Dokumenteninhalt suchen
+      
+      
+        in this dossier
+        in diesem Dossier
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Save Credentials
+        Anmeldedaten speichern
+      
+      
+        Password
+        Passwort
+      
+      
+        Username
+        Benutzername
+      
+      
+        Login Username
+        Login-Benutzername
+      
+      
+        Enable Authentication
+        Authentifizierung aktivieren
+      
+      
+        {days} {days, plural, one{day} other{days}}
+        {days} {days, plural, one{Tag} other{Tage}}
+      
+      
+        {hours} {hours, plural, one{hour} other{hours}}
+        {hours} {hours, plural, one{Stunde} other{Stunden}}
+      
+      
+        < 1 hour
+        < 1 Stunde
+      
+      
+        Time to restore already passed
+        Frist für Wiederherstellung verstrichen
+      
+      
+        Back
+        Zurück
+      
+      
+        Active Dossiers
+        Aktives Dossier
+      
+      
+        Account
+        Konto
+      
+      
+        Settings
+        Einstellungen
+      
+      
+        My Downloads
+        Meine Downloads
+      
+      
+        German
+        Deutsch
+      
+      
+        English
+        Englisch
+      
+      
+        Language
+        Sprache
+      
+      
+        Logout
+        Abmelden
+      
+      
+        Trash
+        Papierkorb
+      
+      
+        Delete Forever
+        Endgültig löschen
+      
+      
+        Restore
+        Wiederherstellen
+      
+      
+        Forever Delete Selected Dossiers
+        Ausgewählte Dossiert endgültig löschen
+      
+      
+        Restore Selected Dossiers
+        Ausgewählte Dossiers wiederherstellen
+      
+      
+        Trash
+        Papierkorb
+      
+      
+        There are no dossiers yet.
+        Es wurde noch kein Dossier angelegt.
+      
+      
+        No dossiers match your current filters.
+        Die ausgewählten Filter treffen auf kein Dossier zu.
+      
+      
+        Deleted on
+        Gelöscht am
+      
+      
+        Name
+        Name
+      
+      
+        Owner
+        Eigentümer
+      
+      
+        Time to restore
+        Verbleibende Zeit für Wiederherstellung
+      
+      
+        {length} deleted {length, plural, one{dossier} other{dossiers}}
+        {length} {length, plural, one{gelöschtes Dossier} other{gelöschte Dossiers}}
+      
+      
+        Type
+        Typ
+      
+      
+        Unknown
+        Unbekannt
+      
+      
+        Cancel
+        Abbrechen
+      
+      
+        Merge entries
+        Einträge zusammenführen
+      
+      
+        Overwrite
+        Überschreiben
+      
+      
+        Choose how you want to proceed:
+        Wählen Sie, wie Sie fortfahren möchten:
+      
+      
+        The dictionary already has entries!
+        Das Wörterbuch hat bereits Einträge!
+      
+      
+        Cancel Upload
+        Upload abbrechen
+      
+      
+        Retry Upload
+        Upload erneut versuchen
+      
+      
+        File Uploads ({len})
+        Datei-Uploads ({len})
+      
+      
+        File too large. Limit is {size}MB.
+        Datei zu groß. Die maximal zulässige Größe beträgt {size} MB.
+      
+      
+        Failed to upload file. 
+        Fehler beim Hochladen des Dokuments
+      
+      
+        Delete User
+        Benutzer löschen
+      
+      
+        Edit User
+        Benutzer bearbeiten
+      
+      
+        New User
+        Neuer Benutzer
+      
+      
+        Delete Users
+        Benutzer löschen
+      
+      
+        You cannot delete your own account.
+        Sie können Ihr eigenes Konto nicht löschen.
+      
+      
+        No users match your current filters.
+        Die ausgewählten Filter treffen auf keinen Benutzer zu.
+      
+      
+        Search...
+        Suche ...
+      
+      
+        Active
+        Aktiv
+      
+      
+        Email
+        E-Mail-Adresse
+      
+      
+        Name
+        Name
+      
+      
+        Roles
+        Rollen
+      
+      
+        {length} {length, plural, one{user} other{users}}
+        {length} {length, plural, one{user} other{users}}
+      
+      
+        User Management
+        Benutzerverwaltung
+      
+      
+        My Profile
+        Mein Profil
+      
+      
+        Change Password
+        Passwort ändern
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Email
+        Email
+      
+      
+        First name
+        Vorname
+      
+      
+        Last name
+        Nachname
+      
+      
+        Edit Profile
+        Profil bearbeiten
+      
+      
+        Users in Workspace
+        Benutzer im Arbeitsbereich
+      
+      
+        Hide Details
+        Details ausblenden
+      
+      
+        Show Details
+        Details anzeigen
+      
+      
+        Users
+        Benutzer
+      
+      
+        List
+        Liste
+      
+      
+        View as:
+        Ansicht als:
+      
+      
+        Workflow
+        Arbeitsablauf
+      
+      
+        Watermark
+        Wasserzeichen
+      
+      
+        Watermark updated!
+        Das Wasserzeichen wurde aktualisiert!
+      
+      
+        Watermark deleted.
+        Das Wasserzeichen wurde gelöscht.
+      
+      
+        Failed to update Watermark
+        Fehler beim Aktualisieren des Wasserzeichens
+      
+      
+        Revert
+        Rückgängig machen
+      
+      
+        Save Changes
+        Änderungen speichern
+      
+      
+        Color
+        Farbe
+      
+      
+        Font Size
+        Schriftgröße
+      
+      
+        Font Type
+        Schriftart
+      
+      
+        Opacity
+        Deckkraft
+      
+      
+        Orientation
+        Ausrichtung
+      
+      
+        Enter text
+        Text eingeben
+      
+      
+        Watermark
+        Wasserzeichen
+      
+      
+        All
+        Alle
+      
+      
+        {count} selected
+        {count} ausgewählt
+      
+      
+        None
+        Keiner
+      
+      
+        Select
+        Wählen
+      
+      
+        Yesterday
+        Gestern
+      
+    
+  
+
\ No newline at end of file
diff --git a/tools/auto-i18n/test.xml b/tools/auto-i18n/test.xml
new file mode 100644
index 000000000..d0d98ac60
--- /dev/null
+++ b/tools/auto-i18n/test.xml
@@ -0,0 +1,4295 @@
+
+
+    
+        

+            
+        

+        
+            
+                Account Settings
+            
+            
+                All
+                
+            
+            
+                None
+                
+            
+            
+                Active
+                
+            
+            
+                Save
+                
+            
+            
+                Save and Edit Team
+                
+            
+            
+                Dossier with this name already exists!
+                
+            
+            
+                Failed to save dossier.
+                
+            
+            
+                Description
+                
+            
+            
+                Enter Description
+                
+            
+            
+                Due Date
+                
+            
+            
+                Dossier Name
+                
+            
+            
+                Enter Name
+                
+            
+            
+                Dossier Template
+                
+            
+            
+                Watermark application on redacted documents
+                
+            
+            
+                Watermark application on preview documents
+                
+            
+            
+                Create Dossier
+                
+            
+            
+                Dictionary with this name already exists!
+                
+            
+            
+                Failed to save dictionary!
+                
+            
+            
+                Invalid color or rank! Rank is already used by another dictionary or the color is not a valid hexColor!
+                
+            
+            
+                Enable 'Add to dictionary'
+                
+            
+            
+                Case Sensitive
+                
+            
+            
+                Hex Color
+                
+            
+            
+                #
+                
+            
+            
+                Description
+                
+            
+            
+                Enter Description
+                
+            
+            
+                Hint
+                
+            
+            
+                Display Name
+                
+            
+            
+                Cannot be edited after saving.
+                
+            
+            
+                Enter Name
+                
+            
+            
+                Rank
+                
+            
+            
+                1000
+                
+            
+            
+                Redaction
+                
+            
+            
+                Technical Name
+                
+            
+            
+                Save Dictionary
+                
+            
+            
+                {type, select, edit{Edit
+                    {name}} create{Create} other{}} Dictionary
+                
+            
+            
+                Failed to save attribute!
+                
+            
+            
+                Attribute Name
+                
+            
+            
+                Enter Name
+                
+            
+            
+                Attribute Placeholder
+                
+            
+            
+                Attribute Type
+                
+            
+            
+                Save Attribute
+                
+            
+            
+                {type, select, edit{Edit
+                    {name}} create{Add New} other{}} Dossier
+                    Attribute
+                
+            
+            
+                Failed to create dossier template: a dossier template with the same name already exists.
+                
+            
+            
+                Failed to create dossier template.
+                
+            
+            
+                Description
+                
+            
+            
+                Enter Description
+                
+            
+            
+                Dossier Template Name
+                
+            
+            
+                Enter Name
+                
+            
+            
+                Valid from
+                
+            
+            
+                Valid to
+                
+            
+            
+                Save Dossier Template
+                
+            
+            
+                {type, select, edit{Edit
+                    {name}} create{Create} other{}} Dossier
+                    Template
+                
+            
+            
+                CSV Column Header
+                
+            
+            
+                Enter CSV Column Header
+                
+            
+            
+                The maximum number of displayed attributes ({maxNumber})
+                    has been reached.
+                
+            
+            
+                Displayed In File List
+                
+            
+            
+                Filterable
+                
+            
+            
+                The maximum number of filterable attributes ({maxNumber})
+                    has been reached.
+                
+            
+            
+                Attribute Name
+                
+            
+            
+                Enter Name
+                
+            
+            
+                Set as Primary
+                
+            
+            
+                Make Read-Only
+                
+            
+            
+                Type
+                
+            
+            
+                Save Attribute
+                
+            
+            
+                {type, select, edit{Edit
+                    {name}} create{Add New} other{}} File
+                    Attribute
+                
+            
+            
+                Cancel
+                
+            
+            
+                Save Justification
+                
+            
+            
+                Description
+                
+            
+            
+                Enter Description
+                
+            
+            
+                Name
+                
+            
+            
+                Enter Name
+                
+            
+            
+                Legal Basis
+                
+            
+            
+                Enter Legal Basis
+                
+            
+            
+                {type, select, edit{Edit
+                    {name}} create{Add New} other{}} Justification
+                
+            
+            
+                Cancel
+                
+            
+            
+                Delete User
+                
+            
+            
+                Save User
+                
+            
+            
+                Save Changes
+                
+            
+            
+                This e-mail address is already in use by a different user!
+                
+            
+            
+                Failed to save user!
+                
+            
+            
+                Email
+                
+            
+            
+                First Name
+                
+            
+            
+                Last Name
+                
+            
+            
+                Reset Password
+                
+            
+            
+                Role
+                
+            
+            
+                {type, select, edit{Edit} create{Add
+                    New} other{}} User
+                
+            
+            
+                Dossier Templates
+                
+            
+            
+                Settings
+                
+            
+            
+                Annotation
+                
+            
+            
+                Accept Recommendation
+                
+            
+            
+                Approve Suggestion
+                
+            
+            
+                Edit Reason
+                
+            
+            
+                Force Hint
+                
+            
+            
+                Force Redaction
+                
+            
+            
+                Hide
+                
+            
+            
+                Cannot add ''{content}'' to the {dictionaryName} dictionary
+                    because it was recognized as a general term that appears too often in texts.
+                
+            
+            
+                Failed to add entry to dictionary: {error}
+                
+            
+            
+                Entry added to dictionary. Changes will be visible after reanalysis.
+                
+            
+            
+                Failed to approve dictionary entry: {error}
+                
+            
+            
+                Dictionary entry approved. Changes will be visible after reanalysis.
+                
+            
+            
+                Failed to decline dictionary suggestion: {error}
+                
+            
+            
+                Dictionary suggestion declined.
+                
+            
+            
+                Failed to remove dictionary entry: {error}
+                
+            
+            
+                Dictionary entry removed!
+                
+            
+            
+                Failed to request removal of dictionary entry: {error}
+                
+            
+            
+                Requested to remove dictionary entry!
+                
+            
+            
+                Failed to save suggestion for dictionary modification: {error}
+                
+            
+            
+                Suggestion for dictionary modification saved!
+                
+            
+            
+                Failed to undo: {error}
+                
+            
+            
+                Undo successful
+                
+            
+            
+                Failed to save redaction: {error}
+                
+            
+            
+                Redaction added!
+                
+            
+            
+                Failed to approve suggestion: {error}
+                
+            
+            
+                Suggestion approved.
+                
+            
+            
+                Failed to edit annotation reason: {error}
+                
+            
+            
+                Annotation reason was edited.
+                
+            
+            
+                Failed to decline suggestion: {error}
+                
+            
+            
+                Suggestion declined.
+                
+            
+            
+                Failed to save redaction: {error}
+                
+            
+            
+                Redaction added!
+                
+            
+            
+                Failed to recategorize image: {error}
+                
+            
+            
+                Image recategorized.
+                
+            
+            
+                Failed to remove redaction: {error}
+                
+            
+            
+                Redaction removed!
+                
+            
+            
+                Failed to request annotation reason change: {error}
+                
+            
+            
+                Annotation reason change requested.
+                
+            
+            
+                Failed to save redaction suggestion: {error}
+                
+            
+            
+                Redaction suggestion saved
+                
+            
+            
+                Failed to request image recategorization: {error}
+                
+            
+            
+                Image recategorization requested.
+                
+            
+            
+                Failed to request removal of redaction: {error}
+                
+            
+            
+                Requested to remove redaction!
+                
+            
+            
+                Failed to save redaction suggestion: {error}
+                
+            
+            
+                Redaction suggestion saved
+                
+            
+            
+                Failed to undo: {error}
+                
+            
+            
+                Undo successful
+                
+            
+            
+                Recategorize
+                
+            
+            
+                Reject Suggestion
+                
+            
+            
+                False Positive
+                
+            
+            
+                Remove only here
+                
+            
+            
+                Remove from dictionary
+                
+            
+            
+                Save Resize
+                
+            
+            
+                Abort Resize
+                
+            
+            
+                Resize
+                
+            
+            
+                Show
+                
+            
+            
+                Undo
+                
+            
+            
+                Redaction forced
+                
+            
+            
+                Manual changes:
+                
+            
+            
+                Reason changed
+                
+            
+            
+                Image category changed
+                
+            
+            
+                Redaction/Hint removed
+                
+            
+            
+                Redaction area has been modified
+                
+            
+            
+                {isHint, select, true{Hint} other{Redaction}} based on dictionary
+                
+            
+            
+                Redaction based on AI
+                
+            
+            
+                Redaction based on rule {rule}
+                
+            
+            
+                Declined Suggestion
+                
+            
+            
+                Hint
+                
+            
+            
+                Ignored Hint
+                
+            
+            
+                Manual Redaction
+                
+            
+            
+                Recommendation
+                
+            
+            
+                Redaction
+                
+            
+            
+                Skipped
+                
+            
+            
+                Suggested redaction
+                
+            
+            
+                Suggested dictionary add
+                
+            
+            
+                Suggested change legal basis
+                
+            
+            
+                Suggestion force redaction
+                
+            
+            
+                Suggested recategorize image
+                
+            
+            
+                Suggested redaction removal
+                
+            
+            
+                Suggested dictionary removal
+                
+            
+            
+                Suggested Resize
+                
+            
+            
+                Annotations
+                
+            
+            
+                Archived
+                
+            
+            
+                Approvers
+                
+            
+            
+                Make Approver
+                
+            
+            
+                No members with "review only" permission.
+                
+            
+            
+                Reviewers
+                
+            
+            
+                Search...
+                
+            
+            
+                Select from the list below.
+                
+            
+            
+                Owner
+                
+            
+            
+                Cancel
+                
+            
+            
+                {type, select, approver{Approver} reviewer{Reviewer
+                    } other{}}
+                
+            
+            
+                Save
+                
+            
+            
+                Manage File {type, select, approver{Approver} reviewer{Reviewer
+                    } other{}}
+                
+            
+            
+                Cancel
+                
+            
+            
+                Save
+                
+            
+            
+                Successfully assigned {ownerName} to dossier: {dossierName}.
+                
+            
+            
+                Successfully {reviewerName, select, undefined{unassigned
+                    user from} other{assigned {reviewerName} to
+                    file:}} {filename}.
+                
+            
+            
+                Audit
+                
+            
+            
+                All Users
+                
+            
+            
+                All Categories
+                
+            
+            
+                Audit
+                
+            
+            
+                Audit Log
+                
+            
+            
+                Dictionary
+                
+            
+            
+                Document
+                
+            
+            
+                Dossier
+                
+            
+            
+                Dossier Template
+                
+            
+            
+                Download
+                
+            
+            
+                License
+                
+            
+            
+                Project
+                
+            
+            
+                Project Template
+                
+            
+            
+                User
+                
+            
+            
+                No available logs.
+                
+            
+            
+                Category
+                
+            
+            
+                Date
+                
+            
+            
+                Message
+                
+            
+            
+                User
+                
+            
+            
+                {length} {length, plural, one{Log} other{Logs
+                    }}
+                
+            
+            
+                to
+                
+            
+            
+                Your user is successfully logged in but has no role assigned yet. Please contact your RedactManager administrator to assign appropriate roles.
+                
+            
+            
+                Your user is successfully logged in but has no role assigned yet. Please contact <a href={adminUrl}  target=_blank >your RedactManager administrator</a> to assign
+                    appropriate roles!
+                
+            
+            
+                Your user is successfully logged in but has no role assigned yet. Please contact {adminName} to
+                    assign appropriate roles.
+                
+            
+            
+                Your user is successfully logged in but has no role assigned yet. Please contact <a href={adminUrl} target=_blank >{adminName}</a>
+                    to assign appropriate roles.
+                
+            
+            
+                Logout
+                
+            
+            
+                by
+                
+            
+            
+                Cancel
+                
+            
+            
+                Save Changes
+                
+            
+            
+                Value / Classification
+                
+            
+            
+                Comment
+                
+            
+            
+                Legal Basis
+                
+            
+            
+                Select redaction reason
+                
+            
+            
+                Select a reason...
+                
+            
+            
+                Paragraph / Location
+                
+            
+            
+                Edit Redaction Reason
+                
+            
+            
+                Enter comment
+                
+            
+            
+                {count} {count, plural, one{comment} other{comments
+                    }}
+                
+            
+            
+                Hide comments
+                
+            
+            
+                Close View
+                
+            
+            
+                Yes
+                
+            
+            
+                No
+                
+            
+            
+                This action requires confirmation, do you wish to proceed?
+                
+            
+            
+                Confirm Action
+                
+            
+            
+                Configurations
+                
+            
+            
+                Keep {type, select, single{Attribute} bulk{Attributes
+                    } other{}}
+                
+            
+            
+                Delete {type, select, single{Attribute} bulk{Attributes
+                    } other{}}
+                
+            
+            
+                All documents {type, select, single{it is} bulk{they
+                    are} other{}} used on will be impacted
+                
+            
+            
+                All inputted details on the documents will be lost
+                
+            
+            
+                Delete {type, select, single{{name}} bulk{File Attributes
+                    } other{}}
+                
+            
+            
+                Please confirm that you understand the ramifications of your action!
+                
+            
+            
+                Warning: this cannot be undone!
+                
+            
+            
+                Keep {usersCount, plural, one{User} other{Users
+                    }}
+                
+            
+            
+                Delete {usersCount, plural, one{User} other{Users
+                    }}
+                
+            
+            
+                All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted
+                
+            
+            
+                {dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted
+                
+            
+            
+                Delete {usersCount, plural, one{User} other{Users}} from Workspace
+                
+            
+            
+                Please confirm that you understand the ramifications of your action!
+                
+            
+            
+                Warning: this cannot be undone!
+                
+            
+            
+                This document has unseen changes, do you wish to approve it anyway?
+                
+            
+            
+                Warning!
+                
+            
+            
+                At least one of the files you selected has unseen changes, do you wish to approve them anyway?
+                
+            
+            
+                Warning!
+                
+            
+            
+                This document is currently reviewed by someone else. Do you want to become the reviewer and assign yourself to this document?
+                
+            
+            
+                Re-assign user
+                
+            
+            
+                <strong>Warning!</strong> <br><br> Number of pages does not match, current document has <strong>{currentDocumentPageCount} page(s)</strong>. Uploaded document has <strong>{compareDocumentPageCount} page(s)</strong>. <br><br> Do you wish to
+                    proceed?
+                
+            
+            
+                Compare with file: {fileName}
+                
+            
+            
+                Delete {dossiersCount, plural, one{Dossier} other{Dossiers
+                    }}
+                
+            
+            
+                Keep {dossiersCount, plural, one{Dossier} other{Dossiers
+                    }}
+                
+            
+            
+                Are you sure you want to delete {dossiersCount, plural, one{this
+                    dossier} other{these dossiers}}?
+                
+            
+            
+                Delete {dossiersCount, plural, one{{dossierName}} other{Selected Dossiers
+                    }}
+                
+            
+            
+                Do you wish to proceed?
+                
+            
+            
+                Delete Document
+                
+            
+            
+                Are you sure you want to delete {count, plural, one{this
+                    justification} other{these justifications}}?
+                
+            
+            
+                Delete {count, plural, one{{justificationName}} other{Selected Justifications
+                    }}
+                
+            
+            
+                To proceed please type below
+                
+            
+            
+                Delete {filesCount, plural, one{Document} other{Documents
+                    }}
+                
+            
+            
+                Keep {filesCount, plural, one{Document} other{Documents
+                    }}
+                
+            
+            
+                Are you sure you want to delete {filesCount, plural, one{this
+                    document} other{these documents}}?
+                
+            
+            
+                Delete {filesCount, plural, one{{fileName}} other{Selected Documents
+                    }}
+                
+            
+            
+                Upload as multi-file report
+                
+            
+            
+                Upload as single-file report
+                
+            
+            
+                Cancel Upload
+                
+            
+            
+                Please choose if <b>{fileName}</b> is a single
+                    or multi-file report template
+                
+            
+            
+                Report Template Upload
+                
+            
+            
+                Yes. Continue upload
+                
+            
+            
+                No. Cancel Upload
+                
+            
+            
+                There is already a Report Template with the name: <b>{fileName}</b>.
+                    Do you wish to continue?
+                
+            
+            
+                Report Template Upload
+                
+            
+            
+                Reason
+                
+            
+            
+                Default Colors
+                
+            
+            
+                Edit Color
+                
+            
+            
+                Color
+                
+            
+            
+                Type
+                
+            
+            
+                {length} Default {length, plural, one{Color} other{Colors
+                    }}
+                
+            
+            
+                Analysis
+                
+            
+            
+                Default Color
+                
+            
+            
+                Dictionary Request
+                
+            
+            
+                Ignored Hint
+                
+            
+            
+                Manual Redaction
+                
+            
+            
+                Skipped
+                
+            
+            
+                Preview
+                
+            
+            
+                Request Add
+                
+            
+            
+                Request Remove
+                
+            
+            
+                Updated
+                
+            
+            
+                DEV
+                
+            
+            
+                Dictionaries
+                
+            
+            
+                Dictionary
+                
+            
+            
+                Delete Dictionary
+                
+            
+            
+                Edit Dictionary
+                
+            
+            
+                New Dictionary
+                
+            
+            
+                Delete Selected Dictionaries
+                
+            
+            
+                Case Sensitive
+                
+            
+            
+                New Dictionary
+                
+            
+            
+                There are no dictionaries yet.
+                
+            
+            
+                No dictionaries match your current filters.
+                
+            
+            
+                Search...
+                
+            
+            
+                Entries
+                
+            
+            
+                Types
+                
+            
+            
+                Hint/Redaction
+                
+            
+            
+                Rank
+                
+            
+            
+                Type
+                
+            
+            
+                {length} {length, plural, one{dictionary} other{dictionaries
+                    }}
+                
+            
+            
+                Delete Dictionary
+                
+            
+            
+                Download Dictionary
+                
+            
+            
+                Edit Dictionary
+                
+            
+            
+                Upload Dictionary
+                
+            
+            
+                Compare
+                
+            
+            
+                Select Dictionary
+                
+            
+            
+                Select Dossier
+                
+            
+            
+                Select Dossier Template
+                
+            
+            
+                Description
+                
+            
+            
+                Some entries of the dictionary are below the minimum length of 2. These are highlighted with red!
+                
+            
+            
+                Something went wrong... Dictionary update failed!
+                
+            
+            
+                Revert
+                
+            
+            
+                Save Changes
+                
+            
+            
+                Search...
+                
+            
+            
+                Select a dictionary above to compare with the current one.
+                
+            
+            
+                Dictionary updated!
+                
+            
+            
+                Digital Signature
+                
+            
+            
+                Uploaded Certificate is not valid for signing PDFs. PCKS.12 format is required.
+                
+            
+            
+                Delete Digital Signature
+                
+            
+            
+                Failed to remove digital signature, please try again.
+                
+            
+            
+                Digital signature removed. Redacted files will no longer be signed!
+                
+            
+            
+                Reset
+                
+            
+            
+                Save Digital Signature
+                
+            
+            
+                Failed to save digital signature
+                
+            
+            
+                Digital signature saved successfully
+                
+            
+            
+                Certificate Name
+                
+            
+            
+                Certificate Name
+                
+            
+            
+                Contact Information
+                
+            
+            
+                Contact Information
+                
+            
+            
+                Location
+                
+            
+            
+                Location
+                
+            
+            
+                Upload Certificate
+                
+            
+            
+                No Digital Signature certificate is configured. For signing redacted documents please upload a PCKS.12 certificate.
+                
+            
+            
+                Certificate Password/Key
+                
+            
+            
+                Password
+                
+            
+            
+                Reason
+                
+            
+            
+                Reason
+                
+            
+            
+                Save Document Info
+                
+            
+            
+                Introduce File Attributes
+                
+            
+            
+                Dossier
+                
+            
+            
+                Date
+                
+            
+            
+                Image
+                
+            
+            
+                Number
+                
+            
+            
+                Free Text
+                
+            
+            
+                Dossier Attributes
+                
+            
+            
+                Delete Attribute
+                
+            
+            
+                Edit Attribute
+                
+            
+            
+                New Attribute
+                
+            
+            
+                Delete Selected Attributes
+                
+            
+            
+                New Attribute
+                
+            
+            
+                There are no dossier attributes.
+                
+            
+            
+                No attributes match your current filters.
+                
+            
+            
+                Search...
+                
+            
+            
+                Label
+                
+            
+            
+                Placeholder
+                
+            
+            
+                Type
+                
+            
+            
+                {length} dossier {length, plural, one{attribute} other{attributes
+                    }}
+                
+            
+            
+                Assign Members
+                
+            
+            
+                Hide Details
+                
+            
+            
+                Edit Owner
+                
+            
+            
+                Show Details
+                
+            
+            
+                Members
+                
+            
+            
+                Owner
+                
+            
+            
+                See less
+                
+            
+            
+                Dossier Details
+                
+            
+            
+                New Dossier
+                
+            
+            
+                Delete Dossier
+                
+            
+            
+                Failed to delete dossier: {dossierName}
+                
+            
+            
+                Dossier Info
+                
+            
+            
+                Edit Dossier
+                
+            
+            
+                Dossier Name
+                
+            
+            
+                Dossier name...
+                
+            
+            
+                New Dossier
+                
+            
+            
+                You currently have no dossiers.
+                
+            
+            
+                No dossiers match your current filters.
+                
+            
+            
+                My Dossiers
+                
+            
+            
+                Other
+                
+            
+            
+                To Approve
+                
+            
+            
+                To Review
+                
+            
+            
+                Analyze entire dossier
+                
+            
+            
+                {count, plural, one{Page} other{Pages
+                    }}
+                
+            
+            
+                {count, plural, one{Dossier} other{Dossiers
+                    }}
+                
+            
+            
+                Total Documents
+                
+            
+            
+                Total users
+                
+            
+            
+                Name
+                
+            
+            
+                Workload
+                
+            
+            
+                Owner
+                
+            
+            
+                Status
+                
+            
+            
+                {length} active {length, plural, one{Dossier} other{Dossiers
+                    }}
+                
+            
+            
+                Approve
+                
+            
+            
+                File can only be approved once it has been analysed with the latest dictionaries and all suggestions have been processed.
+                
+            
+            
+                Assign Approver
+                
+            
+            
+                Assign To Me
+                
+            
+            
+                Assign User
+                
+            
+            
+                Delete Documents
+                
+            
+            
+                Analyze Documents
+                
+            
+            
+                Delete File
+                
+            
+            
+                {count} custom {count, plural, one{attribute} other{attributes
+                    }}
+                
+            
+            
+                Image uploaded
+                
+            
+            
+                show less
+                
+            
+            
+                Documents in Dossier
+                
+            
+            
+                Description
+                
+            
+            
+                Dossier Dictionary
+                
+            
+            
+                {count} {count, plural, one{page} other{pages
+                    }}
+                
+            
+            
+                Created on {date}
+                
+            
+            
+                {count} deleted files
+                
+            
+            
+                {count} {count, plural, one{document} other{documents
+                    }}
+                
+            
+            
+                Due {date}
+                
+            
+            
+                {count} {count, plural, one{user} other{users
+                    }}
+                
+            
+            
+                {count} processing {count, plural, one{document} other{documents
+                    }}
+                
+            
+            
+                Download
+                
+            
+            
+                You need to be approver in the dossier and the {count, plural, one{file
+                    needs} other{files need}} to be approved in
+                    order to download.
+                
+            
+            
+                Re-processing required
+                
+            
+            
+                Pending...
+                
+            
+            
+                Document Name
+                
+            
+            
+                Document name...
+                
+            
+            
+                Download CSV File Report
+                
+            
+            
+                Edit Dossier
+                
+            
+            
+                Upload Document
+                
+            
+            
+                Analyze all
+                
+            
+            
+                Upload Document
+                
+            
+            
+                There are no documents yet.
+                
+            
+            
+                No documents match your current filters.
+                
+            
+            
+                OCR Document
+                
+            
+            
+                OCR was performed for this file.
+                
+            
+            
+                Assigned to me
+                
+            
+            
+                Assigned to others
+                
+            
+            
+                Recent ({hours} h)
+                
+            
+            
+                Unassigned
+                
+            
+            
+                Failed to schedule files for reanalysis. Please try again.
+                
+            
+            
+                Files scheduled for reanalysis.
+                
+            
+            
+                Analyze File
+                
+            
+            
+                Added
+                
+            
+            
+                Assigned to
+                
+            
+            
+                Name
+                
+            
+            
+                Workload
+                
+            
+            
+                Pages
+                
+            
+            
+                Status
+                
+            
+            
+                {length} {length, plural, one{document} other{documents
+                    }}
+                
+            
+            
+                For Approval
+                
+            
+            
+                Under Review
+                
+            
+            
+                Drag & drop files anywhere...
+                
+            
+            
+                Dossier Templates
+                
+            
+            
+                Delete Template
+                
+            
+            
+                Edit Template
+                
+            
+            
+                New Dossier Template
+                
+            
+            
+                Delete Selected Dossier Templates
+                
+            
+            
+                {length} {length, plural, one{dictionary} other{dictionaries
+                    }}
+                
+            
+            
+                Cannot delete this DossierTemplate! At least one Dossier uses this template!
+                
+            
+            
+                Cannot delete this DossierTemplate!
+                
+            
+            
+                There are no dossier templates yet.
+                
+            
+            
+                No dossier templates match your current filters.
+                
+            
+            
+                Search...
+                
+            
+            
+                Created by
+                
+            
+            
+                Created on
+                
+            
+            
+                Modified on
+                
+            
+            
+                Name
+                
+            
+            
+                {length} dossier {length, plural, one{template} other{templates
+                    }}
+                
+            
+            
+                Choose what is included at download:
+                
+            
+            
+                Your download has been queued, you can see all your requested downloads here: <a href='/ui/main/downloads'>My Downloads<a/>.
+                
+            
+            
+                Annotated PDF
+                
+            
+            
+                Flatten PDF
+                
+            
+            
+                {length} document {length, plural, one{version} other{versions
+                    }}
+                
+            
+            
+                Optimized PDF
+                
+            
+            
+                Preview PDF
+                
+            
+            
+                Redacted PDF
+                
+            
+            
+                Delete
+                
+            
+            
+                Download
+                
+            
+            
+                Delete Selected Downloads
+                
+            
+            
+                No active downloads.
+                
+            
+            
+                Date
+                
+            
+            
+                Name
+                
+            
+            
+                Size
+                
+            
+            
+                Status
+                
+            
+            
+                {length} {length, plural, one{download} other{downloads
+                    }}
+                
+            
+            
+                Failed to update colors.
+                
+            
+            
+                Color
+                
+            
+            
+                Color
+                
+            
+            
+                Save
+                
+            
+            
+                Successfully updated color for {color}.
+                
+            
+            
+                Revert
+                
+            
+            
+                Save
+                
+            
+            
+                Save & Close
+                
+            
+            
+                Custom Dossier Attributes
+                
+            
+            
+                Delete Image
+                
+            
+            
+                Only PNG, JPG and JPEG files are allowed as image dossier attributes.
+                
+            
+            
+                Image Attributes
+                
+            
+            
+                There are no text attributes
+                
+            
+            
+                There are no image attributes
+                
+            
+            
+                Upload Image
+                
+            
+            
+                Dossier {dossierName} was updated.
+                
+            
+            
+                Dossier {dossierName} was deleted.
+                
+            
+            
+                Delete Forever
+                
+            
+            
+                Restore
+                
+            
+            
+                Forever Delete Selected Documents
+                
+            
+            
+                Restore Selected Documents
+                
+            
+            
+                Deleted items can be restored up to {hours} hours from
+                    their deletion
+                
+            
+            
+                There are no deleted documents.
+                
+            
+            
+                Assignee
+                
+            
+            
+                Deleted On
+                
+            
+            
+                Name
+                
+            
+            
+                Pages
+                
+            
+            
+                Status
+                
+            
+            
+                Time To Restore
+                
+            
+            
+                {length} deleted {length, plural, one{document} other{documents
+                    }}
+                
+            
+            
+                Cancel
+                
+            
+            
+                Edit Display Name
+                
+            
+            
+                Failed to update dictionary display name.
+                
+            
+            
+                Enter Display Name
+                
+            
+            
+                Save Display Name
+                
+            
+            
+                Successfully updated dictionary display name.
+                
+            
+            
+                {length} {length, plural, one{entry} other{entries
+                    }}
+                
+            
+            
+                Description
+                
+            
+            
+                Enter Description
+                
+            
+            
+                Due Date
+                
+            
+            
+                Dossier Name
+                
+            
+            
+                Enter Name
+                
+            
+            
+                Dossier Template
+                
+            
+            
+                Watermark application on redacted documents
+                
+            
+            
+                Watermark application on preview documents
+                
+            
+            
+                Edit {dossierName}
+                
+            
+            
+                Choose what is included at download:
+                
+            
+            
+                Deleted Documents
+                
+            
+            
+                Dictionary
+                
+            
+            
+                Dossier Attributes
+                
+            
+            
+                Dossier Dictionary
+                
+            
+            
+                Dossier Info
+                
+            
+            
+                Download Package
+                
+            
+            
+                General Information
+                
+            
+            
+                Members
+                
+            
+            
+                Team Members
+                
+            
+            
+                Configurations
+                
+            
+            
+                You have unsaved changes. Save or revert before changing the tab.
+                
+            
+            
+                Back to overview
+                
+            
+            
+                This dossier has been deleted!
+                
+            
+            
+                Back to overview
+                
+            
+            
+                The dossier of this file has been deleted!
+                
+            
+            
+                Back to dossier
+                
+            
+            
+                This file has been deleted!
+                
+            
+            
+                Action failed with code {status}
+                
+            
+            
+                Disconnected
+                
+            
+            
+                Reconnected
+                
+            
+            
+                Reload
+                
+            
+            
+                Oops! Something went wrong...
+                
+            
+            
+                {day} {month} {year} at {hour}:
+                    {minute}
+                
+            
+            
+                File
+                
+            
+            
+                Date
+                
+            
+            
+                Number
+                
+            
+            
+                Free Text
+                
+            
+            
+                File Attributes
+                
+            
+            
+                Cancel
+                
+            
+            
+                Edit Name
+                
+            
+            
+                Remove
+                
+            
+            
+                Save
+                
+            
+            
+                {value} available
+                
+            
+            
+                Cancel
+                
+            
+            
+                CSV Column
+                
+            
+            
+                Delimiter
+                
+            
+            
+                ,
+                
+            
+            
+                Encoding
+                
+            
+            
+                UTF-8
+                
+            
+            
+                File:
+                
+            
+            
+                Key Column
+                
+            
+            
+                Select column...
+                
+            
+            
+                No file attributes defined. Select a column from the left panel to start defining file attributes.
+                
+            
+            
+                Preview CSV column by hovering the entry.
+                
+            
+            
+                No sample data for {column}.
+                
+            
+            
+                Parse CSV with new options
+                
+            
+            
+                All
+                
+            
+            
+                None
+                
+            
+            
+                Failed to create File Attributes!
+                
+            
+            
+                Save Attributes
+                
+            
+            
+                {count} file {count, plural, one{attribute} other{attributes}} created successfully!
+                
+            
+            
+                Search by column name...
+                
+            
+            
+                {value} selected
+                
+            
+            
+                Name
+                
+            
+            
+                primary
+                
+            
+            
+                The value of the attribute set as primary shows up under the file name in the documents list.
+                
+            
+            
+                Read-Only
+                
+            
+            
+                Type
+                
+            
+            
+                Disable Read-only for all attributes
+                
+            
+            
+                Enable Read-only for all attributes
+                
+            
+            
+                Make Read-only
+                
+            
+            
+                Remove Selected
+                
+            
+            
+                Type
+                
+            
+            
+                {length} file {length, plural, one{attribute} other{attributes
+                    }}
+                
+            
+            
+                Select CSV columns to use as File Attributes
+                
+            
+            
+                {rows} rows in total
+                
+            
+            
+                Delete Attribute
+                
+            
+            
+                Edit Attribute
+                
+            
+            
+                New Attribute
+                
+            
+            
+                Delete Selected Attributes
+                
+            
+            
+                File-Attribute with this name already exists!
+                
+            
+            
+                Failed to add File-Attribute
+                
+            
+            
+                There are no file attributes yet.
+                
+            
+            
+                No file attributes match your current filters.
+                
+            
+            
+                Read-only
+                
+            
+            
+                Search by attribute name...
+                
+            
+            
+                CSV Column
+                
+            
+            
+                Displayed in File List
+                
+            
+            
+                Filterable
+                
+            
+            
+                Name
+                
+            
+            
+                Primary
+                
+            
+            
+                The value of the attribute set as primary shows up under the file name in the documents list.
+                
+            
+            
+                Read-Only
+                
+            
+            
+                Input Type
+                
+            
+            
+                {length} file {length, plural, one{attribute} other{attributes
+                    }}
+                
+            
+            
+                Upload File Attributes Configuration
+                
+            
+            
+                Assign to me
+                
+            
+            
+                Assign User
+                
+            
+            
+                Change User
+                
+            
+            
+                Delta
+                
+            
+            
+                Delta View shows only the changes since last re-analysis. This view is only available if there is at least 1 change
+                
+            
+            
+                Your Document Info lives here. This includes metadata required on each document.
+                
+            
+            
+                Download Original File
+                
+            
+            
+                Exclude pages from redaction
+                
+            
+            
+                excluded
+                
+            
+            
+                Full Screen (F)
+                
+            
+            
+                Last Reviewed by:
+                
+            
+            
+                There are no annotations on this page.
+                
+            
+            
+                Jump to first page
+                
+            
+            
+                Jump to last page
+                
+            
+            
+                This document was not processed with the latest rule/dictionary set. Analyze now to get updated annotations.
+                
+            
+            
+                Preview
+                
+            
+            
+                Redaction preview shows only redactions. Consider this a preview for the final redacted version. This view is only available if the file has no pending changes & doesn't require a reanalysis
+                
+            
+            
+                Standard
+                
+            
+            
+                Standard Workload view shows all hints, redactions, recommendations & suggestions. This view allows editing.
+                
+            
+            
+                Jump to Next
+                
+            
+            
+                Jump to Previous
+                
+            
+            
+                Workload
+                
+            
+            
+                This page is
+                
+            
+            
+                Select
+                
+            
+            
+                All
+                
+            
+            
+                None
+                
+            
+            
+                Close Document Info
+                
+            
+            
+                Created on: {date}
+                
+            
+            
+                in {dossierName}
+                
+            
+            
+                Due: {date}
+                
+            
+            
+                {pages} pages
+                
+            
+            
+                Edit Document Info
+                
+            
+            
+                Document Info
+                
+            
+            
+                Close
+                
+            
+            
+                Error! Invalid page selection.
+                
+            
+            
+                Minus (-) for range and comma (,) for enumeration.
+                
+            
+            
+                e.g. 1-20,22,32
+                
+            
+            
+                Exclude Pages
+                
+            
+            
+                No excluded pages.
+                
+            
+            
+                Undo
+                
+            
+            
+                Removed from redaction
+                
+            
+            
+                Redaction is disabled for this document.
+                
+            
+            
+                Disable redaction
+                
+            
+            
+                Enable for redaction
+                
+            
+            
+                Enabling / disabling is permitted only for managers
+                
+            
+            
+                Approved
+                
+            
+            
+                Deleted
+                
+            
+            
+                Re-processing required
+                
+            
+            
+                Processing
+                
+            
+            
+                Image Analyzing
+                
+            
+            
+                Processing
+                
+            
+            
+                New
+                
+            
+            
+                OCR Processing
+                
+            
+            
+                Processed
+                
+            
+            
+                Processing...
+                
+            
+            
+                Processing
+                
+            
+            
+                Unassigned
+                
+            
+            
+                Under Approval
+                
+            
+            
+                Under Review
+                
+            
+            
+                Unprocessed
+                
+            
+            
+                Filter options
+                
+            
+            
+                Filter
+                
+            
+            
+                Filter
+                
+            
+            
+                Only annotations with redaction changes
+                
+            
+            
+                Only annotations on unseen pages
+                
+            
+            
+                Only annotations with comments
+                
+            
+            
+                Analysis pending
+                
+            
+            
+                Comments
+                
+            
+            
+                Hints only
+                
+            
+            
+                Images
+                
+            
+            
+                No Annotations
+                
+            
+            
+                Redacted
+                
+            
+            
+                Suggested Redaction
+                
+            
+            
+                Updated
+                
+            
+            
+                Assignee(s)
+                
+            
+            
+                Dossier Templates
+                
+            
+            
+                Empty
+                
+            
+            
+                Filter:
+                
+            
+            
+                Workload
+                
+            
+            
+                Dossier Member(s)
+                
+            
+            
+                Status
+                
+            
+            
+                Save Configurations
+                
+            
+            
+                Test Connection
+                
+            
+            
+                Environment
+                
+            
+            
+                RedactManager
+                
+            
+            
+                Enable Authentication
+                
+            
+            
+                Change Credentials
+                
+            
+            
+                Envelope From
+                
+            
+            
+                Info text regarding envelope from field.
+                
+            
+            
+                Sender Envelope Email Address
+                
+            
+            
+                From
+                
+            
+            
+                Name for Sender
+                
+            
+            
+                Info text regarding the name for sender.
+                
+            
+            
+                Display Name for Sender Email Address
+                
+            
+            
+                Sender Email Address
+                
+            
+            
+                Host
+                
+            
+            
+                SMTP Host
+                
+            
+            
+                Port
+                
+            
+            
+                Reply To
+                
+            
+            
+                Name for Reply To
+                
+            
+            
+                Display Name for Reply To Email Address
+                
+            
+            
+                Reply To Email Address
+                
+            
+            
+                Enable SSL
+                
+            
+            
+                Enable StartTLS
+                
+            
+            
+                Show Forgot password link on Login screen
+                
+            
+            
+                General Configurations
+                
+            
+            
+                SMTP (Simple Mail Transfer Protocol) enables you to send your emails through the specified server settings.
+                
+            
+            
+                Test email could not be sent! Please revise the email address.
+                
+            
+            
+                Test email was sent successfully!
+                
+            
+            
+                Configure SMTP Account
+                
+            
+            
+                Help Mode (H)
+                
+            
+            
+                <b> Clicking anywhere on the screen </b> will show you which areas are interactive. Hovering an interactive area will <b> change the mouse cursor </b> to let you know if the element is interactive.
+                
+            
+            
+                Open Help Mode Instructions
+                
+            
+            
+                Help Mode
+                
+            
+            
+                <b> Welcome to Help Mode! <br> Clicking on interactive elements will open info about them in new tab. </b>
+                
+            
+            
+                Hint
+                
+            
+            
+                Formula
+                
+            
+            
+                Image
+                
+            
+            
+                Logo
+                
+            
+            
+                Signature
+                
+            
+            
+                Unassigned
+                
+            
+            
+                You
+                
+            
+            
+                Justifications
+                
+            
+            
+                Delete Justification
+                
+            
+            
+                Edit Justification
+                
+            
+            
+                Add New Justification
+                
+            
+            
+                Delete Selected Justifications
+                
+            
+            
+                There are no justifications yet.
+                
+            
+            
+                Description
+                
+            
+            
+                Name
+                
+            
+            
+                Legal Basis
+                
+            
+            
+                {length} {length, plural, one{justification} other{justifications
+                    }}
+                
+            
+            
+                Analyzed Pages
+                
+            
+            
+                Backend Application Version
+                
+            
+            
+                Cumulative Pages
+                
+            
+            
+                Legend
+                
+            
+            
+                Licensed Total
+                
+            
+            
+                Pages per Month
+                
+            
+            
+                Total Pages
+                
+            
+            
+                Copyright © 2020 - {currentYear} knecon AG (powered by
+                    IQSER)
+                
+            
+            
+                Copyright Claim
+                
+            
+            
+                Analyzed Pages in Current Licensing Period
+                
+            
+            
+                Custom Application Title
+                
+            
+            
+                Email Report
+                
+            
+            
+                Total Analyzed Pages in current license period: {pages}.
+                
+            
+            
+                Licensed Pages: {pages}.
+                
+            
+            
+                License Report {licenseCustomer}
+                
+            
+            
+                The use of this product is subject to the terms of the Redaction End User Agreement, unless otherwise specified therein.
+                
+            
+            
+                End User License Agreement
+                
+            
+            
+                Number of licensed pages
+                
+            
+            
+                Licensed to
+                
+            
+            
+                Licensing Details
+                
+            
+            
+                Licensing Period
+                
+            
+            
+                OCR Analyzed Pages
+                
+            
+            
+                Total Analyzed Pages Since {date}
+                
+            
+            
+                Unlicensed Analyzed Pages
+                
+            
+            
+                Usage Details
+                
+            
+            
+                License Information
+                
+            
+            
+                Save
+                
+            
+            
+                Value / Classification
+                
+            
+            
+                Comment
+                
+            
+            
+                Dictionary
+                
+            
+            
+                Legal Basis
+                
+            
+            
+                Reason
+                
+            
+            
+                Select a reason ...
+                
+            
+            
+                Custom Rectangle
+                
+            
+            
+                Paragraph / Location
+                
+            
+            
+                Selected text:
+                
+            
+            
+                Add to dictionary
+                
+            
+            
+                Set false positive
+                
+            
+            
+                Force Hint
+                
+            
+            
+                Force Redaction
+                
+            
+            
+                Redaction
+                
+            
+            
+                Request add to dictionary
+                
+            
+            
+                Request false positive
+                
+            
+            
+                Request Redaction
+                
+            
+            
+                Apr.
+                
+            
+            
+                Aug.
+                
+            
+            
+                Dec.
+                
+            
+            
+                Feb.
+                
+            
+            
+                Jan.
+                
+            
+            
+                Jul.
+                
+            
+            
+                Jun.
+                
+            
+            
+                Mar.
+                
+            
+            
+                May
+                
+            
+            
+                Nov.
+                
+            
+            
+                Oct.
+                
+            
+            
+                Sep.
+                
+            
+            
+                You have been assigned as approver for <b><a href="{fileHref}"
+                    target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+                
+            
+            
+                You have been assigned as reviewer for <b><a href="{fileHref}"
+                    target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+                
+            
+            
+                 <b><a href="{fileHref}" target="_blank">{fileName}</a></b> has been approved!
+                
+            
+            
+                Dossier: <b>{dossierName}</b> has been
+                    deleted!
+                
+            
+            
+                <b><a href="{dossierHref}" target="_blank">{dossierName}</a></b> owner removed!
+                
+            
+            
+                 <b><a href="{dossierHref}"
+                    target="_blank">{dossierName}</a></b> owner changed to <b>{user}</b>!
+                
+            
+            
+                Your <b><a href='/ui/main/downloads', target="_blank">download</a></b> is ready!
+                
+            
+            
+                You currently have no notifications
+                
+            
+            
+                You have been unassigned from <b><a href="{fileHref}"
+                    target="_blank">{fileName}</a></b> in dossier: <b><a href="{dossierHref}" target="_blank">{dossierName}</a><b>!
+                
+            
+            
+                You have been added to dossier: <b><a href="{dossierHref}"
+                    target="_blank">{dossierName}</a></b>!
+                
+            
+            
+                You have been demoted to reviewer in dossier: <b><a href="{dossierHref}"
+                    target="_blank">{dossierName}</a></b>!
+                
+            
+            
+                You have been promoted to approver in dossier: <b><a href="{dossierHref}"
+                    target="_blank">{dossierName}</a></b>!
+                
+            
+            
+                You have been removed as a member from dossier: <b><a href="{dossierHref}"
+                    target="_blank">{dossierName}</a></b> !
+                
+            
+            
+                Notifications
+                
+            
+            
+                Email Notifications
+                
+            
+            
+                In-App Notifications
+                
+            
+            
+                Something went wrong... Preferences update failed!
+                
+            
+            
+                Document related notifications
+                
+            
+            
+                Dossier related notifications
+                
+            
+            
+                Other notifications
+                
+            
+            
+                Choose on which action you want to be notified
+                
+            
+            
+                When I am assigned to a document as Approver
+                
+            
+            
+                When I am assigned to a document as Reviewer
+                
+            
+            
+                When the document status changes to Approved
+                
+            
+            
+                When the document status changes to Under Approval
+                
+            
+            
+                When the document status changes to Under Review
+                
+            
+            
+                When a dossier was deleted
+                
+            
+            
+                When the owner of a dossier got deleted
+                
+            
+            
+                When I loose dossier ownership
+                
+            
+            
+                When I become the dossier owner
+                
+            
+            
+                When a download is ready
+                
+            
+            
+                When I am unassigned from a document
+                
+            
+            
+                When a user was added to my dossier
+                
+            
+            
+                When I become a Reviewer in a dossier
+                
+            
+            
+                When I become an Approver in a dossier
+                
+            
+            
+                When I loose dossier membership
+                
+            
+            
+                Daily Summary
+                
+            
+            
+                Instant
+                
+            
+            
+                Weekly Summary
+                
+            
+            
+                Notifications Preferences
+                
+            
+            
+                Cancel all uploads
+                
+            
+            
+                Replace existing document
+                
+            
+            
+                Remember choice and don't ask me again
+                
+            
+            
+                Keep existing document
+                
+            
+            
+                <b>{filename}</b> already exists. Choose how
+                    to proceed:
+                
+            
+            
+                Document already exists!
+                
+            
+            
+                Page
+                
+            
+            
+                Next
+                
+            
+            
+                Prev
+                
+            
+            
+                Search for selection
+                
+            
+            
+                {active, select, true{Disable} false{Enable} other{}} annotation tooltips
+                
+            
+            
+                WARNING: You have unsaved changes. Press Cancel to go back and save these changes, or OK to lose these changes.
+                
+            
+            
+                Read only
+                
+            
+            
+                Cancel
+                
+            
+            
+                Save Changes
+                
+            
+            
+                Comment
+                
+            
+            
+                Select image type
+                
+            
+            
+                Select a type...
+                
+            
+            
+                Edit Image Type
+                
+            
+            
+                Redaction
+                
+            
+            
+                Cancel
+                
+            
+            
+                Yes, proceed and remove!
+                
+            
+            
+                Dictionary
+                
+            
+            
+                Image: {typeLabel}
+                
+            
+            
+                Following entries will be removed from their respective dictionaries:
+                
+            
+            
+                Remove From Dictionary
+                
+            
+            
+                Following redactions will be removed only here:
+                
+            
+            
+                Remove Redaction
+                
+            
+            
+                Value
+                
+            
+            
+                {length} report {length, plural, one{type} other{types
+                    }}
+                
+            
+            
+                Reports
+                
+            
+            
+                A short text explaining how to create report documents. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
+                
+            
+            
+                This placeholder gets replaced with the value of the dossier attribute <code>{attribute}</code>.
+                
+            
+            
+                This placeholder gets replaced with the value of the file attribute <code>{attribute}</code>.
+                
+            
+            
+                This placeholder is replaced by the creation date of the report in the common day-month-year notation (dd.MM.yyyy), e.g. 15.10.2021.
+                
+            
+            
+                This placeholder gets replaced by the creation date of the report in the American all-numeric date format (MM/dd/yyyy), e.g. 10/15/2021.
+                
+            
+            
+                This placeholder is replaced by the creation date of the report in the international ISO 8601 format (yyyy-MM-dd), e.g. 2021-10-15.
+                
+            
+            
+                This placeholder is replaced by the name of the dossier in which the redacted files are stored.
+                
+            
+            
+                This placeholder is replaced by the file name.
+                
+            
+            
+                This placeholder is replaced by a text snippet that contains the redaction.
+                
+            
+            
+                This placeholder is replaced by the justification of the redaction. It is a combination of the legal reference (justificationParagraph) and the justification text (justificationReason).
+                
+            
+            
+                This placeholder is replaced by the legal reference of the justification of the redaction.
+                
+            
+            
+                This placeholder is replaced by the justification text of the redaction.
+                
+            
+            
+                This placeholder is replaced by the page number of the redaction.
+                
+            
+            
+                This placeholder is replaced by the paragraph that contains the redaction.
+                
+            
+            
+                This placeholder is replaced by the time the report was created.
+                
+            
+            
+                A short text explaining what placeholders are and how to use them in your report template. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
+                
+            
+            
+                Document Setup
+                
+            
+            
+                Invalid format selected for Upload! Supported formats are XLSX and DOCX
+                
+            
+            
+                (Multi-file)
+                
+            
+            
+                Report Documents
+                
+            
+            
+                Description
+                
+            
+            
+                Placeholders
+                
+            
+            
+                Reports
+                
+            
+            
+                Upload a Document
+                
+            
+            
+                Reset
+                
+            
+            
+                Cancel
+                
+            
+            
+                Save
+                
+            
+            
+                Failed to reset password. The new password doesn't match the password policy.
+                
+            
+            
+                Temporary password
+                
+            
+            
+                Set Temporary Password for {userName}
+                
+            
+            
+                Cancel
+                
+            
+            
+                Save Changes
+                
+            
+            
+                Comment
+                
+            
+            
+                Resize Redaction
+                
+            
+            
+                Inactive
+                
+            
+            
+                Manager & Admin
+                
+            
+            
+                No role defined
+                
+            
+            
+                Application Admin
+                
+            
+            
+                Manager
+                
+            
+            
+                User
+                
+            
+            
+                Users Admin
+                
+            
+            
+                Regular
+                
+            
+            
+                Rule Editor
+                
+            
+            
+                Something went wrong... Rules update failed!
+                
+            
+            
+                Revert
+                
+            
+            
+                Save Changes
+                
+            
+            
+                Rules updated!
+                
+            
+            
+                Assignee
+                
+            
+            
+                Document
+                
+            
+            
+                Dossier
+                
+            
+            
+                Pages
+                
+            
+            
+                Status
+                
+            
+            
+                Filter by Dossier
+                
+            
+            
+                Dossier name...
+                
+            
+            
+                Missing
+                
+            
+            
+                Must contain
+                
+            
+            
+                Please enter a keyword into the search bar to look for documents or document content.
+                
+            
+            
+                No documents match your current filters.
+                
+            
+            
+                {length} search {length, plural, one{result} other{results
+                    }}
+                
+            
+            
+                across all dossiers
+                
+            
+            
+                Search documents...
+                
+            
+            
+                in this dossier
+                
+            
+            
+                Cancel
+                
+            
+            
+                Save Credentials
+                
+            
+            
+                Password
+                
+            
+            
+                Username
+                
+            
+            
+                Login Username
+                
+            
+            
+                Enable Authentication
+                
+            
+            
+                {days} {days, plural, one{day} other{days
+                    }}
+                
+            
+            
+                {hours} {hours, plural, one{hour} other{hours
+                    }}
+                
+            
+            
+                < 1 hour
+                
+            
+            
+                Time to restore already passed
+                
+            
+            
+                Back
+                
+            
+            
+                Active Dossiers
+                
+            
+            
+                Account
+                
+            
+            
+                Settings
+                
+            
+            
+                My Downloads
+                
+            
+            
+                German
+                
+            
+            
+                English
+                
+            
+            
+                Language
+                
+            
+            
+                Logout
+                
+            
+            
+                Trash
+                
+            
+            
+                Delete Forever
+                
+            
+            
+                Restore
+                
+            
+            
+                Forever Delete Selected Dossiers
+                
+            
+            
+                Restore Selected Dossiers
+                
+            
+            
+                Trash
+                
+            
+            
+                There are no dossiers yet.
+                
+            
+            
+                No dossiers match your current filters.
+                
+            
+            
+                Deleted on
+                
+            
+            
+                Name
+                
+            
+            
+                Owner
+                
+            
+            
+                Time to restore
+                
+            
+            
+                {length} deleted {length, plural, one{dossier} other{dossiers
+                    }}
+                
+            
+            
+                Type
+                
+            
+            
+                Unknown
+                
+            
+            
+                Cancel
+                
+            
+            
+                Merge entries
+                
+            
+            
+                Overwrite
+                
+            
+            
+                Choose how you want to proceed:
+                
+            
+            
+                The dictionary already has entries!
+                
+            
+            
+                Cancel Upload
+                
+            
+            
+                Retry Upload
+                
+            
+            
+                File Uploads ({len})
+                
+            
+            
+                File too large. Limit is {size}MB.
+                
+            
+            
+                Failed to upload file. 
+                
+            
+            
+                Delete User
+                
+            
+            
+                Edit User
+                
+            
+            
+                New User
+                
+            
+            
+                Delete Users
+                
+            
+            
+                You cannot delete your own account.
+                
+            
+            
+                No users match your current filters.
+                
+            
+            
+                Search...
+                
+            
+            
+                Active
+                
+            
+            
+                Email
+                
+            
+            
+                Name
+                
+            
+            
+                Roles
+                
+            
+            
+                {length} {length, plural, one{user} other{users
+                    }}
+                
+            
+            
+                User Management
+                
+            
+            
+                My Profile
+                
+            
+            
+                Change Password
+                
+            
+            
+                Save Changes
+                
+            
+            
+                Email
+                
+            
+            
+                First name
+                
+            
+            
+                Last name
+                
+            
+            
+                Edit Profile
+                
+            
+            
+                Users in Workspace
+                
+            
+            
+                Hide Details
+                
+            
+            
+                Show Details
+                
+            
+            
+                Users
+                
+            
+            
+                List
+                
+            
+            
+                View as:
+                
+            
+            
+                Workflow
+                
+            
+            
+                Watermark
+                
+            
+            
+                Watermark updated!
+                
+            
+            
+                Watermark deleted.
+                
+            
+            
+                Failed to update Watermark
+                
+            
+            
+                Revert
+                
+            
+            
+                Save Changes
+                
+            
+            
+                Color
+                
+            
+            
+                Font Size
+                
+            
+            
+                Font Type
+                
+            
+            
+                Opacity
+                
+            
+            
+                Orientation
+                
+            
+            
+                Enter text
+                
+            
+            
+                Watermark
+                
+            
+            
+                All
+                
+            
+            
+                {count} selected
+                
+            
+            
+                None
+                
+            
+            
+                Select
+                
+            
+            
+                Yesterday
+                
+            
+        
+    
+
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 7266ccaf4..5104abb9e 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -9,10 +9,10 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es2015",
-    "module": "esnext",
+    "target": "es2017",
+    "module": "es2020",
     "typeRoots": ["node_modules/@types"],
-    "lib": ["es2019", "dom"],
+    "lib": ["es2020", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
diff --git a/yarn.lock b/yarn.lock
index 6e6bb5530..b119ae5ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,120 +2,143 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-1.0.1.tgz#1398e73e567c2a7992df6554c15bb94a89b68ba2"
-  integrity sha512-Ta9bMA3EtUHDaZJXqUoT5cn/EecwOp+SXpKJqxDbDuMbLvEMu6YTyDDuvTWeStODfdmXyfMo7LymQyPkN3BicA==
+"@ampproject/remapping@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-1.1.1.tgz#e220d0a5288b07afd6392a584d15921839e9da32"
+  integrity sha512-YVAcA4DKLOj296CF5SrQ8cYiMRiUGc2sqFpLxsDGWE34suHqhGP/5yMsDHKsrh8hs8I5TiRVXNwKPWQpX3iGjw==
   dependencies:
-    "@jridgewell/resolve-uri" "1.0.0"
+    "@jridgewell/resolve-uri" "^3.0.3"
     sourcemap-codec "1.4.8"
 
-"@angular-devkit/architect@0.1300.3":
-  version "0.1300.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1300.3.tgz#8d74a0f3cc3a0e4ecb0c6723e13fc0fee4790363"
-  integrity sha512-XY3sjRLk06Q+uAU0BePuIWcK1n3Jr0ksNV0ACNAct+MnI3QFfPPaYA/Tdhp9uWobuZ4lUrL0drc2uppNu0wKmA==
+"@angular-devkit/architect@0.1302.0":
+  version "0.1302.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1302.0.tgz#31a2e6f0c744c5076c85b6db71e31665d7daef55"
+  integrity sha512-1CmVYvxyfvK/khTcDJwwXibm/z4upM2j5SDpwuIdaLx21E4oQPmHn+U/quT/jE5VI1zfZi2vfvIaSXn9XQzMiQ==
   dependencies:
-    "@angular-devkit/core" "13.0.3"
+    "@angular-devkit/core" "13.2.0"
     rxjs "6.6.7"
 
-"@angular-devkit/build-angular@13.0.3":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-13.0.3.tgz#763db8882ff86612462a2b6bcdf441ba8e4b29a5"
-  integrity sha512-5KFsknpnq3mc0KwcIDjvmqB3trz5cMt48dB0nrc23zkFI9v4hkpalc/OEg/H3G93K0c9g6dcyxmHkNfsU1+CHw==
+"@angular-devkit/build-angular@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-13.2.0.tgz#5880890b5083a31f96d237ffee5f82af6fcc11a8"
+  integrity sha512-cHnm/P7uKJjKh2BCN8gnnd240J5z3IesQyRAx88kFSlL5sKCGyGoAYKAjU585/lllIXjtFXSR/S2d/cHg8ShKw==
   dependencies:
-    "@ampproject/remapping" "1.0.1"
-    "@angular-devkit/architect" "0.1300.3"
-    "@angular-devkit/build-webpack" "0.1300.3"
-    "@angular-devkit/core" "13.0.3"
-    "@babel/core" "7.15.8"
-    "@babel/generator" "7.15.8"
-    "@babel/helper-annotate-as-pure" "7.15.4"
-    "@babel/plugin-proposal-async-generator-functions" "7.15.8"
-    "@babel/plugin-transform-async-to-generator" "7.14.5"
-    "@babel/plugin-transform-runtime" "7.15.8"
-    "@babel/preset-env" "7.15.8"
-    "@babel/runtime" "7.15.4"
-    "@babel/template" "7.15.4"
-    "@discoveryjs/json-ext" "0.5.5"
-    "@ngtools/webpack" "13.0.3"
+    "@ampproject/remapping" "1.1.1"
+    "@angular-devkit/architect" "0.1302.0"
+    "@angular-devkit/build-webpack" "0.1302.0"
+    "@angular-devkit/core" "13.2.0"
+    "@babel/core" "7.16.12"
+    "@babel/generator" "7.16.8"
+    "@babel/helper-annotate-as-pure" "7.16.7"
+    "@babel/plugin-proposal-async-generator-functions" "7.16.8"
+    "@babel/plugin-transform-async-to-generator" "7.16.8"
+    "@babel/plugin-transform-runtime" "7.16.10"
+    "@babel/preset-env" "7.16.11"
+    "@babel/runtime" "7.16.7"
+    "@babel/template" "7.16.7"
+    "@discoveryjs/json-ext" "0.5.6"
+    "@ngtools/webpack" "13.2.0"
     ansi-colors "4.1.1"
     babel-loader "8.2.3"
     babel-plugin-istanbul "6.1.1"
     browserslist "^4.9.1"
     cacache "15.3.0"
-    caniuse-lite "^1.0.30001032"
     circular-dependency-plugin "5.2.2"
-    copy-webpack-plugin "9.0.1"
-    core-js "3.19.0"
-    critters "0.0.14"
-    css-loader "6.5.0"
-    esbuild-wasm "0.13.12"
+    copy-webpack-plugin "10.2.1"
+    core-js "3.20.3"
+    critters "0.0.16"
+    css-loader "6.5.1"
+    esbuild-wasm "0.14.14"
     glob "7.2.0"
     https-proxy-agent "5.0.0"
     inquirer "8.2.0"
+    jsonc-parser "3.0.0"
     karma-source-map-support "1.4.0"
     less "4.1.2"
     less-loader "10.2.0"
     license-webpack-plugin "4.0.0"
-    loader-utils "3.0.0"
-    mini-css-extract-plugin "2.4.3"
+    loader-utils "3.2.0"
+    mini-css-extract-plugin "2.5.3"
     minimatch "3.0.4"
     open "8.4.0"
     ora "5.4.1"
     parse5-html-rewriting-stream "6.0.1"
-    piscina "3.1.0"
-    postcss "8.3.11"
+    piscina "3.2.0"
+    postcss "8.4.5"
     postcss-import "14.0.2"
-    postcss-loader "6.2.0"
-    postcss-preset-env "6.7.0"
+    postcss-loader "6.2.1"
+    postcss-preset-env "7.2.3"
     regenerator-runtime "0.13.9"
-    resolve-url-loader "4.0.0"
+    resolve-url-loader "5.0.0"
     rxjs "6.6.7"
-    sass "1.43.4"
-    sass-loader "12.3.0"
+    sass "1.49.0"
+    sass-loader "12.4.0"
     semver "7.3.5"
-    source-map-loader "3.0.0"
-    source-map-support "0.5.20"
-    stylus "0.55.0"
+    source-map-loader "3.0.1"
+    source-map-support "0.5.21"
+    stylus "0.56.0"
     stylus-loader "6.2.0"
-    terser "5.9.0"
+    terser "5.10.0"
     text-table "0.2.0"
     tree-kill "1.2.2"
     tslib "2.3.1"
-    webpack "5.64.1"
-    webpack-dev-middleware "5.2.1"
-    webpack-dev-server "4.4.0"
+    webpack "5.67.0"
+    webpack-dev-middleware "5.3.0"
+    webpack-dev-server "4.7.3"
     webpack-merge "5.8.0"
-    webpack-subresource-integrity "5.0.0"
+    webpack-subresource-integrity "5.1.0"
   optionalDependencies:
-    esbuild "0.13.12"
+    esbuild "0.14.14"
 
-"@angular-devkit/build-webpack@0.1300.3":
-  version "0.1300.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1300.3.tgz#c0464b6c0d5d09cdd613ed17173a7f3822da1aa3"
-  integrity sha512-3DNo8575FFPMqJaVMXxrIduWkrcKm5zYSCvkMOmzHLp+gx+RXQiwnoXfVJpukcE/jwK/4SWyRE8Tw75sfPJ71A==
+"@angular-devkit/build-webpack@0.1302.0":
+  version "0.1302.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1302.0.tgz#92e41035805fb99c1167fe2a9018a20e03025e76"
+  integrity sha512-x5BLdobF7c7j4W8frJuKM73ZYvPygjPN8vq1iKhsEraClqJG8cLiDwLEEFcrzIfmCHTX1o1o75sWC0FNln2LfQ==
   dependencies:
-    "@angular-devkit/architect" "0.1300.3"
+    "@angular-devkit/architect" "0.1302.0"
     rxjs "6.6.7"
 
-"@angular-devkit/core@13.0.3":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-13.0.3.tgz#05911ab964f8cbd5cade9bd48215424836ab9c87"
-  integrity sha512-5yTYW6m4pkDPSYNxThm+47h+UZ6XVEfdfsXR3o+WlRG0hc18EuQ+sXZkzhvZrk5KMLlXFex4eO40RPq2vvWS/w==
+"@angular-devkit/core@13.1.3":
+  version "13.1.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-13.1.3.tgz#d1f8a6b4ad4326732a160a7549fccca1369fd108"
+  integrity sha512-o14jGDk4h14dVYYQafOn+2rq9CDmDMbDV6logqKYCLzTDRlK8gccDnqJM/QKAlfWCzbllZqcHDmg6FyoRLO9RQ==
   dependencies:
-    ajv "8.6.3"
+    ajv "8.8.2"
     ajv-formats "2.1.1"
     fast-json-stable-stringify "2.1.0"
     magic-string "0.25.7"
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@13.0.3", "@angular-devkit/schematics@~13.0.0":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-13.0.3.tgz#255895e10c2b025df8ee4ff93428cb2249ae5fc0"
-  integrity sha512-+Va1E0zJBCg5jqSfITusghoMJgPAwlU+WUs49fuGVCzfJPwfSjTKSrsbhanahMd27+Ys3rovGZq0F2JUdL801A==
+"@angular-devkit/core@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-13.2.0.tgz#d7ee99ba40af70193a436a27ee1591a1ec754cd9"
+  integrity sha512-5+aV2W2QUazySMKusBuT2pi2qsXWpTHJG2x62mKGAy0lxzwG8l3if+WP3Uh85SQS+zqlHeKxEbmm9zNn8ZrzFg==
   dependencies:
-    "@angular-devkit/core" "13.0.3"
+    ajv "8.9.0"
+    ajv-formats "2.1.1"
+    fast-json-stable-stringify "2.1.0"
+    magic-string "0.25.7"
+    rxjs "6.6.7"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@13.1.3", "@angular-devkit/schematics@~13.1.0":
+  version "13.1.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-13.1.3.tgz#2328f9cf63d6f556392d96b73af794fc52bfc87f"
+  integrity sha512-TvjThB/pFXNFM0j0WX5yg0L2/3xNsqawQuWhkDJ05MBDEnSxbgv5hmOzNL8SNIEMgP0VbSTHtSg5kZvmNiH7vg==
+  dependencies:
+    "@angular-devkit/core" "13.1.3"
+    jsonc-parser "3.0.0"
+    magic-string "0.25.7"
+    ora "5.4.1"
+    rxjs "6.6.7"
+
+"@angular-devkit/schematics@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-13.2.0.tgz#656a5491be9f25e08faffd410c6ad9a75a82a8a2"
+  integrity sha512-EwoqDqLJH5YpWiLuQJwonnJu2bi4xQlyKXyUTuXsQ4gIsAPrg+ijyAe+F/brAtDLBj0sU7JHoC0U1yx2pZ7f1A==
+  dependencies:
+    "@angular-devkit/core" "13.2.0"
     jsonc-parser "3.0.0"
     magic-string "0.25.7"
     ora "5.4.1"
@@ -160,34 +183,34 @@
     "@angular-eslint/bundled-angular-compiler" "13.0.1"
     "@typescript-eslint/experimental-utils" "5.3.0"
 
-"@angular/animations@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-13.0.2.tgz#afa38f32bfa40be94730905e187279e6af69999d"
-  integrity sha512-ROR70rM6E13pIJzaYf0Su/ALSoBm5fIMjozey636pAq21TxTy5IfhgaBjv/vflC9psbpaySGw2H5XnwejP0gSw==
+"@angular/animations@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-13.2.0.tgz#001983463ea5a1b0ffc8e86b0cd5efeb3acb3a4d"
+  integrity sha512-zLmNxkfxDQShJ97V9gTyQdlEbCD/zDUdpHXKlUViBIbe2M13FLGV3e2D+x9jGr/PRzFe0cukOnYxNEHJqqjqPA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/cdk@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-13.0.2.tgz#48b9c00d24c9e764c0a718873acf8c6779241a35"
-  integrity sha512-m7RHIAXpFpgsrydhWXX1hAXRmQpQ+m9eRCYAoz8QiDCchYyVvTaxkZ8J7XGS8RtJ2EiocXSp4TlwQQrpXe+4lg==
+"@angular/cdk@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-13.2.0.tgz#57f0359b230805774abb7e1b8c1699c06ae9a669"
+  integrity sha512-1fQyfr/KmcF8y/Xz789DN37XgjQPE4kAYjoh6GRd62yKDm/Ic9hKuoKfAthA1bQeskjTO1pb4sMOgum8B4iHeA==
   dependencies:
     tslib "^2.3.0"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@13.0.3":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-13.0.3.tgz#7d357a80dc612421115b1288291ce6278720d0a4"
-  integrity sha512-LDXDXDbQ1MBHVUstu4aNjFbyg5f9hLP52gEKB8Z6fQlf5CB1X5zD6UPcR4IvoYt03EFxg3DHco+ueJQ20oZUWQ==
+"@angular/cli@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-13.2.0.tgz#550841330a4eead75466f423c68a57be3640ec53"
+  integrity sha512-xrtClCucVSBwELG6zgaHrjC71p1rZOkwjF/HewnOFNjyjXSbWIO2y5d/6O2wxmNASoeStpiEU0zPpwDGhXiYpQ==
   dependencies:
-    "@angular-devkit/architect" "0.1300.3"
-    "@angular-devkit/core" "13.0.3"
-    "@angular-devkit/schematics" "13.0.3"
-    "@schematics/angular" "13.0.3"
+    "@angular-devkit/architect" "0.1302.0"
+    "@angular-devkit/core" "13.2.0"
+    "@angular-devkit/schematics" "13.2.0"
+    "@schematics/angular" "13.2.0"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.1"
-    debug "4.3.2"
+    debug "4.3.3"
     ini "2.0.0"
     inquirer "8.2.0"
     jsonc-parser "3.0.0"
@@ -195,23 +218,23 @@
     npm-pick-manifest "6.1.1"
     open "8.4.0"
     ora "5.4.1"
-    pacote "12.0.2"
-    resolve "1.20.0"
+    pacote "12.0.3"
+    resolve "1.22.0"
     semver "7.3.5"
     symbol-observable "4.0.0"
     uuid "8.3.2"
 
-"@angular/common@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-13.0.2.tgz#794cea4e1e626012e69ca5fc6ddb78d613b8004f"
-  integrity sha512-UxWzNAU/o9pP02AYB5MrnIlShirfO631NolmvP0jTSEmym1nAeDOwZIYlkgfcJMHFXFc7DBnE2XOGaTZ8if3kw==
+"@angular/common@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-13.2.0.tgz#d5e311c14c90867d5da7d1d5f539813e338a7d5f"
+  integrity sha512-zyq3kscl5BoY+xxl4YOfbKP72xwzx/vKLE+2ougjPu2spm5KIllIAo/VrxVqIBrsGWT/4gs9pvIOqOdOfufxUA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-13.0.2.tgz#36757ecb6c7ea63a7a053791737ff39e11b4e45d"
-  integrity sha512-KVDntMBoPoAPdpyO3LxR2U3BO3ja5fY5Im5rzynjBCC3dnwAPPKoIlYZlFY/5ov6yVoVleeb/BOovYxHuxZBsA==
+"@angular/compiler-cli@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-13.2.0.tgz#6eee613e86ec028a4a2b88a9dce45512eef7e862"
+  integrity sha512-IDX0X3GXjhUzd/cFyNZBG3eVqh6Y2W7MYvH9tXbZHcJ6vH9RkN2+zh/XQautVWy4EP33oQoDlsydfYKqbHr9TA==
   dependencies:
     "@babel/core" "^7.8.6"
     canonical-path "1.0.0"
@@ -225,71 +248,78 @@
     tslib "^2.3.0"
     yargs "^17.2.1"
 
-"@angular/compiler@13.0.2", "@angular/compiler@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-13.0.2.tgz#5bc1bfc1931f1ff2813f8fff8b8ceaa57b47d717"
-  integrity sha512-EvIFT8y5VNICrnPgiamv/z9hfQ7KjLCM52g4ssXGCeGPVj58OEfslEc3jO4BCJG7xuLm7dCuSRV0pBlJNTSYFg==
+"@angular/compiler@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-13.2.0.tgz#4112970f2bf6e347511de1e32459d717141750e3"
+  integrity sha512-TTA+Mn31vAwI4qiaH0h8DqNV3DWgZF+Q9G8Qqbw17k8Jf+B5CdLkMYBF8wbGegIdsEfo+6DebCp71W+aJxuSlw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-13.0.2.tgz#786bb1242d69e8b7a2cbae224448c27e2f1fc064"
-  integrity sha512-6Jbct50lncMqzwLILzfmwQRK8eOEMv0quCL3pQptEpYPSlPqKz6QRxD76BykSUOs7XYJ/KdZmu3uGcT2Q/DUVg==
+"@angular/compiler@^13.1.1":
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-13.1.2.tgz#86afbe282d0ff407fd8aeb66a79a804f40e7efa4"
+  integrity sha512-xbM3eClhUIHEFR0Et1bVC18Q7+kJx+hNNWWQl63RNYYBxTZnZpXA3mYi6IcEasy7BHkobVW+5teqlibFQY4gfQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-13.0.2.tgz#c4779636639b9a3c7166b223f3d5c39149b7c72d"
-  integrity sha512-JGgEOTH/OYr7/RlqJUPSzKQF/a55UM5PD6CgpUjAXKrCV18+zhofO05g+ibIZH3OfONntthcbKEXxMTX2EEQqg==
+"@angular/core@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-13.2.0.tgz#8db7b6f56eb2f211b72d943582061b247f39fe7f"
+  integrity sha512-mWRWbbZ6k00AicA/GrxmWKaw8upo77sRQz4tSYKpwVKt2TtCeoW8OkdYUpnmuVjxpF0bD6PtVc0e1fD6es/ElA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-13.0.2.tgz#edc2ff3f7fdaa679c69d98728924539480119694"
-  integrity sha512-Q0pvN1cwrUz1qjTis0jsuaZ/NmByKvlLaecDfluOsf4y8AoL509A1Ih5bsN+RNR74EdYj9AmBpBx37Mf7SygWQ==
-
-"@angular/material-moment-adapter@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/material-moment-adapter/-/material-moment-adapter-13.0.2.tgz#8992e759e0e5aa1d89171ff814ef843111726320"
-  integrity sha512-cpwxJMwJ+WtF59cD2vSkPor1iiKmmciOaichDhqAx5ZfVLcyYX27+lz9wLrTKinpkvzIx7gRMViu/DYrrwbBMA==
+"@angular/forms@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-13.2.0.tgz#67d505c09175d1ba809be721303316db7b0c60d4"
+  integrity sha512-aduXLuvqynDRRdb316yY1O5rdMQ2DKeNxu5P2FG1nkLQ3hqZvpiaUMhFyXvKDG3s0rV5e/PZs1cpg0Aqdfwevw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/material@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-13.0.2.tgz#bbab63f69c9227110b7e22d694fe984528b3d5c2"
-  integrity sha512-DbbkQFpZ73oxOuR9LkkpeUPWP31DNIG3Z94sOrtdBhX3HfbLLOCaAJAIwMl8+bEuzDgtWBmx3taUR8l4WKCO8g==
+"@angular/language-service@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-13.2.0.tgz#f198f3108fade0bc329f15e8d28c335ba4f4c549"
+  integrity sha512-nK40YXy9f2MsrejvTiKMrS7YHNvBxp3QIBU8aJN36LpkTTWC8aVqZ5A3to8JL0U6Anra8mkcC070xoYfh6miwg==
+
+"@angular/material-moment-adapter@^13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/material-moment-adapter/-/material-moment-adapter-13.2.0.tgz#4374466f3d794277abebab63761fa53c4a152fb1"
+  integrity sha512-m4lGQWwZ2/1MPtBmimbARHskCuLHzZ/WVbg8xXdiNHkcfkzSzJaknDM7IU+FwPiGLHAe/sC3U7qJBKAmirguPg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser-dynamic@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.0.2.tgz#596dfbf5041210d2ecb959d2f298e86940a2adec"
-  integrity sha512-2wZX2oop3A1kWFcbRYqe8AxBQjT35DXf1qlGyFQoMn7D0vOAprg6X1hUK2XBItRrvwRWh3hSVhzkustTIl+r6g==
+"@angular/material@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-13.2.0.tgz#c18d1fcb7fa339ec1f481b558c0c32adbb7ec970"
+  integrity sha512-VxseAkzEN2fakorQUa+r4enUhTAeY4gJ8NRbd0A7r0gKDLGcszJ1XYph4WiNs3bLkZUH1EirhOMAfpNOZ8SqFg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-13.0.2.tgz#b4fd97e67321e15a4b6d3f0dcb10b11e8f024cb5"
-  integrity sha512-fkLGr9Vj2cvFzXefyhNaqwXX90+WbpYj5cCii7S1HcbJ9qSM5ZenLp1t8mGRhmWI7odY4BrFskWOChlWFrLEkA==
+"@angular/platform-browser-dynamic@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.2.0.tgz#68e24f5774e016283bc8dc864d4bb3f6abc895b9"
+  integrity sha512-VPL0uF/KWk+jBfkZwt60K6YbTFOvQzZbhwE4LttjjejstdvR0IMD3PtVDrdgIUWNfjikcCVN5Ds0GB6zZUb04Q==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/router@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-13.0.2.tgz#08f80a55d594fdc1c3e75f8fffacff6d4121a5ce"
-  integrity sha512-AfmT845dcYPvNbUdV2ALlf++szZP3ie2d0eu7JyGWe3anV1fbDcg76RhjxFK8yVUxryrCQtEnot1VEEVlhGkyw==
+"@angular/platform-browser@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-13.2.0.tgz#d8a309c231dec646ab1dad28240466a00151b54b"
+  integrity sha512-FB9eKdRqpjopTFbea5JXnqSPFR7DZD4nepOSGnYttV9cVj4pABqx2A6FJCnyvPPUSTamODye/pNkGmzP2P1gcw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/service-worker@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-13.0.2.tgz#599812f7bb47c2716e1d4d721f3a15035ef077d8"
-  integrity sha512-cH5adbvwI+cr6qKVdvNfQ5B0I//3NJwXkP04ifllPUIw7Te1pUfVb8eIN8UI/80aqG0uu/uIes7QoovSIayqOA==
+"@angular/router@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-13.2.0.tgz#1bde95cc05195ed2c5cb1ec4f54233e48c2f33a3"
+  integrity sha512-8fWxcWT/LpaGhmXJ8xH+E7UObzt5IMGzK1sJGRu508y5tcbuBlTJt3yV97mCeUQ0g/E+2GEv6vuxY7OcfDaZow==
+  dependencies:
+    tslib "^2.3.0"
+
+"@angular/service-worker@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-13.2.0.tgz#38e6eb423ef36528f3a7a162a726b0b47098a61d"
+  integrity sha512-ppxsckRObzMRlSYouGa5GCpbMlVCV7g70JPRYHK3UFTYrMLAEIsOhW9sAugEL72QfxgeXFKAjWdwQgBxwq7uLw==
   dependencies:
     tslib "^2.3.0"
 
@@ -298,39 +328,44 @@
   resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06"
   integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
   integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==
   dependencies:
     "@babel/highlight" "^7.16.0"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.16.0":
+"@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4":
   version "7.16.4"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
   integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
 
-"@babel/core@7.15.8":
-  version "7.15.8"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10"
-  integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==
+"@babel/compat-data@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
+  integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
+
+"@babel/core@7.16.12":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784"
+  integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==
   dependencies:
-    "@babel/code-frame" "^7.15.8"
-    "@babel/generator" "^7.15.8"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-module-transforms" "^7.15.8"
-    "@babel/helpers" "^7.15.4"
-    "@babel/parser" "^7.15.8"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.6"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helpers" "^7.16.7"
+    "@babel/parser" "^7.16.12"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.10"
+    "@babel/types" "^7.16.8"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -359,16 +394,37 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@7.15.8":
-  version "7.15.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1"
-  integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==
+"@babel/core@^7.8.0":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
+  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
   dependencies:
-    "@babel/types" "^7.15.6"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helpers" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@7.16.8", "@babel/generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
+  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
+  dependencies:
+    "@babel/types" "^7.16.8"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.15.8", "@babel/generator@^7.16.0", "@babel/generator@^7.7.2":
+"@babel/generator@^7.16.0", "@babel/generator@^7.7.2":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2"
   integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==
@@ -377,12 +433,21 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
-  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
+"@babel/generator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.7.tgz#b42bf46a3079fa65e1544135f32e7958f048adbb"
+  integrity sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==
   dependencies:
-    "@babel/types" "^7.15.4"
+    "@babel/types" "^7.16.7"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-annotate-as-pure@7.16.7", "@babel/helper-annotate-as-pure@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
+  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+  dependencies:
+    "@babel/types" "^7.16.7"
 
 "@babel/helper-annotate-as-pure@^7.16.0":
   version "7.16.0"
@@ -391,15 +456,15 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882"
-  integrity sha512-9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
+  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-explode-assignable-expression" "^7.16.7"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4", "@babel/helper-compilation-targets@^7.16.0":
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.0":
   version "7.16.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0"
   integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==
@@ -409,17 +474,41 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b"
-  integrity sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==
+"@babel/helper-compilation-targets@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
+  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-member-expression-to-functions" "^7.16.0"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/helper-replace-supers" "^7.16.0"
-    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/compat-data" "^7.16.4"
+    "@babel/helper-validator-option" "^7.16.7"
+    browserslist "^4.17.5"
+    semver "^6.3.0"
+
+"@babel/helper-create-class-features-plugin@^7.16.10":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
+  integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
+"@babel/helper-create-class-features-plugin@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.7.tgz#9c5b34b53a01f2097daf10678d65135c1b9f84ba"
+  integrity sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
 
 "@babel/helper-create-regexp-features-plugin@^7.16.0":
   version "7.16.0"
@@ -429,10 +518,18 @@
     "@babel/helper-annotate-as-pure" "^7.16.0"
     regexpu-core "^4.7.1"
 
-"@babel/helper-define-polyfill-provider@^0.2.2", "@babel/helper-define-polyfill-provider@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz#8867aed79d3ea6cade40f801efb7ac5c66916b10"
-  integrity sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==
+"@babel/helper-create-regexp-features-plugin@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
+  integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    regexpu-core "^4.7.1"
+
+"@babel/helper-define-polyfill-provider@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971"
+  integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==
   dependencies:
     "@babel/helper-compilation-targets" "^7.13.0"
     "@babel/helper-module-imports" "^7.12.13"
@@ -443,12 +540,33 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-explode-assignable-expression@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778"
-  integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ==
+"@babel/helper-define-polyfill-provider@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
+  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-explode-assignable-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
+  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
+  dependencies:
+    "@babel/types" "^7.16.7"
 
 "@babel/helper-function-name@^7.16.0":
   version "7.16.0"
@@ -459,6 +577,15 @@
     "@babel/template" "^7.16.0"
     "@babel/types" "^7.16.0"
 
+"@babel/helper-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
+  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-get-function-arity@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
@@ -466,6 +593,13 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
+"@babel/helper-get-function-arity@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
+  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-hoist-variables@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
@@ -473,6 +607,13 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-member-expression-to-functions@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4"
@@ -480,14 +621,28 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4", "@babel/helper-module-imports@^7.16.0":
+"@babel/helper-member-expression-to-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
+  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
   integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-module-transforms@^7.15.8", "@babel/helper-module-transforms@^7.16.0":
+"@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-transforms@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5"
   integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==
@@ -501,6 +656,20 @@
     "@babel/traverse" "^7.16.0"
     "@babel/types" "^7.16.0"
 
+"@babel/helper-module-transforms@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
+  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-optimise-call-expression@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
@@ -508,19 +677,31 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
+"@babel/helper-optimise-call-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
+  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
   integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
 
-"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4", "@babel/helper-remap-async-to-generator@^7.16.0", "@babel/helper-remap-async-to-generator@^7.16.4":
-  version "7.16.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e"
-  integrity sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA==
+"@babel/helper-plugin-utils@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+
+"@babel/helper-remap-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
+  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-wrap-function" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-wrap-function" "^7.16.8"
+    "@babel/types" "^7.16.8"
 
 "@babel/helper-replace-supers@^7.16.0":
   version "7.16.0"
@@ -532,6 +713,17 @@
     "@babel/traverse" "^7.16.0"
     "@babel/types" "^7.16.0"
 
+"@babel/helper-replace-supers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
+  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-simple-access@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
@@ -539,6 +731,13 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
+"@babel/helper-simple-access@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
+  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
@@ -553,27 +752,44 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-validator-identifier@^7.15.7":
   version "7.15.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
 "@babel/helper-validator-option@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
   integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
 
-"@babel/helper-wrap-function@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c"
-  integrity sha512-VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g==
-  dependencies:
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.0"
-    "@babel/types" "^7.16.0"
+"@babel/helper-validator-option@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
+  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
 
-"@babel/helpers@^7.15.4", "@babel/helpers@^7.16.0":
+"@babel/helper-wrap-function@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
+  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.8"
+    "@babel/types" "^7.16.8"
+
+"@babel/helpers@^7.16.0":
   version "7.16.3"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c"
   integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==
@@ -582,7 +798,16 @@
     "@babel/traverse" "^7.16.3"
     "@babel/types" "^7.16.0"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0":
+"@babel/helpers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
+  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/highlight@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
   integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==
@@ -591,150 +816,180 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3", "@babel/parser@^7.7.2":
+"@babel/highlight@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
+  integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3", "@babel/parser@^7.7.2":
   version "7.16.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e"
   integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2"
-  integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA==
+"@babel/parser@^7.16.10", "@babel/parser@^7.16.12":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
+  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
+
+"@babel/parser@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.7.tgz#d372dda9c89fcec340a82630a9f533f2fe15877e"
+  integrity sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==
+
+"@babel/parser@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
+  integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
+  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
+  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
 
-"@babel/plugin-proposal-async-generator-functions@7.15.8":
-  version "7.15.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz#a3100f785fab4357987c4223ab1b02b599048403"
-  integrity sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==
+"@babel/plugin-proposal-async-generator-functions@7.16.8", "@babel/plugin-proposal-async-generator-functions@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
+  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-remap-async-to-generator" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-async-generator-functions@^7.15.8":
-  version "7.16.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081"
-  integrity sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg==
+"@babel/plugin-proposal-class-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
+  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-remap-async-to-generator" "^7.16.4"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-class-properties@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz#c029618267ddebc7280fa286e0f8ca2a278a2d1a"
-  integrity sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==
+"@babel/plugin-proposal-class-static-block@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
+  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-proposal-class-static-block@^7.15.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz#5296942c564d8144c83eea347d0aa8a0b89170e7"
-  integrity sha512-mAy3sdcY9sKAkf3lQbDiv3olOfiLqI51c9DR9b19uMoR2Z6r5pmGl7dfNFqEvqOyqbf1ta4lknK4gc5PJn3mfA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1"
-  integrity sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ==
+"@babel/plugin-proposal-dynamic-import@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
+  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz#9c01dee40b9d6b847b656aaf4a3976a71740f222"
-  integrity sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA==
+"@babel/plugin-proposal-export-namespace-from@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
+  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz#cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25"
-  integrity sha512-kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg==
+"@babel/plugin-proposal-json-strings@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
+  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz#a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd"
-  integrity sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q==
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
+  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz#44e1cce08fe2427482cf446a91bb451528ed0596"
-  integrity sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
+  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz#5d418e4fbbf8b9b7d03125d3a52730433a373734"
-  integrity sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q==
+"@babel/plugin-proposal-numeric-separator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
+  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.15.6":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz#5fb32f6d924d6e6712810362a60e12a2609872e6"
-  integrity sha512-LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg==
+"@babel/plugin-proposal-object-rest-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
+  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
   dependencies:
-    "@babel/compat-data" "^7.16.0"
-    "@babel/helper-compilation-targets" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/compat-data" "^7.16.4"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.0"
+    "@babel/plugin-transform-parameters" "^7.16.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz#5910085811ab4c28b00d6ebffa4ab0274d1e5f16"
-  integrity sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw==
+"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
+  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.14.5", "@babel/plugin-proposal-optional-chaining@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz#56dbc3970825683608e9efb55ea82c2a2d6c8dc0"
-  integrity sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==
+"@babel/plugin-proposal-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
+  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz#b4dafb9c717e4301c5776b30d080d6383c89aff6"
-  integrity sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg==
+"@babel/plugin-proposal-private-methods@^7.16.11":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
+  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.16.10"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-property-in-object@^7.15.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz#69e935b2c5c79d2488112d886f0c4e2790fee76f"
-  integrity sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw==
+"@babel/plugin-proposal-private-property-in-object@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
+  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-create-class-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
+  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz#890482dfc5ea378e42e19a71e709728cabf18612"
   integrity sha512-ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g==
@@ -861,73 +1116,73 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz#951706f8b449c834ed07bd474c0924c944b95a8e"
-  integrity sha512-vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA==
+"@babel/plugin-transform-arrow-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
+  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-async-to-generator@7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
-  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
+"@babel/plugin-transform-async-to-generator@7.16.8", "@babel/plugin-transform-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
+  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
   dependencies:
-    "@babel/helper-module-imports" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-remap-async-to-generator" "^7.14.5"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
 
-"@babel/plugin-transform-async-to-generator@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz#df12637f9630ddfa0ef9d7a11bc414d629d38604"
-  integrity sha512-PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw==
+"@babel/plugin-transform-block-scoped-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
+  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-remap-async-to-generator" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoped-functions@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d"
-  integrity sha512-V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg==
+"@babel/plugin-transform-block-scoping@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
+  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoping@^7.15.3":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"
-  integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw==
+"@babel/plugin-transform-classes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
+  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-classes@^7.15.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5"
-  integrity sha512-HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.16.0"
-    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7"
-  integrity sha512-63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw==
+"@babel/plugin-transform-computed-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
+  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-destructuring@^7.14.7":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c"
-  integrity sha512-Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q==
+"@babel/plugin-transform-destructuring@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
+  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-dotall-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
+  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f"
   integrity sha512-FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw==
@@ -935,226 +1190,228 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.0"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176"
-  integrity sha512-LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ==
+"@babel/plugin-transform-duplicate-keys@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
+  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-exponentiation-operator@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4"
-  integrity sha512-OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw==
+"@babel/plugin-transform-exponentiation-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
+  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-for-of@^7.15.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2"
-  integrity sha512-5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ==
+"@babel/plugin-transform-for-of@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
+  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-function-name@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e"
-  integrity sha512-lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg==
+"@babel/plugin-transform-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
+  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
   dependencies:
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-literals@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac"
-  integrity sha512-gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ==
+"@babel/plugin-transform-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
+  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-member-expression-literals@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b"
-  integrity sha512-WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg==
+"@babel/plugin-transform-member-expression-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
+  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e"
-  integrity sha512-rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw==
+"@babel/plugin-transform-modules-amd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
+  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.15.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922"
-  integrity sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ==
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
+  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-simple-access" "^7.16.0"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-simple-access" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.15.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4"
-  integrity sha512-yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg==
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
+  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.0"
-    "@babel/helper-module-transforms" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7"
-  integrity sha512-nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg==
+"@babel/plugin-transform-modules-umd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
+  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca"
-  integrity sha512-LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
+  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
 
-"@babel/plugin-transform-new-target@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35"
-  integrity sha512-fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw==
+"@babel/plugin-transform-new-target@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
+  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-object-super@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b"
-  integrity sha512-fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg==
+"@babel/plugin-transform-object-super@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
+  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.15.4", "@babel/plugin-transform-parameters@^7.16.0":
-  version "7.16.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15"
-  integrity sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w==
+"@babel/plugin-transform-parameters@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
+  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-property-literals@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1"
-  integrity sha512-XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ==
+"@babel/plugin-transform-property-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
+  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4"
-  integrity sha512-JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg==
+"@babel/plugin-transform-regenerator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
+  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c"
-  integrity sha512-Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg==
+"@babel/plugin-transform-reserved-words@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
+  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-runtime@7.15.8":
-  version "7.15.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz#9d15b1e94e1c7f6344f65a8d573597d93c6cd886"
-  integrity sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw==
+"@babel/plugin-transform-runtime@7.16.10":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz#53d9fd3496daedce1dd99639097fa5d14f4c7c2c"
+  integrity sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==
   dependencies:
-    "@babel/helper-module-imports" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    babel-plugin-polyfill-corejs2 "^0.2.2"
-    babel-plugin-polyfill-corejs3 "^0.2.5"
-    babel-plugin-polyfill-regenerator "^0.2.2"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.5.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d"
-  integrity sha512-iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow==
+"@babel/plugin-transform-shorthand-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
+  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-spread@^7.15.8":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb"
-  integrity sha512-Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg==
+"@babel/plugin-transform-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
+  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
 
-"@babel/plugin-transform-sticky-regex@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd"
-  integrity sha512-/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q==
+"@babel/plugin-transform-sticky-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
+  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-template-literals@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302"
-  integrity sha512-Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q==
+"@babel/plugin-transform-template-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
+  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2"
-  integrity sha512-++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg==
+"@babel/plugin-transform-typeof-symbol@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
+  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-unicode-escapes@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3"
-  integrity sha512-VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A==
+"@babel/plugin-transform-unicode-escapes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
+  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-unicode-regex@^7.14.5":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402"
-  integrity sha512-jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A==
+"@babel/plugin-transform-unicode-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
+  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/preset-env@7.15.8":
-  version "7.15.8"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.8.tgz#f527ce5bcb121cd199f6b502bf23e420b3ff8dba"
-  integrity sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==
+"@babel/preset-env@7.16.11":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
+  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
   dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.15.8"
-    "@babel/plugin-proposal-class-properties" "^7.14.5"
-    "@babel/plugin-proposal-class-static-block" "^7.15.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
-    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
-    "@babel/plugin-proposal-json-strings" "^7.14.5"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
-    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
-    "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
-    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-    "@babel/plugin-proposal-private-methods" "^7.14.5"
-    "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+    "@babel/compat-data" "^7.16.8"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-option" "^7.16.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-class-static-block" "^7.16.7"
+    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
+    "@babel/plugin-proposal-json-strings" "^7.16.7"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
+    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-private-methods" "^7.16.11"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
@@ -1169,47 +1426,47 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.14.5"
-    "@babel/plugin-transform-async-to-generator" "^7.14.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
-    "@babel/plugin-transform-block-scoping" "^7.15.3"
-    "@babel/plugin-transform-classes" "^7.15.4"
-    "@babel/plugin-transform-computed-properties" "^7.14.5"
-    "@babel/plugin-transform-destructuring" "^7.14.7"
-    "@babel/plugin-transform-dotall-regex" "^7.14.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
-    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
-    "@babel/plugin-transform-for-of" "^7.15.4"
-    "@babel/plugin-transform-function-name" "^7.14.5"
-    "@babel/plugin-transform-literals" "^7.14.5"
-    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
-    "@babel/plugin-transform-modules-amd" "^7.14.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.15.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.15.4"
-    "@babel/plugin-transform-modules-umd" "^7.14.5"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
-    "@babel/plugin-transform-new-target" "^7.14.5"
-    "@babel/plugin-transform-object-super" "^7.14.5"
-    "@babel/plugin-transform-parameters" "^7.15.4"
-    "@babel/plugin-transform-property-literals" "^7.14.5"
-    "@babel/plugin-transform-regenerator" "^7.14.5"
-    "@babel/plugin-transform-reserved-words" "^7.14.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
-    "@babel/plugin-transform-spread" "^7.15.8"
-    "@babel/plugin-transform-sticky-regex" "^7.14.5"
-    "@babel/plugin-transform-template-literals" "^7.14.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
-    "@babel/plugin-transform-unicode-regex" "^7.14.5"
-    "@babel/preset-modules" "^0.1.4"
-    "@babel/types" "^7.15.6"
-    babel-plugin-polyfill-corejs2 "^0.2.2"
-    babel-plugin-polyfill-corejs3 "^0.2.5"
-    babel-plugin-polyfill-regenerator "^0.2.2"
-    core-js-compat "^3.16.0"
+    "@babel/plugin-transform-arrow-functions" "^7.16.7"
+    "@babel/plugin-transform-async-to-generator" "^7.16.8"
+    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
+    "@babel/plugin-transform-block-scoping" "^7.16.7"
+    "@babel/plugin-transform-classes" "^7.16.7"
+    "@babel/plugin-transform-computed-properties" "^7.16.7"
+    "@babel/plugin-transform-destructuring" "^7.16.7"
+    "@babel/plugin-transform-dotall-regex" "^7.16.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
+    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
+    "@babel/plugin-transform-for-of" "^7.16.7"
+    "@babel/plugin-transform-function-name" "^7.16.7"
+    "@babel/plugin-transform-literals" "^7.16.7"
+    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
+    "@babel/plugin-transform-modules-amd" "^7.16.7"
+    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
+    "@babel/plugin-transform-modules-umd" "^7.16.7"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
+    "@babel/plugin-transform-new-target" "^7.16.7"
+    "@babel/plugin-transform-object-super" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-property-literals" "^7.16.7"
+    "@babel/plugin-transform-regenerator" "^7.16.7"
+    "@babel/plugin-transform-reserved-words" "^7.16.7"
+    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
+    "@babel/plugin-transform-spread" "^7.16.7"
+    "@babel/plugin-transform-sticky-regex" "^7.16.7"
+    "@babel/plugin-transform-template-literals" "^7.16.7"
+    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
+    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
+    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.16.8"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.5.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    core-js-compat "^3.20.2"
     semver "^6.3.0"
 
-"@babel/preset-modules@^0.1.4":
+"@babel/preset-modules@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
   integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
@@ -1228,10 +1485,10 @@
     core-js-pure "^3.19.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
-  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
+"@babel/runtime@7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
+  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -1242,16 +1499,16 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
-  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
+"@babel/template@7.16.7", "@babel/template@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
   dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/parser" "^7.15.4"
-    "@babel/types" "^7.15.4"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
 
-"@babel/template@^7.15.4", "@babel/template@^7.16.0", "@babel/template@^7.3.3":
+"@babel/template@^7.16.0", "@babel/template@^7.3.3":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
   integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
@@ -1260,7 +1517,7 @@
     "@babel/parser" "^7.16.0"
     "@babel/types" "^7.16.0"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3", "@babel/traverse@^7.7.2":
   version "7.16.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787"
   integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==
@@ -1275,7 +1532,55 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/traverse@^7.16.10":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
+  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.16.10"
+    "@babel/types" "^7.16.8"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.7.tgz#dac01236a72c2560073658dd1a285fe4e0865d76"
+  integrity sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.8.tgz#bab2f2b09a5fe8a8d9cad22cbfe3ba1d126fef9c"
+  integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.16.8"
+    "@babel/types" "^7.16.8"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
   integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
@@ -1283,19 +1588,34 @@
     "@babel/helper-validator-identifier" "^7.15.7"
     to-fast-properties "^2.0.0"
 
-"@bartholomej/ngx-translate-extract@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@bartholomej/ngx-translate-extract/-/ngx-translate-extract-8.0.1.tgz#4d9cc6ffbc2ce7f34d88cd15b28da2f382f58f43"
-  integrity sha512-mf/G8Xjz865xjLekZ6U0q5g6BO9ZF++tn3bDs1bPPOAKCw2BjBmwbMOftfGOdHYrVcSTa0yl2sqafZqYa4+waA==
+"@babel/types@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159"
+  integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==
   dependencies:
-    "@angular/compiler" "^13.0.2"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
+  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@bartholomej/ngx-translate-extract@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@bartholomej/ngx-translate-extract/-/ngx-translate-extract-8.0.2.tgz#24fd28c34d66a91b20e6c3b0e1cc1b70878b1bc7"
+  integrity sha512-QBayCNhuatTL5mJJzfGtBpbbViRqG+Vv0iQGyiTcoJv40Wv4G+70rQl1Q+I+CW6jcw5L1VfR+RDtKD6WkeuWZw==
+  dependencies:
+    "@angular/compiler" "^13.1.1"
     "@phenomnomnominal/tsquery" "^4.1.1"
     boxen "^6.2.1"
     colorette "^2.0.16"
     flat "^5.0.2"
     gettext-parser "^4.2.0"
     glob "^7.2.0"
-    mkdirp "^1.0.4"
     path "^0.12.7"
     terminal-link "^3.0.0"
     yargs "^17.2.1"
@@ -1324,51 +1644,6 @@
   dependencies:
     "@cspotcode/source-map-consumer" "0.8.0"
 
-"@csstools/convert-colors@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-2.0.0.tgz#6dd323583b40cfe05aaaca30debbb30f26742bbf"
-  integrity sha512-P7BVvddsP2Wl5v3drJ3ArzpdfXMqoZ/oHOV/yFiGFb3JQr9Z9UXZ9tnHAKJsO89lfprR1F9ExW3Yij21EjEBIA==
-
-"@csstools/convert-colors@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
-  integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
-
-"@cypress/listr-verbose-renderer@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a"
-  integrity sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=
-  dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
-    date-fns "^1.27.2"
-    figures "^1.7.0"
-
-"@cypress/request@^2.88.5", "@cypress/request@^2.88.7":
-  version "2.88.9"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.9.tgz#7428fc66008ec3a4727c189857f6bb7f758f1d92"
-  integrity sha512-6md3dtAd3DXfTEXFb2Yde3TSaqpYsSBw3a1VFwAC9Fscu2B0DtY2Venu35csZyJj09XNkPMGRoE4ZXUdtkI+zg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.3.6"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^8.3.2"
-
 "@cypress/webpack-preprocessor@^5.9.1":
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.10.0.tgz#477eee82c04caec956a07e51d2d90a9947ed6d7e"
@@ -1378,31 +1653,23 @@
     debug "4.3.2"
     lodash "^4.17.20"
 
-"@cypress/xvfb@^1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
-  integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==
-  dependencies:
-    debug "^3.1.0"
-    lodash.once "^4.1.1"
+"@discoveryjs/json-ext@0.5.6":
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"
+  integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==
 
-"@discoveryjs/json-ext@0.5.5":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3"
-  integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==
-
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint/eslintrc@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
+  integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
+    debug "^4.3.2"
+    espree "^9.2.0"
     globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
@@ -1411,16 +1678,16 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
   integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
+  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
@@ -1453,35 +1720,47 @@
     jest-util "^27.3.1"
     slash "^3.0.0"
 
-"@jest/core@^27.3.1":
-  version "27.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.3.1.tgz#04992ef1b58b17c459afb87ab56d81e63d386925"
-  integrity sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==
+"@jest/console@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.4.6.tgz#0742e6787f682b22bdad56f9db2a8a77f6a86107"
+  integrity sha512-jauXyacQD33n47A44KrlOVeiXHEXDqapSdfb9kTekOchH/Pd18kBIO1+xxJQRLuG+LUuljFCwTG92ra4NW7SpA==
   dependencies:
-    "@jest/console" "^27.3.1"
-    "@jest/reporters" "^27.3.1"
-    "@jest/test-result" "^27.3.1"
-    "@jest/transform" "^27.3.1"
-    "@jest/types" "^27.2.5"
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^27.4.6"
+    jest-util "^27.4.2"
+    slash "^3.0.0"
+
+"@jest/core@^27.4.7":
+  version "27.4.7"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.4.7.tgz#84eabdf42a25f1fa138272ed229bcf0a1b5e6913"
+  integrity sha512-n181PurSJkVMS+kClIFSX/LLvw9ExSb+4IMtD6YnfxZVerw9ANYtW0bPrm0MJu2pfe9SY9FJ9FtQ+MdZkrZwjg==
+  dependencies:
+    "@jest/console" "^27.4.6"
+    "@jest/reporters" "^27.4.6"
+    "@jest/test-result" "^27.4.6"
+    "@jest/transform" "^27.4.6"
+    "@jest/types" "^27.4.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     emittery "^0.8.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^27.3.0"
-    jest-config "^27.3.1"
-    jest-haste-map "^27.3.1"
-    jest-message-util "^27.3.1"
-    jest-regex-util "^27.0.6"
-    jest-resolve "^27.3.1"
-    jest-resolve-dependencies "^27.3.1"
-    jest-runner "^27.3.1"
-    jest-runtime "^27.3.1"
-    jest-snapshot "^27.3.1"
-    jest-util "^27.3.1"
-    jest-validate "^27.3.1"
-    jest-watcher "^27.3.1"
+    jest-changed-files "^27.4.2"
+    jest-config "^27.4.7"
+    jest-haste-map "^27.4.6"
+    jest-message-util "^27.4.6"
+    jest-regex-util "^27.4.0"
+    jest-resolve "^27.4.6"
+    jest-resolve-dependencies "^27.4.6"
+    jest-runner "^27.4.6"
+    jest-runtime "^27.4.6"
+    jest-snapshot "^27.4.6"
+    jest-util "^27.4.2"
+    jest-validate "^27.4.6"
+    jest-watcher "^27.4.6"
     micromatch "^4.0.4"
     rimraf "^3.0.0"
     slash "^3.0.0"
@@ -1497,6 +1776,16 @@
     "@types/node" "*"
     jest-mock "^27.3.0"
 
+"@jest/environment@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.4.6.tgz#1e92885d64f48c8454df35ed9779fbcf31c56d8b"
+  integrity sha512-E6t+RXPfATEEGVidr84WngLNWZ8ffCPky8RqqRK6u1Bn0LK92INe0MDttyPl/JOzaq92BmDzOeuqk09TvM22Sg==
+  dependencies:
+    "@jest/fake-timers" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    jest-mock "^27.4.6"
+
 "@jest/fake-timers@^27.3.1":
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.3.1.tgz#1fad860ee9b13034762cdb94266e95609dfce641"
@@ -1509,6 +1798,18 @@
     jest-mock "^27.3.0"
     jest-util "^27.3.1"
 
+"@jest/fake-timers@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.4.6.tgz#e026ae1671316dbd04a56945be2fa251204324e8"
+  integrity sha512-mfaethuYF8scV8ntPpiVGIHQgS0XIALbpY2jt2l7wb/bvq4Q5pDLk4EP4D7SAvYT1QrPOPVZAtbdGAOOyIgs7A==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    "@sinonjs/fake-timers" "^8.0.1"
+    "@types/node" "*"
+    jest-message-util "^27.4.6"
+    jest-mock "^27.4.6"
+    jest-util "^27.4.2"
+
 "@jest/globals@^27.3.1":
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.3.1.tgz#ce1dfb03d379237a9da6c1b99ecfaca1922a5f9e"
@@ -1518,6 +1819,15 @@
     "@jest/types" "^27.2.5"
     expect "^27.3.1"
 
+"@jest/globals@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.4.6.tgz#3f09bed64b0fd7f5f996920258bd4be8f52f060a"
+  integrity sha512-kAiwMGZ7UxrgPzu8Yv9uvWmXXxsy0GciNejlHvfPIfWkSxChzv6bgTS3YqBkGuHcis+ouMFI2696n2t+XYIeFw==
+  dependencies:
+    "@jest/environment" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    expect "^27.4.6"
+
 "@jest/reporters@27.2.2":
   version "27.2.2"
   resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.2.2.tgz#e2d41cd9f8088676b81b9a9908cb1ba67bdbee78"
@@ -1548,16 +1858,16 @@
     terminal-link "^2.0.0"
     v8-to-istanbul "^8.0.0"
 
-"@jest/reporters@^27.3.1":
-  version "27.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.3.1.tgz#28b5c1f5789481e23788048fa822ed15486430b9"
-  integrity sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==
+"@jest/reporters@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.4.6.tgz#b53dec3a93baf9b00826abf95b932de919d6d8dd"
+  integrity sha512-+Zo9gV81R14+PSq4wzee4GC2mhAN9i9a7qgJWL90Gpx7fHYkWpTBvwWNZUXvJByYR9tAVBdc8VxDWqfJyIUrIQ==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^27.3.1"
-    "@jest/test-result" "^27.3.1"
-    "@jest/transform" "^27.3.1"
-    "@jest/types" "^27.2.5"
+    "@jest/console" "^27.4.6"
+    "@jest/test-result" "^27.4.6"
+    "@jest/transform" "^27.4.6"
+    "@jest/types" "^27.4.2"
     "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
@@ -1565,14 +1875,14 @@
     glob "^7.1.2"
     graceful-fs "^4.2.4"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-instrument "^5.1.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^27.3.1"
-    jest-resolve "^27.3.1"
-    jest-util "^27.3.1"
-    jest-worker "^27.3.1"
+    istanbul-reports "^3.1.3"
+    jest-haste-map "^27.4.6"
+    jest-resolve "^27.4.6"
+    jest-util "^27.4.2"
+    jest-worker "^27.4.6"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
@@ -1588,6 +1898,15 @@
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
+"@jest/source-map@^27.4.0":
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.4.0.tgz#2f0385d0d884fb3e2554e8f71f8fa957af9a74b6"
+  integrity sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.2.4"
+    source-map "^0.6.0"
+
 "@jest/test-result@27.2.2":
   version "27.2.2"
   resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.2.2.tgz#cd4ba1ca9b0521e463bd4b32349ba1842277563b"
@@ -1608,7 +1927,17 @@
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^27.2.2", "@jest/test-sequencer@^27.3.1":
+"@jest/test-result@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.4.6.tgz#b3df94c3d899c040f602cea296979844f61bdf69"
+  integrity sha512-fi9IGj3fkOrlMmhQqa/t9xum8jaJOOAi/lZlm6JXSc55rJMXKHxNDN1oCP39B0/DhNOa2OMupF9BcKZnNtXMOQ==
+  dependencies:
+    "@jest/console" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
+"@jest/test-sequencer@^27.2.2":
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz#4b3bde2dbb05ee74afdae608cf0768e3354683b1"
   integrity sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==
@@ -1618,6 +1947,16 @@
     jest-haste-map "^27.3.1"
     jest-runtime "^27.3.1"
 
+"@jest/test-sequencer@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.4.6.tgz#447339b8a3d7b5436f50934df30854e442a9d904"
+  integrity sha512-3GL+nsf6E1PsyNsJuvPyIz+DwFuCtBdtvPpm/LMXVkBJbdFvQYCDpccYT56qq5BGniXWlE81n2qk1sdXfZebnw==
+  dependencies:
+    "@jest/test-result" "^27.4.6"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^27.4.6"
+    jest-runtime "^27.4.6"
+
 "@jest/transform@^27.2.2", "@jest/transform@^27.3.1":
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.3.1.tgz#ff80eafbeabe811e9025e4b6f452126718455220"
@@ -1639,6 +1978,27 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
+"@jest/transform@^27.4.6":
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.4.6.tgz#153621940b1ed500305eacdb31105d415dc30231"
+  integrity sha512-9MsufmJC8t5JTpWEQJ0OcOOAXaH5ioaIX6uHVBLBMoCZPfKKQF+EqP8kACAvCZ0Y1h2Zr3uOccg8re+Dr5jxyw==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^27.4.2"
+    babel-plugin-istanbul "^6.1.1"
+    chalk "^4.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^27.4.6"
+    jest-regex-util "^27.4.0"
+    jest-util "^27.4.2"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
 "@jest/types@^27.1.1", "@jest/types@^27.2.5":
   version "27.2.5"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.2.5.tgz#420765c052605e75686982d24b061b4cbba22132"
@@ -1650,37 +2010,48 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@jridgewell/resolve-uri@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-1.0.0.tgz#3fdf5798f0b49e90155896f6291df186eac06c83"
-  integrity sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==
-
-"@materia-ui/ngx-monaco-editor@^6.0.0-beta.1":
-  version "6.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@materia-ui/ngx-monaco-editor/-/ngx-monaco-editor-6.0.0-beta.1.tgz#e3f38f730fac210d8aa12655ae7fb2c21164efbf"
-  integrity sha512-vdKUWb4NKZfbA9AU9PpJ3GPPCZkOc0LxFzfl2uHFllrvqKbbHu1QF4YPRuRJkix5CqFzg+4DifZnU8XagYpceg==
+"@jest/types@^27.4.2":
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.4.2.tgz#96536ebd34da6392c2b7c7737d693885b5dd44a5"
+  integrity sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==
   dependencies:
-    tslib "^2.0.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^16.0.0"
+    chalk "^4.0.0"
 
-"@ngtools/webpack@13.0.3":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-13.0.3.tgz#ec31dfa49dae79aeee68cc970fea6f5fd9ebc76d"
-  integrity sha512-sVi1Xk8pyy6Y6JODySucYfvuxb5k3IIX/oIWy8QxlFVzpeB2UMqEOevrgvtmiEbQNB1W+aYSTph6oeV+PRX5YA==
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.3.tgz#b80093f4edbb5490c49746231513669c8f518acb"
+  integrity sha512-fuIOnc81C5iRNevb/XPiM8Khp9bVjreydRQ37rt0C/dY0PAW1DRvEM3WrKX/5rStS5lbgwS0FCgqSndh9tvK5w==
 
-"@ngx-translate/core@^13.0.0":
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-13.0.0.tgz#60547cb8a0845a2a0abfde6b0bf5ec6516a63fd6"
-  integrity sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==
-  dependencies:
-    tslib "^2.0.0"
-
-"@ngx-translate/http-loader@^6.0.0":
+"@materia-ui/ngx-monaco-editor@^6.0.0":
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-6.0.0.tgz#041393ab5753f50ecf64262d624703046b8c7570"
-  integrity sha512-LCekn6qCbeXWlhESCxU1rAbZz33WzDG0lI7Ig0pYC1o5YxJWrkU9y3Y4tNi+jakQ7R6YhTR2D3ox6APxDtA0wA==
+  resolved "https://registry.yarnpkg.com/@materia-ui/ngx-monaco-editor/-/ngx-monaco-editor-6.0.0.tgz#9ae93666019e9a6d4f787370b4373cbb63a04a38"
+  integrity sha512-gTqNQjOGznZxOC0NlmKdKSGCJuTts8YmK4dsTQAGc5IgIV7cZdQWiW6AL742h0ruED6q0cAunEYjXT6jzHBoIQ==
   dependencies:
     tslib "^2.0.0"
 
+"@ngtools/webpack@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-13.2.0.tgz#9e1b9f66007033cf1fd58345b364773ce090cb10"
+  integrity sha512-dQKPsEsST/HSBYtC75E0ARI1zVsW65h/NYzcAwtOd8DKFmlj8EZMqKC4KwcJ/EKlwR1PN12nBZhuQ1HUVH8Vtg==
+
+"@ngx-translate/core@^14.0.0":
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-14.0.0.tgz#af421d0e1a28376843f0fed375cd2fae7630a5ff"
+  integrity sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==
+  dependencies:
+    tslib "^2.3.0"
+
+"@ngx-translate/http-loader@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-7.0.0.tgz#905f38d8d13342621516635bf480ff9a4f73e9fc"
+  integrity sha512-j+NpXXlcGVdyUNyY/qsJrqqeAdJdizCd+GKh3usXExSqy1aE9866jlAIL+xrfDU4w+LiMoma5pgE4emvFebZmA==
+  dependencies:
+    tslib "^2.3.0"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1762,90 +2133,91 @@
     node-gyp "^8.2.0"
     read-package-json-fast "^2.0.1"
 
-"@nrwl/angular@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/angular/-/angular-13.2.3.tgz#ec7e5304553bd75317abf4686536c17a5651f936"
-  integrity sha512-7IFRmyPLgoWjUGOXuUHfN7wx4T5T6sixHRJjPr2SX81ssRaQjOEFMMSON6xZdaGabd9qnR87ZR1eQVuj4c2wLg==
+"@nrwl/angular@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/angular/-/angular-13.6.1.tgz#3013931b17ca38a11865a544a5e80d0d15ccf115"
+  integrity sha512-mJLsqA28EgQUlwJR82tJWW5lxY4L+FI57es6TSB9PSKWeMuGgrwO15h/aMaFBp9WqMQETh61XnMQAe5pWSCnEQ==
   dependencies:
-    "@angular-devkit/schematics" "~13.0.0"
-    "@nrwl/cypress" "13.2.3"
-    "@nrwl/devkit" "13.2.3"
-    "@nrwl/jest" "13.2.3"
-    "@nrwl/linter" "13.2.3"
-    "@nrwl/storybook" "13.2.3"
+    "@angular-devkit/schematics" "~13.1.0"
+    "@nrwl/cypress" "13.6.1"
+    "@nrwl/devkit" "13.6.1"
+    "@nrwl/jest" "13.6.1"
+    "@nrwl/linter" "13.6.1"
+    "@nrwl/storybook" "13.6.1"
     "@phenomnomnominal/tsquery" "4.1.1"
-    "@schematics/angular" "~13.0.0"
-    find-parent-dir "^0.3.1"
+    "@schematics/angular" "~13.1.0"
     ignore "^5.0.4"
     jasmine-marbles "~0.8.4"
     rxjs-for-await "0.0.2"
+    semver "7.3.4"
+    ts-node "~9.1.1"
+    tsconfig-paths "^3.9.0"
     tslib "^2.3.0"
     webpack-merge "5.7.3"
 
-"@nrwl/cli@*", "@nrwl/cli@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-13.2.3.tgz#a0cf0d0d8f7e3c5475b4bed6c6d4c4c16d889b84"
-  integrity sha512-4hrOYQ9MqhWOdjQTwuQqHTfPu8lYgdFCE39PVWAcePtoi67mUeba54HkyT6nkTHI1TbO7q8Kf+R73dRhhxDlpA==
+"@nrwl/cli@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-13.6.1.tgz#25bba4e1e8fd516ba239c2cab8677d86a6d109c9"
+  integrity sha512-e6iEM5CKbwm67MK3daAEYuxX9kXeUBtbV4mEPU0mX6q7cqSMd0PdVVHpdZMkJtbUG+c2CD+IayoVOdJryAh4Vw==
   dependencies:
-    "@nrwl/tao" "13.2.3"
+    "@nrwl/tao" "13.6.1"
     chalk "4.1.0"
     enquirer "~2.3.6"
     v8-compile-cache "2.3.0"
-    yargs "15.4.1"
     yargs-parser "20.0.0"
 
-"@nrwl/cypress@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-13.2.3.tgz#d8f6067317557158c496ac2954f18a77c0d37625"
-  integrity sha512-gp6yluBx37CV/ROHDusri2ew6dR+jFMRGZXmL4Jp+TaFc6ewAI+aQDHUI6py6tvNNtZ+8P/x1hPiaPikn8w5vQ==
+"@nrwl/cypress@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-13.6.1.tgz#71f4d9d052e0f30668f174481fcbaa627a486875"
+  integrity sha512-luz36D3dal2x5367WK/oURGzObzIwFuGwjlp+L8dq5KzYtRhbzutfHhWCk/JEOsCrLBlI5jKH37x7kbpkH8OKQ==
   dependencies:
     "@cypress/webpack-preprocessor" "^5.9.1"
-    "@nrwl/devkit" "13.2.3"
-    "@nrwl/linter" "13.2.3"
-    "@nrwl/workspace" "13.2.3"
+    "@nrwl/devkit" "13.6.1"
+    "@nrwl/linter" "13.6.1"
+    "@nrwl/workspace" "13.6.1"
     chalk "4.1.0"
     enhanced-resolve "^5.8.3"
     fork-ts-checker-webpack-plugin "6.2.10"
     rxjs "^6.5.4"
     ts-loader "^9.2.6"
     tsconfig-paths "^3.9.0"
-    tsconfig-paths-webpack-plugin "3.4.1"
+    tsconfig-paths-webpack-plugin "3.5.2"
     tslib "^2.3.0"
     webpack-node-externals "^3.0.0"
-    yargs-parser "20.0.0"
 
-"@nrwl/devkit@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-13.2.3.tgz#34c8cda7ef5d0e618a7522dbbed6ac37a961302b"
-  integrity sha512-/cp8hFclOXSAjj9pwb6bOU8yw593HfelcCBi8o8Jhb0Luhn1RzLCOpmHNsOf2hWzSUPEr0BuI0R55ubCEB+k6A==
+"@nrwl/devkit@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-13.6.1.tgz#2fc99552aed7692d247b70dbc21c8a12d3e15c9e"
+  integrity sha512-Y3rfzmBqOVLPEiC7BUqckNLfg0dTgPfRmO1bFmSYclALxzs+mMoZGH/3RjIIrYAG6WLYgO298RIzMJsz2vU4sA==
   dependencies:
-    "@nrwl/tao" "13.2.3"
+    "@nrwl/tao" "13.6.1"
     ejs "^3.1.5"
     ignore "^5.0.4"
     rxjs "^6.5.4"
     semver "7.3.4"
     tslib "^2.3.0"
 
-"@nrwl/eslint-plugin-nx@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-13.2.3.tgz#a799e66755a18e2e57db007317e21e2785a2caea"
-  integrity sha512-WEb/ZTvc3JCFPKFng8Gsx9UU7NXePWcQSidngmzXd114/NrM8TkHOx4Ps2nEZyYzpOy/Zo8rqAmbtLgruaYvwg==
+"@nrwl/eslint-plugin-nx@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-13.6.1.tgz#fc7712ad11246a3f87929c711f968f98c4300714"
+  integrity sha512-ATDkLyLZ5c2xytJ4n9Ii4tlKVkXq9eXonOLIY0jzMfJc4dTWZRP8vliJACm1CA/nhNJyJTNaRojIa7gZwKzKRA==
   dependencies:
-    "@nrwl/devkit" "13.2.3"
-    "@nrwl/workspace" "13.2.3"
-    "@typescript-eslint/experimental-utils" "~4.33.0"
+    "@nrwl/devkit" "13.6.1"
+    "@nrwl/workspace" "13.6.1"
+    "@swc-node/register" "^1.4.2"
+    "@typescript-eslint/experimental-utils" "~5.3.0"
+    chalk "4.1.0"
     confusing-browser-globals "^1.0.9"
-    ts-node "^9.1.1"
     tsconfig-paths "^3.9.0"
 
-"@nrwl/jest@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-13.2.3.tgz#0902a9637d4d1a5ec6c07ad9c9091fda77603686"
-  integrity sha512-M9/x0uZNSVKkcyNHcA2+Muj23KRo9SDiCsTb7HnkHhtSbhIWMd1knKP45bOr8CjeeiKNPeervx7uiN5516z8JA==
+"@nrwl/jest@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-13.6.1.tgz#140bd19874ae9a7172747ddb2ec2a7a63b614f94"
+  integrity sha512-54qgcKfKdMpafdUmpsgSR9gacO7zvJJWPUFlQ2QHxqg6tm88U05Hb1LWK/21u5hgifpe/BHOklHJwPaHdUnKtw==
   dependencies:
     "@jest/reporters" "27.2.2"
     "@jest/test-result" "27.2.2"
-    "@nrwl/devkit" "13.2.3"
+    "@nrwl/devkit" "13.6.1"
     chalk "4.1.0"
     identity-obj-proxy "3.0.0"
     jest-config "27.2.2"
@@ -1855,43 +2227,43 @@
     rxjs "^6.5.4"
     tslib "^2.3.0"
 
-"@nrwl/linter@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-13.2.3.tgz#39afeff12cf5d5678d521efb52b3fb11a80da77b"
-  integrity sha512-kdzPWYzR96XYghJ5yIaYSybDrtcAcSxgcscwP1UWvME19O2W8DHbhIj3AzBgjSG0X6hBEh6k9kpyQ49jNkUMCw==
+"@nrwl/linter@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-13.6.1.tgz#ba5ce6d57dd41e9380fb243ea46cf5a13a1d1203"
+  integrity sha512-UDojjrleA/9FwM8zzG/ClAJnenit12l2bNI3xnHGDjazOp3iQg2paOdshq8TzQA9qwvGae0EXwyQfOfkZzBb/A==
   dependencies:
-    "@nrwl/devkit" "13.2.3"
-    "@nrwl/jest" "13.2.3"
-    eslint "7.32.0"
-    glob "7.1.4"
-    minimatch "3.0.4"
+    "@nrwl/devkit" "13.6.1"
+    "@nrwl/jest" "13.6.1"
+    "@phenomnomnominal/tsquery" "4.1.1"
     tmp "~0.2.1"
     tslib "^2.3.0"
 
-"@nrwl/storybook@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-13.2.3.tgz#2794770cd37a1889572743be28ca0554fb5dc07d"
-  integrity sha512-+stufDpXPoiT5vf2jNOLC2YRfPyebbltrPMQ0n8YxqpzN91XHj9ieYmErJ6t2AgEutcDpvfbZkVEYKqPNNn3hw==
+"@nrwl/storybook@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-13.6.1.tgz#ab103dbc0ab19539d90708ace43d495a13bcb20a"
+  integrity sha512-VwPJgP5Zm6axJKHfEbpX59GacPUcrIXdIsQejHBpfAFwj7JwZgHyybnNxxCk428SWCBz53OXHEc78MEw4XzyGQ==
   dependencies:
-    "@nrwl/cypress" "13.2.3"
-    "@nrwl/devkit" "13.2.3"
-    "@nrwl/linter" "13.2.3"
-    "@nrwl/workspace" "13.2.3"
+    "@nrwl/cypress" "13.6.1"
+    "@nrwl/devkit" "13.6.1"
+    "@nrwl/linter" "13.6.1"
+    "@nrwl/workspace" "13.6.1"
     core-js "^3.6.5"
     semver "7.3.4"
     ts-loader "^9.2.6"
-    tsconfig-paths-webpack-plugin "3.4.1"
+    tsconfig-paths-webpack-plugin "3.5.2"
 
-"@nrwl/tao@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-13.2.3.tgz#f0ca4b08258bbc280d67dae039a2d4fda5830557"
-  integrity sha512-vn+GqvFVinqAXzvbHznPBtCg9OCfirh3hF68sZgY2C6jZ3m47XwST3mLTRSDTtSDy9QfUrSZ6p4uAk2Iht0yBQ==
+"@nrwl/tao@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-13.6.1.tgz#6862b22ba1255435263f291a7db9c3f903b8e08e"
+  integrity sha512-F+ldBZjm8CspTs/n6lBcHFGmRumRV5zTeSCD2p8z6kdAzpDQjuIAPU2O5kRSe0/S1WZ74zNA4SjqprA21zDBGg==
   dependencies:
     chalk "4.1.0"
     enquirer "~2.3.6"
+    fast-glob "3.2.7"
     fs-extra "^9.1.0"
+    ignore "^5.0.4"
     jsonc-parser "3.0.0"
-    nx "13.2.3"
+    nx "13.6.1"
     rxjs "^6.5.4"
     rxjs-for-await "0.0.2"
     semver "7.3.4"
@@ -1899,44 +2271,44 @@
     tslib "^2.3.0"
     yargs-parser "20.0.0"
 
-"@nrwl/workspace@13.2.3":
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-13.2.3.tgz#f778bd77901f06f86bde644151a140917c015761"
-  integrity sha512-dFB6XXDLP4Nmh/Sw8Euwdt7f0tg1O6JxJNvXV2BfWG1rK3dmhTz4Q+8fgxl7AxsrToVrXDAh16mPyfAzpqH4pw==
+"@nrwl/workspace@13.6.1":
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-13.6.1.tgz#a8693ec69d13cdc83954fe14c2c7c6531f439657"
+  integrity sha512-pmMRoYDgfSn0xN+yHYqBt/ltXFU/xCn7RQHa7mo3ThU2+gfAb/IhDHug5yRp2UqMKHmmMWQ6DbGuusXLlVix6A==
   dependencies:
-    "@nrwl/cli" "13.2.3"
-    "@nrwl/devkit" "13.2.3"
-    "@nrwl/jest" "13.2.3"
-    "@nrwl/linter" "13.2.3"
-    "@parcel/watcher" "2.0.0-alpha.11"
+    "@nrwl/cli" "13.6.1"
+    "@nrwl/devkit" "13.6.1"
+    "@nrwl/jest" "13.6.1"
+    "@nrwl/linter" "13.6.1"
+    "@parcel/watcher" "2.0.4"
     chalk "4.1.0"
     chokidar "^3.5.1"
-    cosmiconfig "^4.0.0"
+    cli-cursor "3.1.0"
+    cli-spinners "2.6.1"
     dotenv "~10.0.0"
     enquirer "~2.3.6"
+    figures "3.2.0"
     flat "^5.0.2"
     fs-extra "^9.1.0"
     glob "7.1.4"
     ignore "^5.0.4"
     minimatch "3.0.4"
-    npm-run-all "^4.1.5"
     npm-run-path "^4.0.1"
     open "^7.4.2"
     rxjs "^6.5.4"
     semver "7.3.4"
-    strip-ansi "6.0.0"
     tmp "~0.2.1"
     tslib "^2.3.0"
     yargs "15.4.1"
     yargs-parser "20.0.0"
 
-"@parcel/watcher@2.0.0-alpha.11":
-  version "2.0.0-alpha.11"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.0-alpha.11.tgz#8d6233d4416880810438cd2628e6a35273241ab3"
-  integrity sha512-zMIAsFLcnB82kkk0kSOZ/zgyihb8sty0zVrsz+3ruoYXkchymWsCDsxiX4v+X2s8Jppk3JE8vlnD4DKs3QTOEQ==
+"@parcel/watcher@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
+  integrity sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==
   dependencies:
-    node-addon-api "^3.0.2"
-    node-gyp-build "^4.2.3"
+    node-addon-api "^3.2.1"
+    node-gyp-build "^4.3.0"
 
 "@pdftron/webviewer@8.2.0":
   version "8.2.0"
@@ -1978,20 +2350,22 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
-  integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==
+"@schematics/angular@13.2.0":
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-13.2.0.tgz#fee1ef0810d16d7090822233e6e6e01a91a04a2c"
+  integrity sha512-DlUJ+ix9u/wz7IWc82dix5xsDGu0nztZ6Litrv+EsFDRYc95IFxTWuNwwjL2eRkI2KLIk79wmO7xhlUwrUyNlg==
   dependencies:
-    any-observable "^0.3.0"
+    "@angular-devkit/core" "13.2.0"
+    "@angular-devkit/schematics" "13.2.0"
+    jsonc-parser "3.0.0"
 
-"@schematics/angular@13.0.3", "@schematics/angular@~13.0.0":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-13.0.3.tgz#08c5511b0e72a9934ac84545d3e49e05bd0dbf6c"
-  integrity sha512-qH6mnmGaDCuG1FM3vLdvSFDG394TeZO0ZvRDrw3iCYlX5Nkbz0Kvt0MPtWNZmlohwFhGlbXKVQiR++1dxa6eEA==
+"@schematics/angular@~13.1.0":
+  version "13.1.3"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-13.1.3.tgz#c763cdf1a2e0784d5263c23b581bfeb4a4a2f12e"
+  integrity sha512-IixVWAEtN97N74PCxg3T03Ar/ECjGyJBWKAjKTTCrgNSWhm2mKgIc4RyI6cVCnltfJWIo48fcFhlOx/elShaCg==
   dependencies:
-    "@angular-devkit/core" "13.0.3"
-    "@angular-devkit/schematics" "13.0.3"
+    "@angular-devkit/core" "13.1.3"
+    "@angular-devkit/schematics" "13.1.3"
     jsonc-parser "3.0.0"
 
 "@sinonjs/commons@^1.7.0":
@@ -2008,11 +2382,123 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@swimlane/ngx-charts@^17.0.1":
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/@swimlane/ngx-charts/-/ngx-charts-17.0.1.tgz#7d86d4725f864d798659c0c0a2eabb6f9f60982c"
-  integrity sha512-4pvSznkFo/vM59YUnXH0Y/f8n9cUBBelHuh7UoNlMchl1jI083eFk0zK5fEL2sF3c+vvEpBeYB523GxWvWoifw==
+"@swc-node/core@^1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@swc-node/core/-/core-1.8.2.tgz#950ad394a8e8385658e6a951ec554bbf61a1693e"
+  integrity sha512-IoJ7tGHQ6JOMSmFe4VhP64uLmFKMNasS0QEgUrLFQ0h/dTvpQMynnoGBEJoPL6LfsebZ/q4uKqbpWrth6/yrAA==
   dependencies:
+    "@swc/core" "^1.2.119"
+
+"@swc-node/register@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@swc-node/register/-/register-1.4.2.tgz#98801cc5ad8792519511bd6ae31c01f40aa487a3"
+  integrity sha512-wLZz0J7BTO//1Eq7e4eBQjKF380Hr2eVemz849msQSKcVM1D7UJUt/dP2TinEVGx++/BXJ/0q37i6n9Iw0EM0w==
+  dependencies:
+    "@swc-node/core" "^1.8.2"
+    "@swc-node/sourcemap-support" "^0.1.11"
+    chalk "4"
+    debug "^4.3.3"
+    pirates "^4.0.4"
+    tslib "^2.3.1"
+    typescript "^4.5.3"
+
+"@swc-node/sourcemap-support@^0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@swc-node/sourcemap-support/-/sourcemap-support-0.1.11.tgz#50cda396baade0636e8f53596b7a66386490c06d"
+  integrity sha512-b+Mn3oQl+7nUSt7hPzIbY9B30YhcFo1PT4kd9P4QmD6raycmIealOAhAdZID/JevphzsOXHQB4OqJm7Yi5tMcA==
+  dependencies:
+    source-map-support "^0.5.21"
+
+"@swc/core-android-arm-eabi@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.135.tgz#11a53c1e55d66cc281b5de8abbe8560465e268ab"
+  integrity sha512-Qx5PXLzedOVSWHIY88iTxEa6m5RONs7bDIF05mNH1qaXsOkBD52MZ+mFDW6uGZ2OnOuMjD2OY08877429atBgA==
+
+"@swc/core-android-arm64@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.135.tgz#cddcd82d45229b82c0aa4aecca83dcc1c6667d61"
+  integrity sha512-XeZN9Efr44hGPOnHnrcNvdYU0Yn1UQOgR1LReS19aFJT7vWdI6Boe900V22J2K2ccJaOYqmic9BR6kRtDO7gGg==
+
+"@swc/core-darwin-arm64@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.135.tgz#1fc8b9028660374c3ef78ca862c08b1b659df72f"
+  integrity sha512-2DSs8IuGbu86B+ENnJVTAtn57HU4KSw9FJTGQfA+5IWBuUHJgpANcfQ3Xp19MtolfLW+Z4Xy8HCvdFljiQONRQ==
+
+"@swc/core-darwin-x64@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.135.tgz#f0af5c49128d91eebd9f2428c660d8a2d066b7d0"
+  integrity sha512-nS32iLbaW7g6ILlvWCZp1pwfLSndDGragsFcuw9xo6KR58KeDNdG54GQ6CwugqWiCEgzD+ZCvYmfcTjlgGJt/Q==
+
+"@swc/core-freebsd-x64@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.135.tgz#aa126c82e36ca47895fe68e2072fa93aebaa3c80"
+  integrity sha512-8tM7eOFsOT7bNlx1u0GoldopMVigPM9sLzKfwdRm4doDsE/DeUXumQI2mb8JTqzHpcjYxEiFBaNy8L7wf8wAEQ==
+
+"@swc/core-linux-arm-gnueabihf@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.135.tgz#56cead34686a2233a36d6e546f7dd096f2c90b7a"
+  integrity sha512-sppILSuR/HClz9mzZuxziAH7/QSUSgM3gSxGKlXzC8AItcBZFJ/7ygqg0TjCFFcQ+n0BdNltUIMztdv+5qwRSg==
+
+"@swc/core-linux-arm64-gnu@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.135.tgz#0ec99ccdda78aa7e0d018a6928691632eb84bff8"
+  integrity sha512-inu6jZCHiHw+3kSvmBRGUIDLMi/XFsIyMOue3QJReOuL5BTIQJ/I1oYhLsaSGcmEZM2Mo7QJ2jDBB3SjM5YzeA==
+
+"@swc/core-linux-arm64-musl@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.135.tgz#e41cad8df03b5f8b9eeb124a2d723992061d4026"
+  integrity sha512-hPGetFUhez77OUgig1XmNHZbUmpKGt72u9cN0AX5NtmFdfYYu4p6l+6YB6jg6/TrPmyJlJD5vroVz8JR/pZS+w==
+
+"@swc/core-linux-x64-gnu@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.135.tgz#c2fd5206b0a40760f4f878f367a21033473c2d12"
+  integrity sha512-PTEzzMWvUaXI/sInu8oPo7yYj2WPgfl4QL3wo2OEEKwE27xFjUmKv80pXGIFD9/Xn33Xz8cA0d8yGTWYD+tOIg==
+
+"@swc/core-linux-x64-musl@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.135.tgz#fc12e424921dbffee0ef9d025dd162f8aaa45b74"
+  integrity sha512-6zqf/1x1QYIhYFIPRRo5ArHIvWVWfH8fuRE6AwL1nQz/Y19SAJx3PXgwlAjtu4CZfciuUqY99PeFtTOu1Dnjhg==
+
+"@swc/core-win32-arm64-msvc@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.135.tgz#c65a44f48e6c48105460265a25dcebb5babe5315"
+  integrity sha512-vEMQSsvYMhdT5MS0pXRNmtMxfe3Bf/TZxMeezadLcOfSdYbeshQ8t41UdVsU1xvUvRA0fmbAcipXgNmwC14ACg==
+
+"@swc/core-win32-ia32-msvc@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.135.tgz#cd92bb983c729f05128c9abe9b74c01467c0afe3"
+  integrity sha512-w1XwAGHaFNhhDOQgwy36GB0oXKi/0DKj0mmWol263YehMQic5f+usNF9EGfgFkWf8EnRpdP/oEAXpsDfniBmww==
+
+"@swc/core-win32-x64-msvc@1.2.135":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.135.tgz#ff293654b5ac3715782c9e6677cf5a188bb83597"
+  integrity sha512-hGSoHDbq7mGGb5gg1hTtzxXiqrhmEO02/oAVqSVTX7zsOnVSu9hBxim72R4a8/hqGaCGDIfeXmibwvhcYzrwfg==
+
+"@swc/core@^1.2.119":
+  version "1.2.135"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.135.tgz#ab29d549385790d779e78066bb10e0849241c5e8"
+  integrity sha512-YaltU0YygEo+pmy28GIEuHgTIKP5mzUXbgathdU2AoKytM+rNTP6QtJLewUgK86CZuu1nDpH42srhgXWIUWz2g==
+  optionalDependencies:
+    "@swc/core-android-arm-eabi" "1.2.135"
+    "@swc/core-android-arm64" "1.2.135"
+    "@swc/core-darwin-arm64" "1.2.135"
+    "@swc/core-darwin-x64" "1.2.135"
+    "@swc/core-freebsd-x64" "1.2.135"
+    "@swc/core-linux-arm-gnueabihf" "1.2.135"
+    "@swc/core-linux-arm64-gnu" "1.2.135"
+    "@swc/core-linux-arm64-musl" "1.2.135"
+    "@swc/core-linux-x64-gnu" "1.2.135"
+    "@swc/core-linux-x64-musl" "1.2.135"
+    "@swc/core-win32-arm64-msvc" "1.2.135"
+    "@swc/core-win32-ia32-msvc" "1.2.135"
+    "@swc/core-win32-x64-msvc" "1.2.135"
+
+"@swimlane/ngx-charts@^20.0.1":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@swimlane/ngx-charts/-/ngx-charts-20.0.1.tgz#6bcbf31b1ba88a53bc5796ed23e7ddf65189a493"
+  integrity sha512-gceTOLm4vZHBvNPyNAFqQf96xM+NLy56nRGX1cGR0dBQJq/0PtexrbEttg3AiZy5DvyXNF6rNdeZynUMZUi61Q==
+  dependencies:
+    "@types/d3-shape" "^2.0.0"
     d3-array "^2.9.1"
     d3-brush "^2.1.0"
     d3-color "^2.0.0"
@@ -2031,6 +2517,11 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
@@ -2084,12 +2575,47 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/cypress@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@types/cypress/-/cypress-1.1.3.tgz#0a700c040d53e9e12b5af98e41d4a88c39f39b6a"
-  integrity sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
   dependencies:
-    cypress "*"
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/bonjour@^3.5.9":
+  version "3.5.10"
+  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
+  integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==
+  dependencies:
+    "@types/node" "*"
+
+"@types/connect-history-api-fallback@^1.3.5":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/d3-path@^2":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-2.0.1.tgz#ca03dfa8b94d8add97ad0cd97e96e2006b4763cb"
+  integrity sha512-6K8LaFlztlhZO7mwsZg7ClRsdLg3FJRzIIi6SZXDWmmSJc2x8dd2VkESbLXdk3p8cuvz71f36S0y8Zv2AxqvQw==
+
+"@types/d3-shape@^2.0.0":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-2.1.3.tgz#35d397b9e687abaa0de82343b250b9897b8cacf3"
+  integrity sha512-HAhCel3wP93kh4/rq+7atLdybcESZ5bRHDEZUojClyZWsRuEMo3A52NGYJSh48SxfxEU6RZIVbZL2YFZ2OAlzQ==
+  dependencies:
+    "@types/d3-path" "^2"
 
 "@types/eslint-scope@^3.7.0":
   version "3.7.1"
@@ -2117,6 +2643,25 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
+  version "4.17.28"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@*":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/graceful-fs@^4.1.2":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
@@ -2150,15 +2695,15 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@27.0.3":
-  version "27.0.3"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.3.tgz#0cf9dfe9009e467f70a342f0f94ead19842a783a"
-  integrity sha512-cmmwv9t7gBYt7hNKH5Spu7Kuu/DotGa+Ff+JGRKZ4db5eh8PnKS4LuebJ3YLUoyOyIHraTGyULn23YtEAm0VSg==
+"@types/jest@27.4.0":
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.0.tgz#037ab8b872067cae842a320841693080f9cb84ed"
+  integrity sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==
   dependencies:
     jest-diff "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -2168,30 +2713,30 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
-"@types/lodash@^4.14.177":
-  version "4.14.177"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.177.tgz#f70c0d19c30fab101cad46b52be60363c43c4578"
-  integrity sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==
+"@types/lodash@^4.14.178":
+  version "4.14.178"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8"
+  integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==
+
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/node@*", "@types/node@16.11.10":
+"@types/node@*":
   version "16.11.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae"
   integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==
 
-"@types/node@12.12.50":
-  version "12.12.50"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.50.tgz#e9b2e85fafc15f2a8aa8fdd41091b983da5fd6ee"
-  integrity sha512-5ImO01Fb8YsEOYpV+aeyGYztcYcjGsBvN4D7G5r1ef2cuQOpymjWNQi5V0rKHE6PC2ru3HkoUr/Br2/8GUA84w==
-
-"@types/node@^14.14.31":
-  version "14.17.34"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz#fe4b38b3f07617c0fa31ae923fca9249641038f0"
-  integrity sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==
+"@types/node@17.0.13":
+  version "17.0.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.13.tgz#5ed7ed7c662948335fcad6c412bb42d99ea754e3"
+  integrity sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -2203,6 +2748,23 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.2.tgz#4c62fae93eb479660c3bd93f9d24d561597a8281"
   integrity sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==
 
+"@types/puppeteer@^5.4.4":
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-5.4.4.tgz#e92abeccc4f46207c3e1b38934a1246be080ccd0"
+  integrity sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==
+  dependencies:
+    "@types/node" "*"
+
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
 "@types/resolve@1.17.1":
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -2215,21 +2777,40 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
   integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
 
-"@types/sinonjs__fake-timers@^6.0.1", "@types/sinonjs__fake-timers@^6.0.2":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
-  integrity sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==
+"@types/serve-index@^1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
+  integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
+  dependencies:
+    "@types/express" "*"
 
-"@types/sizzle@^2.3.2":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef"
-  integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==
+"@types/serve-static@*":
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/sockjs@^0.3.33":
+  version "0.3.33"
+  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
+  integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
+  dependencies:
+    "@types/node" "*"
 
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/ws@^8.2.2":
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21"
+  integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "20.2.1"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
@@ -2242,39 +2823,21 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yauzl@^2.9.1":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
-  integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
+"@typescript-eslint/eslint-plugin@5.10.1":
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.1.tgz#870195d0f2146b36d11fc71131b75aba52354c69"
+  integrity sha512-xN3CYqFlyE/qOcy978/L0xLR2HlcAGIyIK5sMOasxaaAPfQRj/MmMV6OC3I7NZO84oEUdWCOju34Z9W8E0pFDQ==
   dependencies:
-    "@types/node" "*"
-
-"@typescript-eslint/eslint-plugin@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
-  integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "4.33.0"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    debug "^4.3.1"
+    "@typescript-eslint/scope-manager" "5.10.1"
+    "@typescript-eslint/type-utils" "5.10.1"
+    "@typescript-eslint/utils" "5.10.1"
+    debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
-    regexpp "^3.1.0"
+    regexpp "^3.2.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.33.0", "@typescript-eslint/experimental-utils@~4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd"
-  integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==
-  dependencies:
-    "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
 "@typescript-eslint/experimental-utils@5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.0.tgz#ee56b4957547ed2b0fc7451205e41502e664f546"
@@ -2287,23 +2850,35 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
-  integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
+"@typescript-eslint/experimental-utils@~5.3.0":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz#bbd8f9b67b4d5fdcb9d2f90297d8fcda22561e05"
+  integrity sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    debug "^4.3.1"
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.3.1"
+    "@typescript-eslint/types" "5.3.1"
+    "@typescript-eslint/typescript-estree" "5.3.1"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
 
-"@typescript-eslint/scope-manager@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
-  integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==
+"@typescript-eslint/parser@5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.3.1.tgz#8ff1977c3d3200c217b3e4628d43ef92f89e5261"
+  integrity sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw==
   dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
+    "@typescript-eslint/scope-manager" "5.3.1"
+    "@typescript-eslint/types" "5.3.1"
+    "@typescript-eslint/typescript-estree" "5.3.1"
+    debug "^4.3.2"
+
+"@typescript-eslint/scope-manager@5.10.1":
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.1.tgz#f0539c73804d2423506db2475352a4dec36cd809"
+  integrity sha512-Lyvi559Gvpn94k7+ElXNMEnXu/iundV5uFmCUNnftbFrUbAJ1WBoaGgkbOBm07jVZa682oaBU37ao/NGGX4ZDg==
+  dependencies:
+    "@typescript-eslint/types" "5.10.1"
+    "@typescript-eslint/visitor-keys" "5.10.1"
 
 "@typescript-eslint/scope-manager@5.3.0":
   version "5.3.0"
@@ -2313,26 +2888,48 @@
     "@typescript-eslint/types" "5.3.0"
     "@typescript-eslint/visitor-keys" "5.3.0"
 
-"@typescript-eslint/types@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
-  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
+"@typescript-eslint/scope-manager@5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz#3cfbfbcf5488fb2a9a6fbbe97963ee1e8d419269"
+  integrity sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==
+  dependencies:
+    "@typescript-eslint/types" "5.3.1"
+    "@typescript-eslint/visitor-keys" "5.3.1"
+
+"@typescript-eslint/type-utils@5.10.1":
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.1.tgz#5e526c00142585e40ab1503e83f1ff608c367405"
+  integrity sha512-AfVJkV8uck/UIoDqhu+ptEdBoQATON9GXnhOpPLzkQRJcSChkvD//qsz9JVffl2goxX+ybs5klvacE9vmrQyCw==
+  dependencies:
+    "@typescript-eslint/utils" "5.10.1"
+    debug "^4.3.2"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.10.1":
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.1.tgz#dca9bd4cb8c067fc85304a31f38ec4766ba2d1ea"
+  integrity sha512-ZvxQ2QMy49bIIBpTqFiOenucqUyjTQ0WNLhBM6X1fh1NNlYAC6Kxsx8bRTY3jdYsYg44a0Z/uEgQkohbR0H87Q==
 
 "@typescript-eslint/types@5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.0.tgz#af29fd53867c2df0028c57c36a655bd7e9e05416"
   integrity sha512-fce5pG41/w8O6ahQEhXmMV+xuh4+GayzqEogN24EK+vECA3I6pUwKuLi5QbXO721EMitpQne5VKXofPonYlAQg==
 
-"@typescript-eslint/typescript-estree@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
-  integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
+"@typescript-eslint/types@5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.1.tgz#afaa715b69ebfcfde3af8b0403bf27527912f9b7"
+  integrity sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==
+
+"@typescript-eslint/typescript-estree@5.10.1":
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.1.tgz#b268e67be0553f8790ba3fe87113282977adda15"
+  integrity sha512-PwIGnH7jIueXv4opcwEbVGDATjGPO1dx9RkUl5LlHDSe+FXxPwFL5W/qYd5/NHr7f6lo/vvTrAzd0KlQtRusJQ==
   dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
-    debug "^4.3.1"
-    globby "^11.0.3"
-    is-glob "^4.0.1"
+    "@typescript-eslint/types" "5.10.1"
+    "@typescript-eslint/visitor-keys" "5.10.1"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
@@ -2349,13 +2946,38 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
-  integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
+"@typescript-eslint/typescript-estree@5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz#50cc4bfb93dc31bc75e08ae52e29fcb786d606ec"
+  integrity sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==
   dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    eslint-visitor-keys "^2.0.0"
+    "@typescript-eslint/types" "5.3.1"
+    "@typescript-eslint/visitor-keys" "5.3.1"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.10.1":
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.1.tgz#fa682a33af47080ba2c4368ee0ad2128213a1196"
+  integrity sha512-RRmlITiUbLuTRtn/gcPRi4202niF+q7ylFLCKu4c+O/PcpRvZ/nAUwQ2G00bZgpWkhrNLNnvhZLbDn8Ml0qsQw==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.10.1"
+    "@typescript-eslint/types" "5.10.1"
+    "@typescript-eslint/typescript-estree" "5.10.1"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/visitor-keys@5.10.1":
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.1.tgz#29102de692f59d7d34ecc457ed59ab5fc558010b"
+  integrity sha512-NjQ0Xinhy9IL979tpoTRuLKxMc0zJC7QVSdeerXs2/QvOy2yRkzX5dRb10X5woNUdJgU8G3nYRDlI33sq1K4YQ==
+  dependencies:
+    "@typescript-eslint/types" "5.10.1"
+    eslint-visitor-keys "^3.0.0"
 
 "@typescript-eslint/visitor-keys@5.3.0":
   version "5.3.0"
@@ -2365,6 +2987,14 @@
     "@typescript-eslint/types" "5.3.0"
     eslint-visitor-keys "^3.0.0"
 
+"@typescript-eslint/visitor-keys@5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz#c2860ff22939352db4f3806f34b21d8ad00588ba"
+  integrity sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==
+  dependencies:
+    "@typescript-eslint/types" "5.3.1"
+    eslint-visitor-keys "^3.0.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -2697,7 +3327,7 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.1.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -2707,6 +3337,11 @@ acorn@^8.2.4, acorn@^8.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
   integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
 
+acorn@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99"
@@ -2763,27 +3398,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@8.6.3:
-  version "8.6.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
-  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
+ajv@8.8.2, ajv@^8.0.0, ajv@^8.8.0:
   version "8.8.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb"
   integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
@@ -2793,6 +3408,26 @@ ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+ajv@8.9.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
+  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ansi-align@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
@@ -2805,12 +3440,7 @@ ansi-colors@4.1.1, ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-ansi-escapes@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
+ansi-escapes@^4.2.1:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -2836,17 +3466,7 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2856,11 +3476,6 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -2890,11 +3505,6 @@ ansi-wrap@0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -2921,11 +3531,6 @@ aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-arch@^2.1.2, arch@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
-  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
-
 are-we-there-yet@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
@@ -2946,6 +3551,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -2984,7 +3594,7 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.3:
+array-includes@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
   integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
@@ -3000,12 +3610,17 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+array-union@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975"
+  integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==
+
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flat@^1.2.4:
+array.prototype.flat@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
   integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
@@ -3019,6 +3634,11 @@ arrify@^2.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
+asap@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
 asn1.js@^5.2.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -3029,18 +3649,6 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -3054,11 +3662,6 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -3076,11 +3679,6 @@ async@^2.6.2:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd"
-  integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -3096,40 +3694,17 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^10.4.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8"
-  integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==
+autoprefixer@^10.4.2:
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b"
+  integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==
   dependencies:
-    browserslist "^4.17.5"
-    caniuse-lite "^1.0.30001272"
-    fraction.js "^4.1.1"
+    browserslist "^4.19.1"
+    caniuse-lite "^1.0.30001297"
+    fraction.js "^4.1.2"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
-    postcss-value-parser "^4.1.0"
-
-autoprefixer@^9.6.1:
-  version "9.8.8"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
-  integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
-  dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    picocolors "^0.2.1"
-    postcss "^7.0.32"
-    postcss-value-parser "^4.1.0"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+    postcss-value-parser "^4.2.0"
 
 axios@^0.18.0:
   version "0.18.1"
@@ -3139,19 +3714,19 @@ axios@^0.18.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
-axios@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
-  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
+axios@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
+  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
   dependencies:
-    follow-redirects "^1.14.4"
+    follow-redirects "^1.14.7"
 
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
-babel-jest@^27.2.2, babel-jest@^27.3.1:
+babel-jest@^27.2.2:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.3.1.tgz#0636a3404c68e07001e434ac4956d82da8a80022"
   integrity sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==
@@ -3165,6 +3740,20 @@ babel-jest@^27.2.2, babel-jest@^27.3.1:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
+babel-jest@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.4.6.tgz#4d024e69e241cdf4f396e453a07100f44f7ce314"
+  integrity sha512-qZL0JT0HS1L+lOuH+xC2DVASR3nunZi/ozGhpgauJHgmI7f8rudxf6hUjEHympdQ/J64CdKmPkgfJ+A3U6QCrg==
+  dependencies:
+    "@jest/transform" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^27.4.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    slash "^3.0.0"
+
 babel-loader@8.2.3:
   version "8.2.3"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
@@ -3182,7 +3771,7 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-istanbul@6.1.1, babel-plugin-istanbul@^6.0.0:
+babel-plugin-istanbul@6.1.1, babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
   integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
@@ -3203,29 +3792,39 @@ babel-plugin-jest-hoist@^27.2.0:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-polyfill-corejs2@^0.2.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz#6ed8e30981b062f8fe6aca8873a37ebcc8cc1c0f"
-  integrity sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==
+babel-plugin-jest-hoist@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz#d7831fc0f93573788d80dee7e682482da4c730d6"
+  integrity sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.0.0"
+    "@types/babel__traverse" "^7.0.6"
+
+babel-plugin-polyfill-corejs2@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd"
+  integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==
   dependencies:
     "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.2.4"
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
-  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
+babel-plugin-polyfill-corejs3@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060"
+  integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
-    core-js-compat "^3.16.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    core-js-compat "^3.20.0"
 
-babel-plugin-polyfill-regenerator@^0.2.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz#2e9808f5027c4336c994992b48a4262580cb8d6d"
-  integrity sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==
+babel-plugin-polyfill-regenerator@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be"
+  integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.4"
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
@@ -3253,6 +3852,14 @@ babel-preset-jest@^27.2.0:
     babel-plugin-jest-hoist "^27.2.0"
     babel-preset-current-node-syntax "^1.0.0"
 
+babel-preset-jest@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz#70d0e676a282ccb200fbabd7f415db5fdf393bca"
+  integrity sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==
+  dependencies:
+    babel-plugin-jest-hoist "^27.4.0"
+    babel-preset-current-node-syntax "^1.0.0"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -3286,23 +3893,11 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
-big.js@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.1.1.tgz#63b35b19dc9775c94991ee5db7694880655d5537"
-  integrity sha512-1vObw81a8ylZO5ePrtMay0n018TcftpTA5HFKDaSuiUDBo8biRBtjIobw60OpwuvrGk+FsxKamqN4cnmj/eXdg==
-
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
@@ -3337,12 +3932,7 @@ bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-blob-util@2.0.2, blob-util@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
-  integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
-
-bluebird@3.7.2, bluebird@^3.5.5, bluebird@^3.7.1, bluebird@^3.7.2:
+bluebird@^3.5.5, bluebird@^3.7.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -3506,7 +4096,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.17.5, browserslist@^4.17.6, browserslist@^4.6.4, browserslist@^4.9.1:
+browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.17.5, browserslist@^4.9.1:
   version "4.18.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
   integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
@@ -3517,6 +4107,17 @@ browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^
     node-releases "^2.0.1"
     picocolors "^1.0.0"
 
+browserslist@^4.19.1:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
+  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+  dependencies:
+    caniuse-lite "^1.0.30001286"
+    electron-to-chromium "^1.4.17"
+    escalade "^3.1.1"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
+
 bs-logger@0.x, bs-logger@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
@@ -3671,11 +4272,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cachedir@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
-  integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -3699,21 +4295,26 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e"
   integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==
 
-caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280:
+caniuse-lite@^1.0.30001280:
   version "1.0.30001283"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz#8573685bdae4d733ef18f78d44ba0ca5fe9e896b"
   integrity sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==
 
+caniuse-lite@^1.0.30001286:
+  version "1.0.30001298"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz#0e690039f62e91c3ea581673d716890512e7ec52"
+  integrity sha512-AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ==
+
+caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001299:
+  version "1.0.30001300"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz#11ab6c57d3eb6f964cba950401fd00a146786468"
+  integrity sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
   integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
 caw@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
@@ -3724,6 +4325,14 @@ caw@^2.0.0:
     tunnel-agent "^0.6.0"
     url-to-options "^1.0.1"
 
+chalk@4, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@ -3732,18 +4341,7 @@ chalk@4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^1.0.0, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3760,14 +4358,6 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -3778,11 +4368,6 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-check-more-types@^2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-  integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
-
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
@@ -3880,58 +4465,18 @@ cli-boxes@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145"
   integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==
 
-cli-cursor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  dependencies:
-    restore-cursor "^2.0.0"
-
-cli-cursor@^3.1.0:
+cli-cursor@3.1.0, cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-spinners@^2.5.0:
+cli-spinners@2.6.1, cli-spinners@^2.5.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
   integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
 
-cli-table3@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
-  integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==
-  dependencies:
-    object-assign "^4.1.0"
-    string-width "^4.2.0"
-  optionalDependencies:
-    colors "^1.1.2"
-
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
-
-cli-truncate@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
-  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
-  dependencies:
-    slice-ansi "^3.0.0"
-    string-width "^4.2.0"
-
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
@@ -3974,11 +4519,6 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4011,7 +4551,7 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.1.4, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -4026,12 +4566,7 @@ colorette@^2.0.10, colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
   integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4043,21 +4578,11 @@ commander@^2.20.0, commander@^2.8.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
 commander@^8.0.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-common-tags@^1.8.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
-  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -4103,7 +4628,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.2:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -4175,7 +4700,7 @@ cookie@0.4.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
-cookiejar@^2.1.2:
+cookiejar@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
   integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
@@ -4204,25 +4729,24 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59"
-  integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw==
+copy-webpack-plugin@10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz#115a41f913070ac236a1b576066204cbf35341a1"
+  integrity sha512-nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg==
   dependencies:
-    fast-glob "^3.2.5"
-    glob-parent "^6.0.0"
-    globby "^11.0.3"
+    fast-glob "^3.2.7"
+    glob-parent "^6.0.1"
+    globby "^12.0.2"
     normalize-path "^3.0.0"
-    p-limit "^3.1.0"
-    schema-utils "^3.0.0"
+    schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-core-js-compat@^3.16.0, core-js-compat@^3.16.2:
-  version "3.19.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.1.tgz#fe598f1a9bf37310d77c3813968e9f7c7bb99476"
-  integrity sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==
+core-js-compat@^3.20.0, core-js-compat@^3.20.2:
+  version "3.20.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz#d71f85f94eb5e4bea3407412e549daa083d23bd6"
+  integrity sha512-c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw==
   dependencies:
-    browserslist "^4.17.6"
+    browserslist "^4.19.1"
     semver "7.0.0"
 
 core-js-pure@^3.19.0:
@@ -4230,36 +4754,21 @@ core-js-pure@^3.19.0:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.1.tgz#edffc1fc7634000a55ba05e95b3f0fe9587a5aa4"
   integrity sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==
 
-core-js@3.19.0:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.0.tgz#9e40098a9bc326c7e81b486abbd5e12b9d275176"
-  integrity sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg==
+core-js@3.20.3:
+  version "3.20.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.3.tgz#c710d0a676e684522f3db4ee84e5e18a9d11d69a"
+  integrity sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==
 
 core-js@^3.6.5:
   version "3.19.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.1.tgz#f6f173cae23e73a7d88fa23b6e9da329276c6641"
   integrity sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==
 
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
 cosmiconfig@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
@@ -4318,29 +4827,18 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-critters@0.0.14:
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.14.tgz#08e585ce9cb9b9a3eab88cafda7bde7f6cd0763f"
-  integrity sha512-YiBoGKfU8/xg+tVMw0KfMBgmr0TWa1JGmRXDzbQRQQaDarGUcZZtZEB25QyYrLasQZAnvqoZhSg2GW0zdsQkYQ==
+critters@0.0.16:
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.16.tgz#ffa2c5561a65b43c53b940036237ce72dcebfe93"
+  integrity sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==
   dependencies:
     chalk "^4.1.0"
-    css-select "^4.1.3"
+    css-select "^4.2.0"
     parse5 "^6.0.1"
     parse5-htmlparser2-tree-adapter "^6.0.1"
     postcss "^8.3.7"
     pretty-bytes "^5.3.0"
 
-cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -4367,37 +4865,24 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-css-blank-pseudo@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
-  integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==
+css-blank-pseudo@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.2.tgz#f8660f6a48b17888a9277e53f25cc5abec1f0169"
+  integrity sha512-hOb1LFjRR+8ocA071xUSmg5VslJ8NGo/I2qpUpdeAYyBVCgupS5O8SEVo4SxEMYyFBNodBkzG3T1iqW9HCXxew==
   dependencies:
-    postcss "^7.0.5"
+    postcss-selector-parser "^6.0.8"
 
-css-blank-pseudo@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-2.0.0.tgz#10667f9c5f91e4fbde76c4efac55e8eaa6ed9967"
-  integrity sha512-n7fxEOyuvAVPLPb9kL4XTIK/gnp2fKQ7KFQ+9lj60W9pDn/jTr5LjS/kHHm+rES/YJ3m0S6+uJgYSuAJg9zOyA==
-
-css-has-pseudo@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee"
-  integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==
+css-has-pseudo@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.3.tgz#4824a34cb92dae7e09ea1d3fd19691b653412098"
+  integrity sha512-0gDYWEKaGacwxCqvQ3Ypg6wGdD1AztbMm5h1JsactG2hP2eiflj808QITmuWBpE7sjSEVrAlZhPTVd/nNMj/hQ==
   dependencies:
-    postcss "^7.0.6"
-    postcss-selector-parser "^5.0.0-rc.4"
+    postcss-selector-parser "^6.0.8"
 
-css-has-pseudo@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-2.0.0.tgz#43ae03a990cf3d9e7356837c6b500e04037606b5"
-  integrity sha512-URYSGI0ggED1W1/xOAH0Zn1bf+YL6tYh1PQzAPlWddEAyyO37mPqMbwCzSjTTNmeCR8BMNXSFLaT5xb6MERdAA==
-  dependencies:
-    postcss-selector-parser "^6"
-
-css-loader@6.5.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.0.tgz#9d1cf7766a9a8f0b3c6e1638309b964dbdab46d3"
-  integrity sha512-VmuSdQa3K+wJsl39i7X3qGBM5+ZHmtTnv65fqMGI+fzmHoYmszTVvTqC1XN8JwWDViCB1a8wgNim5SV4fb37xg==
+css-loader@6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.1.tgz#0c43d4fbe0d97f699c91e9818cb585759091d1b1"
+  integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==
   dependencies:
     icss-utils "^5.1.0"
     postcss "^8.2.15"
@@ -4408,30 +4893,23 @@ css-loader@6.5.0:
     postcss-value-parser "^4.1.0"
     semver "^7.3.5"
 
-css-prefers-color-scheme@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
-  integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==
-  dependencies:
-    postcss "^7.0.5"
+css-prefers-color-scheme@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.2.tgz#d5c03a980caab92d8beeee176a8795d331e0c727"
+  integrity sha512-gv0KQBEM+q/XdoKyznovq3KW7ocO7k+FhPP+hQR1MenJdu0uPGS6IZa9PzlbqBeS6XcZJNAoqoFxlAUW461CrA==
 
-css-prefers-color-scheme@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-5.0.0.tgz#a89bc1abfe946e77a1a1e12dbc25a1439705933f"
-  integrity sha512-XpzVrdwbppHm+Nnrzcb/hQb8eq1aKv4U8Oh59LsLfTsbIZZ6Fvn9razb66ihH2aTJ0VhO9n9sVm8piyKXJAZMA==
-
-css-select@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
-  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
+css-select@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd"
+  integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==
   dependencies:
     boolbase "^1.0.0"
-    css-what "^5.0.0"
-    domhandler "^4.2.0"
-    domutils "^2.6.0"
-    nth-check "^2.0.0"
+    css-what "^5.1.0"
+    domhandler "^4.3.0"
+    domutils "^2.8.0"
+    nth-check "^2.0.1"
 
-css-what@^5.0.0:
+css-what@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
   integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
@@ -4445,21 +4923,11 @@ css@^3.0.0:
     source-map "^0.6.1"
     source-map-resolve "^0.6.0"
 
-cssdb@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
-  integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==
-
 cssdb@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-5.0.0.tgz#96db23e70dda3d03a32346de611f0e79fee68b7f"
   integrity sha512-Q7982SynYCtcLUBCPgUPFy2TZmDiFyimpdln8K2v4w2c07W4rXL7q5F1ksVAqOAQfxKyyUGCKSsioezKT5bU1Q==
 
-cssesc@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
-  integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
-
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -4492,119 +4960,6 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-cypress-file-upload@^5.0.8:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"
-  integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==
-
-cypress-keycloak-commands@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/cypress-keycloak-commands/-/cypress-keycloak-commands-1.2.0.tgz#7f241e8e104ebd389f9a844966dcca43694d0645"
-  integrity sha512-j0THu0XMVlWah7YjDoVlFg2bIwSiBSda6g5Pm8HpC/9U2Glk0Hrp4yLggoseft3ThAlrpIkoLaIKMDbmvtgicw==
-
-cypress-keycloak@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/cypress-keycloak/-/cypress-keycloak-1.7.0.tgz#7556c297b12645405cd17d060d4fd6d1b73905ed"
-  integrity sha512-sBlq7VUCTAUps/67mnDXg6rhVWS+PygspCGLfucmT/sQYanTVqmu374JCutNZGnNArOjmkaw0Rn80dC9dp9tJw==
-
-cypress-localstorage-commands@^1.5.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/cypress-localstorage-commands/-/cypress-localstorage-commands-1.6.1.tgz#22299ee8a5555037f4e42111ffb280f2e0fe7d7b"
-  integrity sha512-rvXCB0iLzC3i9y91XH4N2I55NicH62gQk5z/APblCjnNR3wWTbDs8svC7GvE1fjt9AMIHSQm1RfWx037y+TciQ==
-
-cypress@*:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.1.0.tgz#5d23c1b363b7d4853009c74a422a083a8ad2601c"
-  integrity sha512-fyXcCN51vixkPrz/vO/Qy6WL3hKYJzCQFeWofOpGOFewVVXrGfmfSOGFntXpzWBXsIwPn3wzW0HOFw51jZajNQ==
-  dependencies:
-    "@cypress/request" "^2.88.7"
-    "@cypress/xvfb" "^1.2.4"
-    "@types/node" "^14.14.31"
-    "@types/sinonjs__fake-timers" "^6.0.2"
-    "@types/sizzle" "^2.3.2"
-    arch "^2.2.0"
-    blob-util "^2.0.2"
-    bluebird "3.7.2"
-    cachedir "^2.3.0"
-    chalk "^4.1.0"
-    check-more-types "^2.24.0"
-    cli-cursor "^3.1.0"
-    cli-table3 "~0.6.0"
-    commander "^5.1.0"
-    common-tags "^1.8.0"
-    dayjs "^1.10.4"
-    debug "^4.3.2"
-    enquirer "^2.3.6"
-    eventemitter2 "^6.4.3"
-    execa "4.1.0"
-    executable "^4.1.1"
-    extract-zip "2.0.1"
-    figures "^3.2.0"
-    fs-extra "^9.1.0"
-    getos "^3.2.1"
-    is-ci "^3.0.0"
-    is-installed-globally "~0.4.0"
-    lazy-ass "^1.6.0"
-    listr2 "^3.8.3"
-    lodash "^4.17.21"
-    log-symbols "^4.0.0"
-    minimist "^1.2.5"
-    ospath "^1.2.2"
-    pretty-bytes "^5.6.0"
-    proxy-from-env "1.0.0"
-    request-progress "^3.0.0"
-    supports-color "^8.1.1"
-    tmp "~0.2.1"
-    untildify "^4.0.0"
-    url "^0.11.0"
-    yauzl "^2.10.0"
-
-cypress@^6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.9.1.tgz#ce1106bfdc47f8d76381dba63f943447883f864c"
-  integrity sha512-/RVx6sOhsyTR9sd9v0BHI4tnDZAhsH9rNat7CIKCUEr5VPWxyfGH0EzK4IHhAqAH8vjFcD4U14tPiJXshoUrmQ==
-  dependencies:
-    "@cypress/listr-verbose-renderer" "^0.4.1"
-    "@cypress/request" "^2.88.5"
-    "@cypress/xvfb" "^1.2.4"
-    "@types/node" "12.12.50"
-    "@types/sinonjs__fake-timers" "^6.0.1"
-    "@types/sizzle" "^2.3.2"
-    arch "^2.1.2"
-    blob-util "2.0.2"
-    bluebird "^3.7.2"
-    cachedir "^2.3.0"
-    chalk "^4.1.0"
-    check-more-types "^2.24.0"
-    cli-table3 "~0.6.0"
-    commander "^5.1.0"
-    common-tags "^1.8.0"
-    dayjs "^1.9.3"
-    debug "4.3.2"
-    eventemitter2 "^6.4.2"
-    execa "^4.0.2"
-    executable "^4.1.1"
-    extract-zip "^1.7.0"
-    fs-extra "^9.0.1"
-    getos "^3.2.1"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.2"
-    lazy-ass "^1.6.0"
-    listr "^0.14.3"
-    lodash "^4.17.19"
-    log-symbols "^4.0.0"
-    minimist "^1.2.5"
-    moment "^2.29.1"
-    ospath "^1.2.2"
-    pretty-bytes "^5.4.1"
-    ramda "~0.27.1"
-    request-progress "^3.0.0"
-    supports-color "^7.2.0"
-    tmp "~0.2.1"
-    untildify "^4.0.0"
-    url "^0.11.0"
-    yauzl "^2.10.0"
-
 d3-array@2, d3-array@^2.3.0, d3-array@^2.9.1:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81"
@@ -4721,13 +5076,6 @@ d3-transition@2, d3-transition@^2.0.0:
     d3-interpolate "1 - 2"
     d3-timer "1 - 2"
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -4737,16 +5085,6 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
-dayjs@^1.10.4, dayjs@^1.9.3:
-  version "1.10.7"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
-  integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
-
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -4754,7 +5092,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
+debug@4, debug@4.3.3, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
@@ -4768,14 +5106,14 @@ debug@4.3.2:
   dependencies:
     ms "2.1.2"
 
-debug@=3.1.0, debug@~3.1.0:
+debug@=3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -4884,7 +5222,7 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-default-gateway@^6.0.0:
+default-gateway@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
   integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
@@ -4989,11 +5327,24 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
+dezalgo@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 diff-sequences@^27.0.6:
   version "27.0.6"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723"
   integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==
 
+diff-sequences@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.4.0.tgz#d783920ad8d06ec718a060d00196dfef25b132a5"
+  integrity sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==
+
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -5082,7 +5433,14 @@ domhandler@^4.2.0:
   dependencies:
     domelementtype "^2.2.0"
 
-domutils@^2.6.0:
+domhandler@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626"
+  integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==
+  dependencies:
+    domelementtype "^2.2.0"
+
+domutils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
   integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
@@ -5091,7 +5449,12 @@ domutils@^2.6.0:
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
 
-dotenv@10.0.0, dotenv@~10.0.0:
+dotenv@14.3.2:
+  version "14.3.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-14.3.2.tgz#7c30b3a5f777c79a3429cb2db358eef6751e8369"
+  integrity sha512-vwEppIphpFdvaMCaHfCEv9IgwcxMljMw2TnAQBB4VWPvzXQLTb82jwmdOKzlEVUL3gNFT4l4TPKO+Bn+sqcrVQ==
+
+dotenv@~10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
@@ -5128,14 +5491,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5153,10 +5508,10 @@ electron-to-chromium@^1.3.896:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.4.tgz#57311918524c1a26878c330537f967804d43788a"
   integrity sha512-teHtgwcmVcL46jlFvAaqjyiTLWuMrUQO1JqV303JKB4ysXG6m8fXSFhbjal9st0r9mNskI22AraJZorb1VcLVg==
 
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
+electron-to-chromium@^1.4.17:
+  version "1.4.38"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz#10ea58d73d36b13e78d5024f3b74a352d3958d01"
+  integrity sha512-WhHt3sZazKj0KK/UpgsbGQnUUoFeAHVishzHFExMxagpZgjiGYSC9S0ZlbhCfSH2L2i+2A1yyqOIliTctMx7KQ==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -5227,7 +5582,7 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.8.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5, enquirer@^2.3.6, enquirer@~2.3.6:
+enquirer@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
   integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
@@ -5303,339 +5658,356 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild-android-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.12.tgz#e1f199dc05405cdc6670c00fb6c793822bf8ae4c"
-  integrity sha512-TSVZVrb4EIXz6KaYjXfTzPyyRpXV5zgYIADXtQsIenjZ78myvDGaPi11o4ZSaHIwFHsuwkB6ne5SZRBwAQ7maw==
+esbuild-android-arm64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.11.tgz#b8b34e35a5b43880664ac7a3fbc70243d7ed894f"
+  integrity sha512-6iHjgvMnC/SzDH8TefL+/3lgCjYWwAd1LixYfmz/TBPbDQlxcuSkX0yiQgcJB9k+ibZ54yjVXziIwGdlc+6WNw==
 
-esbuild-android-arm64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.13.tgz#da07b5fb2daf7d83dcd725f7cf58a6758e6e702a"
-  integrity sha512-T02aneWWguJrF082jZworjU6vm8f4UQ+IH2K3HREtlqoY9voiJUwHLRL6khRlsNLzVglqgqb7a3HfGx7hAADCQ==
+esbuild-android-arm64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.14.tgz#3705f32f209deeb11c275af47c298c8783dd5f0c"
+  integrity sha512-be/Uw6DdpQiPfula1J4bdmA+wtZ6T3BRCZsDMFB5X+k0Gp8TIh9UvmAcqvKNnbRAafSaXG3jPCeXxDKqnc8hFQ==
 
-esbuild-android-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.15.tgz#3fc3ff0bab76fe35dd237476b5d2b32bb20a3d44"
-  integrity sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==
+esbuild-android-arm64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.2.tgz#256b7cf2f9d382a2a92a4ff4e13187587c9b7c6a"
+  integrity sha512-hEixaKMN3XXCkoe+0WcexO4CcBVU5DCSUT+7P8JZiWZCbAjSkc9b6Yz2X5DSfQmRCtI/cQRU6TfMYrMQ5NBfdw==
 
-esbuild-darwin-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.12.tgz#f5c59e622955c01f050e5a7ac9c1d41db714b94d"
-  integrity sha512-c51C+N+UHySoV2lgfWSwwmlnLnL0JWj/LzuZt9Ltk9ub1s2Y8cr6SQV5W3mqVH1egUceew6KZ8GyI4nwu+fhsw==
+esbuild-darwin-64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.11.tgz#ba805de98c0412e50fcd0636451797da157b0625"
+  integrity sha512-olq84ikh6TiBcrs3FnM4eR5VPPlcJcdW8BnUz/lNoEWYifYQ+Po5DuYV1oz1CTFMw4k6bQIZl8T3yxL+ZT2uvQ==
 
-esbuild-darwin-64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.13.tgz#e94e9fd3b4b5455a2e675cd084a19a71b6904bbf"
-  integrity sha512-wkaiGAsN/09X9kDlkxFfbbIgR78SNjMOfUhoel3CqKBDsi9uZhw7HBNHNxTzYUK8X8LAKFpbODgcRB3b/I8gHA==
+esbuild-darwin-64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.14.tgz#c07e4eae6d938300a2d330ea82494c55bcea84e5"
+  integrity sha512-BEexYmjWafcISK8cT6O98E3TfcLuZL8DKuubry6G54n2+bD4GkoRD6HYUOnCkfl2p7jodA+s4369IjSFSWjtHg==
 
-esbuild-darwin-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.15.tgz#8e9169c16baf444eacec60d09b24d11b255a8e72"
-  integrity sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==
+esbuild-darwin-64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.2.tgz#891a59ce6bc3aded0265f982469b3eb9571b92f8"
+  integrity sha512-Uq8t0cbJQkxkQdbUfOl2wZqZ/AtLZjvJulR1HHnc96UgyzG9YlCLSDMiqjM+NANEy7/zzvwKJsy3iNC9wwqLJA==
 
-esbuild-darwin-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.12.tgz#8abae74c2956a8aa568fc52c78829338c4a4b988"
-  integrity sha512-JvAMtshP45Hd8A8wOzjkY1xAnTKTYuP/QUaKp5eUQGX+76GIie3fCdUUr2ZEKdvpSImNqxiZSIMziEiGB5oUmQ==
+esbuild-darwin-arm64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.11.tgz#4d3573e448af76ce33e16231f3d9f878542d6fe8"
+  integrity sha512-Jj0ieWLREPBYr/TZJrb2GFH8PVzDqiQWavo1pOFFShrcmHWDBDrlDxPzEZ67NF/Un3t6sNNmeI1TUS/fe1xARg==
 
-esbuild-darwin-arm64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.13.tgz#8c320eafbb3ba2c70d8062128c5b71503e342471"
-  integrity sha512-b02/nNKGSV85Gw9pUCI5B48AYjk0vFggDeom0S6QMP/cEDtjSh1WVfoIFNAaLA0MHWfue8KBwoGVsN7rBshs4g==
+esbuild-darwin-arm64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.14.tgz#a8631e13a51a6f784fb0906e2a64c6ab53988755"
+  integrity sha512-tnBKm41pDOB1GtZ8q/w26gZlLLRzVmP8fdsduYjvM+yFD7E2DLG4KbPAqFMWm4Md9B+DitBglP57FY7AznxbTg==
 
-esbuild-darwin-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.15.tgz#1b07f893b632114f805e188ddfca41b2b778229a"
-  integrity sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==
+esbuild-darwin-arm64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.2.tgz#ab834fffa9c612b2901ca1e77e4695d4d8aa63a2"
+  integrity sha512-619MSa17sr7YCIrUj88KzQu2ESA4jKYtIYfLU/smX6qNgxQt3Y/gzM4s6sgJ4fPQzirvmXgcHv1ZNQAs/Xh48A==
 
-esbuild-freebsd-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.12.tgz#6ad2ab8c0364ee7dd2d6e324d876a8e60ae75d12"
-  integrity sha512-r6On/Skv9f0ZjTu6PW5o7pdXr8aOgtFOEURJZYf1XAJs0IQ+gW+o1DzXjVkIoT+n1cm3N/t1KRJfX71MPg/ZUA==
+esbuild-freebsd-64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.11.tgz#9294e6ab359ec93590ab097b0f2017de7c78ab4d"
+  integrity sha512-C5sT3/XIztxxz/zwDjPRHyzj/NJFOnakAanXuyfLDwhwupKPd76/PPHHyJx6Po6NI6PomgVp/zi6GRB8PfrOTA==
 
-esbuild-freebsd-64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.13.tgz#ce0ca5b8c4c274cfebc9326f9b316834bd9dd151"
-  integrity sha512-ALgXYNYDzk9YPVk80A+G4vz2D22Gv4j4y25exDBGgqTcwrVQP8rf/rjwUjHoh9apP76oLbUZTmUmvCMuTI1V9A==
+esbuild-freebsd-64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.14.tgz#c280c2b944746b27ee6c6487c2691865c90bed2e"
+  integrity sha512-Q9Rx6sgArOHalQtNwAaIzJ6dnQ8A+I7f/RsQsdkS3JrdzmnlFo8JEVofTmwVQLoIop7OKUqIVOGP4PoQcwfVMA==
 
-esbuild-freebsd-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.15.tgz#0b8b7eca1690c8ec94c75680c38c07269c1f4a85"
-  integrity sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==
+esbuild-freebsd-64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.2.tgz#f7fc87a83f02de27d5a48472571efa1a432ae86d"
+  integrity sha512-aP6FE/ZsChZpUV6F3HE3x1Pz0paoYXycJ7oLt06g0G9dhJKknPawXCqQg/WMyD+ldCEZfo7F1kavenPdIT/SGQ==
 
-esbuild-freebsd-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.12.tgz#6f38155f4c300ac4c8adde1fde3cc6a4440a8294"
-  integrity sha512-F6LmI2Q1gii073kmBE3NOTt/6zLL5zvZsxNLF8PMAwdHc+iBhD1vzfI8uQZMJA1IgXa3ocr3L3DJH9fLGXy6Yw==
+esbuild-freebsd-arm64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.11.tgz#ae3e0b09173350b66cf8321583c9a1c1fcb8bb55"
+  integrity sha512-y3Llu4wbs0bk4cwjsdAtVOesXb6JkdfZDLKMt+v1U3tOEPBdSu6w8796VTksJgPfqvpX22JmPLClls0h5p+L9w==
 
-esbuild-freebsd-arm64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.13.tgz#463da17562fdcfdf03b3b94b28497d8d8dcc8f62"
-  integrity sha512-uFvkCpsZ1yqWQuonw5T1WZ4j59xP/PCvtu6I4pbLejhNo4nwjW6YalqnBvBSORq5/Ifo9S/wsIlVHzkzEwdtlw==
+esbuild-freebsd-arm64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.14.tgz#aa4e21276efcf20e5ab2487e91ca1d789573189b"
+  integrity sha512-TJvq0OpLM7BkTczlyPIphcvnwrQwQDG1HqxzoYePWn26SMUAlt6wrLnEvxdbXAvNvDLVzG83kA+JimjK7aRNBA==
 
-esbuild-freebsd-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.15.tgz#2e1a6c696bfdcd20a99578b76350b41db1934e52"
-  integrity sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==
+esbuild-freebsd-arm64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.2.tgz#bc8758420431106751f3180293cac0b5bc4ce2ee"
+  integrity sha512-LSm98WTb1QIhyS83+Po0KTpZNdd2XpVpI9ua5rLWqKWbKeNRFwOsjeiuwBaRNc+O32s9oC2ZMefETxHBV6VNkQ==
 
-esbuild-linux-32@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.12.tgz#b1d15e330188a8c21de75c3f0058628a3eefade7"
-  integrity sha512-U1UZwG3UIwF7/V4tCVAo/nkBV9ag5KJiJTt+gaCmLVWH3bPLX7y+fNlhIWZy8raTMnXhMKfaTvWZ9TtmXzvkuQ==
+esbuild-linux-32@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.11.tgz#ddadbc7038aa5a6b1675bb1503cf79a0cbf1229a"
+  integrity sha512-Cg3nVsxArjyLke9EuwictFF3Sva+UlDTwHIuIyx8qpxRYAOUTmxr2LzYrhHyTcGOleLGXUXYsnUVwKqnKAgkcg==
 
-esbuild-linux-32@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.13.tgz#2035793160da2c4be48a929e5bafb14a31789acc"
-  integrity sha512-yxR9BBwEPs9acVEwTrEE2JJNHYVuPQC9YGjRfbNqtyfK/vVBQYuw8JaeRFAvFs3pVJdQD0C2BNP4q9d62SCP4w==
+esbuild-linux-32@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.14.tgz#3db4d929239203ce38a9060d5419ac6a6d28846c"
+  integrity sha512-h/CrK9Baimt5VRbu8gqibWV7e1P9l+mkanQgyOgv0Ng3jHT1NVFC9e6rb1zbDdaJVmuhWX5xVliUA5bDDCcJeg==
 
-esbuild-linux-32@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.15.tgz#6fd39f36fc66dd45b6b5f515728c7bbebc342a69"
-  integrity sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==
+esbuild-linux-32@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.2.tgz#0cc2dcd816d6d66e255bc7aeac139b1d04246812"
+  integrity sha512-8VxnNEyeUbiGflTKcuVc5JEPTqXfsx2O6ABwUbfS1Hp26lYPRPC7pKQK5Dxa0MBejGc50jy7YZae3EGQUQ8EkQ==
 
-esbuild-linux-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.12.tgz#25bd64b66162b02348e32d8f12e4c9ee61f1d070"
-  integrity sha512-YpXSwtu2NxN3N4ifJxEdsgd6Q5d8LYqskrAwjmoCT6yQnEHJSF5uWcxv783HWN7lnGpJi9KUtDvYsnMdyGw71Q==
+esbuild-linux-64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.11.tgz#d698e3ce3a231ddfeec6b5df8c546ae8883fcd88"
+  integrity sha512-oeR6dIrrojr8DKVrxtH3xl4eencmjsgI6kPkDCRIIFwv4p+K7ySviM85K66BN01oLjzthpUMvBVfWSJkBLeRbg==
 
-esbuild-linux-64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.13.tgz#fbe4802a8168c6d339d0749f977b099449b56f22"
-  integrity sha512-kzhjlrlJ+6ESRB/n12WTGll94+y+HFeyoWsOrLo/Si0s0f+Vip4b8vlnG0GSiS6JTsWYAtGHReGczFOaETlKIw==
+esbuild-linux-64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.14.tgz#f880026254c1f565a7a10fdebb7cff9b083a127d"
+  integrity sha512-IC+wAiIg/egp5OhQp4W44D9PcBOH1b621iRn1OXmlLzij9a/6BGr9NMIL4CRwz4j2kp3WNZu5sT473tYdynOuQ==
 
-esbuild-linux-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.15.tgz#9cb8e4bcd7574e67946e4ee5f1f1e12386bb6dd3"
-  integrity sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==
+esbuild-linux-64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.2.tgz#c790f739aa75b15c153609ea3457153fbe4db93d"
+  integrity sha512-4bzMS2dNxOJoFIiHId4w+tqQzdnsch71JJV1qZnbnErSFWcR9lRgpSqWnTTFtv6XM+MvltRzSXC5wQ7AEBY6Hg==
 
-esbuild-linux-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.12.tgz#ba582298457cc5c9ac823a275de117620c06537f"
-  integrity sha512-sgDNb8kb3BVodtAlcFGgwk+43KFCYjnFOaOfJibXnnIojNWuJHpL6aQJ4mumzNWw8Rt1xEtDQyuGK9f+Y24jGA==
+esbuild-linux-arm64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.11.tgz#85faea9fa99ad355b5e3b283197a4dfd0a110fe7"
+  integrity sha512-+e6ZCgTFQYZlmg2OqLkg1jHLYtkNDksxWDBWNtI4XG4WxuOCUErLqfEt9qWjvzK3XBcCzHImrajkUjO+rRkbMg==
 
-esbuild-linux-arm64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.13.tgz#f08d98df28d436ed4aad1529615822bb74d4d978"
-  integrity sha512-KMrEfnVbmmJxT3vfTnPv/AiXpBFbbyExH13BsUGy1HZRPFMi5Gev5gk8kJIZCQSRfNR17aqq8sO5Crm2KpZkng==
+esbuild-linux-arm64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.14.tgz#a34bc3076e50b109c3b8c8bad9c146e35942322b"
+  integrity sha512-6QVul3RI4M5/VxVIRF/I5F+7BaxzR3DfNGoqEVSCZqUbgzHExPn+LXr5ly1C7af2Kw4AHpo+wDqx8A4ziP9avw==
 
-esbuild-linux-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.15.tgz#3891aa3704ec579a1b92d2a586122e5b6a2bfba1"
-  integrity sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==
+esbuild-linux-arm64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.2.tgz#96858a1f89ad30274dec780d0e3dd8b5691c6b0c"
+  integrity sha512-RlIVp0RwJrdtasDF1vTFueLYZ8WuFzxoQ1OoRFZOTyJHCGCNgh7xJIC34gd7B7+RT0CzLBB4LcM5n0LS+hIoww==
 
-esbuild-linux-arm@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.12.tgz#6bc81c957bff22725688cc6359c29a25765be09b"
-  integrity sha512-SyiT/JKxU6J+DY2qUiSLZJqCAftIt3uoGejZ0HDnUM2MGJqEGSGh7p1ecVL2gna3PxS4P+j6WAehCwgkBPXNIw==
+esbuild-linux-arm@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.11.tgz#74cbcf0b8a22c8401bcbcd6ebd4cbf2baca8b7b4"
+  integrity sha512-vcwskfD9g0tojux/ZaTJptJQU3a7YgTYsptK1y6LQ/rJmw7U5QJvboNawqM98Ca3ToYEucfCRGbl66OTNtp6KQ==
 
-esbuild-linux-arm@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.13.tgz#6f968c3a98b64e30c80b212384192d0cfcb32e7f"
-  integrity sha512-hXub4pcEds+U1TfvLp1maJ+GHRw7oizvzbGRdUvVDwtITtjq8qpHV5Q5hWNNn6Q+b3b2UxF03JcgnpzCw96nUQ==
+esbuild-linux-arm@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.14.tgz#231ffd12fef69ee06365d4c94b69850e4830e927"
+  integrity sha512-gxpOaHOPwp7zSmcKYsHrtxabScMqaTzfSQioAMUaB047YiMuDBzqVcKBG8OuESrYkGrL9DDljXr/mQNg7pbdaQ==
 
-esbuild-linux-arm@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.15.tgz#8a00e99e6a0c6c9a6b7f334841364d8a2b4aecfe"
-  integrity sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==
+esbuild-linux-arm@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.2.tgz#03e193225afa9b1215d2ec6efe8edf0c03eeed6f"
+  integrity sha512-PaylahvMHhH8YMfJPMKEqi64qA0Su+d4FNfHKvlKes/2dUe4QxgbwXT9oLVgy8iJdcFMrO7By4R8fS8S0p8aVQ==
 
-esbuild-linux-mips64le@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.12.tgz#ef3c4aba3e585d847cbade5945a8b4a5c62c7ce2"
-  integrity sha512-qQJHlZBG+QwVIA8AbTEtbvF084QgDi4DaUsUnA+EolY1bxrG+UyOuGflM2ZritGhfS/k7THFjJbjH2wIeoKA2g==
+esbuild-linux-mips64le@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.11.tgz#490429211a3233f5cbbd8575b7758b897e42979a"
+  integrity sha512-Rrs99L+p54vepmXIb87xTG6ukrQv+CzrM8eoeR+r/OFL2Rg8RlyEtCeshXJ2+Q66MXZOgPJaokXJZb9snq28bw==
 
-esbuild-linux-mips64le@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.13.tgz#690c78dc4725efe7d06a1431287966fbf7774c7f"
-  integrity sha512-cJT9O1LYljqnnqlHaS0hdG73t7hHzF3zcN0BPsjvBq+5Ad47VJun+/IG4inPhk8ta0aEDK6LdP+F9299xa483w==
+esbuild-linux-mips64le@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.14.tgz#bd00570e3a30422224b732c7a5f262146c357403"
+  integrity sha512-4Jl5/+xoINKbA4cesH3f4R+q0vltAztZ6Jm8YycS8lNhN1pgZJBDxWfI6HUMIAdkKlIpR1PIkA9aXQgZ8sxFAg==
 
-esbuild-linux-mips64le@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.15.tgz#36b07cc47c3d21e48db3bb1f4d9ef8f46aead4f7"
-  integrity sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==
+esbuild-linux-mips64le@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.2.tgz#972f218d2cb5125237376d40ad60a6e5356a782c"
+  integrity sha512-Fdwrq2roFnO5oetIiUQQueZ3+5soCxBSJswg3MvYaXDomj47BN6oAWMZgLrFh1oVrtWrxSDLCJBenYdbm2s+qQ==
 
-esbuild-linux-ppc64le@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.12.tgz#a21fb64e80c38bef06122e48283990fc6db578e1"
-  integrity sha512-2dSnm1ldL7Lppwlo04CGQUpwNn5hGqXI38OzaoPOkRsBRWFBozyGxTFSee/zHFS+Pdh3b28JJbRK3owrrRgWNw==
+esbuild-linux-ppc64le@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.11.tgz#fc79d60710213b5b98345f5b138d48245616827a"
+  integrity sha512-JyzziGAI0D30Vyzt0HDihp4s1IUtJ3ssV2zx9O/c+U/dhUHVP2TmlYjzCfCr2Q6mwXTeloDcLS4qkyvJtYptdQ==
 
-esbuild-linux-ppc64le@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.13.tgz#7ec9048502de46754567e734aae7aebd2df6df02"
-  integrity sha512-+rghW8st6/7O6QJqAjVK3eXzKkZqYAw6LgHv7yTMiJ6ASnNvghSeOcIvXFep3W2oaJc35SgSPf21Ugh0o777qQ==
+esbuild-linux-ppc64le@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.14.tgz#430609413fd9e04d9def4e3f06726b031b23d825"
+  integrity sha512-BitW37GxeebKxqYNl4SVuSdnIJAzH830Lr6Mkq3pBHXtzQay0vK+IeOR/Ele1GtNVJ+/f8wYM53tcThkv5SC5w==
 
-esbuild-linux-ppc64le@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.15.tgz#f7e6bba40b9a11eb9dcae5b01550ea04670edad2"
-  integrity sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==
+esbuild-linux-ppc64le@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.2.tgz#20b71622ac09142b0e523f633af0829def7fed6b"
+  integrity sha512-vxptskw8JfCDD9QqpRO0XnsM1osuWeRjPaXX1TwdveLogYsbdFtcuiuK/4FxGiNMUr1ojtnCS2rMPbY8puc5NA==
 
-esbuild-netbsd-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.12.tgz#1ea7fc8cfce88a20a4047b867ef184049a6641ae"
-  integrity sha512-D4raxr02dcRiQNbxOLzpqBzcJNFAdsDNxjUbKkDMZBkL54Z0vZh4LRndycdZAMcIdizC/l/Yp/ZsBdAFxc5nbA==
+esbuild-linux-s390x@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.11.tgz#ca4b93556bbba6cc95b0644f2ee93c982165ba07"
+  integrity sha512-DoThrkzunZ1nfRGoDN6REwmo8ZZWHd2ztniPVIR5RMw/Il9wiWEYBahb8jnMzQaSOxBsGp0PbyJeVLTUatnlcw==
 
-esbuild-netbsd-64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.13.tgz#439bdaefffa03a8fa84324f5d83d636f548a2de3"
-  integrity sha512-A/B7rwmzPdzF8c3mht5TukbnNwY5qMJqes09ou0RSzA5/jm7Jwl/8z853ofujTFOLhkNHUf002EAgokzSgEMpQ==
+esbuild-linux-s390x@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.14.tgz#2f0d8cbfe53cf3cb97f6372549a41a8051dbd689"
+  integrity sha512-vLj6p76HOZG3wfuTr5MyO3qW5iu8YdhUNxuY+tx846rPo7GcKtYSPMusQjeVEfZlJpSYoR+yrNBBxq+qVF9zrw==
 
-esbuild-netbsd-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.15.tgz#a2fedc549c2b629d580a732d840712b08d440038"
-  integrity sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==
+esbuild-netbsd-64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.11.tgz#edb340bc6653c88804cac2253e21b74258fce165"
+  integrity sha512-12luoRQz+6eihKYh1zjrw0CBa2aw3twIiHV/FAfjh2NEBDgJQOY4WCEUEN+Rgon7xmLh4XUxCQjnwrvf8zhACw==
 
-esbuild-openbsd-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.12.tgz#adde32f2f1b05dc4bd4fc544d6ea5a4379f9ca4d"
-  integrity sha512-KuLCmYMb2kh05QuPJ+va60bKIH5wHL8ypDkmpy47lzwmdxNsuySeCMHuTv5o2Af1RUn5KLO5ZxaZeq4GEY7DaQ==
+esbuild-netbsd-64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.14.tgz#3e44de35e1add7e9582f3c0d2558d86aafbc813b"
+  integrity sha512-fn8looXPQhpVqUyCBWUuPjesH+yGIyfbIQrLKG05rr1Kgm3rZD/gaYrd3Wpmf5syVZx70pKZPvdHp8OTA+y7cQ==
 
-esbuild-openbsd-64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.13.tgz#c9958e5291a00a3090c1ec482d6bcdf2d5b5d107"
-  integrity sha512-szwtuRA4rXKT3BbwoGpsff6G7nGxdKgUbW9LQo6nm0TVCCjDNDC/LXxT994duIW8Tyq04xZzzZSW7x7ttDiw1w==
+esbuild-netbsd-64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.2.tgz#dbd6a25117902ef67aa11d8779dd9c6bca7fbe82"
+  integrity sha512-I8+LzYK5iSNpspS9eCV9sW67Rj8FgMHimGri4mKiGAmN0pNfx+hFX146rYtzGtewuxKtTsPywWteHx+hPRLDsw==
 
-esbuild-openbsd-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.15.tgz#b22c0e5806d3a1fbf0325872037f885306b05cd7"
-  integrity sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==
+esbuild-openbsd-64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.11.tgz#caeff5f946f79a60ce7bcf88871ca4c71d3476e8"
+  integrity sha512-l18TZDjmvwW6cDeR4fmizNoxndyDHamGOOAenwI4SOJbzlJmwfr0jUgjbaXCUuYVOA964siw+Ix+A+bhALWg8Q==
 
-esbuild-sunos-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.12.tgz#a7ecaf52b7364fbee76dc8aa707fa3e1cff3342c"
-  integrity sha512-jBsF+e0woK3miKI8ufGWKG3o3rY9DpHvCVRn5eburMIIE+2c+y3IZ1srsthKyKI6kkXLvV4Cf/E7w56kLipMXw==
+esbuild-openbsd-64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.14.tgz#04710ef1d01cd9f15d54f50d20b5a3778f8306a2"
+  integrity sha512-HdAnJ399pPff3SKbd8g+P4o5znseni5u5n5rJ6Z7ouqOdgbOwHe2ofZbMow17WMdNtz1IyOZk2Wo9Ve6/lZ4Rg==
 
-esbuild-sunos-64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.13.tgz#ac9ead8287379cd2f6d00bd38c5997fda9c1179e"
-  integrity sha512-ihyds9O48tVOYF48iaHYUK/boU5zRaLOXFS+OOL3ceD39AyHo46HVmsJLc7A2ez0AxNZCxuhu+P9OxfPfycTYQ==
+esbuild-openbsd-64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.2.tgz#3c5f199eed459b2f88865548394c0b77383d9ca4"
+  integrity sha512-120HgMe9elidWUvM2E6mMf0csrGwx8sYDqUIJugyMy1oHm+/nT08bTAVXuwYG/rkMIqsEO9AlMxuYnwR6En/3Q==
 
-esbuild-sunos-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.15.tgz#d0b6454a88375ee8d3964daeff55c85c91c7cef4"
-  integrity sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==
+esbuild-sunos-64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.11.tgz#90ce7e1749c2958a53509b4bae7b8f7d98f276d6"
+  integrity sha512-bmYzDtwASBB8c+0/HVOAiE9diR7+8zLm/i3kEojUH2z0aIs6x/S4KiTuT5/0VKJ4zk69kXel1cNWlHBMkmavQg==
 
-esbuild-wasm@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.13.12.tgz#1f78316c12e66ca7dffded832d5a9630b34b7657"
-  integrity sha512-eGdiSewbnJffEvyA0qQmr+w3HurBMVp4QhOfICzeeoL9naC8qC3PFaw6hZaqSgks5DXnQONtUGUFLsX3eXpq8A==
+esbuild-sunos-64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.14.tgz#8e583dd92c5c7ac4303ddc37f588e44211e04e19"
+  integrity sha512-bmDHa99ulsGnYlh/xjBEfxoGuC8CEG5OWvlgD+pF7bKKiVTbtxqVCvOGEZeoDXB+ja6AvHIbPxrEE32J+m5nqQ==
 
-esbuild-wasm@^0.13.0:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.13.15.tgz#3e1f075f6d3a2203caebaf6371578f2741539111"
-  integrity sha512-QO/ZqlnpXtiMKrPp8lgwsNJFKGKwm0EcIN6Og3vbhkFaauRTgGsX0t96gW7pFIY5UAARW/O+i1B/YLid6jW6eQ==
+esbuild-sunos-64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.2.tgz#900a681db6b76c6a7f60fc28d2bfe5b11698641c"
+  integrity sha512-Q3xcf9Uyfra9UuCFxoLixVvdigo0daZaKJ97TL2KNA4bxRUPK18wwGUk3AxvgDQZpRmg82w9PnkaNYo7a+24ow==
 
-esbuild-windows-32@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.12.tgz#a8756033dc905c4b7bea19be69f7ee68809f8770"
-  integrity sha512-L9m4lLFQrFeR7F+eLZXG82SbXZfUhyfu6CexZEil6vm+lc7GDCE0Q8DiNutkpzjv1+RAbIGVva9muItQ7HVTkQ==
+esbuild-wasm@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.14.14.tgz#d4c8d5fc405939a2234a31abf00967dfd1da1caa"
+  integrity sha512-qTjK4MWnYtQHCMGg2qDUqeFYXfVvYq5qJkQTIsOV4VZCknoYePVaDTG9ygEB9Ct0kc0DWs7IrS6Ja+GjY62Kzw==
 
-esbuild-windows-32@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.13.tgz#a3820fc86631ca594cb7b348514b5cc3f058cfd6"
-  integrity sha512-h2RTYwpG4ldGVJlbmORObmilzL8EECy8BFiF8trWE1ZPHLpECE9//J3Bi+W3eDUuv/TqUbiNpGrq4t/odbayUw==
+esbuild-wasm@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.14.2.tgz#49c59c610a0be48becec87a7d9019d143468f2f9"
+  integrity sha512-Rs8NjWoo1UdsVjhxT2o6kLCX9Sh65pyd3/h4XeJ3jjQNM6NgL+/CSowuJgvOIjDAXMLXpc6fdGnyZQDil9IUJA==
 
-esbuild-windows-32@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.15.tgz#c96d0b9bbb52f3303322582ef8e4847c5ad375a7"
-  integrity sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==
+esbuild-wasm@^0.14.0:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.14.11.tgz#bd09f4c42969cddcae39007d284f8ef747aae85d"
+  integrity sha512-9e1R6hv0hiU+BkJI2edqUuWfXUbOP2Mox+Ijl/uY1vLLlSsunkrcADqD/4Rz+VCEDzw6ecscJM+uJqR2fRmEUg==
 
-esbuild-windows-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.12.tgz#ae694aa66ca078acb8509b2da31197ed1f40f798"
-  integrity sha512-k4tX4uJlSbSkfs78W5d9+I9gpd+7N95W7H2bgOMFPsYREVJs31+Q2gLLHlsnlY95zBoPQMIzHooUIsixQIBjaQ==
+esbuild-windows-32@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.11.tgz#d067f4ce15b29efba6336e6a23597120fafe49ec"
+  integrity sha512-J1Ys5hMid8QgdY00OBvIolXgCQn1ARhYtxPnG6ESWNTty3ashtc4+As5nTrsErnv8ZGUcWZe4WzTP/DmEVX1UQ==
 
-esbuild-windows-64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.13.tgz#1da748441f228d75dff474ddb7d584b81887323c"
-  integrity sha512-oMrgjP4CjONvDHe7IZXHrMk3wX5Lof/IwFEIbwbhgbXGBaN2dke9PkViTiXC3zGJSGpMvATXVplEhlInJ0drHA==
+esbuild-windows-32@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.14.tgz#6d293ddfb71229f21cc13d85d5d2f43e8131693b"
+  integrity sha512-6tVooQcxJCNenPp5GHZBs/RLu31q4B+BuF4MEoRxswT+Eq2JGF0ZWDRQwNKB8QVIo3t6Svc5wNGez+CwKNQjBg==
 
-esbuild-windows-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz#1f79cb9b1e1bb02fb25cd414cb90d4ea2892c294"
-  integrity sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==
+esbuild-windows-32@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.2.tgz#61e0ba5bd95b277a55d2b997ac4c04dfe2559220"
+  integrity sha512-TW7O49tPsrq+N1sW8mb3m24j/iDGa4xzAZH4wHWwoIzgtZAYPKC0hpIhufRRG/LA30bdMChO9pjJZ5mtcybtBQ==
 
-esbuild-windows-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.12.tgz#782c5a8bd6d717ea55aaafe648f9926ca36a4a88"
-  integrity sha512-2tTv/BpYRIvuwHpp2M960nG7uvL+d78LFW/ikPItO+2GfK51CswIKSetSpDii+cjz8e9iSPgs+BU4o8nWICBwQ==
+esbuild-windows-64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.11.tgz#13e86dd37a6cd61a5276fa2d271342d0f74da864"
+  integrity sha512-h9FmMskMuGeN/9G9+LlHPAoiQk9jlKDUn9yA0MpiGzwLa82E7r1b1u+h2a+InprbSnSLxDq/7p5YGtYVO85Mlg==
 
-esbuild-windows-arm64@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.13.tgz#06dfa52a6b178a5932a9a6e2fdb240c09e6da30c"
-  integrity sha512-6fsDfTuTvltYB5k+QPah/x7LrI2+OLAJLE3bWLDiZI6E8wXMQU+wLqtEO/U/RvJgVY1loPs5eMpUBpVajczh1A==
+esbuild-windows-64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.14.tgz#08a36844b69542f8ec1cb33a5ddcea02b9d0b2e8"
+  integrity sha512-kl3BdPXh0/RD/dad41dtzj2itMUR4C6nQbXQCyYHHo4zoUoeIXhpCrSl7BAW1nv5EFL8stT1V+TQVXGZca5A2A==
 
-esbuild-windows-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.15.tgz#482173070810df22a752c686509c370c3be3b3c3"
-  integrity sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==
+esbuild-windows-64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.2.tgz#6ab59ef721ff75c682a1c8ae0570dabb637abddb"
+  integrity sha512-Rym6ViMNmi1E2QuQMWy0AFAfdY0wGwZD73BnzlsQBX5hZBuy/L+Speh7ucUZ16gwsrMM9v86icZUDrSN/lNBKg==
 
-esbuild@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.12.tgz#9cac641594bf03cf34145258c093d743ebbde7ca"
-  integrity sha512-vTKKUt+yoz61U/BbrnmlG9XIjwpdIxmHB8DlPR0AAW6OdS+nBQBci6LUHU2q9WbBobMEIQxxDpKbkmOGYvxsow==
+esbuild-windows-arm64@0.14.11:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.11.tgz#e8edfdf1d712085e6dc3fba18a0c225aaae32b75"
+  integrity sha512-dZp7Krv13KpwKklt9/1vBFBMqxEQIO6ri7Azf8C+ob4zOegpJmha2XY9VVWP/OyQ0OWk6cEeIzMJwInRZrzBUQ==
+
+esbuild-windows-arm64@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.14.tgz#ca747ce4066d5b8a79dbe48fe6ecd92d202e5366"
+  integrity sha512-dCm1wTOm6HIisLanmybvRKvaXZZo4yEVrHh1dY0v582GThXJOzuXGja1HIQgV09RpSHYRL3m4KoUBL00l6SWEg==
+
+esbuild-windows-arm64@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.2.tgz#aca2a4f83d2f0d1592ad4be832ed0045fc888cda"
+  integrity sha512-ZrLbhr0vX5Em/P1faMnHucjVVWPS+m3tktAtz93WkMZLmbRJevhiW1y4CbulBd2z0MEdXZ6emDa1zFHq5O5bSA==
+
+esbuild@0.14.14:
+  version "0.14.14"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.14.tgz#3b99f20d628013c3e2ae90e67687e03f1d6eb071"
+  integrity sha512-aiK4ddv+uui0k52OqSHu4xxu+SzOim7Rlz4i25pMEiC8rlnGU0HJ9r+ZMfdWL5bzifg+nhnn7x4NSWTeehYblg==
   optionalDependencies:
-    esbuild-android-arm64 "0.13.12"
-    esbuild-darwin-64 "0.13.12"
-    esbuild-darwin-arm64 "0.13.12"
-    esbuild-freebsd-64 "0.13.12"
-    esbuild-freebsd-arm64 "0.13.12"
-    esbuild-linux-32 "0.13.12"
-    esbuild-linux-64 "0.13.12"
-    esbuild-linux-arm "0.13.12"
-    esbuild-linux-arm64 "0.13.12"
-    esbuild-linux-mips64le "0.13.12"
-    esbuild-linux-ppc64le "0.13.12"
-    esbuild-netbsd-64 "0.13.12"
-    esbuild-openbsd-64 "0.13.12"
-    esbuild-sunos-64 "0.13.12"
-    esbuild-windows-32 "0.13.12"
-    esbuild-windows-64 "0.13.12"
-    esbuild-windows-arm64 "0.13.12"
+    esbuild-android-arm64 "0.14.14"
+    esbuild-darwin-64 "0.14.14"
+    esbuild-darwin-arm64 "0.14.14"
+    esbuild-freebsd-64 "0.14.14"
+    esbuild-freebsd-arm64 "0.14.14"
+    esbuild-linux-32 "0.14.14"
+    esbuild-linux-64 "0.14.14"
+    esbuild-linux-arm "0.14.14"
+    esbuild-linux-arm64 "0.14.14"
+    esbuild-linux-mips64le "0.14.14"
+    esbuild-linux-ppc64le "0.14.14"
+    esbuild-linux-s390x "0.14.14"
+    esbuild-netbsd-64 "0.14.14"
+    esbuild-openbsd-64 "0.14.14"
+    esbuild-sunos-64 "0.14.14"
+    esbuild-windows-32 "0.14.14"
+    esbuild-windows-64 "0.14.14"
+    esbuild-windows-arm64 "0.14.14"
 
-esbuild@0.13.13:
-  version "0.13.13"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.13.tgz#0b5399c20f219f663c8c1048436fb0f59ab17a41"
-  integrity sha512-Z17A/R6D0b4s3MousytQ/5i7mTCbaF+Ua/yPfoe71vdTv4KBvVAvQ/6ytMngM2DwGJosl8WxaD75NOQl2QF26Q==
+esbuild@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.2.tgz#9c1e1a652549cc33e44885eea42ea2cc6267edc2"
+  integrity sha512-l076A6o/PIgcyM24s0dWmDI/b8RQf41uWoJu9I0M71CtW/YSw5T5NUeXxs5lo2tFQD+O4CW4nBHJXx3OY5NpXg==
   optionalDependencies:
-    esbuild-android-arm64 "0.13.13"
-    esbuild-darwin-64 "0.13.13"
-    esbuild-darwin-arm64 "0.13.13"
-    esbuild-freebsd-64 "0.13.13"
-    esbuild-freebsd-arm64 "0.13.13"
-    esbuild-linux-32 "0.13.13"
-    esbuild-linux-64 "0.13.13"
-    esbuild-linux-arm "0.13.13"
-    esbuild-linux-arm64 "0.13.13"
-    esbuild-linux-mips64le "0.13.13"
-    esbuild-linux-ppc64le "0.13.13"
-    esbuild-netbsd-64 "0.13.13"
-    esbuild-openbsd-64 "0.13.13"
-    esbuild-sunos-64 "0.13.13"
-    esbuild-windows-32 "0.13.13"
-    esbuild-windows-64 "0.13.13"
-    esbuild-windows-arm64 "0.13.13"
+    esbuild-android-arm64 "0.14.2"
+    esbuild-darwin-64 "0.14.2"
+    esbuild-darwin-arm64 "0.14.2"
+    esbuild-freebsd-64 "0.14.2"
+    esbuild-freebsd-arm64 "0.14.2"
+    esbuild-linux-32 "0.14.2"
+    esbuild-linux-64 "0.14.2"
+    esbuild-linux-arm "0.14.2"
+    esbuild-linux-arm64 "0.14.2"
+    esbuild-linux-mips64le "0.14.2"
+    esbuild-linux-ppc64le "0.14.2"
+    esbuild-netbsd-64 "0.14.2"
+    esbuild-openbsd-64 "0.14.2"
+    esbuild-sunos-64 "0.14.2"
+    esbuild-windows-32 "0.14.2"
+    esbuild-windows-64 "0.14.2"
+    esbuild-windows-arm64 "0.14.2"
 
-esbuild@^0.13.0:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.15.tgz#db56a88166ee373f87dbb2d8798ff449e0450cdf"
-  integrity sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==
+esbuild@^0.14.0:
+  version "0.14.11"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.11.tgz#ac4acb78907874832afb704c3afe58ad37715c27"
+  integrity sha512-xZvPtVj6yecnDeFb3KjjCM6i7B5TCAQZT77kkW/CpXTMnd6VLnRPKrUB1XHI1pSq6a4Zcy3BGueQ8VljqjDGCg==
   optionalDependencies:
-    esbuild-android-arm64 "0.13.15"
-    esbuild-darwin-64 "0.13.15"
-    esbuild-darwin-arm64 "0.13.15"
-    esbuild-freebsd-64 "0.13.15"
-    esbuild-freebsd-arm64 "0.13.15"
-    esbuild-linux-32 "0.13.15"
-    esbuild-linux-64 "0.13.15"
-    esbuild-linux-arm "0.13.15"
-    esbuild-linux-arm64 "0.13.15"
-    esbuild-linux-mips64le "0.13.15"
-    esbuild-linux-ppc64le "0.13.15"
-    esbuild-netbsd-64 "0.13.15"
-    esbuild-openbsd-64 "0.13.15"
-    esbuild-sunos-64 "0.13.15"
-    esbuild-windows-32 "0.13.15"
-    esbuild-windows-64 "0.13.15"
-    esbuild-windows-arm64 "0.13.15"
+    esbuild-android-arm64 "0.14.11"
+    esbuild-darwin-64 "0.14.11"
+    esbuild-darwin-arm64 "0.14.11"
+    esbuild-freebsd-64 "0.14.11"
+    esbuild-freebsd-arm64 "0.14.11"
+    esbuild-linux-32 "0.14.11"
+    esbuild-linux-64 "0.14.11"
+    esbuild-linux-arm "0.14.11"
+    esbuild-linux-arm64 "0.14.11"
+    esbuild-linux-mips64le "0.14.11"
+    esbuild-linux-ppc64le "0.14.11"
+    esbuild-linux-s390x "0.14.11"
+    esbuild-netbsd-64 "0.14.11"
+    esbuild-openbsd-64 "0.14.11"
+    esbuild-sunos-64 "0.14.11"
+    esbuild-windows-32 "0.14.11"
+    esbuild-windows-64 "0.14.11"
+    esbuild-windows-arm64 "0.14.11"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -5674,21 +6046,22 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-airbnb-base@^14.2.1:
-  version "14.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e"
-  integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==
+eslint-config-airbnb-base@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
+  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
   dependencies:
     confusing-browser-globals "^1.0.10"
     object.assign "^4.1.2"
-    object.entries "^1.1.2"
+    object.entries "^1.1.5"
+    semver "^6.3.0"
 
-eslint-config-airbnb-typescript@^14.0.0:
-  version "14.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.2.tgz#4dc1583b9eab671bb011dea7d4ff1fc0d88e6e09"
-  integrity sha512-oaVR63DqpRUiOOeSVxIzhD3FXbqJRH+7Lt9GCMsS9SKgrRW3XpZINN2FO4JEsnaHEGkktumd0AHE9K7KQNuXSQ==
+eslint-config-airbnb-typescript@^16.1.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.1.0.tgz#f75a6b4f3bb679eef34c3c930359c2ca9bc3f09c"
+  integrity sha512-W5Cq20KpEx5ZLC54bnVrC37zq2+WD956Kp/Ma3nYFRjT1v9KM63v+DPkrrmmrVqrlDKaD0ivm/qeYmyHV6qKlw==
   dependencies:
-    eslint-config-airbnb-base "^14.2.1"
+    eslint-config-airbnb-base "^15.0.0"
 
 eslint-config-prettier@8.3.0:
   version "8.3.0"
@@ -5703,35 +6076,32 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-module-utils@^2.6.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"
-  integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==
+eslint-module-utils@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
+  integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
   dependencies:
     debug "^3.2.7"
     find-up "^2.1.0"
-    pkg-dir "^2.0.0"
 
-eslint-plugin-import@2.24.2:
-  version "2.24.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
-  integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
+eslint-plugin-import@2.25.4:
+  version "2.25.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
+  integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
   dependencies:
-    array-includes "^3.1.3"
-    array.prototype.flat "^1.2.4"
+    array-includes "^3.1.4"
+    array.prototype.flat "^1.2.5"
     debug "^2.6.9"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.6.2"
-    find-up "^2.0.0"
+    eslint-module-utils "^2.7.2"
     has "^1.0.3"
-    is-core-module "^2.6.0"
+    is-core-module "^2.8.0"
+    is-glob "^4.0.3"
     minimatch "^3.0.4"
-    object.values "^1.1.4"
-    pkg-up "^2.0.0"
-    read-pkg-up "^3.0.0"
+    object.values "^1.1.5"
     resolve "^1.20.0"
-    tsconfig-paths "^3.11.0"
+    tsconfig-paths "^3.12.0"
 
 eslint-plugin-prettier@^4.0.0:
   version "4.0.0"
@@ -5756,12 +6126,13 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+eslint-scope@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"
+  integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-utils@^3.0.0:
   version "3.0.0"
@@ -5770,11 +6141,6 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
 eslint-visitor-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
@@ -5785,60 +6151,60 @@ eslint-visitor-keys@^3.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
   integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
 
-eslint@7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
+  integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
+
+eslint@8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.7.0.tgz#22e036842ee5b7cf87b03fe237731675b4d3633c"
+  integrity sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+    "@eslint/eslintrc" "^1.0.5"
+    "@humanwhocodes/config-array" "^0.9.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    eslint-scope "^7.1.0"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.2.0"
+    espree "^9.3.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
+    glob-parent "^6.0.1"
     globals "^13.6.0"
-    ignore "^4.0.6"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.2.0, espree@^9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8"
+  integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==
   dependencies:
-    acorn "^7.4.0"
+    acorn "^8.7.0"
     acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    eslint-visitor-keys "^3.1.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
@@ -5889,11 +6255,6 @@ eventemitter-asyncresource@^1.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz#734ff2e44bf448e627f7748f905d6bdd57bdb65b"
   integrity sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==
 
-eventemitter2@^6.4.2, eventemitter2@^6.4.3:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
-  integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==
-
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -5912,7 +6273,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@4.1.0, execa@^4.0.0, execa@^4.0.2:
+execa@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -5942,18 +6303,6 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-executable@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
-  integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
-  dependencies:
-    pify "^2.2.0"
-
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -5984,6 +6333,16 @@ expect@^27.3.1:
     jest-message-util "^27.3.1"
     jest-regex-util "^27.0.6"
 
+expect@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-27.4.6.tgz#f335e128b0335b6ceb4fcab67ece7cbd14c942e6"
+  integrity sha512-1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    jest-get-type "^27.4.0"
+    jest-matcher-utils "^27.4.6"
+    jest-message-util "^27.4.6"
+
 express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -6050,7 +6409,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3.0.2, extend@~3.0.2:
+extend@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -6078,37 +6437,6 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
-  dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
-    yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
-
-extract-zip@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
 fancy-log@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
@@ -6129,7 +6457,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.7:
+fast-glob@3.2.7, fast-glob@^3.1.1, fast-glob@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
   integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
@@ -6150,7 +6478,7 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fast-safe-stringify@^2.0.7:
+fast-safe-stringify@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
@@ -6188,22 +6516,7 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-figures@^3.0.0, figures@^3.2.0:
+figures@3.2.0, figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
@@ -6311,12 +6624,7 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-parent-dir@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.1.tgz#c5c385b96858c3351f95d446cab866cbf9f11125"
-  integrity sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==
-
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -6371,11 +6679,6 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
   integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
 
-flatten@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
-  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
-
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -6391,21 +6694,21 @@ follow-redirects@1.5.10:
   dependencies:
     debug "=3.1.0"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.4:
+follow-redirects@^1.0.0:
   version "1.14.5"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381"
   integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==
 
+follow-redirects@^1.14.7:
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
 fork-ts-checker-webpack-plugin@6.2.10:
   version "6.2.10"
   resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.10.tgz#800ab1fa523c76011a3413bc4e7815e45b63e826"
@@ -6434,26 +6737,31 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.6"
+    combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-formidable@^1.2.2:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168"
-  integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==
+formidable@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz#4310bc7965d185536f9565184dee74fbb75557ff"
+  integrity sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==
+  dependencies:
+    dezalgo "1.0.3"
+    hexoid "1.0.0"
+    once "1.4.0"
+    qs "6.9.3"
 
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fraction.js@^4.1.1:
+fraction.js@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8"
   integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==
@@ -6483,7 +6791,7 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -6602,7 +6910,7 @@ get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
-get-stream@^5.0.0, get-stream@^5.1.0:
+get-stream@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
@@ -6627,20 +6935,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getos@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
-  integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
-  dependencies:
-    async "^3.2.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
 gettext-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-4.2.0.tgz#9327140f76b122d44f0e8cb9338fd855667d9434"
@@ -6666,7 +6960,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.0:
+glob-parent@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -6702,20 +6996,6 @@ glob@7.2.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d"
-  integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==
-  dependencies:
-    ini "1.3.7"
-
-global-dirs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
-  integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
-  dependencies:
-    ini "2.0.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6728,7 +7008,7 @@ globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.1, globby@^11.0.3, globby@^11.0.4:
+globby@^11.0.1, globby@^11.0.4:
   version "11.0.4"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
   integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -6740,6 +7020,18 @@ globby@^11.0.1, globby@^11.0.3, globby@^11.0.4:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+globby@^12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-12.0.2.tgz#53788b2adf235602ed4cabfea5c70a1139e1ab11"
+  integrity sha512-lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ==
+  dependencies:
+    array-union "^3.0.1"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.7"
+    ignore "^5.1.8"
+    merge2 "^1.4.1"
+    slash "^4.0.0"
+
 google-translate-api-browser@^1.1.71:
   version "1.1.71"
   resolved "https://registry.yarnpkg.com/google-translate-api-browser/-/google-translate-api-browser-1.1.71.tgz#08f4098f0bc09b11d389b82d50f6a7f5945df482"
@@ -6773,36 +7065,21 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
+graceful-fs@^4.2.9:
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
   integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -6916,6 +7193,11 @@ hdr-histogram-percentiles-obj@^3.0.0:
   resolved "https://registry.yarnpkg.com/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz#9409f4de0c2dda78e61de2d9d78b1e9f3cba283c"
   integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==
 
+hexoid@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
+  integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==
+
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -7020,6 +7302,15 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
 http-proxy-middleware@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f"
@@ -7040,15 +7331,6 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^2.0.2"
-    sshpk "^1.14.1"
-
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -7102,7 +7384,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.2:
+iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -7148,11 +7430,21 @@ ignore@^5.0.4, ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
   integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
 
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
+immutable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
+  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -7174,21 +7466,11 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -7217,11 +7499,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
-
 ini@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
@@ -7259,16 +7536,6 @@ inquirer@8.2.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-internal-ip@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-6.2.0.tgz#d5541e79716e406b74ac6b07b856ef18dc1621c1"
-  integrity sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==
-  dependencies:
-    default-gateway "^6.0.0"
-    ipaddr.js "^1.9.1"
-    is-ip "^3.1.0"
-    p-event "^4.2.0"
-
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -7283,17 +7550,12 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
-ip-regex@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
-  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
-
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.9.1, ipaddr.js@^1.9.1:
+ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
@@ -7374,13 +7636,6 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
 is-ci@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
@@ -7388,13 +7643,20 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.2.0, is-core-module@^2.6.0:
+is-core-module@^2.2.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
   integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.8.0, is-core-module@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -7434,11 +7696,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
@@ -7461,18 +7718,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -7502,34 +7747,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
-  dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
-
-is-installed-globally@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
-  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
-  dependencies:
-    global-dirs "^3.0.0"
-    is-path-inside "^3.0.2"
-
 is-interactive@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
   integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
-is-ip@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8"
-  integrity sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==
-  dependencies:
-    ip-regex "^4.0.0"
-
 is-lambda@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
@@ -7574,19 +7796,12 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
-  dependencies:
-    symbol-observable "^1.1.0"
-
 is-path-cwd@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-inside@^3.0.1, is-path-inside@^3.0.2:
+is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -7613,11 +7828,6 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-promise@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
 is-regex@^1.0.4, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -7660,7 +7870,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -7670,11 +7880,6 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-url-superb@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-url-superb/-/is-url-superb-4.0.0.tgz#b54d1d2499bb16792748ac967aa3ecb41a33a8c2"
-  integrity sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==
-
 is-weakref@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
@@ -7726,11 +7931,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -7746,7 +7946,7 @@ istanbul-lib-instrument@^4.0.3:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
-istanbul-lib-instrument@^5.0.4:
+istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
   integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
@@ -7783,6 +7983,14 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
+istanbul-reports@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.3.tgz#4bcae3103b94518117930d51283690960b50d3c2"
+  integrity sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -7808,16 +8016,16 @@ jasmine-marbles@~0.8.4:
   dependencies:
     lodash "^4.17.20"
 
-jest-changed-files@^27.3.0:
-  version "27.3.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.3.0.tgz#22a02cc2b34583fc66e443171dc271c0529d263c"
-  integrity sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==
+jest-changed-files@^27.4.2:
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.4.2.tgz#da2547ea47c6e6a5f6ed336151bd2075736eb4a5"
+  integrity sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==
   dependencies:
-    "@jest/types" "^27.2.5"
+    "@jest/types" "^27.4.2"
     execa "^5.0.0"
     throat "^6.0.1"
 
-jest-circus@^27.2.2, jest-circus@^27.3.1:
+jest-circus@^27.2.2:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.3.1.tgz#1679e74387cbbf0c6a8b42de963250a6469e0797"
   integrity sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==
@@ -7842,21 +8050,46 @@ jest-circus@^27.2.2, jest-circus@^27.3.1:
     stack-utils "^2.0.3"
     throat "^6.0.1"
 
-jest-cli@^27.3.1:
-  version "27.3.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.3.1.tgz#b576f9d146ba6643ce0a162d782b40152b6b1d16"
-  integrity sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q==
+jest-circus@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.4.6.tgz#d3af34c0eb742a967b1919fbb351430727bcea6c"
+  integrity sha512-UA7AI5HZrW4wRM72Ro80uRR2Fg+7nR0GESbSI/2M+ambbzVuA63mn5T1p3Z/wlhntzGpIG1xx78GP2YIkf6PhQ==
   dependencies:
-    "@jest/core" "^27.3.1"
-    "@jest/test-result" "^27.3.1"
-    "@jest/types" "^27.2.5"
+    "@jest/environment" "^27.4.6"
+    "@jest/test-result" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^0.7.0"
+    expect "^27.4.6"
+    is-generator-fn "^2.0.0"
+    jest-each "^27.4.6"
+    jest-matcher-utils "^27.4.6"
+    jest-message-util "^27.4.6"
+    jest-runtime "^27.4.6"
+    jest-snapshot "^27.4.6"
+    jest-util "^27.4.2"
+    pretty-format "^27.4.6"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+    throat "^6.0.1"
+
+jest-cli@^27.4.7:
+  version "27.4.7"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.4.7.tgz#d00e759e55d77b3bcfea0715f527c394ca314e5a"
+  integrity sha512-zREYhvjjqe1KsGV15mdnxjThKNDgza1fhDT+iUsXWLCq3sxe9w5xnvyctcYVT5PcdLSjv7Y5dCwTS3FCF1tiuw==
+  dependencies:
+    "@jest/core" "^27.4.7"
+    "@jest/test-result" "^27.4.6"
+    "@jest/types" "^27.4.2"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
-    jest-config "^27.3.1"
-    jest-util "^27.3.1"
-    jest-validate "^27.3.1"
+    jest-config "^27.4.7"
+    jest-util "^27.4.2"
+    jest-validate "^27.4.6"
     prompts "^2.0.1"
     yargs "^16.2.0"
 
@@ -7887,32 +8120,33 @@ jest-config@27.2.2:
     micromatch "^4.0.4"
     pretty-format "^27.2.2"
 
-jest-config@^27.3.1:
-  version "27.3.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.3.1.tgz#cb3b7f6aaa8c0a7daad4f2b9573899ca7e09bbad"
-  integrity sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==
+jest-config@^27.4.7:
+  version "27.4.7"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.4.7.tgz#4f084b2acbd172c8b43aa4cdffe75d89378d3972"
+  integrity sha512-xz/o/KJJEedHMrIY9v2ParIoYSrSVY6IVeE4z5Z3i101GoA5XgfbJz+1C8EYPsv7u7f39dS8F9v46BHDhn0vlw==
   dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^27.3.1"
-    "@jest/types" "^27.2.5"
-    babel-jest "^27.3.1"
+    "@babel/core" "^7.8.0"
+    "@jest/test-sequencer" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    babel-jest "^27.4.6"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-circus "^27.3.1"
-    jest-environment-jsdom "^27.3.1"
-    jest-environment-node "^27.3.1"
-    jest-get-type "^27.3.1"
-    jest-jasmine2 "^27.3.1"
-    jest-regex-util "^27.0.6"
-    jest-resolve "^27.3.1"
-    jest-runner "^27.3.1"
-    jest-util "^27.3.1"
-    jest-validate "^27.3.1"
+    jest-circus "^27.4.6"
+    jest-environment-jsdom "^27.4.6"
+    jest-environment-node "^27.4.6"
+    jest-get-type "^27.4.0"
+    jest-jasmine2 "^27.4.6"
+    jest-regex-util "^27.4.0"
+    jest-resolve "^27.4.6"
+    jest-runner "^27.4.6"
+    jest-util "^27.4.2"
+    jest-validate "^27.4.6"
     micromatch "^4.0.4"
-    pretty-format "^27.3.1"
+    pretty-format "^27.4.6"
+    slash "^3.0.0"
 
 jest-diff@^27.0.0, jest-diff@^27.3.1:
   version "27.3.1"
@@ -7924,6 +8158,16 @@ jest-diff@^27.0.0, jest-diff@^27.3.1:
     jest-get-type "^27.3.1"
     pretty-format "^27.3.1"
 
+jest-diff@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.4.6.tgz#93815774d2012a2cbb6cf23f84d48c7a2618f98d"
+  integrity sha512-zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^27.4.0"
+    jest-get-type "^27.4.0"
+    pretty-format "^27.4.6"
+
 jest-docblock@^27.0.6:
   version "27.0.6"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"
@@ -7931,6 +8175,13 @@ jest-docblock@^27.0.6:
   dependencies:
     detect-newline "^3.0.0"
 
+jest-docblock@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.4.0.tgz#06c78035ca93cbbb84faf8fce64deae79a59f69f"
+  integrity sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==
+  dependencies:
+    detect-newline "^3.0.0"
+
 jest-each@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.3.1.tgz#14c56bb4f18dd18dc6bdd853919b5f16a17761ff"
@@ -7942,6 +8193,17 @@ jest-each@^27.3.1:
     jest-util "^27.3.1"
     pretty-format "^27.3.1"
 
+jest-each@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.4.6.tgz#e7e8561be61d8cc6dbf04296688747ab186c40ff"
+  integrity sha512-n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    chalk "^4.0.0"
+    jest-get-type "^27.4.0"
+    jest-util "^27.4.2"
+    pretty-format "^27.4.6"
+
 jest-environment-jsdom@^27.0.0, jest-environment-jsdom@^27.2.2, jest-environment-jsdom@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz#63ac36d68f7a9303494df783494856222b57f73e"
@@ -7955,6 +8217,19 @@ jest-environment-jsdom@^27.0.0, jest-environment-jsdom@^27.2.2, jest-environment
     jest-util "^27.3.1"
     jsdom "^16.6.0"
 
+jest-environment-jsdom@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz#c23a394eb445b33621dfae9c09e4c8021dea7b36"
+  integrity sha512-o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA==
+  dependencies:
+    "@jest/environment" "^27.4.6"
+    "@jest/fake-timers" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    jest-mock "^27.4.6"
+    jest-util "^27.4.2"
+    jsdom "^16.6.0"
+
 jest-environment-node@^27.2.2, jest-environment-node@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.3.1.tgz#af7d0eed04edafb740311b303f3fe7c8c27014bb"
@@ -7967,11 +8242,28 @@ jest-environment-node@^27.2.2, jest-environment-node@^27.3.1:
     jest-mock "^27.3.0"
     jest-util "^27.3.1"
 
+jest-environment-node@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.4.6.tgz#ee8cd4ef458a0ef09d087c8cd52ca5856df90242"
+  integrity sha512-yfHlZ9m+kzTKZV0hVfhVu6GuDxKAYeFHrfulmy7Jxwsq4V7+ZK7f+c0XP/tbVDMQW7E4neG2u147hFkuVz0MlQ==
+  dependencies:
+    "@jest/environment" "^27.4.6"
+    "@jest/fake-timers" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    jest-mock "^27.4.6"
+    jest-util "^27.4.2"
+
 jest-get-type@^27.0.6, jest-get-type@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.3.1.tgz#a8a2b0a12b50169773099eee60a0e6dd11423eff"
   integrity sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==
 
+jest-get-type@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.4.0.tgz#7503d2663fffa431638337b3998d39c5e928e9b5"
+  integrity sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==
+
 jest-haste-map@^27.2.2, jest-haste-map@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.3.1.tgz#7656fbd64bf48bda904e759fc9d93e2c807353ee"
@@ -7992,7 +8284,27 @@ jest-haste-map@^27.2.2, jest-haste-map@^27.3.1:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^27.2.2, jest-jasmine2@^27.3.1:
+jest-haste-map@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.4.6.tgz#c60b5233a34ca0520f325b7e2cc0a0140ad0862a"
+  integrity sha512-0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-regex-util "^27.4.0"
+    jest-serializer "^27.4.0"
+    jest-util "^27.4.2"
+    jest-worker "^27.4.6"
+    micromatch "^4.0.4"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^2.3.2"
+
+jest-jasmine2@^27.2.2:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz#df6d3d07c7dafc344feb43a0072a6f09458d32b0"
   integrity sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==
@@ -8016,6 +8328,29 @@ jest-jasmine2@^27.2.2, jest-jasmine2@^27.3.1:
     pretty-format "^27.3.1"
     throat "^6.0.1"
 
+jest-jasmine2@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.4.6.tgz#109e8bc036cb455950ae28a018f983f2abe50127"
+  integrity sha512-uAGNXF644I/whzhsf7/qf74gqy9OuhvJ0XYp8SDecX2ooGeaPnmJMjXjKt0mqh1Rl5dtRGxJgNrHlBQIBfS5Nw==
+  dependencies:
+    "@jest/environment" "^27.4.6"
+    "@jest/source-map" "^27.4.0"
+    "@jest/test-result" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    expect "^27.4.6"
+    is-generator-fn "^2.0.0"
+    jest-each "^27.4.6"
+    jest-matcher-utils "^27.4.6"
+    jest-message-util "^27.4.6"
+    jest-runtime "^27.4.6"
+    jest-snapshot "^27.4.6"
+    jest-util "^27.4.2"
+    pretty-format "^27.4.6"
+    throat "^6.0.1"
+
 jest-leak-detector@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz#7fb632c2992ef707a1e73286e1e704f9cc1772b2"
@@ -8024,6 +8359,14 @@ jest-leak-detector@^27.3.1:
     jest-get-type "^27.3.1"
     pretty-format "^27.3.1"
 
+jest-leak-detector@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.4.6.tgz#ed9bc3ce514b4c582637088d9faf58a33bd59bf4"
+  integrity sha512-kkaGixDf9R7CjHm2pOzfTxZTQQQ2gHTIWKY/JZSiYTc90bZp8kSZnUMS3uLAfwTZwc0tcMRoEX74e14LG1WapA==
+  dependencies:
+    jest-get-type "^27.4.0"
+    pretty-format "^27.4.6"
+
 jest-matcher-utils@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz#257ad61e54a6d4044e080d85dbdc4a08811e9c1c"
@@ -8034,6 +8377,16 @@ jest-matcher-utils@^27.3.1:
     jest-get-type "^27.3.1"
     pretty-format "^27.3.1"
 
+jest-matcher-utils@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz#53ca7f7b58170638590e946f5363b988775509b8"
+  integrity sha512-XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^27.4.6"
+    jest-get-type "^27.4.0"
+    pretty-format "^27.4.6"
+
 jest-message-util@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.3.1.tgz#f7c25688ad3410ab10bcb862bcfe3152345c6436"
@@ -8049,6 +8402,21 @@ jest-message-util@^27.3.1:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-message-util@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.4.6.tgz#9fdde41a33820ded3127465e1a5896061524da31"
+  integrity sha512-0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^27.4.2"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    micromatch "^4.0.4"
+    pretty-format "^27.4.6"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^27.3.0:
   version "27.3.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.3.0.tgz#ddf0ec3cc3e68c8ccd489bef4d1f525571a1b867"
@@ -8057,35 +8425,50 @@ jest-mock@^27.3.0:
     "@jest/types" "^27.2.5"
     "@types/node" "*"
 
+jest-mock@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.4.6.tgz#77d1ba87fbd33ccb8ef1f061697e7341b7635195"
+  integrity sha512-kvojdYRkst8iVSZ1EJ+vc1RRD9llueBjKzXzeCytH3dMM7zvPV/ULcfI2nr0v0VUgm3Bjt3hBCQvOeaBz+ZTHw==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-preset-angular@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-11.0.1.tgz#37774639c9589348ebd606081ea95a84e72c1d13"
-  integrity sha512-7img58VmxvPtwOrkEEczDbV3cjdO/1qzB8Edbde8/e3GJIIk+6LcPnHOLw+dagJxZhcWagYGbqNbR7dxqntOBQ==
+jest-preset-angular@11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-11.1.0.tgz#10c9bf1d4f4c8b903b272b163fd8c1611d510258"
+  integrity sha512-R4ePMBiQub95ESJlN7TozIpRIyMU7buvIdjm8KXqxZK/w8MYwLOSszVStsoZycDmWq5ifZI1eRvhOCUFktFotw==
   dependencies:
     bs-logger "^0.2.6"
-    esbuild "0.13.13"
+    esbuild-wasm "0.14.2"
     jest-environment-jsdom "^27.0.0"
     pretty-format "^27.0.0"
     ts-jest "^27.0.0"
+  optionalDependencies:
+    esbuild "0.14.2"
 
 jest-regex-util@^27.0.6:
   version "27.0.6"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5"
   integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==
 
-jest-resolve-dependencies@^27.3.1:
-  version "27.3.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz#85b99bdbdfa46e2c81c6228fc4c91076f624f6e2"
-  integrity sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==
+jest-regex-util@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.4.0.tgz#e4c45b52653128843d07ad94aec34393ea14fbca"
+  integrity sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==
+
+jest-resolve-dependencies@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.6.tgz#fc50ee56a67d2c2183063f6a500cc4042b5e2327"
+  integrity sha512-W85uJZcFXEVZ7+MZqIPCscdjuctruNGXUZ3OHSXOfXR9ITgbUKeHj+uGcies+0SsvI5GtUfTw4dY7u9qjTvQOw==
   dependencies:
-    "@jest/types" "^27.2.5"
-    jest-regex-util "^27.0.6"
-    jest-snapshot "^27.3.1"
+    "@jest/types" "^27.4.2"
+    jest-regex-util "^27.4.0"
+    jest-snapshot "^27.4.6"
 
 jest-resolve@27.2.2:
   version "27.2.2"
@@ -8119,7 +8502,23 @@ jest-resolve@^27.2.2, jest-resolve@^27.3.1:
     resolve.exports "^1.1.0"
     slash "^3.0.0"
 
-jest-runner@^27.2.2, jest-runner@^27.3.1:
+jest-resolve@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.4.6.tgz#2ec3110655e86d5bfcfa992e404e22f96b0b5977"
+  integrity sha512-SFfITVApqtirbITKFAO7jOVN45UgFzcRdQanOFzjnbd+CACDoyeX7206JyU92l4cRr73+Qy/TlW51+4vHGt+zw==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^27.4.6"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^27.4.2"
+    jest-validate "^27.4.6"
+    resolve "^1.20.0"
+    resolve.exports "^1.1.0"
+    slash "^3.0.0"
+
+jest-runner@^27.2.2:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.3.1.tgz#1d594dcbf3bd8600a7e839e790384559eaf96e3e"
   integrity sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==
@@ -8147,6 +8546,34 @@ jest-runner@^27.2.2, jest-runner@^27.3.1:
     source-map-support "^0.5.6"
     throat "^6.0.1"
 
+jest-runner@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.4.6.tgz#1d390d276ec417e9b4d0d081783584cbc3e24773"
+  integrity sha512-IDeFt2SG4DzqalYBZRgbbPmpwV3X0DcntjezPBERvnhwKGWTW7C5pbbA5lVkmvgteeNfdd/23gwqv3aiilpYPg==
+  dependencies:
+    "@jest/console" "^27.4.6"
+    "@jest/environment" "^27.4.6"
+    "@jest/test-result" "^27.4.6"
+    "@jest/transform" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.8.1"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    jest-docblock "^27.4.0"
+    jest-environment-jsdom "^27.4.6"
+    jest-environment-node "^27.4.6"
+    jest-haste-map "^27.4.6"
+    jest-leak-detector "^27.4.6"
+    jest-message-util "^27.4.6"
+    jest-resolve "^27.4.6"
+    jest-runtime "^27.4.6"
+    jest-util "^27.4.2"
+    jest-worker "^27.4.6"
+    source-map-support "^0.5.6"
+    throat "^6.0.1"
+
 jest-runtime@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.3.1.tgz#80fa32eb85fe5af575865ddf379874777ee993d7"
@@ -8179,6 +8606,34 @@ jest-runtime@^27.3.1:
     strip-bom "^4.0.0"
     yargs "^16.2.0"
 
+jest-runtime@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.4.6.tgz#83ae923818e3ea04463b22f3597f017bb5a1cffa"
+  integrity sha512-eXYeoR/MbIpVDrjqy5d6cGCFOYBFFDeKaNWqTp0h6E74dK0zLHzASQXJpl5a2/40euBmKnprNLJ0Kh0LCndnWQ==
+  dependencies:
+    "@jest/environment" "^27.4.6"
+    "@jest/fake-timers" "^27.4.6"
+    "@jest/globals" "^27.4.6"
+    "@jest/source-map" "^27.4.0"
+    "@jest/test-result" "^27.4.6"
+    "@jest/transform" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    chalk "^4.0.0"
+    cjs-module-lexer "^1.0.0"
+    collect-v8-coverage "^1.0.0"
+    execa "^5.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^27.4.6"
+    jest-message-util "^27.4.6"
+    jest-mock "^27.4.6"
+    jest-regex-util "^27.4.0"
+    jest-resolve "^27.4.6"
+    jest-snapshot "^27.4.6"
+    jest-util "^27.4.2"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+
 jest-serializer@^27.0.6:
   version "27.0.6"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1"
@@ -8187,6 +8642,14 @@ jest-serializer@^27.0.6:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
+jest-serializer@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.4.0.tgz#34866586e1cae2388b7d12ffa2c7819edef5958a"
+  integrity sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==
+  dependencies:
+    "@types/node" "*"
+    graceful-fs "^4.2.4"
+
 jest-snapshot@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.3.1.tgz#1da5c0712a252d70917d46c037054f5918c49ee4"
@@ -8217,6 +8680,34 @@ jest-snapshot@^27.3.1:
     pretty-format "^27.3.1"
     semver "^7.3.2"
 
+jest-snapshot@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.4.6.tgz#e2a3b4fff8bdce3033f2373b2e525d8b6871f616"
+  integrity sha512-fafUCDLQfzuNP9IRcEqaFAMzEe7u5BF7mude51wyWv7VRex60WznZIC7DfKTgSIlJa8aFzYmXclmN328aqSDmQ==
+  dependencies:
+    "@babel/core" "^7.7.2"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.0.0"
+    "@jest/transform" "^27.4.6"
+    "@jest/types" "^27.4.2"
+    "@types/babel__traverse" "^7.0.4"
+    "@types/prettier" "^2.1.5"
+    babel-preset-current-node-syntax "^1.0.0"
+    chalk "^4.0.0"
+    expect "^27.4.6"
+    graceful-fs "^4.2.4"
+    jest-diff "^27.4.6"
+    jest-get-type "^27.4.0"
+    jest-haste-map "^27.4.6"
+    jest-matcher-utils "^27.4.6"
+    jest-message-util "^27.4.6"
+    jest-util "^27.4.2"
+    natural-compare "^1.4.0"
+    pretty-format "^27.4.6"
+    semver "^7.3.2"
+
 jest-util@27.2.0:
   version "27.2.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.2.0.tgz#bfccb85cfafae752257319e825a5b8d4ada470dc"
@@ -8241,6 +8732,18 @@ jest-util@^27.0.0, jest-util@^27.2.0, jest-util@^27.3.1:
     graceful-fs "^4.2.4"
     picomatch "^2.2.3"
 
+jest-util@^27.4.2:
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.4.2.tgz#ed95b05b1adfd761e2cda47e0144c6a58e05a621"
+  integrity sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.4"
+    picomatch "^2.2.3"
+
 jest-validate@^27.2.2, jest-validate@^27.3.1:
   version "27.3.1"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.3.1.tgz#3a395d61a19cd13ae9054af8cdaf299116ef8a24"
@@ -8253,17 +8756,29 @@ jest-validate@^27.2.2, jest-validate@^27.3.1:
     leven "^3.1.0"
     pretty-format "^27.3.1"
 
-jest-watcher@^27.3.1:
-  version "27.3.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.3.1.tgz#ba5e0bc6aa843612b54ddb7f009d1cbff7e05f3e"
-  integrity sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==
+jest-validate@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.4.6.tgz#efc000acc4697b6cf4fa68c7f3f324c92d0c4f1f"
+  integrity sha512-872mEmCPVlBqbA5dToC57vA3yJaMRfIdpCoD3cyHWJOMx+SJwLNw0I71EkWs41oza/Er9Zno9XuTkRYCPDUJXQ==
   dependencies:
-    "@jest/test-result" "^27.3.1"
-    "@jest/types" "^27.2.5"
+    "@jest/types" "^27.4.2"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^27.4.0"
+    leven "^3.1.0"
+    pretty-format "^27.4.6"
+
+jest-watcher@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.4.6.tgz#673679ebeffdd3f94338c24f399b85efc932272d"
+  integrity sha512-yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw==
+  dependencies:
+    "@jest/test-result" "^27.4.6"
+    "@jest/types" "^27.4.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^27.3.1"
+    jest-util "^27.4.2"
     string-length "^4.0.1"
 
 jest-worker@^27.0.6, jest-worker@^27.2.2, jest-worker@^27.3.1:
@@ -8275,14 +8790,23 @@ jest-worker@^27.0.6, jest-worker@^27.2.2, jest-worker@^27.3.1:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@27.3.1:
-  version "27.3.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-27.3.1.tgz#b5bab64e8f56b6f7e275ba1836898b0d9f1e5c8a"
-  integrity sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng==
+jest-worker@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e"
+  integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==
   dependencies:
-    "@jest/core" "^27.3.1"
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+jest@27.4.7:
+  version "27.4.7"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-27.4.7.tgz#87f74b9026a1592f2da05b4d258e57505f28eca4"
+  integrity sha512-8heYvsx7nV/m8m24Vk26Y87g73Ba6ueUd0MWed/NXMhSZIm62U/llVbS0PJe1SHunbyXjJ/BqG1z9bFjGUIvTg==
+  dependencies:
+    "@jest/core" "^27.4.7"
     import-local "^3.0.2"
-    jest-cli "^27.3.1"
+    jest-cli "^27.4.7"
 
 js-sha256@0.9.0:
   version "0.9.0"
@@ -8294,7 +8818,7 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1, js-yaml@^3.9.0:
+js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -8302,10 +8826,12 @@ js-yaml@^3.13.1, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
 
 jsdom@^16.6.0:
   version "16.7.0"
@@ -8350,7 +8876,7 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
@@ -8370,21 +8896,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
 json5@2.x, json5@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
@@ -8418,16 +8934,6 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsprim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
-  integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
 jwt-decode@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
@@ -8440,17 +8946,17 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-keycloak-angular@^8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/keycloak-angular/-/keycloak-angular-8.4.0.tgz#405cb93cae8f01f3612d98caa5967e2c03372d04"
-  integrity sha512-3zBKzPf+ZG+16EfOdp1uxa/XTGElTOQSq5UkfFJzFcJe1D6p696hKIUJHNJECcYNUtt4XhYwUEolMIR+VySqgA==
+keycloak-angular@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/keycloak-angular/-/keycloak-angular-9.1.0.tgz#d51f3a36101bc1f309c082ab71434fb352951607"
+  integrity sha512-ATxVOfxMaBHMOIdGIXDXqQwVhKl0CqCBwg7BabwWToA41jJdV/pBR+QeF3XkBEuvowXfr3bAW2aOfNSXLUJUeg==
   dependencies:
     tslib "^2.0.0"
 
-keycloak-js@15.0.2:
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-15.0.2.tgz#9d12dd8860953a267b9b18f351ad2e76b8e94a9c"
-  integrity sha512-dv2a4NcPSH3AzGWG3ZtB+VrHpuQLdFBYXtQBj/+oBzm6XNwnVAMdL6LIC0OzCLQpn3rKTQJtNSATAGhbKJgewQ==
+keycloak-js@^16.1.1:
+  version "16.1.1"
+  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-16.1.1.tgz#e235f212cc336b9752863ebdce7f7a5707b11b8a"
+  integrity sha512-AkRNIJFSMLfQKIBKK31UL4FGI59MQFf68Bf8I+PFbOSKNtnfGVPYLiZeJgy03Kv5ddswHBjVZOY5T0f5RpZpLw==
   dependencies:
     base64-js "1.3.1"
     js-sha256 "0.9.0"
@@ -8484,16 +8990,11 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klona@^2.0.4:
+klona@^2.0.4, klona@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
-lazy-ass@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
-  integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM=
-
 less-loader@10.2.0:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-10.2.0.tgz#97286d8797dc3dc05b1d16b0ecec5f968bdd4e32"
@@ -8551,64 +9052,6 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
-
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
-
-listr2@^3.8.3:
-  version "3.13.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.13.5.tgz#105a813f2eb2329c4aae27373a281d610ee4985f"
-  integrity sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==
-  dependencies:
-    cli-truncate "^2.1.0"
-    colorette "^2.0.16"
-    log-update "^4.0.0"
-    p-map "^4.0.0"
-    rfdc "^1.3.0"
-    rxjs "^7.4.0"
-    through "^2.3.8"
-    wrap-ansi "^7.0.0"
-
-listr@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
-  dependencies:
-    "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
-
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
@@ -8619,16 +9062,6 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
@@ -8639,12 +9072,10 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
-loader-utils@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.0.0.tgz#dfcd9d1101bc4512d4956e1d5d67577c647b47fe"
-  integrity sha512-ry4RE7qen73BFLgihlbyllGIW9SVWLUD5Cq9VWtzrqhntOMOJl8yEjA89d5mCUTT0puCnHo4EecO6bz+BOAS8w==
-  dependencies:
-    big.js "^6.1.1"
+loader-utils@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f"
+  integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==
 
 loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
@@ -8714,39 +9145,22 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.once@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
 lodash.orderby@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3"
   integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM=
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
-  dependencies:
-    chalk "^1.0.0"
-
-log-symbols@^4.0.0, log-symbols@^4.1.0:
+log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -8754,25 +9168,6 @@ log-symbols@^4.0.0, log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
-log-update@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
-  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
-  dependencies:
-    ansi-escapes "^4.3.0"
-    cli-cursor "^3.1.0"
-    slice-ansi "^4.0.0"
-    wrap-ansi "^6.2.0"
-
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -8826,7 +9221,29 @@ make-error@1.x, make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
+make-fetch-happen@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.0.0.tgz#a2dc77ec1ebf082927f4dc6eaa70227f72e5a250"
+  integrity sha512-CREcDkbKZZ64g5MN1FT+u58mDHX9FQFFtFyio5HonX44BdQdytqPZBXUz+6ibi2w/6ncji59f2phyXGSMGpgzA==
+  dependencies:
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^1.3.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
+
+make-fetch-happen@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
   integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
@@ -8911,11 +9328,6 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -8926,7 +9338,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0:
+merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -8995,7 +9407,7 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24:
   version "2.1.34"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
   integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
@@ -9007,7 +9419,7 @@ mime@1.6.0, mime@^1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.4.6:
+mime@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
@@ -9017,11 +9429,6 @@ mime@~2.5.2:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
   integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -9032,12 +9439,12 @@ mimic-response@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mini-css-extract-plugin@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.3.tgz#be742943c192b028645d4389084ef187615fff82"
-  integrity sha512-zekavl9mZuGyk7COjsfFY/f655AX61EKE0AthXPrmDk+oZyjZ9WzO4WPjXnnO9xl8obK2kmM6rAQrBEmk+WK1g==
+mini-css-extract-plugin@2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
+  integrity sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==
   dependencies:
-    schema-utils "^3.1.0"
+    schema-utils "^4.0.0"
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
@@ -9147,14 +9554,14 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -9164,10 +9571,10 @@ moment@^2.29.1:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
 
-monaco-editor@^0.30.1:
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.30.1.tgz#47f8d18a0aa2264fc5654581741ab8d7bec01689"
-  integrity sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==
+monaco-editor@^0.31.1:
+  version "0.31.1"
+  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.31.1.tgz#67f597b3e45679d1f551237e12a3a42c4438b97b"
+  integrity sha512-FYPwxGZAeP6mRRyrr5XTGHD9gRXVjy7GUzF4IPChnyt3fS5WrNxIkS8DNujWf6EQy0Zlzpxw8oTVE+mWI2/D1Q==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -9281,15 +9688,20 @@ negotiator@0.6.2, negotiator@^0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
+negotiator@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
 neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-packagr@13.0.8:
-  version "13.0.8"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-13.0.8.tgz#0e3b52b59729b4c2898f559ef6418824a89232e4"
-  integrity sha512-m2YhziyqntCsBxZFjqlaoA7Q4eY8yvZzGiTypkIFkG4ORqGb6dXt8WTUu2p+b7vx02bIqTa+1O+1T9KnyDqdiw==
+ng-packagr@13.2.0:
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-13.2.0.tgz#c057c7f87feb857a1326457b59bd007eeaa2a389"
+  integrity sha512-qfAipG1jQLjQ0+NXUTYyCmi5xSdMYY3LUWc7iXrbPfl8R2b8fLO+abW1zNMxS6TtcBUZMyfYtz2NGcFrh7QteA==
   dependencies:
     "@rollup/plugin-json" "^4.1.0"
     "@rollup/plugin-node-resolve" "^13.0.0"
@@ -9300,7 +9712,7 @@ ng-packagr@13.0.8:
     chokidar "^3.5.1"
     commander "^8.0.0"
     dependency-graph "^0.11.0"
-    esbuild-wasm "^0.13.0"
+    esbuild-wasm "^0.14.0"
     find-cache-dir "^3.3.1"
     glob "^7.1.6"
     injection-js "^2.4.0"
@@ -9308,15 +9720,15 @@ ng-packagr@13.0.8:
     less "^4.1.0"
     ora "^5.1.0"
     postcss "^8.2.4"
-    postcss-preset-env "^6.7.0"
+    postcss-preset-env "^7.0.0"
     postcss-url "^10.1.1"
     rollup "^2.45.1"
     rollup-plugin-sourcemaps "^0.6.3"
-    rxjs "^6.5.0"
+    rxjs "^7.0.0"
     sass "^1.32.8"
-    stylus "^0.55.0"
+    stylus "^0.56.0"
   optionalDependencies:
-    esbuild "^0.13.0"
+    esbuild "^0.14.0"
 
 ngx-color-picker@^11.0.0:
   version "11.0.0"
@@ -9332,12 +9744,12 @@ ngx-toastr@^14.1.3:
   dependencies:
     tslib "^2.3.0"
 
-ngx-translate-messageformat-compiler@^4.10.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/ngx-translate-messageformat-compiler/-/ngx-translate-messageformat-compiler-4.11.0.tgz#c9b71dd139ba5fcdcd809001e22622de589fd707"
-  integrity sha512-OdGfWV4fF3DhZqGIHcLmOnQDufugmZ+E90NYr1UPGRZgT10lilr9oLmIrisy3lW4THnZFNo9JXsX7+fX84LbDw==
+ngx-translate-messageformat-compiler@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ngx-translate-messageformat-compiler/-/ngx-translate-messageformat-compiler-5.0.1.tgz#c9304b83440f24d6dfa33c0413dbb93668ffd0e6"
+  integrity sha512-dtw0GgwmLzRCrAlkFOXYY2Ulz1ADXO/+EtvzInwK9vNgnI7VLHilqKVlWjkFetjk++WAsgnAzx7qjzdsdNch2g==
   dependencies:
-    tslib "^1.10.0"
+    tslib "^2.3.1"
 
 nice-napi@^1.0.2:
   version "1.0.2"
@@ -9347,22 +9759,17 @@ nice-napi@^1.0.2:
     node-addon-api "^3.0.0"
     node-gyp-build "^4.2.2"
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-node-addon-api@^3.0.0, node-addon-api@^3.0.2:
+node-addon-api@^3.0.0, node-addon-api@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+node-forge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
+  integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
 
-node-gyp-build@^4.2.2, node-gyp-build@^4.2.3:
+node-gyp-build@^4.2.2, node-gyp-build@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
   integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
@@ -9517,33 +9924,18 @@ npm-pick-manifest@6.1.1, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
     npm-package-arg "^8.1.2"
     semver "^7.3.4"
 
-npm-registry-fetch@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
-  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
+npm-registry-fetch@^12.0.0:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-12.0.1.tgz#211eff2483b1e71706c9a7ce891182ab3ea9168b"
+  integrity sha512-ricy4ezH3Uv0d4am6RSwHjCYTWJI74NJjurIigWMAG7Vs3PFyd0TUlkrez5L0AgaPzDLRsEzqb5cOZ/Ue01bmA==
   dependencies:
-    make-fetch-happen "^9.0.1"
+    make-fetch-happen "^10.0.0"
     minipass "^3.1.3"
     minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
     minizlib "^2.0.0"
     npm-package-arg "^8.0.0"
 
-npm-run-all@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
-  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    memorystream "^0.3.1"
-    minimatch "^3.0.4"
-    pidtree "^0.3.0"
-    read-pkg "^3.0.0"
-    shell-quote "^1.6.1"
-    string.prototype.padend "^3.0.0"
-
 npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -9561,36 +9953,26 @@ npmlog@^6.0.0:
     gauge "^4.0.0"
     set-blocking "^2.0.0"
 
-nth-check@^2.0.0:
+nth-check@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
   integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
   dependencies:
     boolbase "^1.0.0"
 
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-nx@13.2.3:
-  version "13.2.3"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-13.2.3.tgz#d571206b0ad5f8d34aa1aec644d75cbf15b6c097"
-  integrity sha512-aNRbPjArROZazOKAiUhG5uZAZmL1uXdsGoA3p5mDt5fCLSj/CX1V/myuRx+Js0qsAV78W6dSf2z6TiQeIgieXg==
+nx@13.6.1:
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-13.6.1.tgz#4672b463f4c9a6b4a855a9d98b08efcd861f5ac5"
+  integrity sha512-155nM2WJR9TGKXhOdWE07/1nKa4QCSjyoeLPh641U6Bs/6uVtXkJoNJdIeaGDHPIpwQQdhM/1SoZFbVmj5//wQ==
   dependencies:
-    "@nrwl/cli" "*"
+    "@nrwl/cli" "13.6.1"
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -9639,7 +10021,7 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.2:
+object.entries@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
   integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
@@ -9655,7 +10037,7 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.4:
+object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
   integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
@@ -9681,25 +10063,13 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@1.4.0, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -9778,11 +10148,6 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-ospath@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
-  integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=
-
 p-cancelable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
@@ -9795,13 +10160,6 @@ p-event@^1.0.0:
   dependencies:
     p-timeout "^1.1.1"
 
-p-event@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
-  integrity sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==
-  dependencies:
-    p-timeout "^3.1.0"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -9821,7 +10179,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2, p-limit@^3.1.0:
+p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -9856,11 +10214,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -9883,13 +10236,6 @@ p-timeout@^1.1.1:
   dependencies:
     p-finally "^1.0.0"
 
-p-timeout@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
-  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
-  dependencies:
-    p-finally "^1.0.0"
-
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -9900,10 +10246,10 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-12.0.2.tgz#14ae30a81fe62ec4fc18c071150e6763e932527c"
-  integrity sha512-Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg==
+pacote@12.0.3:
+  version "12.0.3"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-12.0.3.tgz#b6f25868deb810e7e0ddf001be88da2bcaca57c7"
+  integrity sha512-CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==
   dependencies:
     "@npmcli/git" "^2.1.0"
     "@npmcli/installed-package-contents" "^1.0.6"
@@ -9918,7 +10264,7 @@ pacote@12.0.2:
     npm-package-arg "^8.0.1"
     npm-packlist "^3.0.0"
     npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^11.0.0"
+    npm-registry-fetch "^12.0.0"
     promise-retry "^2.0.1"
     read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
@@ -9969,14 +10315,6 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
 parse-json@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -10059,17 +10397,12 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.6:
+path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -10086,13 +10419,6 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -10122,16 +10448,6 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -10142,12 +10458,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
   integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
-pidtree@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
-  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
-
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -10181,10 +10492,15 @@ pirates@^4.0.1:
   dependencies:
     node-modules-regexp "^1.0.0"
 
-piscina@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.1.0.tgz#2333636865b6cb69c5a370bbc499a98cabcf3e04"
-  integrity sha512-KTW4sjsCD34MHrUbx9eAAbuUSpVj407hQSgk/6Epkg0pbRBmv4a3UX7Sr8wxm9xYqQLnsN4mFOjqGDzHAdgKQg==
+pirates@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6"
+  integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==
+
+piscina@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.2.0.tgz#f5a1dde0c05567775690cccefe59d9223924d154"
+  integrity sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==
   dependencies:
     eventemitter-asyncresource "^1.0.0"
     hdr-histogram-js "^2.0.1"
@@ -10192,13 +10508,6 @@ piscina@3.1.0:
   optionalDependencies:
     nice-napi "^1.0.2"
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -10220,13 +10529,6 @@ pkg-dir@^5.0.0:
   dependencies:
     find-up "^5.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 please-upgrade-node@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
@@ -10248,14 +10550,6 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-attribute-case-insensitive@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880"
-  integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^6.0.2"
-
 postcss-attribute-case-insensitive@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz#39cbf6babf3ded1e4abf37d09d6eda21c644105c"
@@ -10263,103 +10557,38 @@ postcss-attribute-case-insensitive@^5.0.0:
   dependencies:
     postcss-selector-parser "^6.0.2"
 
-postcss-color-functional-notation@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0"
-  integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==
+postcss-color-functional-notation@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.1.tgz#a25e9e1855e14d04319222a689f120b3240d39e0"
+  integrity sha512-62OBIXCjRXpQZcFOYIXwXBlpAVWrYk8ek1rcjvMING4Q2cf0ipyN9qT+BhHA6HmftGSEnFQu2qgKO3gMscl3Rw==
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    postcss-value-parser "^4.2.0"
 
-postcss-color-functional-notation@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.0.1.tgz#2fd769959e7fe658b4c0e7d40b0ab245fc8664f1"
-  integrity sha512-qxD/7Q2rdmqJLSYxlJFJM9gVdyVLTBVrOUc+B6+KbOe4t2G2KnoI3HdimdK4PerGLqAqKnEVGgal7YKImm0g+w==
+postcss-color-hex-alpha@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.2.tgz#7a248b006dd47bd83063f662352d31fd982f74ec"
+  integrity sha512-gyx8RgqSmGVK156NAdKcsfkY3KPGHhKqvHTL3hhveFrBBToguKFzhyiuk3cljH6L4fJ0Kv+JENuPXs1Wij27Zw==
   dependencies:
-    postcss-values-parser "6.0.1"
+    postcss-value-parser "^4.2.0"
 
-postcss-color-gray@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547"
-  integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==
+postcss-color-rebeccapurple@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz#5d397039424a58a9ca628762eb0b88a61a66e079"
+  integrity sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==
   dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-hex-alpha@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388"
-  integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==
-  dependencies:
-    postcss "^7.0.14"
-    postcss-values-parser "^2.0.1"
-
-postcss-color-hex-alpha@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.0.tgz#84bfd985a93b0a18e047ebcb5fd463e2cae5e7a6"
-  integrity sha512-Z0xiE0j+hbefUj0LWOMkzmTIS7k+dqJKzLwoKww0KJhju/sWXr+84Yk7rmvFoML/4LjGpJgefZvDwExrsWfHZw==
-  dependencies:
-    postcss-values-parser "^6.0.0"
-
-postcss-color-mod-function@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d"
-  integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==
-  dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-rebeccapurple@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77"
-  integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-rebeccapurple@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.0.tgz#980fbd98eb68ebbb38be02a82c7554e043c8fdf4"
-  integrity sha512-+Ogw3SA0ESjjO87S8Dn+aAEHK6hFAWAVbTVnyXnmbV6Xh0TKi0vXpzhlKG/yrxujxtlgQcMQNQjg75uWWv28xA==
-  dependencies:
-    postcss-values-parser "^6"
-
-postcss-custom-media@^7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
-  integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==
-  dependencies:
-    postcss "^7.0.14"
+    postcss-value-parser "^4.2.0"
 
 postcss-custom-media@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1"
   integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==
 
-postcss-custom-properties@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.0.0.tgz#fd01ec9bd1462336ea8af7ba3c1a2c47c203031e"
-  integrity sha512-eAyX3rMjZKxdne6tWKjkWbNWfw6bbv4xTsrjNJ7C3uGDODrzbQXR+ueshRkw7Lhlhc3qyTmYH/sFfD0AbhgdSQ==
+postcss-custom-properties@^12.1.2:
+  version "12.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.2.tgz#066ecdb03779178ad60b8153755e79a2e70d17a9"
+  integrity sha512-Zvd+k66PHBYYPiXtdjNVx2l54Y9kQC7K1eUHzBND97RW/ayNxfaPOW+9NL3r0nsVbX1asPLdkDj585Wg0NBJCA==
   dependencies:
-    postcss-values-parser "^6"
-
-postcss-custom-properties@^8.0.11:
-  version "8.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97"
-  integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==
-  dependencies:
-    postcss "^7.0.17"
-    postcss-values-parser "^2.0.1"
-
-postcss-custom-selectors@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba"
-  integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    postcss-value-parser "^4.2.0"
 
 postcss-custom-selectors@^6.0.0:
   version "6.0.0"
@@ -10368,113 +10597,57 @@ postcss-custom-selectors@^6.0.0:
   dependencies:
     postcss-selector-parser "^6.0.4"
 
-postcss-dir-pseudo-class@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2"
-  integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==
+postcss-dir-pseudo-class@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.3.tgz#febfe305e75267913a53bf5094c7679f5cfa9b55"
+  integrity sha512-qiPm+CNAlgXiMf0J5IbBBEXA9l/Q5HGsNGkL3znIwT2ZFRLGY9U2fTUpa4lqCUXQOxaLimpacHeQC80BD2qbDw==
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    postcss-selector-parser "^6.0.8"
 
-postcss-dir-pseudo-class@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.0.tgz#7026a070a4849072a232eaf0cdd960de3013658d"
-  integrity sha512-TC4eB5ZnLRSV1PLsAPualEjxFysU9IVEBx8h+Md2qzo8iWdNqwWCckx5fTWfe6dJxUpB0TWEpWEFhZ/YHvjSCA==
+postcss-double-position-gradients@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.4.tgz#2484b9785ef3ba81b0f03a279c52ec58fc5344c2"
+  integrity sha512-qz+s5vhKJlsHw8HjSs+HVk2QGFdRyC68KGRQGX3i+GcnUjhWhXQEmCXW6siOJkZ1giu0ddPwSO6I6JdVVVPoog==
   dependencies:
-    postcss-selector-parser "6.0.6"
+    postcss-value-parser "^4.2.0"
 
-postcss-double-position-gradients@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e"
-  integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==
+postcss-env-function@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.4.tgz#4e85359ca4fcdde4ec4b73752a41de818dbe91cc"
+  integrity sha512-0ltahRTPtXSIlEZFv7zIvdEib7HN0ZbUQxrxIKn8KbiRyhALo854I/CggU5lyZe6ZBvSTJ6Al2vkZecI2OhneQ==
   dependencies:
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
+    postcss-value-parser "^4.2.0"
 
-postcss-double-position-gradients@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.1.tgz#3c21ad52b6f13d81caf2563b0010a2c5872272af"
-  integrity sha512-L18N4Y1gpKQPEnZ6JOxO3H5gswZzTNR+ZqruZG7cOtOF/GR6J1YBRKn5hdTn3Vs4Y9XuDqaBD8vIXFIEft9Jqw==
+postcss-focus-visible@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.3.tgz#14635b71a6b9140f488f11f26cbc9965a13f6843"
+  integrity sha512-ozOsg+L1U8S+rxSHnJJiET6dNLyADcPHhEarhhtCI9DBLGOPG/2i4ddVoFch9LzrBgb8uDaaRI4nuid2OM82ZA==
   dependencies:
-    postcss-values-parser "6.0.1"
+    postcss-selector-parser "^6.0.8"
 
-postcss-env-function@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7"
-  integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==
+postcss-focus-within@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.3.tgz#0b0bf425f14a646bbfd973b463e2d20d85a3a841"
+  integrity sha512-fk9y2uFS6/Kpp7/A9Hz9Z4rlFQ8+tzgBcQCXAFSrXFGAbKx+4ZZOmmfHuYjCOMegPWoz0pnC6fNzi8j7Xyqp5Q==
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-env-function@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.2.tgz#5509d008ff0f069fa18bd2eace4f3fdb18150c28"
-  integrity sha512-VXKv0Vskq7olS3Q2zj38G4au4PkW+YWBRgng2Czx0pP9PyqU6uzjS6uVU1VkJN8i0OTPM7g82YFUdiz/7pEvpg==
-  dependencies:
-    postcss-values-parser "6.0.1"
-
-postcss-focus-visible@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e"
-  integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-focus-visible@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.1.tgz#b12a859616eca7152976fec24ef337ab29bbc405"
-  integrity sha512-UddLlBmJ78Nu7OrKME70EKxCPBdxTx7pKIyD3GDNRM8Tnq19zmscT9QzsvR8gygz0i0nNUjMtSz4N3AEWZ5R/Q==
-
-postcss-focus-within@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680"
-  integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-focus-within@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.1.tgz#615659122325d86e00bc8ed84ab6129d0b3a0f62"
-  integrity sha512-50v1AZVlFSVzLTNdBQG521Aa54VABf/X1RkhR8Fm/9dDQby0W0XdwOnuo8Juvf0ZZXbKkxyTkyyQD0QaNVZVGg==
-
-postcss-font-variant@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz#42d4c0ab30894f60f98b17561eb5c0321f502641"
-  integrity sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==
-  dependencies:
-    postcss "^7.0.2"
+    postcss-selector-parser "^6.0.8"
 
 postcss-font-variant@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
   integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
 
-postcss-gap-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715"
-  integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==
-  dependencies:
-    postcss "^7.0.2"
+postcss-gap-properties@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.2.tgz#562fbf43a6a721565b3ca0e01008690991d2f726"
+  integrity sha512-EaMy/pbxtQnKDsnbEjdqlkCkROTQZzolcLKgIE+3b7EuJfJydH55cZeHfm+MtIezXRqhR80VKgaztO/vHq94Fw==
 
-postcss-gap-properties@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.0.tgz#8941c400df902247603fd915c7dc81e1d7686b15"
-  integrity sha512-QJOkz1epC/iCuOdhQPm3n9T+F25+P+MYJEEcs5xz/Q+020mc9c6ZRGJkzPJd8FS9hFmT9eEKFEx9PEDl+lH5og==
-
-postcss-image-set-function@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288"
-  integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==
+postcss-image-set-function@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.4.tgz#ce91579ab2c1386d412ff5cd5e733c474b1f75ee"
+  integrity sha512-BlEo9gSTj66lXjRNByvkMK9dEdEGFXRfGjKRi9fo8s0/P3oEk74cAoonl/utiM50E2OPVb/XSu+lWvdW4KtE/Q==
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-image-set-function@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.2.tgz#95b64db01b8812fcbece3bb36a3f2b8133bf7c91"
-  integrity sha512-NbTOc3xOq/YjIJS8/UVnhI16NxRuCiEWjem0eYt87sKvjdpk00niQ9oVo3eSR+kmMKWIO979x3j5i1GYJNxe1A==
-  dependencies:
-    postcss-values-parser "6.0.1"
+    postcss-value-parser "^4.2.0"
 
 postcss-import@14.0.2, postcss-import@^14.0.2:
   version "14.0.2"
@@ -10485,62 +10658,31 @@ postcss-import@14.0.2, postcss-import@^14.0.2:
     read-cache "^1.0.0"
     resolve "^1.1.7"
 
-postcss-initial@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"
-  integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==
-  dependencies:
-    postcss "^7.0.2"
-
 postcss-initial@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
   integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
 
-postcss-lab-function@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e"
-  integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==
+postcss-lab-function@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.0.3.tgz#633745b324afbcd5881da85fe2cef58b17487536"
+  integrity sha512-MH4tymWmefdZQ7uVG/4icfLjAQmH6o2NRYyVh2mKoB4RXJp9PjsyhZwhH4ouaCQHvg+qJVj3RzeAR1EQpIlXZA==
   dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    postcss-value-parser "^4.2.0"
 
-postcss-lab-function@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.0.1.tgz#b6a1fb1032ddd7f4f7198ca78ec84c9b5bc7d80e"
-  integrity sha512-8F2keZUlUiX/tznbCZ5y3Bmx6pnc19kvL4oq+x+uoK0ZYQjUWmHDdVHBG6iMq2T0Fteu+AgGAo94UcIsL4ay2w==
-  dependencies:
-    "@csstools/convert-colors" "2.0.0"
-    postcss-values-parser "6.0.1"
-
-postcss-loader@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.0.tgz#714370a3f567141cf4cadcdf9575f5234d186bc5"
-  integrity sha512-H9hv447QjQJVDbHj3OUdciyAXY3v5+UDduzEytAlZCVHCpNAAg/mCSwhYYqZr9BiGYhmYspU8QXxZwiHTLn3yA==
+postcss-loader@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef"
+  integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==
   dependencies:
     cosmiconfig "^7.0.0"
-    klona "^2.0.4"
+    klona "^2.0.5"
     semver "^7.3.5"
 
-postcss-logical@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
-  integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-logical@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.0.tgz#f646ef6a3562890e1123a32e695d14cc271afb21"
-  integrity sha512-fWEWMn/xf6F9SMzAD7OS0GTm8Qh1BlBmEbVT/YZGYhwipQEwOpO7YOOu+qnzLksDg9JjLRj5tLmeN8OW8+ogIA==
-
-postcss-media-minmax@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5"
-  integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==
-  dependencies:
-    postcss "^7.0.2"
+postcss-logical@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.3.tgz#9934e0fb16af70adbd94217b24d2f315ceb5c2f0"
+  integrity sha512-P5NcHWYrif0vK8rgOy/T87vg0WRIj3HSknrvp1wzDbiBeoDPVmiVRmkown2eSQdpPveat/MC1ess5uhzZFVnqQ==
 
 postcss-media-minmax@^5.0.0:
   version "5.0.0"
@@ -10575,185 +10717,81 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nesting@^10.0.2:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.0.2.tgz#0cf9e81712fe7b6c3005e7d884cce2cb0a06326e"
-  integrity sha512-FdecapAKIe+kp6uLNW7icw1g1B2HRhAAfsNv/TPzopeM08gpUbnBpqKSVqxrCqLDwzQG854ZJn5I0BiJ35WvmA==
+postcss-nesting@^10.1.2:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.2.tgz#2e5f811b3d75602ea18a95dd445bde5297145141"
+  integrity sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==
   dependencies:
-    postcss-selector-parser "6.0.6"
+    postcss-selector-parser "^6.0.8"
 
-postcss-nesting@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052"
-  integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-overflow-shorthand@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30"
-  integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-overflow-shorthand@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.0.tgz#f57631672333b302ffdcfc0735b8b7d0244c2a25"
-  integrity sha512-4fTapLT68wUoIr4m3Z0sKn1NbXX0lJYvj4aDA2++KpNx8wMSVf55UuLPz0nSjXa7dV1p0xQHlJ0iFJRNrSY2mw==
-
-postcss-page-break@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf"
-  integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==
-  dependencies:
-    postcss "^7.0.2"
+postcss-overflow-shorthand@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.2.tgz#b4e9c89728cd1e4918173dfb95936b75f78d4148"
+  integrity sha512-odBMVt6PTX7jOE9UNvmnLrFzA9pXS44Jd5shFGGtSHY80QCuJF+14McSy0iavZggRZ9Oj//C9vOKQmexvyEJMg==
 
 postcss-page-break@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
   integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
 
-postcss-place@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62"
-  integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==
+postcss-place@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.3.tgz#ca8040dfd937c7769a233a3bd6e66e139cf89e62"
+  integrity sha512-tDQ3m+GYoOar+KoQgj+pwPAvGHAp/Sby6vrFiyrELrMKQJ4AejL0NcS0mm296OKKYA2SRg9ism/hlT/OLhBrdQ==
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    postcss-value-parser "^4.2.0"
 
-postcss-place@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.1.tgz#9fbd18b3d1d438d313b2a29f5a50424c8ebca28d"
-  integrity sha512-X+vHHzqZjI4JbSoj3uYpL6rGRUHE1O9F8g+jBFn5U94U0t6GjJuL/xSN7tU6Pnm9tpfXioHfxwt9E8+JrCB9OQ==
+postcss-preset-env@7.2.3, postcss-preset-env@^7.0.0, postcss-preset-env@^7.2.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.2.3.tgz#01b9b6eea0ff16c27a3d514f10105d56363428a6"
+  integrity sha512-Ok0DhLfwrcNGrBn8sNdy1uZqWRk/9FId0GiQ39W4ILop5GHtjJs8bu1MY9isPwHInpVEPWjb4CEcEaSbBLpfwA==
   dependencies:
-    postcss-values-parser "6.0.1"
-
-postcss-preset-env@6.7.0, postcss-preset-env@^6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5"
-  integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==
-  dependencies:
-    autoprefixer "^9.6.1"
-    browserslist "^4.6.4"
-    caniuse-lite "^1.0.30000981"
-    css-blank-pseudo "^0.1.4"
-    css-has-pseudo "^0.10.0"
-    css-prefers-color-scheme "^3.1.1"
-    cssdb "^4.4.0"
-    postcss "^7.0.17"
-    postcss-attribute-case-insensitive "^4.0.1"
-    postcss-color-functional-notation "^2.0.1"
-    postcss-color-gray "^5.0.0"
-    postcss-color-hex-alpha "^5.0.3"
-    postcss-color-mod-function "^3.0.3"
-    postcss-color-rebeccapurple "^4.0.1"
-    postcss-custom-media "^7.0.8"
-    postcss-custom-properties "^8.0.11"
-    postcss-custom-selectors "^5.1.2"
-    postcss-dir-pseudo-class "^5.0.0"
-    postcss-double-position-gradients "^1.0.0"
-    postcss-env-function "^2.0.2"
-    postcss-focus-visible "^4.0.0"
-    postcss-focus-within "^3.0.0"
-    postcss-font-variant "^4.0.0"
-    postcss-gap-properties "^2.0.0"
-    postcss-image-set-function "^3.0.1"
-    postcss-initial "^3.0.0"
-    postcss-lab-function "^2.0.1"
-    postcss-logical "^3.0.0"
-    postcss-media-minmax "^4.0.0"
-    postcss-nesting "^7.0.0"
-    postcss-overflow-shorthand "^2.0.0"
-    postcss-page-break "^2.0.0"
-    postcss-place "^4.0.1"
-    postcss-pseudo-class-any-link "^6.0.0"
-    postcss-replace-overflow-wrap "^3.0.0"
-    postcss-selector-matches "^4.0.0"
-    postcss-selector-not "^4.0.0"
-
-postcss-preset-env@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.0.1.tgz#7f1fc5ac38e60a8e5ff9a920396d936a830e6120"
-  integrity sha512-oB7IJGwLBEwnao823mS2b9hqbp5Brm0EZKWRVROayjGwyPQVjY9gZpPZk/ItFakdx7GAPgv3ya+9R3KrUqCwYA==
-  dependencies:
-    autoprefixer "^10.4.0"
-    browserslist "^4.17.5"
-    caniuse-lite "^1.0.30001272"
-    css-blank-pseudo "^2.0.0"
-    css-has-pseudo "^2.0.0"
-    css-prefers-color-scheme "^5.0.0"
+    autoprefixer "^10.4.2"
+    browserslist "^4.19.1"
+    caniuse-lite "^1.0.30001299"
+    css-blank-pseudo "^3.0.2"
+    css-has-pseudo "^3.0.3"
+    css-prefers-color-scheme "^6.0.2"
     cssdb "^5.0.0"
-    postcss "^8.3"
     postcss-attribute-case-insensitive "^5.0.0"
-    postcss-color-functional-notation "^4.0.1"
-    postcss-color-hex-alpha "^8.0.0"
-    postcss-color-rebeccapurple "^7.0.0"
+    postcss-color-functional-notation "^4.2.1"
+    postcss-color-hex-alpha "^8.0.2"
+    postcss-color-rebeccapurple "^7.0.2"
     postcss-custom-media "^8.0.0"
-    postcss-custom-properties "^12.0.0"
+    postcss-custom-properties "^12.1.2"
     postcss-custom-selectors "^6.0.0"
-    postcss-dir-pseudo-class "^6.0.0"
-    postcss-double-position-gradients "^3.0.1"
-    postcss-env-function "^4.0.2"
-    postcss-focus-visible "^6.0.1"
-    postcss-focus-within "^5.0.1"
+    postcss-dir-pseudo-class "^6.0.3"
+    postcss-double-position-gradients "^3.0.4"
+    postcss-env-function "^4.0.4"
+    postcss-focus-visible "^6.0.3"
+    postcss-focus-within "^5.0.3"
     postcss-font-variant "^5.0.0"
-    postcss-gap-properties "^3.0.0"
-    postcss-image-set-function "^4.0.2"
+    postcss-gap-properties "^3.0.2"
+    postcss-image-set-function "^4.0.4"
     postcss-initial "^4.0.1"
-    postcss-lab-function "^4.0.1"
-    postcss-logical "^5.0.0"
+    postcss-lab-function "^4.0.3"
+    postcss-logical "^5.0.3"
     postcss-media-minmax "^5.0.0"
-    postcss-nesting "^10.0.2"
-    postcss-overflow-shorthand "^3.0.0"
+    postcss-nesting "^10.1.2"
+    postcss-overflow-shorthand "^3.0.2"
     postcss-page-break "^3.0.4"
-    postcss-place "^7.0.1"
-    postcss-pseudo-class-any-link "^7.0.0"
+    postcss-place "^7.0.3"
+    postcss-pseudo-class-any-link "^7.0.2"
     postcss-replace-overflow-wrap "^4.0.0"
     postcss-selector-not "^5.0.0"
 
-postcss-pseudo-class-any-link@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1"
-  integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==
+postcss-pseudo-class-any-link@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.0.2.tgz#6284c2f970715c78fe992d2fac1130e9991585c9"
+  integrity sha512-CG35J1COUH7OOBgpw5O+0koOLUd5N4vUGKUqSAuIe4GiuLHWU96Pqp+UPC8QITTd12zYAFx76pV7qWT/0Aj/TA==
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
-
-postcss-pseudo-class-any-link@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.0.0.tgz#b06483c8a241cee1e420f9ebd08680d4f95b2b20"
-  integrity sha512-Q4KjHlyBo91nvW+wTDZHGYcjtlSSkYwxweMuq1g8+dx1S8qAnedItvHLnbdAAdqJCZP1is5dLqiI8TvfJ+cjVQ==
-  dependencies:
-    postcss-selector-parser "^6"
-
-postcss-replace-overflow-wrap@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c"
-  integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==
-  dependencies:
-    postcss "^7.0.2"
+    postcss-selector-parser "^6.0.8"
 
 postcss-replace-overflow-wrap@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
   integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
-postcss-selector-matches@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff"
-  integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
-
-postcss-selector-not@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf"
-  integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
-
 postcss-selector-not@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz#ac5fc506f7565dd872f82f5314c0f81a05630dc7"
@@ -10761,7 +10799,7 @@ postcss-selector-not@^5.0.0:
   dependencies:
     balanced-match "^1.0.0"
 
-postcss-selector-parser@6.0.6, postcss-selector-parser@^6, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
   integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
@@ -10769,14 +10807,13 @@ postcss-selector-parser@6.0.6, postcss-selector-parser@^6, postcss-selector-pars
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
-  integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
+postcss-selector-parser@^6.0.8:
+  version "6.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz#f023ed7a9ea736cd7ef70342996e8e78645a7914"
+  integrity sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==
   dependencies:
-    cssesc "^2.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
 
 postcss-url@^10.1.1:
   version "10.1.3"
@@ -10793,42 +10830,21 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss-values-parser@6.0.1, postcss-values-parser@^6, postcss-values-parser@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-6.0.1.tgz#aeb5e4522c4aabeb1ebbb14122194b9c08069675"
-  integrity sha512-hH3HREaFAEsVOzUgYiwvFggUqUvoIZoXD2OjhzY2CEM7uVDaQTKP5bmqbchCBoVvywsqiGVYhwC8p2wMUzpW+Q==
-  dependencies:
-    color-name "^1.1.4"
-    is-url-superb "^4.0.0"
-    quote-unquote "^1.0.0"
+postcss-value-parser@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
-  integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
-  dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss@8.3.11:
-  version "8.3.11"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858"
-  integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==
+postcss@8.4.5, postcss@^8.2.14, postcss@^8.4.5:
+  version "8.4.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
+  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
   dependencies:
     nanoid "^3.1.30"
     picocolors "^1.0.0"
-    source-map-js "^0.6.2"
+    source-map-js "^1.0.1"
 
-postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
-postcss@^8.2.15, postcss@^8.2.4, postcss@^8.3, postcss@^8.3.7, postcss@^8.3.9:
+postcss@^8.2.15, postcss@^8.2.4, postcss@^8.3.7:
   version "8.4.4"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.4.tgz#d53d4ec6a75fd62557a66bb41978bf47ff0c2869"
   integrity sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==
@@ -10859,12 +10875,12 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893"
-  integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==
+prettier@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
+  integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
-pretty-bytes@^5.3.0, pretty-bytes@^5.4.1, pretty-bytes@^5.6.0:
+pretty-bytes@^5.3.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
@@ -10879,10 +10895,19 @@ pretty-format@^27.0.0, pretty-format@^27.2.2, pretty-format@^27.3.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-pretty-quick@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.2.tgz#89d8741af7122cbd7f34182df746c5a7ea360b5c"
-  integrity sha512-T+fpTJrDjTzewql4p3lKrRA7z3MrNyjBK1MKeaBm5PpKwATgVm885TpY7TgY8KFt5Q1Qn3QDseRQcyX9AKTKkA==
+pretty-format@^27.4.6:
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.4.6.tgz#1b784d2f53c68db31797b2348fa39b49e31846b7"
+  integrity sha512-NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g==
+  dependencies:
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^17.0.1"
+
+pretty-quick@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.3.tgz#15281108c0ddf446675157ca40240099157b638e"
+  integrity sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA==
   dependencies:
     chalk "^3.0.0"
     execa "^4.0.0"
@@ -10901,7 +10926,7 @@ process@^0.11.1, process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0, progress@^2.0.3:
+progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -10940,17 +10965,12 @@ proxy-addr@~2.0.5:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-from-env@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
-
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -11012,18 +11032,18 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.9.4:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
-  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+qs@6.9.3:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
+  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+
+qs@^6.10.1:
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
   dependencies:
     side-channel "^1.0.4"
 
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -11044,16 +11064,6 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-quote-unquote@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b"
-  integrity sha1-Z6mncUjv/q+BpNQoQEpxC6qsigs=
-
-ramda@~0.27.1:
-  version "0.27.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9"
-  integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -11104,14 +11114,6 @@ read-package-json-fast@^2.0.1:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-pkg-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
@@ -11121,15 +11123,6 @@ read-pkg@2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@@ -11218,7 +11211,7 @@ regexp.prototype.flags@^1.2.0:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.1.0:
+regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -11262,19 +11255,12 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-progress@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
-  integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=
-  dependencies:
-    throttleit "^1.0.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.1, require-from-string@^2.0.2:
+require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
@@ -11306,15 +11292,15 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-url-loader@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz#d50d4ddc746bb10468443167acf800dcd6c3ad57"
-  integrity sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==
+resolve-url-loader@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz#ee3142fb1f1e0d9db9524d539cfa166e9314f795"
+  integrity sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==
   dependencies:
     adjust-sourcemap-loader "^4.0.0"
     convert-source-map "^1.7.0"
     loader-utils "^2.0.0"
-    postcss "^7.0.35"
+    postcss "^8.2.14"
     source-map "0.6.1"
 
 resolve-url@^0.2.1:
@@ -11327,7 +11313,16 @@ resolve.exports@1.1.0, resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@1.20.0, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0:
+resolve@1.22.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+  dependencies:
+    is-core-module "^2.8.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -11335,22 +11330,6 @@ resolve@1.20.0, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -11379,11 +11358,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
 rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -11445,14 +11419,21 @@ rxjs-for-await@0.0.2:
   resolved "https://registry.yarnpkg.com/rxjs-for-await/-/rxjs-for-await-0.0.2.tgz#26598a1d6167147cc192172970e7eed4e620384b"
   integrity sha512-IJ8R/ZCFMHOcDIqoABs82jal00VrZx8Xkgfe7TOKoaRPAW5nH/VFlG23bXpeGdrmtqI9UobFPgUKgCuFc7Lncw==
 
-rxjs@6.6.7, rxjs@^6.3.3, rxjs@^6.5.0, rxjs@^6.5.4, rxjs@~6.6.7:
+rxjs@6.6.7, rxjs@^6.5.4:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.2.0, rxjs@^7.4.0:
+rxjs@^7.0.0, rxjs@~7.5.2:
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.2.tgz#11e4a3a1dfad85dbf7fb6e33cbba17668497490b"
+  integrity sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w==
+  dependencies:
+    tslib "^2.1.0"
+
+rxjs@^7.2.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68"
   integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==
@@ -11476,27 +11457,29 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0, safer-buffer@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@12.3.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.3.0.tgz#93278981c189c36a58cbfc37d4b9cef0cdc02871"
-  integrity sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA==
+sass-loader@12.4.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.4.0.tgz#260b0d51a8a373bb8e88efc11f6ba5583fea0bcf"
+  integrity sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==
   dependencies:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@1.43.4:
-  version "1.43.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.43.4.tgz#68c7d6a1b004bef49af0d9caf750e9b252105d1f"
-  integrity sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==
+sass@1.49.0, sass@^1.49.0:
+  version "1.49.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz#65ec1b1d9a6bc1bae8d2c9d4b392c13f5d32c078"
+  integrity sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.32.8, sass@^1.39.2:
+sass@^1.32.8:
   version "1.43.5"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.43.5.tgz#25a9d91dd098793ef7229d7b04dd3daae2fc4a65"
   integrity sha512-WuNm+eAryMgQluL7Mbq9M4EruyGGMyal7Lu58FfnRMVWxgUzIvI7aSn60iNt3kn5yZBMR7G84fAGDcwqOF5JOg==
@@ -11542,7 +11525,7 @@ schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -11580,12 +11563,12 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.10.11:
-  version "1.10.11"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
-  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
+selfsigned@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b"
+  integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==
   dependencies:
-    node-forge "^0.10.0"
+    node-forge "^1.2.0"
 
 semver-compare@^1.0.0:
   version "1.0.0"
@@ -11597,7 +11580,7 @@ semver-regex@^3.1.2:
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3"
   integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ==
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -11614,7 +11597,7 @@ semver@7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.3.5, semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@7.3.5, semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -11727,13 +11710,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -11741,21 +11717,11 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.6.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -11780,28 +11746,10 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
-
-slice-ansi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
-  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-slice-ansi@^4.0.0:
+slash@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
 slugify@^1.4.0:
   version "1.6.3"
@@ -11903,24 +11851,19 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-js@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
-  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
-
-source-map-js@^1.0.1:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"
   integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==
 
-source-map-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.0.tgz#f2a04ee2808ad01c774dea6b7d2639839f3b3049"
-  integrity sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==
+source-map-loader@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz#9ae5edc7c2d42570934be4c95d1ccc6352eba52d"
+  integrity sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==
   dependencies:
     abab "^2.0.5"
-    iconv-lite "^0.6.2"
-    source-map-js "^0.6.2"
+    iconv-lite "^0.6.3"
+    source-map-js "^1.0.1"
 
 source-map-resolve@^0.5.0:
   version "0.5.3"
@@ -11941,15 +11884,7 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@0.5.20:
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
-  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.17, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+source-map-support@0.5.21, source-map-support@^0.5.17, source-map-support@^0.5.21, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -12043,21 +11978,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sshpk@^1.14.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 ssri@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
@@ -12137,15 +12057,6 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -12155,14 +12066,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
 string-width@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.0.1.tgz#0d8158335a6cfd8eb95da9b6b262ce314a036ffd"
@@ -12172,15 +12075,6 @@ string-width@^5.0.1:
     is-fullwidth-code-point "^4.0.0"
     strip-ansi "^7.0.1"
 
-string.prototype.padend@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz#997a6de12c92c7cb34dc8a201a6c53d9bd88a5f1"
-  integrity sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -12211,27 +12105,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -12289,18 +12162,16 @@ stylus-loader@6.2.0:
     klona "^2.0.4"
     normalize-path "^3.0.0"
 
-stylus@0.55.0, stylus@^0.55.0:
-  version "0.55.0"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.55.0.tgz#bd404a36dd93fa87744a9dd2d2b1b8450345e5fc"
-  integrity sha512-MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw==
+stylus@0.56.0, stylus@^0.56.0:
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.56.0.tgz#13fc85c48082db483c90d2530942fe8b0be988eb"
+  integrity sha512-Ev3fOb4bUElwWu4F9P9WjnnaSpc8XB9OFHSFZSKMFL1CE1oM+oFXWEgAqPmmZIyhBihuqIQlFsVTypiiS9RxeA==
   dependencies:
     css "^3.0.0"
-    debug "~3.1.0"
+    debug "^4.3.2"
     glob "^7.1.6"
-    mkdirp "~1.0.4"
     safer-buffer "^2.1.2"
     sax "~1.2.4"
-    semver "^6.3.0"
     source-map "^0.7.3"
 
 superagent-promise@^1.1.0:
@@ -12308,27 +12179,22 @@ superagent-promise@^1.1.0:
   resolved "https://registry.yarnpkg.com/superagent-promise/-/superagent-promise-1.1.0.tgz#baf22d8bbdd439a9b07dd10f8c08f54fe2503533"
   integrity sha1-uvIti73UOamwfdEPjAj1T+JQNTM=
 
-superagent@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/superagent/-/superagent-6.1.0.tgz#09f08807bc41108ef164cfb4be293cebd480f4a6"
-  integrity sha512-OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg==
+superagent@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.1.tgz#2ab187d38c3078c31c3771c0b751f10163a27136"
+  integrity sha512-CQ2weSS6M+doIwwYFoMatklhRbx6sVNdB99OEJ5czcP3cng76Ljqus694knFWgOj3RkrtxZqIgpe6vhe0J7QWQ==
   dependencies:
     component-emitter "^1.3.0"
-    cookiejar "^2.1.2"
-    debug "^4.1.1"
-    fast-safe-stringify "^2.0.7"
-    form-data "^3.0.0"
-    formidable "^1.2.2"
+    cookiejar "^2.1.3"
+    debug "^4.3.3"
+    fast-safe-stringify "^2.1.1"
+    form-data "^4.0.0"
+    formidable "^2.0.1"
     methods "^1.1.2"
-    mime "^2.4.6"
-    qs "^6.9.4"
+    mime "^2.5.0"
+    qs "^6.10.1"
     readable-stream "^3.6.0"
-    semver "^7.3.2"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+    semver "^7.3.5"
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -12337,14 +12203,14 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0, supports-color@^8.1.1:
+supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -12359,32 +12225,21 @@ supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.2.0:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 symbol-observable@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
   integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
 
-symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-table@^6.0.9:
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.3.tgz#255388439715a738391bd2ee4cbca89a4d05a9b7"
-  integrity sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
 tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
@@ -12462,10 +12317,10 @@ terser-webpack-plugin@^5.1.3:
     source-map "^0.6.1"
     terser "^5.7.2"
 
-terser@5.9.0:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351"
-  integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==
+terser@5.10.0, terser@^5.7.2:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
+  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
   dependencies:
     commander "^2.20.0"
     source-map "~0.7.2"
@@ -12480,15 +12335,6 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.7.2:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
-  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.20"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -12508,11 +12354,6 @@ throat@^6.0.1:
   resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
   integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
 
-throttleit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
-  integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
-
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -12628,14 +12469,6 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -12655,7 +12488,21 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-ts-jest@27.0.7, ts-jest@^27.0.0:
+ts-jest@27.1.3:
+  version "27.1.3"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.3.tgz#1f723e7e74027c4da92c0ffbd73287e8af2b2957"
+  integrity sha512-6Nlura7s6uM9BVUAoqLH7JHyMXjz8gluryjpPXxr3IxZdAXnU6FhjvVLHFtfd1vsE1p8zD1OJfskkc0jhTSnkA==
+  dependencies:
+    bs-logger "0.x"
+    fast-json-stable-stringify "2.x"
+    jest-util "^27.0.0"
+    json5 "2.x"
+    lodash.memoize "4.x"
+    make-error "1.x"
+    semver "7.x"
+    yargs-parser "20.x"
+
+ts-jest@^27.0.0:
   version "27.0.7"
   resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.7.tgz#fb7c8c8cb5526ab371bc1b23d06e745652cca2d0"
   integrity sha512-O41shibMqzdafpuP+CkrOL7ykbmLh+FqQrXEmV9CydQ5JBk0Sj0uAEF5TNNe94fZWKm3yYvWa/IbyV4Yg1zK2Q==
@@ -12697,7 +12544,7 @@ ts-node@10.4.0:
     make-error "^1.1.1"
     yn "3.1.1"
 
-ts-node@^9.1.1:
+ts-node@~9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
   integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
@@ -12709,16 +12556,16 @@ ts-node@^9.1.1:
     source-map-support "^0.5.17"
     yn "3.1.1"
 
-tsconfig-paths-webpack-plugin@3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.4.1.tgz#4f0d7aa7c8258e7f99e0aa9b27c5687693b55eb1"
-  integrity sha512-HN1aWCPOXLF3dDke1w4z3RfCgmm9yTppg51FMCqZ02p6leKD4JZvvnPZtqhvnQVmoWWaQjbpO93h2WFjRJjQcA==
+tsconfig-paths-webpack-plugin@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz#01aafff59130c04a8c4ebc96a3045c43c376449a"
+  integrity sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.7.0"
     tsconfig-paths "^3.9.0"
 
-tsconfig-paths@^3.11.0, tsconfig-paths@^3.9.0:
+tsconfig-paths@^3.12.0, tsconfig-paths@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
   integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
@@ -12728,12 +12575,12 @@ tsconfig-paths@^3.11.0, tsconfig-paths@^3.9.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@2.3.1, tslib@^2.0.0, tslib@^2.3.0, tslib@^2.3.1:
+tslib@2.3.1, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -12762,11 +12609,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -12831,10 +12673,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.4.4:
-  version "4.4.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
-  integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
+typescript@4.5.5, typescript@^4.5.3:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -12887,11 +12729,6 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
 unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
@@ -12929,11 +12766,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-untildify@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
-  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
-
 upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
@@ -13007,7 +12839,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@8.3.2, uuid@^8.3.2:
+uuid@8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -13051,15 +12883,6 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -13104,10 +12927,10 @@ watchpack@^1.7.4:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"
 
-watchpack@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.0.tgz#a41bca3da6afaff31e92a433f4c856a0c25ea0c4"
-  integrity sha512-MnN0Q1OsvB/GGHETrFeZPQaOelWh/7O+EiFlj8sM9GPjtQkis7k01aAxrg/18kTfoIVcLL+haEVFlXDaSRwKRw==
+watchpack@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
+  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -13136,21 +12959,10 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-dev-middleware@5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.2.1.tgz#97c948144349177856a3d2d9c612cc3fee180cf1"
-  integrity sha512-Kx1X+36Rn9JaZcQMrJ7qN3PMAuKmEDD9ZISjUj3Cgq4A6PtwYsC4mpaKotSRYH3iOF6HsUa8viHKS59FlyVifQ==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.2.2"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^3.1.0"
-
-webpack-dev-middleware@^5.2.1:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62"
-  integrity sha512-DjZyYrsHhkikAFNvSNKrpnziXukU1EChFAh9j4LAm6ndPLPW8cN0KhM7T+RAiOqsQ6ABfQ8hoKIs9IWMTjov+w==
+webpack-dev-middleware@5.3.0, webpack-dev-middleware@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c"
+  integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.2.2"
@@ -13158,35 +12970,39 @@ webpack-dev-middleware@^5.2.1:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.4.0.tgz#10ec17088f840c9ccb2ebb0b43c49ec293206f7e"
-  integrity sha512-+S0XRIbsopVjPFjCO8I07FXYBWYqkFmuP56ucGMTs2hA/gV4q2M9xTmNo5Tg4o8ffRR+Nm3AsXnQXxKRyYovrA==
+webpack-dev-server@4.7.3:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
+  integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==
   dependencies:
+    "@types/bonjour" "^3.5.9"
+    "@types/connect-history-api-fallback" "^1.3.5"
+    "@types/serve-index" "^1.9.1"
+    "@types/sockjs" "^0.3.33"
+    "@types/ws" "^8.2.2"
     ansi-html-community "^0.0.8"
     bonjour "^3.5.0"
     chokidar "^3.5.2"
     colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^1.6.0"
+    default-gateway "^6.0.3"
     del "^6.0.0"
     express "^4.17.1"
     graceful-fs "^4.2.6"
     html-entities "^2.3.2"
     http-proxy-middleware "^2.0.0"
-    internal-ip "^6.2.0"
     ipaddr.js "^2.0.1"
     open "^8.0.9"
     p-retry "^4.5.0"
     portfinder "^1.0.28"
-    schema-utils "^3.1.0"
-    selfsigned "^1.10.11"
+    schema-utils "^4.0.0"
+    selfsigned "^2.0.0"
     serve-index "^1.9.1"
     sockjs "^0.3.21"
     spdy "^4.0.2"
     strip-ansi "^7.0.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^5.2.1"
+    webpack-dev-middleware "^5.3.0"
     ws "^8.1.0"
 
 webpack-merge@5.7.3:
@@ -13218,22 +13034,27 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^3.0.0, webpack-sources@^3.2.2:
+webpack-sources@^3.0.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260"
   integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==
 
-webpack-subresource-integrity@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-5.0.0.tgz#8268b9cc1a229a8f8129ca9eeb59cde52185b6b1"
-  integrity sha512-x9514FpLRydO+UAQ8DY4aLtCjxmdLkuQVcDFN1kGzuusREYJ1B0rzk/iIlWiL6dnvrhEGFj2+UsdxDkP8Z4UKg==
+webpack-sources@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack-subresource-integrity@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz#8b7606b033c6ccac14e684267cb7fb1f5c2a132a"
+  integrity sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==
   dependencies:
     typed-assert "^1.0.8"
 
-webpack@5.64.1:
-  version "5.64.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.64.1.tgz#fd59840c16f04fe315f2b2598a85026f12dfa1bb"
-  integrity sha512-b4FHmRgaaAjP+aVOVz41a9Qa5SmkUPQ+u8FntTQ1roPHahSComB6rXnLwc976VhUY4CqTaLu5mCswuHiNhOfVw==
+webpack@5.67.0:
+  version "5.67.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.67.0.tgz#cb43ca2aad5f7cc81c4cd36b626e6b819805dbfd"
+  integrity sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.50"
@@ -13249,7 +13070,7 @@ webpack@5.64.1:
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     json-parse-better-errors "^1.0.2"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
@@ -13257,8 +13078,8 @@ webpack@5.64.1:
     schema-utils "^3.1.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
-    watchpack "^2.2.0"
-    webpack-sources "^3.2.2"
+    watchpack "^2.3.1"
+    webpack-sources "^3.2.3"
 
 webpack@^4.18.1:
   version "4.46.0"
@@ -13345,13 +13166,6 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -13390,14 +13204,6 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -13450,6 +13256,20 @@ ws@^8.1.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d"
   integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==
 
+xliff@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/xliff/-/xliff-6.0.0.tgz#4f32ec481e6272af0020cbe6b1d57030647bec8d"
+  integrity sha512-N058dhmntriq/8BZw8HGWuseFoBjT+hRq0ETi4i+ioPraSay0LkpSr8lW7pB7NdbulqrYoA7Uu0X8t+Plu7GCQ==
+  dependencies:
+    xml-js "1.6.11"
+
+xml-js@1.6.11:
+  version "1.6.11"
+  resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9"
+  integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==
+  dependencies:
+    sax "^1.2.4"
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
@@ -13558,7 +13378,7 @@ yargs@^17.2.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yauzl@^2.10.0, yauzl@^2.4.2:
+yauzl@^2.4.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
   integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=