From b7208a085d0a143e3c0f5c9636234e3f250f0026 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sat, 7 Aug 2021 02:28:11 +0300 Subject: [PATCH] remove duplicated methods --- .../base-screen/base-screen.component.html | 35 ++++---- .../base-screen/base-screen.component.ts | 88 ++++++------------- .../admin-side-nav.component.html | 7 +- .../admin-side-nav.component.ts | 69 +++++++++------ .../screens/audit/audit-screen.component.html | 2 +- .../screens/audit/audit-screen.component.ts | 11 +-- .../digital-signature-screen.component.html | 5 +- .../digital-signature-screen.component.ts | 10 +-- ...er-templates-listing-screen.component.html | 9 +- ...sier-templates-listing-screen.component.ts | 17 ++-- .../general-config-screen.component.html | 2 +- .../general-config-screen.component.ts | 19 ++-- .../license-information-screen.component.html | 2 +- .../license-information-screen.component.ts | 28 +++--- .../user-listing-screen.component.html | 6 +- .../user-listing-screen.component.ts | 24 ++--- .../src/app/modules/auth/red-role.guard.ts | 2 +- .../dossier-details.component.html | 2 +- .../dossier-details.component.ts | 3 +- .../dossier-listing-actions.component.html | 4 +- .../dossier-listing-actions.component.ts | 6 +- .../file-actions/file-actions.component.html | 2 +- .../file-actions/file-actions.component.ts | 8 +- .../team-members/team-members.component.html | 2 +- .../team-members/team-members.component.ts | 5 +- .../edit-dossier-team-members.component.ts | 12 +-- .../dossier-listing-screen.component.html | 2 +- .../dossier-listing-screen.component.ts | 17 ++-- .../dossier-overview-screen.component.ts | 31 +++---- .../user-button/user-button.component.html | 2 +- .../user-button/user-button.component.ts | 3 +- .../initials-avatar.component.ts | 2 +- .../services/file-download.service.ts | 10 +-- .../src/app/services/permissions.service.ts | 18 +--- apps/red-ui/src/app/services/user.service.ts | 21 +---- apps/red-ui/src/app/state/app-state.guard.ts | 2 +- 36 files changed, 219 insertions(+), 269 deletions(-) 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 d25b81ec6..dd0b594a5 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 @@ -1,7 +1,7 @@
-
-
+
+
@@ -23,20 +23,19 @@
-
- - +
+ {{ 'top-bar.navigation-items.back' | translate }} - + +
- + @@ -85,7 +88,7 @@ - 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 1f597b032..d296df378 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 @@ -1,9 +1,8 @@ import { Component } from '@angular/core'; import { UserService } from '@services/user.service'; import { AppStateService } from '@state/app-state.service'; -import { PermissionsService } from '@services/permissions.service'; import { UserPreferenceService } from '@services/user-preference.service'; -import { Router } from '@angular/router'; +import { NavigationStart, Router } from '@angular/router'; import { Title } from '@angular/platform-browser'; import { FileDownloadService } from '@upload-download/services/file-download.service'; import { TranslateService } from '@ngx-translate/core'; @@ -12,19 +11,33 @@ import { SpotlightSearchComponent } from '@components/spotlight-search/spotlight import { SpotlightSearchAction } from '@components/spotlight-search/spotlight-search-action'; import { SpotlightSearchDialogData } from '@components/spotlight-search/spotlight-search-dialog-data'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { distinctUntilChanged, filter, map, startWith } from 'rxjs/operators'; interface MenuItem { - name: string; - routerLink?: string; - show: boolean; - action?: () => void; + readonly name: string; + readonly routerLink?: string; + readonly show: boolean; + readonly action?: () => void; } +const isNavigationStart = event => event instanceof NavigationStart; +const isDossiersView = url => url.includes('/main/dossiers') && !url.includes('/search'); +const isSearchScreen = url => url.includes('/main/dossiers') && url.includes('/search'); + @Component({ templateUrl: './base-screen.component.html', styleUrls: ['./base-screen.component.scss'] }) export class BaseScreenComponent { + private readonly _navigationStart$ = this._router.events.pipe( + filter(isNavigationStart), + map((event: NavigationStart) => event.url), + startWith(this._router.url), + distinctUntilChanged() + ); + readonly currentUser = this.userService.currentUser; + readonly isDossiersView$ = this._navigationStart$.pipe(map(isDossiersView)); + readonly isSearchScreen$ = this._navigationStart$.pipe(map(isSearchScreen)); readonly userMenuItems: MenuItem[] = [ { name: _('top-bar.navigation-items.my-account.children.my-profile'), @@ -34,60 +47,31 @@ export class BaseScreenComponent { { name: _('top-bar.navigation-items.my-account.children.admin'), routerLink: '/main/admin', - show: this.permissionsService.isManager() || this.permissionsService.isUserAdmin(), + show: this.currentUser.isManager || this.currentUser.isUserAdmin, action: this.appStateService.reset }, { name: _('top-bar.navigation-items.my-account.children.downloads'), routerLink: '/main/downloads', - show: this.permissionsService.isUser() + show: this.currentUser.isUser }, { name: _('top-bar.navigation-items.my-account.children.trash'), routerLink: '/main/admin/trash', - show: this.permissionsService.isManager() || this.permissionsService.isUserAdmin() + show: this.currentUser.isManager || this.currentUser.isUserAdmin } ]; - showSearch = false; - constructor( readonly appStateService: AppStateService, - readonly permissionsService: PermissionsService, + readonly userService: UserService, readonly userPreferenceService: UserPreferenceService, readonly titleService: Title, readonly fileDownloadService: FileDownloadService, private readonly _router: Router, - private readonly _userService: UserService, private readonly _translateService: TranslateService, private readonly _dialog: MatDialog - ) { - _router.events.subscribe(() => { - this._dossiersView = _router.url.includes('/main/dossiers') && !this.isSearchScreen; - }); - } - - private _dossiersView: boolean; - - get dossiersView() { - return this._dossiersView; - } - - get isSearchScreen() { - return this._router.url.includes('/search'); - } - - get user() { - return this._userService.currentUser; - } - - get showPendingDownloadsDot() { - return this.fileDownloadService.hasPendingDownloads; - } - - get languages(): string[] { - return this._translateService.langs; - } + ) {} openSpotlightSearch() { const spotlightSearchActions: SpotlightSearchAction[] = [ @@ -95,12 +79,12 @@ export class BaseScreenComponent { text: this._translateService.instant('search.this-dossier'), icon: 'red:enter', hide: !this.appStateService.activeDossier, - action: query => this._searchThisDossier(query) + action: query => this._search(query, this.appStateService.activeDossier.dossierId) }, { text: this._translateService.instant('search.entire-platform'), icon: 'red:enter', - action: query => this._searchEntirePlatform(query) + action: query => this._search(query) } ]; @@ -112,23 +96,9 @@ export class BaseScreenComponent { }); } - private _searchThisDossier(query: string) { - this._router - .navigate(['main/dossiers/search'], { - queryParams: { - query: query, - dossierId: this.appStateService.activeDossier.dossierId - } - }) - .then(); - } - - private _searchEntirePlatform(query: string) { - this._router.navigate(['main/dossiers/search'], { queryParams: { query: query } }).then(); - } - - logout() { - this._userService.logout(); + private _search(query: string, dossierId?: string) { + const queryParams = { query, dossierId }; + this._router.navigate(['main/dossiers/search'], { queryParams }).then(); } trackByName(index: number, item: MenuItem) { diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html index c7f2cb60a..e9e153dfe 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html @@ -1,12 +1,7 @@
- +
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 fd7e1d919..9e1768712 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 @@ -2,12 +2,11 @@ import { Component, OnDestroy } from '@angular/core'; import { DigitalSignature, DigitalSignatureControllerService } from '@redaction/red-ui-http'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Toaster } from '@services/toaster.service'; -import { PermissionsService } from '@services/permissions.service'; import { lastIndexOfEnd } from '@utils/functions'; -import { AutoUnsubscribeComponent } from '@iqser/common-ui'; +import { AutoUnsubscribeComponent, IconButtonTypes } from '@iqser/common-ui'; import { LoadingService } from '@services/loading.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { IconButtonTypes } from '@iqser/common-ui'; +import { UserService } from '@services/user.service'; @Component({ selector: 'redaction-digital-signature-screen', @@ -16,6 +15,7 @@ import { IconButtonTypes } from '@iqser/common-ui'; }) export class DigitalSignatureScreenComponent extends AutoUnsubscribeComponent implements OnDestroy { readonly iconButtonTypes = IconButtonTypes; + readonly currentUser = this._userService.currentUser; digitalSignature: DigitalSignature; digitalSignatureForm: FormGroup; @@ -23,11 +23,11 @@ export class DigitalSignatureScreenComponent extends AutoUnsubscribeComponent im digitalSignatureExists = false; constructor( - private readonly _digitalSignatureControllerService: DigitalSignatureControllerService, private readonly _toaster: Toaster, private readonly _formBuilder: FormBuilder, + private readonly _userService: UserService, private readonly _loadingService: LoadingService, - readonly permissionsService: PermissionsService + private readonly _digitalSignatureControllerService: DigitalSignatureControllerService ) { super(); this.loadDigitalSignatureAndInitializeForm(); diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html index 31131457a..3d0b22543 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html @@ -4,10 +4,7 @@
- +
@@ -27,7 +24,7 @@ implements OnInit { + protected readonly _primaryKey = 'name'; readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; - protected readonly _primaryKey = 'name'; + readonly currentUser = this._userService.currentUser; constructor( - private readonly _dialogService: AdminDialogService, - private readonly _appStateService: AppStateService, - private readonly _loadingService: LoadingService, - private readonly _dossierTemplateControllerService: DossierTemplateControllerService, protected readonly _injector: Injector, - readonly permissionsService: PermissionsService, - readonly userPreferenceService: UserPreferenceService + private readonly _userService: UserService, + private readonly _loadingService: LoadingService, + private readonly _appStateService: AppStateService, + private readonly _dialogService: AdminDialogService, + readonly userPreferenceService: UserPreferenceService, + private readonly _dossierTemplateControllerService: DossierTemplateControllerService ) { super(_injector); } diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html index f09d283db..d2bf4b800 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html @@ -9,7 +9,7 @@
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 73c972123..45338abba 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 @@ -1,13 +1,13 @@ import { Component, OnInit } from '@angular/core'; -import { PermissionsService } from '@services/permissions.service'; import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui-http'; import { AppConfigService } from '@app-config/app-config.service'; import * as moment from 'moment'; import { TranslateService } from '@ngx-translate/core'; -import { LoadingService } from '../../../../services/loading.service'; -import { ButtonConfig } from '../../../shared/components/page-header/models/button-config.model'; +import { LoadingService } from '@services/loading.service'; +import { ButtonConfig } from '@shared/components/page-header/models/button-config.model'; import { IconButtonTypes } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { UserService } from '@services/user.service'; @Component({ selector: 'redaction-license-information-screen', @@ -15,6 +15,15 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; styleUrls: ['./license-information-screen.component.scss'] }) export class LicenseInformationScreenComponent implements OnInit { + readonly currentUser = this._userService.currentUser; + readonly buttonConfigs: ButtonConfig[] = [ + { + label: _('license-info-screen.email-report'), + action: () => this.sendMail(), + type: IconButtonTypes.primary + } + ]; + currentInfo: LicenseReport = {}; totalInfo: LicenseReport = {}; unlicensedInfo: LicenseReport = {}; @@ -34,20 +43,13 @@ export class LicenseInformationScreenComponent implements OnInit { group: 'Ordinal', domain: ['#0389ec'] }; - buttonConfigs: ButtonConfig[] = [ - { - label: _('license-info-screen.email-report'), - action: () => this.sendMail(), - type: IconButtonTypes.primary - } - ]; constructor( - readonly permissionsService: PermissionsService, + private readonly _userService: UserService, readonly appConfigService: AppConfigService, - private readonly _licenseReportController: LicenseReportControllerService, + private readonly _loadingService: LoadingService, private readonly _translateService: TranslateService, - private readonly _loadingService: LoadingService + private readonly _licenseReportController: LicenseReportControllerService ) { _loadingService.start(); } diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html index f1cd91a66..099755b9c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html @@ -15,13 +15,13 @@ >
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 060a9c968..9e7145501 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 @@ -1,5 +1,4 @@ import { Component, Injector, OnInit, QueryList, ViewChildren } from '@angular/core'; -import { PermissionsService } from '@services/permissions.service'; import { UserService, UserWrapper } from '@services/user.service'; import { UserControllerService } from '@redaction/red-ui-http'; import { AdminDialogService } from '../../services/admin-dialog.service'; @@ -20,32 +19,33 @@ import { rolesTranslations } from '../../../../translations/roles-translations'; providers: [...DefaultListingServices] }) export class UserListingScreenComponent extends BaseListingComponent implements OnInit { + protected readonly _primaryKey = 'id'; + readonly translations = rolesTranslations; readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; + readonly currentUser = this.userService.currentUser; readonly canDeleteSelected$ = this._canDeleteSelected$; + collapsedDetails = false; chartData: DoughnutChartConfig[] = []; - readonly translations = rolesTranslations; - protected readonly _primaryKey = 'id'; @ViewChildren(InitialsAvatarComponent) private readonly _avatars: QueryList; constructor( - readonly permissionsService: PermissionsService, readonly userService: UserService, - private readonly _translateService: TranslateService, - private readonly _dialogService: AdminDialogService, - private readonly _userControllerService: UserControllerService, - private readonly _translateChartService: TranslateChartService, + protected readonly _injector: Injector, private readonly _loadingService: LoadingService, - protected readonly _injector: Injector + private readonly _dialogService: AdminDialogService, + private readonly _translateService: TranslateService, + private readonly _userControllerService: UserControllerService, + private readonly _translateChartService: TranslateChartService ) { super(_injector); } get _canDeleteSelected$(): Observable { const entities$ = this.screenStateService.selectedEntities$; - return entities$.pipe(map(all => all.indexOf(this.userService.currentUser) === -1)); + return entities$.pipe(map(all => all.indexOf(this.currentUser) === -1)); } async ngOnInit() { @@ -75,7 +75,7 @@ export class UserListingScreenComponent extends BaseListingComponent item.userId === user.id).detectChanges(); @@ -96,7 +96,7 @@ export class UserListingScreenComponent extends BaseListingComponent !this.userService.isActive(user)).length, + value: this.allEntities.filter(user => !user.isActive).length, color: 'INACTIVE', label: 'INACTIVE' }, 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 5d53ce911..0e15433a5 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 @@ -36,7 +36,7 @@ export class RedRoleGuard implements CanActivate { return; } - if (!this._userService.isUser() && state.url.startsWith('/main/dossiers')) { + if (!this._userService.currentUser.isUser && state.url.startsWith('/main/dossiers')) { this._router.navigate(['/main/admin']); obs.next(false); obs.complete(); diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html index f92cc9879..0eff21054 100644 --- a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html @@ -19,7 +19,7 @@ -
+
(); - actionMenuOpen = false; constructor( readonly permissionsService: PermissionsService, readonly appStateService: AppStateService, - private readonly _dialogService: DossiersDialogService + private readonly _dialogService: DossiersDialogService, + private readonly _userService: UserService ) {} openEditDossierDialog($event: MouseEvent, dossierWrapper: DossierWrapper) { diff --git a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html index b57c5ad4b..5e450dc3e 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts index 6ffe91d1c..e8396a9fa 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts @@ -10,6 +10,7 @@ import { FileManagementControllerService } from '@redaction/red-ui-http'; import { TranslateService } from '@ngx-translate/core'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { CircleButtonTypes } from '@iqser/common-ui'; +import { UserService } from '@services/user.service'; @Component({ selector: 'redaction-file-actions', @@ -18,12 +19,12 @@ import { CircleButtonTypes } from '@iqser/common-ui'; }) export class FileActionsComponent implements OnInit { readonly circleButtonTypes = CircleButtonTypes; + readonly currentUser = this._userService.currentUser; @Input() fileStatus: FileStatusWrapper; @Input() activeDocumentInfo: boolean; @Input() activeExcludePages: boolean; @Output() actionPerformed = new EventEmitter(); - actionMenuOpen: boolean; screen: 'file-preview' | 'dossier-overview'; @@ -34,7 +35,8 @@ export class FileActionsComponent implements OnInit { private readonly _fileActionService: FileActionService, private readonly _loadingService: LoadingService, private readonly _fileManagementControllerService: FileManagementControllerService, - private readonly _translateService: TranslateService + private readonly _translateService: TranslateService, + private readonly _userService: UserService ) {} get statusBarConfig() { @@ -50,7 +52,7 @@ export class FileActionsComponent implements OnInit { } get toggleTooltip(): string { - if (!this.permissionsService.isManager()) { + if (!this.currentUser.isManager) { return _('file-preview.toggle-analysis.only-managers'); } diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html index 377b3aed3..2e2ca7728 100644 --- a/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html @@ -16,7 +16,7 @@
(); @ViewChild(TeamMembersManagerComponent) managerComponent: TeamMembersManagerComponent; - constructor(private readonly _appStateService: AppStateService, private readonly _permissionsService: PermissionsService) {} + constructor(private readonly _appStateService: AppStateService, private readonly _userService: UserService) {} get changed() { return this.managerComponent.changed; } get disabled() { - return !this._permissionsService.isManager(); + return !this.currentUser.isManager; } async save() { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.html index 42721ebdc..5373bb893 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.html @@ -17,7 +17,7 @@ (action)="openAddDossierDialog()" *ngIf="screenStateService.noData$ | async" [buttonLabel]="'dossier-listing.no-data.action' | translate" - [showButton]="permissionsService.isManager()" + [showButton]="currentUser.isManager" [text]="'dossier-listing.no-data.title' | translate" icon="red:folder" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts index 953f27ff5..2275fdc47 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts @@ -42,11 +42,12 @@ export class DossierListingScreenComponent readonly itemSize = 95; protected readonly _primaryKey = 'dossierName'; readonly tableHeaderLabel = _('dossier-listing.table-header.title'); + readonly currentUser = this._userService.currentUser; readonly buttonConfigs: ButtonConfig[] = [ { label: _('dossier-listing.add-new'), action: () => this.openAddDossierDialog(), - hide: !this.permissionsService.isManager(), + hide: !this.currentUser.isManager, icon: 'red:plus', type: 'primary' } @@ -76,15 +77,15 @@ export class DossierListingScreenComponent private readonly _needsWorkTemplate: TemplateRef; constructor( - private readonly _translateChartService: TranslateChartService, - private readonly _userService: UserService, - private readonly _dialogService: DossiersDialogService, - private readonly _translateService: TranslateService, private readonly _router: Router, - private readonly _appStateService: AppStateService, - private readonly _userPreferenceService: UserPreferenceService, + protected readonly _injector: Injector, + private readonly _userService: UserService, readonly changeDetectorRef: ChangeDetectorRef, - protected readonly _injector: Injector + private readonly _appStateService: AppStateService, + private readonly _translateService: TranslateService, + private readonly _dialogService: DossiersDialogService, + private readonly _translateChartService: TranslateChartService, + private readonly _userPreferenceService: UserPreferenceService ) { super(_injector); this._appStateService.reset(); 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 7d799cea7..072123811 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 @@ -45,6 +45,7 @@ export class DossierOverviewScreenComponent readonly itemSize = 80; protected readonly _primaryKey = 'filename'; readonly tableHeaderLabel = _('dossier-overview.table-header.title'); + readonly currentUser = this._userService.currentUser; private readonly _lastOpenedFileKey = 'Dossier-Recent-' + this.activeDossier.dossierId; readonly actionConfigs: ActionConfig[] = [ @@ -52,7 +53,7 @@ export class DossierOverviewScreenComponent label: this._translateService.instant('dossier-overview.header-actions.edit'), action: $event => this.openEditDossierDialog($event), icon: 'red:edit', - hide: !this.permissionsService.isManager() + hide: !this.currentUser.isManager } ]; readonly tableColumnConfigs: TableColumnConfig[] = [ @@ -98,21 +99,21 @@ export class DossierOverviewScreenComponent @ViewChild('fileInput') private _fileInput: ElementRef; constructor( - private readonly _userService: UserService, + private readonly _router: Router, private readonly _toaster: Toaster, + protected readonly _injector: Injector, + private readonly _userService: UserService, + private readonly _loadingService: LoadingService, + private readonly _appStateService: AppStateService, + private readonly _appConfigService: AppConfigService, + private readonly _translateService: TranslateService, private readonly _dialogService: DossiersDialogService, + private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _fileUploadService: FileUploadService, private readonly _statusOverlayService: StatusOverlayService, - private readonly _router: Router, - private readonly _translateService: TranslateService, - private readonly _fileDropOverlayService: FileDropOverlayService, - private readonly _appStateService: AppStateService, private readonly _userPreferenceService: UserPreferenceService, - private readonly _appConfigService: AppConfigService, - private readonly _changeDetectorRef: ChangeDetectorRef, - private readonly _loadingService: LoadingService, - private readonly _dossierAttributesService: DossierAttributesService, - protected readonly _injector: Injector + private readonly _fileDropOverlayService: FileDropOverlayService, + private readonly _dossierAttributesService: DossierAttributesService ) { super(_injector); this._loadEntitiesFromState(); @@ -122,10 +123,6 @@ export class DossierOverviewScreenComponent return this._appStateService.activeDossier; } - get userId() { - return this._userService.currentUser.id; - } - get checkedRequiredFilters() { return this.filterService.getFilterGroup('quickFilters')?.filters.filter(f => f.required && f.checked); } @@ -384,7 +381,7 @@ export class DossierOverviewScreenComponent { key: 'assigned-to-me', label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-me'), - checker: (file: FileStatusWrapper) => file.currentReviewer === this.userId + checker: (file: FileStatusWrapper) => file.currentReviewer === this.currentUser.id }, { key: 'unassigned', @@ -394,7 +391,7 @@ export class DossierOverviewScreenComponent { key: 'assigned-to-others', label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-others'), - checker: (file: FileStatusWrapper) => !!file.currentReviewer && file.currentReviewer !== this.userId + checker: (file: FileStatusWrapper) => !!file.currentReviewer && file.currentReviewer !== this.currentUser.id } ]; } 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 0d47530d6..205781407 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.ts b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.ts index ac4f71fe1..5f963f39d 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.ts @@ -1,5 +1,4 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { UserWrapper } from '@services/user.service'; @Component({ selector: 'redaction-user-button', @@ -8,6 +7,6 @@ import { UserWrapper } from '@services/user.service'; changeDetection: ChangeDetectionStrategy.OnPush }) export class UserButtonComponent { - @Input() user: UserWrapper; + @Input() userId: string; @Input() showDot = false; } diff --git a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts index 1104ee260..0db332be9 100644 --- a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts @@ -38,7 +38,7 @@ export class InitialsAvatarComponent extends AutoUnsubscribeComponent implements } get disabled(): boolean { - return !this._userService.isActive(this.user); + return !this.user?.isActive; } private get _colorClass() { 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 4abf26af6..421761d8e 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 @@ -8,8 +8,8 @@ import { FileStatusWrapper } from '@models/file/file-status.wrapper'; import { mergeMap, tap } from 'rxjs/operators'; import { DownloadStatusWrapper } from '../model/download-status.wrapper'; import { AppStateService } from '@state/app-state.service'; -import { PermissionsService } from '@services/permissions.service'; import { KeycloakService } from 'keycloak-angular'; +import { UserService } from '@services/user.service'; @Injectable() export class FileDownloadService { @@ -18,17 +18,17 @@ export class FileDownloadService { hasPendingDownloads; constructor( + private readonly _userService: UserService, private readonly _applicationRef: ApplicationRef, + private readonly _keycloakService: KeycloakService, private readonly _appStateService: AppStateService, - private readonly _permissionsService: PermissionsService, - private readonly _downloadControllerService: DownloadControllerService, private readonly _translateService: TranslateService, private readonly _appConfigService: AppConfigService, - private readonly _keycloakService: KeycloakService, + private readonly _downloadControllerService: DownloadControllerService, private readonly _fileManagementControllerService: FileManagementControllerService ) { interval(5000).subscribe(() => { - if (_permissionsService.isUser()) { + if (_userService.currentUser.isUser) { this.getDownloadStatus().subscribe(() => {}); } }); diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 646aa34c4..506c3f81c 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -19,10 +19,6 @@ export class PermissionsService { return this._appStateService.activeDossier; } - isManager(user?: UserWrapper) { - return this._userService.isManager(user); - } - isReviewerOrApprover(fileStatus?: FileStatusWrapper): boolean { return this.isFileReviewer(fileStatus) || this.isApprover(); } @@ -40,7 +36,7 @@ export class PermissionsService { } canToggleAnalysis(fileStatus: FileStatusWrapper): boolean { - return this.isManager() && ['UNASSIGNED', 'UNDER_REVIEW', 'UNDER_APPROVAL'].includes(fileStatus.status); + return this._userService.currentUser.isManager && ['UNASSIGNED', 'UNDER_REVIEW', 'UNDER_APPROVAL'].includes(fileStatus.status); } canReanalyseFile(fileStatus = this._activeFile): boolean { @@ -159,22 +155,14 @@ export class PermissionsService { return user.isAdmin; } - isUserAdmin(user = this._userService.currentUser): boolean { - return user.isUserAdmin; - } - - isUser(user = this._userService.currentUser): boolean { - return user.isUser; - } - canOcrFile(fileStatus = this._activeFile): boolean { return ( !fileStatus.isExcluded && !fileStatus.ocrTime && ['UNASSIGNED', 'UNDER_REVIEW', 'UNDER_APPROVAL'].includes(fileStatus.status) ); } - canManageUsers(user?: UserWrapper): boolean { - return this.isUserAdmin(user); + canManageUsers(user: UserWrapper = this._userService.currentUser): boolean { + return user.isUserAdmin; } canAddComment(fileStatus = this._activeFile): boolean { diff --git a/apps/red-ui/src/app/services/user.service.ts b/apps/red-ui/src/app/services/user.service.ts index 1939cd5dc..8ab66e8c5 100644 --- a/apps/red-ui/src/app/services/user.service.ts +++ b/apps/red-ui/src/app/services/user.service.ts @@ -25,6 +25,7 @@ export class UserWrapper { name = this.firstName && this.lastName ? `${this.firstName} ${this.lastName}` : this.username; searchKey = this.name + this.username + this.email; + isActive = this.roles.length > 0; isManager = this.roles.indexOf('RED_MANAGER') >= 0; isUserAdmin = this.roles.indexOf('RED_USER_ADMIN') >= 0; isUser = this.roles.indexOf('RED_USER') >= 0; @@ -48,10 +49,6 @@ export class UserService { private _allRedUsers: UserWrapper[]; - get allRedUsers(): UserWrapper[] { - return this._allRedUsers; - } - get managerUsers(): UserWrapper[] { return this._allRedUsers.filter(user => user.isManager); } @@ -120,22 +117,6 @@ export class UserService { return user.roles.indexOf('RED_MANAGER') >= 0; } - isUser(user: UserWrapper = this._currentUser): boolean { - return user.roles?.indexOf('RED_USER') >= 0; - } - - isUserAdmin(user: UserWrapper = this._currentUser): boolean { - return user.roles?.indexOf('RED_USER_ADMIN') >= 0; - } - - isAdmin(user: UserWrapper = this._currentUser): boolean { - return user.roles?.indexOf('RED_ADMIN') >= 0; - } - - isActive(user: UserWrapper = this._currentUser): boolean { - return user.roles?.length > 0; - } - hasAnyRole(requiredRoles: string[], user: UserWrapper = this._currentUser) { if (requiredRoles?.length > 0) { for (const role of requiredRoles) if (user.roles.indexOf(role) >= 0) return true; 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 75bfccedf..39c225494 100644 --- a/apps/red-ui/src/app/state/app-state.guard.ts +++ b/apps/red-ui/src/app/state/app-state.guard.ts @@ -24,7 +24,7 @@ export class AppStateGuard implements CanActivate { await this._appStateService.loadDictionaryDataIfNecessary(); } - if (this._userService.isUser()) { + if (this._userService.currentUser.isUser) { await this._appStateService.loadAllDossiersIfNecessary(); }