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 070deabe8..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.user; - } - - 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/components/downloads-list-screen/downloads-list-screen.component.html b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html index cc8b6956e..8007a30fd 100644 --- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html +++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html @@ -7,12 +7,12 @@ [bulkActions]="bulkActions" [hasEmptyColumn]="true" [selectionEnabled]="true" - [tableColConfigs]="tableColConfigs" + [tableColumnConfigs]="tableColConfigs" [tableHeaderLabel]="tableHeaderLabel" > @@ -74,7 +74,7 @@ implements OnInit { readonly circleButtonTypes = CircleButtonTypes; readonly itemSize = 80; - readonly tableColConfigs: TableColConfig[] = [ + protected readonly _primaryKey = 'storageId'; + readonly tableHeaderLabel = _('downloads-list.table-header.title'); + readonly tableColConfigs: TableColumnConfig[] = [ { label: _('downloads-list.table-col-names.name') }, { label: _('downloads-list.table-col-names.size') }, { label: _('downloads-list.table-col-names.date') }, { label: _('downloads-list.table-col-names.status') } ]; - protected readonly _primaryKey = 'storageId'; - protected readonly _tableHeaderLabel = _('downloads-list.table-header.title'); constructor( readonly fileDownloadService: FileDownloadService, @@ -46,13 +41,13 @@ export class DownloadsListScreenComponent extends BaseListingComponent d.storageId); + const storageIds = (downloads || this.entitiesService.selected).map(d => d.storageId); await this._downloadControllerService.deleteDownload({ storageIds }).toPromise(); await this._loadData(); } private async _loadData() { await this.fileDownloadService.getDownloadStatus().toPromise(); - this.screenStateService.setEntities(this.fileDownloadService.downloads); + this.entitiesService.setEntities(this.fileDownloadService.downloads); } } diff --git a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts index 6816cf6c2..e1dcc7b0e 100644 --- a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts @@ -98,12 +98,12 @@ export class UserProfileScreenComponent implements OnInit { private _initializeForm(): void { try { this._profileModel = { - email: this._userService.user.email, - firstName: this._userService.user.firstName, - lastName: this._userService.user.lastName, + email: this._userService.currentUser.email, + firstName: this._userService.currentUser.firstName, + lastName: this._userService.currentUser.lastName, language: this._languageService.currentLanguage }; - if (this._userService.user.email) { + if (this._userService.currentUser.email) { // disable email if it's already set this.formGroup.get('email').disable(); } 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 @@
, @Inject(MAT_DIALOG_DATA) public user: User) {} + constructor(readonly dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly user: UserWrapper) {} toggleResetPassword() { this.resettingPassword = !this.resettingPassword; 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 d65dbbe76..71e219ca7 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 @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { User, UserControllerService } from '@redaction/red-ui-http'; -import { UserService } from '@services/user.service'; +import { FormBuilder, Validators } from '@angular/forms'; +import { UserControllerService } from '@redaction/red-ui-http'; +import { UserService, UserWrapper } from '@services/user.service'; import { LoadingService } from '@services/loading.service'; @Component({ @@ -10,8 +10,10 @@ import { LoadingService } from '@services/loading.service'; styleUrls: ['./reset-password.component.scss'] }) export class ResetPasswordComponent { - passwordForm: FormGroup; - @Input() user: User; + readonly passwordForm = this._formBuilder.group({ + temporaryPassword: [null, Validators.required] + }); + @Input() user: UserWrapper; @Output() toggleResetPassword = new EventEmitter(); constructor( @@ -19,14 +21,10 @@ export class ResetPasswordComponent { private readonly _userControllerService: UserControllerService, private readonly _userService: UserService, private readonly _loadingService: LoadingService - ) { - this.passwordForm = this._formBuilder.group({ - temporaryPassword: [null, Validators.required] - }); - } + ) {} get userName() { - return this._userService.getNameForId(this.user.userId); + return this._userService.getNameForId(this.user.id); } async save() { @@ -37,7 +35,7 @@ export class ResetPasswordComponent { password: this.passwordForm.get('temporaryPassword').value, temporary: true }, - this.user.userId + this.user.id ) .toPromise(); this._loadingService.stop(); 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 617d32a01..d9a6aa7e1 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,10 +1,11 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { User, UserControllerService } from '@redaction/red-ui-http'; +import { UserControllerService } from '@redaction/red-ui-http'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { LoadingService } from '@services/loading.service'; import { rolesTranslations } from '../../../../../translations/roles-translations'; import { IconButtonTypes } from '@iqser/common-ui'; +import { UserWrapper } from '@services/user.service'; @Component({ selector: 'redaction-user-details', @@ -14,7 +15,7 @@ import { IconButtonTypes } from '@iqser/common-ui'; export class UserDetailsComponent implements OnInit { readonly iconButtonTypes = IconButtonTypes; - @Input() user: User; + @Input() user: UserWrapper; @Output() toggleResetPassword = new EventEmitter(); @Output() closeDialog = new EventEmitter(); userForm: FormGroup; @@ -99,7 +100,7 @@ export class UserDetailsComponent implements OnInit { if (!this.user) { await this._userControllerService.createUser(userData).toPromise(); } else { - await this._userControllerService.updateProfile(userData, this.user.userId).toPromise(); + await this._userControllerService.updateProfile(userData, this.user.id).toPromise(); } this.closeDialog.emit(true); 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 f6ed8044d..3c0ffa4eb 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 @@ -1,9 +1,10 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { User, UserControllerService } from '@redaction/red-ui-http'; +import { UserControllerService } from '@redaction/red-ui-http'; import { AppStateService } from '@state/app-state.service'; import { LoadingService } from '@services/loading.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { UserWrapper } from '@services/user.service'; @Component({ selector: 'redaction-confirm-delete-users-dialog', @@ -11,7 +12,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; styleUrls: ['./confirm-delete-users-dialog.component.scss'] }) export class ConfirmDeleteUsersDialogComponent { - checkboxes = [ + readonly checkboxes = [ { value: false, label: _('confirm-delete-users.impacted-dossiers') }, { value: false, label: _('confirm-delete-users.impacted-documents') } ]; @@ -22,12 +23,12 @@ export class ConfirmDeleteUsersDialogComponent { private readonly _appStateService: AppStateService, private readonly _loadingService: LoadingService, private readonly _userControllerService: UserControllerService, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public users: User[] + readonly dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) readonly users: UserWrapper[] ) { this.dossiersCount = this._appStateService.allDossiers.filter(dw => { for (const user of this.users) { - if (dw.memberIds.indexOf(user.userId) !== -1) { + if (dw.memberIds.indexOf(user.id) !== -1) { return true; } } @@ -42,7 +43,7 @@ export class ConfirmDeleteUsersDialogComponent { async deleteUser() { if (this.valid) { this._loadingService.start(); - await this._userControllerService.deleteUsers(this.users.map(u => u.userId)).toPromise(); + await this._userControllerService.deleteUsers(this.users.map(u => u.id)).toPromise(); this.dialogRef.close(true); } else { this.showToast = true; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html index e036c7165..d2637374c 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html @@ -1,14 +1,14 @@
- {{ 'file-attributes-csv-import.table-header.title' | translate: { length: (screenStateService.allEntitiesLength$ | async) } }} + {{ 'file-attributes-csv-import.table-header.title' | translate: { length: (entitiesService.allLength$ | async) } }} - +
- + - + - + > - + >
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss index 300d530d8..7af2b2f30 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss @@ -1,6 +1,6 @@ @import '../../../../../../assets/styles/variables'; -redaction-table-col-name::ng-deep { +iqser-table-column-name::ng-deep { > div { padding: 0 13px 0 10px !important; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts index f45e4cf77..016cdcc13 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts @@ -1,52 +1,51 @@ import { Component, EventEmitter, Injector, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { Field } from '../file-attributes-csv-import-dialog.component'; import { FileAttributeConfig } from '@redaction/red-ui-http'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { SortingService } from '@services/sorting.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; -import { fileAttributeTypesTranslations } from '../../../translations/file-attribute-types-translations'; import { CircleButtonTypes } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; +import { fileAttributeTypesTranslations } from '../../../translations/file-attribute-types-translations'; @Component({ selector: 'redaction-active-fields-listing', templateUrl: './active-fields-listing.component.html', styleUrls: ['./active-fields-listing.component.scss'], - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class ActiveFieldsListingComponent extends BaseListingComponent implements OnChanges { + protected readonly _primaryKey = 'csvColumn'; readonly circleButtonTypes = CircleButtonTypes; readonly translations = fileAttributeTypesTranslations; + readonly typeOptions = [ + FileAttributeConfig.TypeEnum.TEXT, + FileAttributeConfig.TypeEnum.NUMBER, + FileAttributeConfig.TypeEnum.DATE + ] as const; @Input() entities: Field[]; @Output() entitiesChange = new EventEmitter(); @Output() setHoveredColumn = new EventEmitter(); @Output() toggleFieldActive = new EventEmitter(); - readonly typeOptions = [FileAttributeConfig.TypeEnum.TEXT, FileAttributeConfig.TypeEnum.NUMBER, FileAttributeConfig.TypeEnum.DATE]; - protected readonly _primaryKey = 'csvColumn'; - constructor(protected readonly _injector: Injector) { super(_injector); } ngOnChanges(changes: SimpleChanges): void { if (changes.entities) { - this.screenStateService.setEntities(this.entities); - this.screenStateService.updateSelection(); + this.entitiesService.setEntities(this.entities); + this.entitiesService.updateSelection(); } } deactivateSelection() { this.allEntities.filter(field => this.isSelected(field)).forEach(field => (field.primaryAttribute = false)); - this.screenStateService.setEntities(this.allEntities.filter(field => !this.isSelected(field))); + this.entitiesService.setEntities(this.allEntities.filter(field => !this.isSelected(field))); this.entitiesChange.emit(this.allEntities); - this.screenStateService.setSelectedEntities([]); + this.entitiesService.setSelected([]); } setAttributeForSelection(attribute: string, value: any) { - for (const item of this.screenStateService.selectedEntities) { + for (const item of this.entitiesService.selected) { this.allEntities.find(f => f.csvColumn === item.csvColumn)[attribute] = value; } } 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 ae2aa660f..8ccc251f2 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 @@ -8,11 +8,7 @@ import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { Toaster } from '@services/toaster.service'; import { TranslateService } from '@ngx-translate/core'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { SortingService } from '@services/sorting.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; export interface Field { @@ -29,7 +25,7 @@ export interface Field { @Component({ templateUrl: './file-attributes-csv-import-dialog.component.html', styleUrls: ['./file-attributes-csv-import-dialog.component.scss'], - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class FileAttributesCsvImportDialogComponent extends BaseListingComponent { protected readonly _primaryKey = 'csvColumn'; @@ -97,7 +93,7 @@ export class FileAttributesCsvImportDialogComponent extends BaseListingComponent this.parseResult.meta.fields = Object.keys(this.parseResult.data[0]); } - this.screenStateService.setEntities(this.parseResult.meta.fields.map(field => this._buildAttribute(field))); + this.entitiesService.setEntities(this.parseResult.meta.fields.map(field => this._buildAttribute(field))); this.activeFields = []; for (const entity of this.allEntities) { 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 6c54118ab..06e99ce26 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 @@ -19,7 +19,7 @@ export class SmtpAuthDialogComponent { @Inject(MAT_DIALOG_DATA) public data: SMTPConfigurationModel ) { this.authForm = this._formBuilder.group({ - user: [data?.user || this._userService.user.email, [Validators.required]], + user: [data?.user || this._userService.currentUser.email, [Validators.required]], password: [data?.password, Validators.required] }); } 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 c72caa634..452ba50bf 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 @@ -9,7 +9,7 @@
- - + - + - + + >
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 1ef28c086..f0c2f60e4 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 @@ -1,5 +1,4 @@ import { Component, OnDestroy } from '@angular/core'; -import { PermissionsService } from '@services/permissions.service'; import { FormBuilder, FormGroup } from '@angular/forms'; import { AuditControllerService, AuditResponse, AuditSearchRequest } from '@redaction/red-ui-http'; import { Moment } from 'moment'; @@ -8,6 +7,7 @@ import { LoadingService } from '@services/loading.service'; import { AutoUnsubscribeComponent } from '@iqser/common-ui'; import { auditCategoriesTranslations } from '../../translations/audit-categories-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { UserService } from '@services/user.service'; const PAGE_SIZE = 50; @@ -19,7 +19,8 @@ const PAGE_SIZE = 50; export class AuditScreenComponent extends AutoUnsubscribeComponent implements OnDestroy { readonly ALL_CATEGORIES = 'allCategories'; readonly ALL_USERS = _('audit-screen.all-users'); - translations = auditCategoriesTranslations; + readonly translations = auditCategoriesTranslations; + readonly currentUser = this._userService.currentUser; filterForm: FormGroup; categories: string[] = []; @@ -30,10 +31,10 @@ export class AuditScreenComponent extends AutoUnsubscribeComponent implements On private _previousTo: Moment; constructor( - readonly permissionsService: PermissionsService, + private readonly _userService: UserService, private readonly _formBuilder: FormBuilder, - private readonly _auditControllerService: AuditControllerService, - private readonly _loadingService: LoadingService + private readonly _loadingService: LoadingService, + private readonly _auditControllerService: AuditControllerService ) { super(); this.filterForm = this._formBuilder.group({ 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 13f4e0f18..7751a4b12 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 @@ -22,21 +22,21 @@
- {{ 'default-colors-screen.table-header.title' | translate: { length: screenStateService.allEntitiesLength$ | async } }} + {{ 'default-colors-screen.table-header.title' | translate: { length: entitiesService.allLength$ | async } }}
- + > - + >
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 c6dc1bd5f..31735d502 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 @@ -5,20 +5,16 @@ import { ActivatedRoute } from '@angular/router'; import { PermissionsService } from '@services/permissions.service'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { LoadingService } from '@services/loading.service'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; -import { DefaultColorType } from '@models/default-color-key.model'; -import { SortingService } from '@services/sorting.service'; -import { defaultColorsTranslations } from '../../translations/default-colors-translations'; import { CircleButtonTypes } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; +import { DefaultColorType } from '@models/default-color-key.model'; +import { defaultColorsTranslations } from '../../translations/default-colors-translations'; @Component({ templateUrl: './default-colors-screen.component.html', styleUrls: ['./default-colors-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class DefaultColorsScreenComponent extends BaseListingComponent<{ @@ -70,7 +66,7 @@ export class DefaultColorsScreenComponent key, value: data[key] })); - this.screenStateService.setEntities(entities); + this.entitiesService.setEntities(entities); this._loadingService.stop(); } } 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 972b7fc2b..486f7251f 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 @@ -23,12 +23,12 @@
- {{ 'dictionary-listing.table-header.title' | translate: { length: (screenStateService.displayedLength$ | async) } }} + {{ 'dictionary-listing.table-header.title' | translate: { length: (entitiesService.displayedLength$ | async) } }}
-
+
- + > - + > - + >
div { padding-left: 10px !important; } 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 6d7059a0e..8085ba4fe 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 @@ -9,13 +9,9 @@ import { ActivatedRoute } from '@angular/router'; import { TypeValueWrapper } from '@models/file/type-value.wrapper'; import { TranslateService } from '@ngx-translate/core'; import { LoadingService } from '@services/loading.service'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { SortingService } from '@services/sorting.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; -import { AdminDialogService } from '../../services/admin-dialog.service'; import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; +import { AdminDialogService } from '../../services/admin-dialog.service'; const toChartConfig = (dict: TypeValueWrapper): DoughnutChartConfig => ({ value: dict.entries?.length ?? 0, @@ -27,7 +23,7 @@ const toChartConfig = (dict: TypeValueWrapper): DoughnutChartConfig => ({ @Component({ templateUrl: './dictionary-listing-screen.component.html', styleUrls: ['./dictionary-listing-screen.component.scss'], - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class DictionaryListingScreenComponent extends BaseListingComponent implements OnInit { readonly iconButtonTypes = IconButtonTypes; @@ -56,7 +52,7 @@ export class DictionaryListingScreenComponent extends BaseListingComponent { this._loadingService.start(); await this._dictionaryControllerService @@ -65,7 +61,7 @@ export class DictionaryListingScreenComponent extends BaseListingComponent !d.virtual); if (!loadEntries) - this.screenStateService.setEntities( + this.entitiesService.setEntities( entities.map(dict => { dict.entries = this.allEntities.find(d => d.type === dict.type)?.entries || []; return dict; }) ); - else this.screenStateService.setEntities(entities); + else this.entitiesService.setEntities(entities); if (!loadEntries) return; diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html index 1d9216985..25309661d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html @@ -4,10 +4,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-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 cfad15a4d..c12b709fb 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 @@ -20,23 +20,22 @@
-
+
{{ - 'dossier-attributes-listing.table-header.title' - | translate: { length: (screenStateService.displayedLength$ | async) } + 'dossier-attributes-listing.table-header.title' | translate: { length: (entitiesService.displayedLength$ | async) } }}
-
+
- + > - + > - + >
@@ -84,7 +83,7 @@ div { padding-left: 10px !important; } 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 84b0a775b..d78abd454 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 @@ -1,23 +1,19 @@ import { Component, Injector, OnInit } from '@angular/core'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; import { DossierAttributeConfig } from '@redaction/red-ui-http'; import { AppStateService } from '@state/app-state.service'; import { ActivatedRoute } from '@angular/router'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { LoadingService } from '@services/loading.service'; -import { SortingService } from '@services/sorting.service'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; +import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations'; -import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui'; @Component({ templateUrl: './dossier-attributes-listing-screen.component.html', styleUrls: ['./dossier-attributes-listing-screen.component.scss'], - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class DossierAttributesListingScreenComponent extends BaseListingComponent implements OnInit { readonly iconButtonTypes = IconButtonTypes; @@ -45,7 +41,7 @@ export class DossierAttributesListingScreenComponent extends BaseListingComponen openConfirmDeleteAttributeDialog($event: MouseEvent, dossierAttribute?: DossierAttributeConfig) { this._dialogService.openDialog('confirm', $event, null, async () => { this._loadingService.start(); - const ids = dossierAttribute ? [dossierAttribute.id] : this.screenStateService.selectedEntities.map(item => item.id); + const ids = dossierAttribute ? [dossierAttribute.id] : this.entitiesService.selected.map(item => item.id); await this._dossierAttributesService.deleteConfigs(ids); await this._loadData(); }); @@ -65,7 +61,7 @@ export class DossierAttributesListingScreenComponent extends BaseListingComponen private async _loadData() { this._loadingService.start(); const attributes = await this._dossierAttributesService.getConfig(); - this.screenStateService.setEntities(attributes); + this.entitiesService.setEntities(attributes); this._loadingService.stop(); } } 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 ed7af38bd..bf3379f53 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,30 +4,27 @@
- +
{{ 'dossier-templates-listing.table-header.title' - | translate: { length: (screenStateService.displayedLength$ | async) } + | translate: { length: (entitiesService.displayedLength$ | async) } }}
-
+
- - + - + - + + >
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-template-listing/dossier-templates-listing-screen.component.scss index 6fd6360f8..5d6ba5f25 100644 --- 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-template-listing/dossier-templates-listing-screen.component.scss @@ -5,7 +5,7 @@ padding: 0 24px 0 10px; } -redaction-table-col-name::ng-deep { +iqser-table-column-name::ng-deep { > div { padding-left: 10px !important; } 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-template-listing/dossier-templates-listing-screen.component.ts index 81159eb85..430ceddf0 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-template-listing/dossier-templates-listing-screen.component.ts @@ -1,37 +1,34 @@ import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; -import { PermissionsService } from '@services/permissions.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { DossierTemplateModelWrapper } from '@models/file/dossier-template-model.wrapper'; import { LoadingService } from '@services/loading.service'; import { DossierTemplateControllerService } from '@redaction/red-ui-http'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; -import { SortingService } from '@services/sorting.service'; import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; +import { UserService } from '@services/user.service'; @Component({ templateUrl: './dossier-templates-listing-screen.component.html', styleUrls: ['./dossier-templates-listing-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class DossierTemplatesListingScreenComponent extends BaseListingComponent 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); } @@ -44,9 +41,9 @@ export class DossierTemplatesListingScreenComponent extends BaseListingComponent return this._dialogService.openDialog('confirm', $event, null, async () => { this._loadingService.start(); await this._dossierTemplateControllerService - .deleteDossierTemplates(this.screenStateService.selectedEntities.map(d => d.dossierTemplateId)) + .deleteDossierTemplates(this.entitiesService.selected.map(d => d.dossierTemplateId)) .toPromise(); - this.screenStateService.setSelectedEntities([]); + this.entitiesService.setSelected([]); await this._appStateService.loadAllDossierTemplates(); await this._appStateService.loadDictionaryData(); this.loadDossierTemplatesData(); @@ -56,7 +53,7 @@ export class DossierTemplatesListingScreenComponent extends BaseListingComponent loadDossierTemplatesData() { this._loadingService.start(); this._appStateService.reset(); - this.screenStateService.setEntities(this._appStateService.dossierTemplates); + this.entitiesService.setEntities(this._appStateService.dossierTemplates); this._loadDossierTemplateStats(); this._loadingService.stop(); } @@ -70,7 +67,7 @@ export class DossierTemplatesListingScreenComponent extends BaseListingComponent } private _loadDossierTemplateStats() { - this.screenStateService.allEntities.forEach(rs => { + this.entitiesService.all.forEach(rs => { const dictionaries = this._appStateService.dictionaryData[rs.dossierTemplateId]; if (dictionaries) { rs.dictionariesCount = Object.keys(dictionaries) 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 69db731d0..40423855e 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 @@ -23,14 +23,12 @@
- {{ - 'file-attributes-listing.table-header.title' | translate: { length: (screenStateService.displayedLength$ | async) } - }} + {{ 'file-attributes-listing.table-header.title' | translate: { length: (entitiesService.displayedLength$ | async) } }}
-
+
- + > - + > - + > - + > - + >
@@ -107,7 +105,7 @@
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss index b4d8ef8d5..89eddfa02 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss @@ -9,7 +9,7 @@ padding: 0 24px 0 10px; } -redaction-table-col-name::ng-deep { +iqser-table-column-name::ng-deep { > div { padding-left: 10px !important; } 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 94ccfe2dd..a0ba6da26 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 @@ -5,19 +5,15 @@ import { AppStateService } from '@state/app-state.service'; import { ActivatedRoute } from '@angular/router'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { LoadingService } from '@services/loading.service'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { SortingService } from '@services/sorting.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; -import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; +import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; @Component({ templateUrl: './file-attributes-listing-screen.component.html', styleUrls: ['./file-attributes-listing-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class FileAttributesListingScreenComponent extends BaseListingComponent implements OnInit, OnDestroy { readonly iconButtonTypes = IconButtonTypes; @@ -69,7 +65,7 @@ export class FileAttributesListingScreenComponent extends BaseListingComponent f.id), + this.entitiesService.selected.map(f => f.id), this._appStateService.activeDossierTemplateId ) .toPromise(); @@ -102,7 +98,7 @@ export class FileAttributesListingScreenComponent extends BaseListingComponent
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/trash/trash-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html index 4d1ada6e4..ae24d7d02 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html @@ -8,17 +8,17 @@
- {{ 'trash.table-header.title' | translate: { length: (screenStateService.displayedLength$ | async) } }} + {{ 'trash.table-header.title' | translate: { length: (entitiesService.displayedLength$ | async) } }}
-
+
- - - + + - + + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss index f2e81812c..41c1395e0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss @@ -9,7 +9,7 @@ } } -redaction-table-col-name::ng-deep { +iqser-table-column-name::ng-deep { > div { padding-left: 10px !important; } diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts index 0231d0d66..e26cf9d5d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts @@ -4,15 +4,11 @@ import { Dossier } from '@redaction/red-ui-http'; import { LoadingService } from '@services/loading.service'; import { AppConfigKey, AppConfigService } from '@app-config/app-config.service'; import * as moment from 'moment'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { SortingService } from '@services/sorting.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; -import { DossiersService } from '../../../dossier/services/dossiers.service'; import { CircleButtonTypes } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; +import { DossiersService } from '../../../dossier/services/dossiers.service'; import { AdminDialogService } from '../../services/admin-dialog.service'; -import { ConfirmationDialogInput, TitleColors } from '../../../shared/dialogs/confirmation-dialog/confirmation-dialog.component'; +import { ConfirmationDialogInput, TitleColors } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; const HOURS_IN_A_DAY = 24; @@ -22,12 +18,12 @@ const MINUTES_IN_AN_HOUR = 60; templateUrl: './trash-screen.component.html', styleUrls: ['./trash-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - providers: [FilterService, SearchService, ScreenStateService, SortingService, DossiersService] + providers: [...DefaultListingServices, DossiersService] }) export class TrashScreenComponent extends BaseListingComponent implements OnInit { - readonly circleButtonTypes = CircleButtonTypes; readonly itemSize = 80; protected readonly _primaryKey = 'dossierName'; + readonly circleButtonTypes = CircleButtonTypes; private readonly _deleteRetentionHours = this._appConfigService.getConfig(AppConfigKey.DELETE_RETENTION_HOURS); constructor( @@ -50,7 +46,7 @@ export class TrashScreenComponent extends BaseListingComponent implemen } async loadDossierTemplatesData(): Promise { - this.screenStateService.setEntities(await this._dossiersService.getDeleted()); + this.entitiesService.setEntities(await this._dossiersService.getDeleted()); } canRestore(softDeletedTime: string): boolean { @@ -70,11 +66,11 @@ export class TrashScreenComponent extends BaseListingComponent implemen return moment(softDeletedTime).add(this._deleteRetentionHours, 'hours').toISOString(); } - bulkDelete(dossiers = this.screenStateService.selectedEntities) { + bulkDelete(dossiers = this.entitiesService.selected) { this._loadingService.loadWhile(this._hardDelete(dossiers)); } - bulkRestore(dossierIds = this.screenStateService.selectedEntities.map(d => d.dossierId)) { + bulkRestore(dossierIds = this.entitiesService.selected.map(d => d.dossierId)) { this._loadingService.loadWhile(this._restore(dossierIds)); } @@ -107,8 +103,8 @@ export class TrashScreenComponent extends BaseListingComponent implemen } private _removeFromList(ids: string[]): void { - const entities = this.screenStateService.allEntities.filter(e => !ids.includes(e.dossierId)); - this.screenStateService.setEntities(entities); - this.screenStateService.setSelectedEntities([]); + const entities = this.entitiesService.all.filter(e => !ids.includes(e.dossierId)); + this.entitiesService.setEntities(entities); + this.entitiesService.setSelected([]); } } 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 b486f7966..38cab06b3 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 @@ > - {{ 'user-listing.table-header.title' | translate: { length: (screenStateService.displayedLength$ | async) } }} + {{ 'user-listing.table-header.title' | translate: { length: (entitiesService.displayedLength$ | async) } }}
- + - + - + > - +
@@ -87,17 +87,13 @@
- +
{{ user.email || '-' }}
@@ -112,7 +108,7 @@ > div { padding: 0 13px 0 10px !important; } 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 366af994d..248a9afe3 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,55 +1,51 @@ import { Component, Injector, OnInit, QueryList, ViewChildren } from '@angular/core'; -import { PermissionsService } from '@services/permissions.service'; -import { UserService } from '@services/user.service'; -import { User, UserControllerService } from '@redaction/red-ui-http'; +import { UserService, UserWrapper } from '@services/user.service'; +import { UserControllerService } from '@redaction/red-ui-http'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { TranslateService } from '@ngx-translate/core'; import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { TranslateChartService } from '@services/translate-chart.service'; import { LoadingService } from '@services/loading.service'; import { InitialsAvatarComponent } from '@shared/components/initials-avatar/initials-avatar.component'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { SortingService } from '@services/sorting.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; +import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { rolesTranslations } from '../../../../translations/roles-translations'; -import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui'; @Component({ templateUrl: './user-listing-screen.component.html', styleUrls: ['./user-listing-screen.component.scss'], - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) -export class UserListingScreenComponent extends BaseListingComponent implements OnInit { +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 = 'userId'; @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.user) === -1)); + const entities$ = this.entitiesService.selected$; + return entities$.pipe(map(all => all.indexOf(this.currentUser) === -1)); } async ngOnInit() { @@ -57,19 +53,19 @@ export class UserListingScreenComponent extends BaseListingComponent imple this.searchService.setSearchKey('searchKey'); } - openAddEditUserDialog($event: MouseEvent, user?: User) { + openAddEditUserDialog($event: MouseEvent, user?: UserWrapper) { this._dialogService.openDialog('addEditUser', $event, user, async () => { await this._loadData(); }); } - openDeleteUsersDialog(users: User[], $event?: MouseEvent) { + openDeleteUsersDialog(users: UserWrapper[], $event?: MouseEvent) { this._dialogService.openDialog('deleteUsers', $event, users, async () => { await this._loadData(); }); } - getDisplayRoles(user: User) { + getDisplayRoles(user: UserWrapper) { const separator = ', '; return ( user.roles.map(role => this._translateService.instant(this.translations[role])).join(separator) || @@ -77,20 +73,20 @@ export class UserListingScreenComponent extends BaseListingComponent imple ); } - async toggleActive(user: User) { + async toggleActive(user: UserWrapper) { this._loadingService.start(); - user.roles = this.userService.isActive(user) ? [] : ['RED_USER']; - await this._userControllerService.updateProfile(user, user.userId).toPromise(); + user.roles = user.isActive ? [] : ['RED_USER']; + await this._userControllerService.updateProfile(user, user.id).toPromise(); await this._loadData(); - this._avatars.find(item => item.userId === user.userId).detectChanges(); + this._avatars.find(item => item.userId === user.id).detectChanges(); } bulkDelete() { - this.openDeleteUsersDialog(this.screenStateService.allEntities.filter(u => this.isSelected(u))); + this.openDeleteUsersDialog(this.entitiesService.all.filter(u => this.isSelected(u))); } private async _loadData() { - this.screenStateService.setEntities(await this.userService.loadAllUsers()); + this.entitiesService.setEntities(await this.userService.loadAllUsers()); await this.userService.loadAllUsers(); this._computeStats(); this._loadingService.stop(); @@ -100,7 +96,7 @@ export class UserListingScreenComponent extends BaseListingComponent imple this.chartData = this._translateChartService.translateRoles( [ { - value: this.allEntities.filter(user => !this.userService.isActive(user)).length, + value: this.allEntities.filter(user => !user.isActive).length, color: 'INACTIVE', label: 'INACTIVE' }, @@ -110,22 +106,22 @@ export class UserListingScreenComponent extends BaseListingComponent imple label: 'REGULAR' }, { - value: this.allEntities.filter(user => this.userService.isManager(user) && !this.userService.isAdmin(user)).length, + value: this.allEntities.filter(user => user.isManager && !user.isAdmin).length, color: 'MANAGER', label: 'RED_MANAGER' }, { - value: this.allEntities.filter(user => this.userService.isManager(user) && this.userService.isAdmin(user)).length, + value: this.allEntities.filter(user => user.isManager && user.isAdmin).length, color: 'MANAGER_ADMIN', label: 'MANAGER_ADMIN' }, { - value: this.allEntities.filter(user => this.userService.isUserAdmin(user) && !this.userService.isAdmin(user)).length, + value: this.allEntities.filter(user => user.isUserAdmin && !user.isAdmin).length, color: 'USER_ADMIN', label: 'RED_USER_ADMIN' }, { - value: this.allEntities.filter(user => this.userService.isAdmin(user) && !this.userService.isManager(user)).length, + value: this.allEntities.filter(user => user.isAdmin && !user.isManager).length, color: 'ADMIN', label: 'RED_ADMIN' } 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 fd0af5036..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 @@ -16,7 +16,7 @@ export class RedRoleGuard implements CanActivate { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { return new Observable(obs => { - if (!this._userService.user.hasAnyREDRoles) { + if (!this._userService.currentUser.hasAnyREDRoles) { this._router.navigate(['/auth-error']); this._loadingService.stop(); obs.next(false); @@ -26,8 +26,8 @@ export class RedRoleGuard implements CanActivate { // we have at least 1 RED Role -> if it's not user he must be admin if ( - this._userService.user.isUserAdmin && - !this._userService.user.isAdmin && + this._userService.currentUser.isUserAdmin && + !this._userService.currentUser.isAdmin && !(state.url.startsWith('/main/admin/users') || state.url.startsWith('/main/my-profile')) ) { this._router.navigate(['/main/admin/users']); @@ -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/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.ts index 03ae851bc..42859ed31 100644 --- a/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.ts @@ -5,6 +5,7 @@ import { PermissionsService } from '@services/permissions.service'; import { AnnotationPermissions } from '@models/file/annotation.permissions'; import { AnnotationActionsService } from '../../services/annotation-actions.service'; import { WebViewerInstance } from '@pdftron/webviewer'; +import { UserService } from '@services/user.service'; export const AnnotationButtonTypes = { dark: 'dark', @@ -28,9 +29,10 @@ export class AnnotationActionsComponent implements OnInit { annotationPermissions: AnnotationPermissions; constructor( - public appStateService: AppStateService, - public annotationActionsService: AnnotationActionsService, - private _permissionsService: PermissionsService + readonly appStateService: AppStateService, + readonly annotationActionsService: AnnotationActionsService, + private readonly _permissionsService: PermissionsService, + private readonly _userService: UserService ) {} private _annotations: AnnotationWrapper[]; @@ -89,7 +91,7 @@ export class AnnotationActionsComponent implements OnInit { private _setPermissions() { this.annotationPermissions = AnnotationPermissions.forUser( this._permissionsService.isApprover(), - this._permissionsService.currentUser, + this._userService.currentUser, this.annotations ); } diff --git a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts index 257df818d..95c6f8616 100644 --- a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts @@ -8,10 +8,9 @@ import { from, Observable } from 'rxjs'; import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { LoadingService } from '@services/loading.service'; import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component'; -import { ScreenStateService } from '@shared/services/screen-state.service'; +import { CircleButtonTypes, EntitiesService } from '@iqser/common-ui'; import { TranslateService } from '@ngx-translate/core'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { CircleButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-dossier-overview-bulk-actions', @@ -33,7 +32,7 @@ export class DossierOverviewBulkActionsComponent { private readonly _fileActionService: FileActionService, private readonly _loadingService: LoadingService, private readonly _translateService: TranslateService, - private readonly _screenStateService: ScreenStateService + private readonly _entitiesService: EntitiesService ) {} get dossier() { @@ -41,7 +40,7 @@ export class DossierOverviewBulkActionsComponent { } get selectedFiles(): FileStatusWrapper[] { - return this._screenStateService.selectedEntities; + return this._entitiesService.selected; } get areAllFilesSelected() { @@ -146,7 +145,7 @@ export class DossierOverviewBulkActionsComponent { .toPromise(); await this._appStateService.reloadActiveDossierFiles(); this.reload.emit(); - this._screenStateService.setSelectedEntities([]); + this._entitiesService.setSelected([]); this._loadingService.stop(); } ); diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts index 0e0443763..006223e29 100644 --- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts @@ -39,7 +39,7 @@ export class CommentsComponent { this.annotation.comments.push({ text: value, id: commentResponse.commentId, - user: this._userService.userId + user: this._userService.currentUser.id }); }); this.commentForm.reset(); 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 4fa628321..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 @@ -15,11 +15,11 @@
- + -
+
(); - 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/scroll-button/scroll-button.component.html b/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.html index 8c69dd7d9..d303ac067 100644 --- a/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.html @@ -1,7 +1,7 @@ - - diff --git a/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.ts b/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.ts index 6c253406f..335bbfa26 100644 --- a/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.ts @@ -1,5 +1,7 @@ -import { Component, HostListener, Input } from '@angular/core'; +import { Component, HostListener, Input, OnInit } from '@angular/core'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { concatMap, delay, distinctUntilChanged, map, startWith } from 'rxjs/operators'; +import { Observable, of } from 'rxjs'; const ButtonTypes = { top: 'top', @@ -13,28 +15,40 @@ type ButtonType = keyof typeof ButtonTypes; templateUrl: './scroll-button.component.html', styleUrls: ['./scroll-button.component.scss'] }) -export class ScrollButtonComponent { - buttonType = ButtonTypes; +export class ScrollButtonComponent implements OnInit { + readonly buttonType = ButtonTypes; @Input() scrollViewport: CdkVirtualScrollViewport; @Input() itemSize: number; + showScrollUp$: Observable; + showScrollDown$: Observable; + + ngOnInit() { + const scrollSize = () => this.scrollViewport.getDataLength() * this.itemSize; + const scrollIsNeeded = () => this.scrollViewport.getViewportSize() < scrollSize(); + const reachedEnd = (type: ButtonType) => this.scrollViewport.measureScrollOffset(type) === 0; + + const showScrollUp = () => scrollIsNeeded() && !reachedEnd(ButtonTypes.top); + const showScrollDown = () => scrollIsNeeded() && !reachedEnd(ButtonTypes.bottom); + + const scroll$ = this.scrollViewport.elementScrolled().pipe( + startWith(''), + /** Delay first value so that we can wait for items to be rendered in viewport and get correct values */ + concatMap((value, index) => (index === 0 ? of(value).pipe(delay(0)) : of(value))) + ); + this.showScrollUp$ = scroll$.pipe(map(showScrollUp), distinctUntilChanged()); + this.showScrollDown$ = scroll$.pipe(map(showScrollDown), distinctUntilChanged()); + } + scroll(type: ButtonType): void { const viewportSize = (this.scrollViewport?.getViewportSize() - this.itemSize) * (type === ButtonTypes.top ? -1 : 1); const scrollOffset = this.scrollViewport?.measureScrollOffset('top'); this.scrollViewport?.scrollToOffset(scrollOffset + viewportSize, 'smooth'); } - showScroll(type: ButtonType): boolean { - const reachedEnd = this.scrollViewport?.measureScrollOffset(type) === 0; - const scrollSize = this.scrollViewport?.getDataLength() * this.itemSize; - const scrollIsNeeded = this.scrollViewport?.getViewportSize() < scrollSize; - - return scrollIsNeeded && !reachedEnd; - } - @HostListener('document:keyup', ['$event']) spaceAndPageDownScroll(event: KeyboardEvent): void { if (['Space', 'PageDown'].includes(event.code) && (event.target as any).tagName === 'BODY') { diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts index 8d8663ad7..83cf98276 100644 --- a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts @@ -43,15 +43,15 @@ export class TeamMembersManagerComponent implements OnInit { } get ownersSelectOptions() { - return this.userService.managerUsers.map(m => m.userId); + return this.userService.managerUsers.map(m => m.id); } get membersSelectOptions() { const searchQuery = this.searchForm.get('query').value; return this.userService.eligibleUsers - .filter(user => this.userService.getNameForId(user.userId).toLowerCase().includes(searchQuery.toLowerCase())) - .filter(user => this.selectedOwnerId !== user.userId) - .map(user => user.userId); + .filter(user => this.userService.getNameForId(user.id).toLowerCase().includes(searchQuery.toLowerCase())) + .filter(user => this.selectedOwnerId !== user.id) + .map(user => user.id); } get valid(): boolean { 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 @@
= 0 ? singleUser : this.singleUsersSelectOptions[0]; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/team-members/edit-dossier-team-members.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/team-members/edit-dossier-team-members.component.ts index 99155305e..d67674c9e 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/team-members/edit-dossier-team-members.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/team-members/edit-dossier-team-members.component.ts @@ -1,9 +1,9 @@ import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; -import { AppStateService } from '../../../../../state/app-state.service'; -import { DossierWrapper } from '../../../../../state/model/dossier.wrapper'; +import { AppStateService } from '@state/app-state.service'; +import { DossierWrapper } from '@state/model/dossier.wrapper'; import { EditDossierSectionInterface } from '../edit-dossier-section.interface'; -import { PermissionsService } from '@services/permissions.service'; import { TeamMembersManagerComponent } from '../../../components/team-members-manager/team-members-manager.component'; +import { UserService } from '@services/user.service'; @Component({ selector: 'redaction-edit-dossier-team-members', @@ -11,19 +11,21 @@ import { TeamMembersManagerComponent } from '../../../components/team-members-ma styleUrls: ['./edit-dossier-team-members.component.scss'] }) export class EditDossierTeamMembersComponent implements EditDossierSectionInterface { + readonly currentUser = this._userService.currentUser; + @Input() dossierWrapper: DossierWrapper; @Output() updateDossier = new EventEmitter(); @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/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 2c7039e83..2a9966164 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 @@ -2,9 +2,9 @@ import { Component, Inject } 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 { humanize } from '../../../../utils/functions'; -import { PermissionsService } from '../../../../services/permissions.service'; +import { PermissionsService } from '@services/permissions.service'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { humanize } from '@iqser/common-ui'; export interface RemoveAnnotationsDialogInput { annotationsToRemove: AnnotationWrapper[]; 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 8f4cbdf44..96b57646e 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 @@ -8,20 +8,23 @@
- + - +
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 7d0c6e637..1632d77ee 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 @@ -16,12 +16,8 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy'; import { UserPreferenceService } from '@services/user-preference.service'; import { ButtonConfig } from '@shared/components/page-header/models/button-config.model'; -import { FilterService, NestedFilter } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; -import { SortingService } from '@services/sorting.service'; -import { TableColConfig } from '@shared/components/table-col-name/table-col-name.component'; +import { NestedFilter, TableColumnConfig } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; import { workloadTranslations } from '../../translations/workload-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { fileStatusTranslations } from '../../translations/file-status-translations'; @@ -31,29 +27,34 @@ import { dossierStatusChecker, dossierTemplateChecker } from '@shared/components/filters/popup-filter/utils/filter-utils'; +import { PermissionsService } from '@services/permissions.service'; +import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; const isLeavingScreen = event => event instanceof NavigationStart && event.url !== '/main/dossiers'; @Component({ templateUrl: './dossier-listing-screen.component.html', styleUrls: ['./dossier-listing-screen.component.scss'], - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class DossierListingScreenComponent extends BaseListingComponent implements OnInit, AfterViewInit, OnDestroy, OnAttach, OnDetach { readonly itemSize = 95; - buttonConfigs: ButtonConfig[] = [ + protected readonly _primaryKey = 'dossierName'; + readonly currentUser = this._userService.currentUser; + readonly tableHeaderLabel = _('dossier-listing.table-header.title'); + readonly buttonConfigs: ButtonConfig[] = [ { label: _('dossier-listing.add-new'), action: () => this.openAddDossierDialog(), - hide: !this.permissionsService.isManager(), + hide: !this.currentUser.isManager, icon: 'red:plus', type: 'primary' } ]; - tableColConfigs: TableColConfig[] = [ + readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('dossier-listing.table-col-names.name'), withSort: true, @@ -73,22 +74,23 @@ export class DossierListingScreenComponent ]; dossiersChartData: DoughnutChartConfig[] = []; documentsChartData: DoughnutChartConfig[] = []; - protected readonly _primaryKey = 'dossierName'; - protected _tableHeaderLabel = _('dossier-listing.table-header.title'); private _lastScrollPosition: number; @ViewChild('needsWorkTemplate', { read: TemplateRef, static: true }) private readonly _needsWorkTemplate: TemplateRef; + @ViewChild(CdkVirtualScrollViewport) + private readonly _scrollViewport: CdkVirtualScrollViewport; 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 + readonly permissionsService: PermissionsService, + 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(); @@ -96,15 +98,15 @@ export class DossierListingScreenComponent } private get _userId() { - return this._userService.userId; + return this._userService.currentUser.id; } private get _activeDossiersCount(): number { - return this.screenStateService.allEntities.filter(p => p.dossier.status === Dossier.StatusEnum.ACTIVE).length; + return this.entitiesService.all.filter(p => p.dossier.status === Dossier.StatusEnum.ACTIVE).length; } private get _inactiveDossiersCount(): number { - return this.screenStateService.allEntities.length - this._activeDossiersCount; + return this.entitiesService.all.length - this._activeDossiersCount; } ngOnInit(): void { @@ -121,7 +123,7 @@ export class DossierListingScreenComponent }); this.addSubscription = this._router.events.pipe(filter(isLeavingScreen)).subscribe(() => { - this._lastScrollPosition = this.scrollViewport.measureScrollOffset('top'); + this._lastScrollPosition = this._scrollViewport.measureScrollOffset('top'); }); } @@ -130,7 +132,7 @@ export class DossierListingScreenComponent } ngOnAttach() { - this.scrollViewport.scrollTo({ top: this._lastScrollPosition }); + this._scrollViewport.scrollTo({ top: this._lastScrollPosition }); this._appStateService.reset(); this._loadEntitiesFromState(); this.ngOnInit(); @@ -179,7 +181,7 @@ export class DossierListingScreenComponent } private _loadEntitiesFromState() { - this.screenStateService.setEntities(this._appStateService.allDossiers); + this.entitiesService.setEntities(this._appStateService.allDossiers); } private _computeAllFilters() { @@ -188,7 +190,7 @@ export class DossierListingScreenComponent const allDistinctNeedsWork = new Set(); const allDistinctDossierTemplates = new Set(); - this.screenStateService?.allEntities?.forEach(entry => { + this.entitiesService?.all?.forEach(entry => { // all people entry.dossier.memberIds.forEach(f => allDistinctPeople.add(f)); // Needs work @@ -255,7 +257,7 @@ export class DossierListingScreenComponent slug: 'dossierTemplateFilters', label: this._translateService.instant('filters.dossier-templates'), icon: 'red:template', - hide: this.filterService.getFilterGroup('dossierTemplateFilters')?.filters?.length <= 1, + hide: this.filterService.getGroup('dossierTemplateFilters')?.filters?.length <= 1, filters: dossierTemplateFilters, checker: dossierTemplateChecker }); diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html index 5e8fdf75b..0aa509fea 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html @@ -5,17 +5,17 @@ [showCloseButton]="true" > - +
div { padding-left: 10px !important; } 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 ceafa3721..7d85260a9 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 @@ -21,11 +21,8 @@ import { DossierWrapper } from '@state/model/dossier.wrapper'; import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy'; import { AppConfigKey, AppConfigService } from '@app-config/app-config.service'; import { ActionConfig } from '@shared/components/page-header/models/action-config.model'; -import { NestedFilter, FilterService, keyChecker } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { ScreenStateService } from '@shared/services/screen-state.service'; -import { SortingService } from '@services/sorting.service'; -import { BaseListingComponent } from '@shared/base/base-listing.component'; +import { CircleButtonTypes, keyChecker, NestedFilter, TableColumnConfig } from '@iqser/common-ui'; +import { BaseListingComponent, DefaultListingServices } from '@shared/base/base-listing.component'; import { LoadingService } from '@services/loading.service'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; import { DossierAttributeWithValue } from '@models/dossier-attributes.model'; @@ -33,36 +30,35 @@ import { UserPreferenceService } from '@services/user-preference.service'; import { workloadTranslations } from '../../translations/workload-translations'; import { fileStatusTranslations } from '../../translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { CircleButtonTypes } from '@iqser/common-ui'; -import { TableColConfig } from '@shared/components/table-col-name/table-col-name.component'; import { annotationFilterChecker } from '@shared/components/filters/popup-filter/utils/filter-utils'; +import { PermissionsService } from '@services/permissions.service'; +import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; @Component({ templateUrl: './dossier-overview-screen.component.html', styleUrls: ['./dossier-overview-screen.component.scss'], - providers: [FilterService, SearchService, ScreenStateService, SortingService] + providers: [...DefaultListingServices] }) export class DossierOverviewScreenComponent extends BaseListingComponent implements OnInit, OnDestroy, OnDetach, OnAttach { - private readonly _lastOpenedFileKey = 'Dossier-Recent-' + this.activeDossier.dossierId; + readonly itemSize = 80; protected readonly _primaryKey = 'filename'; readonly circleButtonTypes = CircleButtonTypes; - protected readonly _tableHeaderLabel = _('dossier-overview.table-header.title'); + readonly currentUser = this._userService.currentUser; + readonly tableHeaderLabel = _('dossier-overview.table-header.title'); + private readonly _lastOpenedFileKey = 'Dossier-Recent-' + this.activeDossier.dossierId; - readonly itemSize = 80; - collapsedDetails = false; readonly actionConfigs: ActionConfig[] = [ { 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 } ]; - dossierAttributes: DossierAttributeWithValue[] = []; - tableColConfigs: TableColConfig[] = [ + readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('dossier-overview.table-col-names.name'), withSort: true, @@ -94,29 +90,35 @@ export class DossierOverviewScreenComponent column: 'statusSort' } ]; + + collapsedDetails = false; + dossierAttributes: DossierAttributeWithValue[] = []; @ViewChild(DossierDetailsComponent, { static: false }) private readonly _dossierDetailsComponent: DossierDetailsComponent; private _lastScrollPosition: number; @ViewChild('needsWorkTemplate', { read: TemplateRef, static: true }) private readonly _needsWorkTemplate: TemplateRef; - @ViewChild('fileInput') private _fileInput: ElementRef; + @ViewChild('fileInput') private readonly _fileInput: ElementRef; + @ViewChild(CdkVirtualScrollViewport) + private readonly _scrollViewport: CdkVirtualScrollViewport; constructor( - private readonly _userService: UserService, + private readonly _router: Router, private readonly _toaster: Toaster, + protected readonly _injector: Injector, + private readonly _userService: UserService, + readonly permissionsService: PermissionsService, + 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(); @@ -126,19 +128,15 @@ export class DossierOverviewScreenComponent return this._appStateService.activeDossier; } - get userId() { - return this._userService.userId; - } - get checkedRequiredFilters() { - return this.filterService.getFilterGroup('quickFilters')?.filters.filter(f => f.required && f.checked); + return this.filterService.getGroup('quickFilters')?.filters.filter(f => f.required && f.checked); } get checkedNotRequiredFilters() { - return this.filterService.getFilterGroup('quickFilters')?.filters.filter(f => !f.required && f.checked); + return this.filterService.getGroup('quickFilters')?.filters.filter(f => !f.required && f.checked); } - isLastOpenedFile({ fileId }: FileStatusWrapper): boolean { + isLastOpenedFile(fileId: string): boolean { return this._userPreferenceService.getLastOpenedFileId(this._lastOpenedFileKey) === fileId; } @@ -162,7 +160,7 @@ export class DossierOverviewScreenComponent .pipe(filter(event => event instanceof NavigationStart)) .subscribe((event: NavigationStart) => { if (!event.url.endsWith(this._appStateService.activeDossierId)) { - this._lastScrollPosition = this.scrollViewport.measureScrollOffset('top'); + this._lastScrollPosition = this._scrollViewport.measureScrollOffset('top'); } }); @@ -183,7 +181,7 @@ export class DossierOverviewScreenComponent await this._appStateService.reloadActiveDossierFiles(); this._loadEntitiesFromState(); await this.ngOnInit(); - this.scrollViewport.scrollTo({ top: this._lastScrollPosition }); + this._scrollViewport.scrollTo({ top: this._lastScrollPosition }); } ngOnDetach() { @@ -239,7 +237,7 @@ export class DossierOverviewScreenComponent } bulkActionPerformed() { - this.screenStateService.setSelectedEntities([]); + this.entitiesService.setSelected([]); this.reloadDossiers(); } @@ -275,7 +273,7 @@ export class DossierOverviewScreenComponent moment(file.lastUpdated).add(this._appConfigService.getConfig(AppConfigKey.RECENT_PERIOD_IN_HOURS), 'hours').isAfter(moment()); private _loadEntitiesFromState() { - if (this.activeDossier) this.screenStateService.setEntities(this.activeDossier.files); + if (this.activeDossier) this.entitiesService.setEntities(this.activeDossier.files); } private async _uploadFiles(files: FileUploadModel[]) { @@ -291,7 +289,7 @@ export class DossierOverviewScreenComponent const allDistinctAddedDates = new Set(); const allDistinctNeedsWork = new Set(); - this.screenStateService.allEntities.forEach(file => { + this.entitiesService.all.forEach(file => { allDistinctPeople.add(file.currentReviewer); allDistinctFileStatusWrapper.add(file.status); allDistinctAddedDates.add(moment(file.added).format('DD/MM/YYYY')); @@ -369,7 +367,7 @@ export class DossierOverviewScreenComponent private _createQuickFilters() { let quickFilters = []; - if (this.screenStateService.allEntities.filter(this.recentlyModifiedChecker).length > 0) { + if (this.entitiesService.all.filter(this.recentlyModifiedChecker).length > 0) { const recentPeriod = this._appConfigService.getConfig(AppConfigKey.RECENT_PERIOD_IN_HOURS); quickFilters = [ { @@ -388,7 +386,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', @@ -398,7 +396,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/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 5ab0ffdd7..670215425 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 @@ -17,12 +17,11 @@ import { FileStatusWrapper } from '@models/file/file-status.wrapper'; import { PermissionsService } from '@services/permissions.service'; import { timer } from 'rxjs'; import { UserPreferenceService } from '@services/user-preference.service'; -import { UserService } from '@services/user.service'; +import { UserService, UserWrapper } from '@services/user.service'; import { FileManagementControllerService, FileStatus, StatusControllerService, - User, UserPreferenceControllerService } from '@redaction/red-ui-http'; import { PdfViewerDataService } from '../../services/pdf-viewer-data.service'; @@ -34,10 +33,8 @@ import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy'; import { LoadingService } from '@services/loading.service'; import { stampPDFPage } from '@utils/page-stamper'; import { TranslateService } from '@ngx-translate/core'; -import { AutoUnsubscribeComponent, CircleButtonTypes } from '@iqser/common-ui'; +import { AutoUnsubscribeComponent, CircleButtonTypes, NestedFilter, processFilters } from '@iqser/common-ui'; import { fileStatusTranslations } from '../../translations/file-status-translations'; -import { NestedFilter } from '@iqser/common-ui'; -import { processFilters } from '@iqser/common-ui'; import { handleFilterDelta } from '@shared/components/filters/popup-filter/utils/filter-utils'; const ALL_HOTKEY_ARRAY = ['Escape', 'F', 'f']; @@ -276,7 +273,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribeComponent impleme const processStartTime = new Date().getTime(); this.annotationData = this.fileData.getAnnotations( this.appStateService.dictionaryData[this.appStateService.activeDossier.dossierTemplateId], - this.permissionsService.currentUser, + this.userService.currentUser, this.viewMode, this.userPreferenceService.areDevFeaturesEnabled ); @@ -467,8 +464,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribeComponent impleme }); } - async assignReviewer(user: User | string) { - const reviewerId = typeof user === 'string' ? user : user.userId; + async assignReviewer(user: UserWrapper | string) { + const reviewerId = typeof user === 'string' ? user : user.id; const reviewerName = this.userService.getNameForId(reviewerId); const { dossierId, fileId, filename } = this.fileData.fileStatus; diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html index bce8ba1ad..e8b2c4fde 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html @@ -10,7 +10,10 @@
- + - +
implements OnDestroy { readonly fileStatusTranslations = fileStatusTranslations; readonly searchPositions = SearchPositions; readonly itemSize = 85; + protected readonly _primaryKey = 'filename'; + readonly tableHeaderLabel = _('search-screen.table-header'); + readonly tableColumnConfigs: TableColumnConfig[] = [ + { label: _('search-screen.cols.document') }, + { label: _('search-screen.cols.status') }, + { label: _('search-screen.cols.dossier') }, + { label: _('search-screen.cols.pages') } + ]; readonly search$ = new BehaviorSubject(null); readonly searchResults$: Observable = this.search$.asObservable().pipe( switchMap(query => this._search(query)), map(searchResult => this._toMatchedDocuments(searchResult)), map(docs => this._toListItems(docs)), - tap(result => this.screenStateService.setEntities(result)), + tap(result => this.entitiesService.setEntities(result)), tap(() => this._loadingService.stop()) ); - readonly tableColConfigs: TableColConfig[] = [ - { - label: _('search-screen.cols.document') - }, - { - label: _('search-screen.cols.status') - }, - { - label: _('search-screen.cols.dossier') - }, - { - label: _('search-screen.cols.pages') - } - ]; - protected readonly _primaryKey = 'fileName'; - protected readonly _tableHeaderLabel = _('search-screen.table-header'); constructor( protected readonly _injector: Injector, diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts index 420533a70..862159e56 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts @@ -9,13 +9,15 @@ import { getFirstRelevantTextPart } from '@utils/functions'; import { AnnotationPermissions } from '@models/file/annotation.permissions'; import { DossiersDialogService } from './dossiers-dialog.service'; import { BASE_HREF } from '../../../tokens'; +import { UserService } from '@services/user.service'; @Injectable() export class AnnotationActionsService { constructor( @Inject(BASE_HREF) private readonly _baseHref: string, - private readonly _permissionsService: PermissionsService, private readonly _ngZone: NgZone, + private readonly _userService: UserService, + private readonly _permissionsService: PermissionsService, private readonly _manualAnnotationService: ManualAnnotationService, private readonly _translateService: TranslateService, private readonly _dialogService: DossiersDialogService @@ -89,7 +91,7 @@ export class AnnotationActionsService { annotations.forEach(annotation => { const permissions = AnnotationPermissions.forUser( this._permissionsService.isApprover(), - this._permissionsService.currentUser, + this._userService.currentUser, annotation ); const value = permissions.canMarkTextOnlyAsFalsePositive ? annotation.value : this._getFalsePositiveText(annotation); @@ -132,9 +134,9 @@ export class AnnotationActionsService { ): Record[] { const availableActions = []; - const annotationPermissions = annotations.map(a => ({ - annotation: a, - permissions: AnnotationPermissions.forUser(this._permissionsService.isApprover(), this._permissionsService.currentUser, a) + const annotationPermissions = annotations.map(annotation => ({ + annotation, + permissions: AnnotationPermissions.forUser(this._permissionsService.isApprover(), this._userService.currentUser, annotation) })); const canRecategorizeImage = annotations.length === 1 && annotationPermissions[0].permissions.canRecategorizeImage; diff --git a/apps/red-ui/src/app/modules/dossier/services/file-action.service.ts b/apps/red-ui/src/app/modules/dossier/services/file-action.service.ts index 30d46ee8e..438182380 100644 --- a/apps/red-ui/src/app/modules/dossier/services/file-action.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/file-action.service.ts @@ -154,7 +154,7 @@ export class FileActionService { .setFileReviewerForList( fileStatus.map(f => f.fileId), this._appStateService.activeDossierId, - this._userService.userId + this._userService.currentUser.id ) .toPromise(); await this._appStateService.reloadActiveDossierFiles(); 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 6401b72b9..7e2e39b94 100644 --- a/apps/red-ui/src/app/modules/icons/icons.module.ts +++ b/apps/red-ui/src/app/modules/icons/icons.module.ts @@ -70,8 +70,6 @@ export class IconsModule { 'report', 'search', 'secret', - 'sort-asc', - 'sort-desc', 'status', 'status-collapse', 'status-expand', diff --git a/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts b/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts index 411655ed7..25b62057a 100644 --- a/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts +++ b/apps/red-ui/src/app/modules/shared/base/base-listing.component.ts @@ -1,35 +1,36 @@ -import { Component, Injector, OnDestroy, ViewChild } from '@angular/core'; -import { SortingOrders, SortingService } from '@services/sorting.service'; -import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; -import { SearchService } from '../services/search.service'; -import { ScreenStateService } from '../services/screen-state.service'; +import { Component, Injector, OnDestroy } from '@angular/core'; +import { + AutoUnsubscribeComponent, + EntitiesService, + FilterService, + KeysOf, + SearchService, + SortingOrders, + SortingService, + TableColumnConfig +} from '@iqser/common-ui'; import { combineLatest, Observable } from 'rxjs'; -import { AutoUnsubscribeComponent } from '@iqser/common-ui'; import { distinctUntilChanged, map, switchMap } from 'rxjs/operators'; -import { PermissionsService } from '@services/permissions.service'; -import { FilterService } from '@iqser/common-ui'; + +export const DefaultListingServices = [FilterService, SearchService, EntitiesService, SortingService] as const; @Component({ template: '' }) -export abstract class BaseListingComponent extends AutoUnsubscribeComponent implements OnDestroy { - @ViewChild(CdkVirtualScrollViewport) - readonly scrollViewport: CdkVirtualScrollViewport; - - readonly permissionsService = this._injector.get(PermissionsService); +export abstract class BaseListingComponent extends AutoUnsubscribeComponent implements OnDestroy { readonly filterService = this._injector.get(FilterService); - readonly sortingService = this._injector.get(SortingService); - readonly searchService = this._injector.get(SearchService); - readonly screenStateService = this._injector.get>(ScreenStateService); + readonly searchService = this._injector.get>(SearchService); + readonly sortingService = this._injector.get>(SortingService); + readonly entitiesService = this._injector.get>(EntitiesService); - readonly sortedDisplayedEntities$ = this._sortedDisplayedEntities$; readonly noMatch$ = this._noMatch$; + readonly sortedDisplayedEntities$ = this._sortedDisplayedEntities$; - protected readonly _tableHeaderLabel: string; + readonly tableColumnConfigs: TableColumnConfig[]; /** * Key used in the *trackBy* function with **ngFor* or **cdkVirtualFor* * and in the default sorting and as the search field * @protected */ - protected abstract _primaryKey: string; + protected readonly _primaryKey: KeysOf; protected constructor(protected readonly _injector: Injector) { super(); @@ -37,26 +38,18 @@ export abstract class BaseListingComponent extends AutoUnsubscribeComponent i setTimeout(() => this.setInitialConfig()); } - get tableHeaderLabel(): string { - if (!this._tableHeaderLabel) { - throw new Error('Not implemented'); - } - - return this._tableHeaderLabel; - } - get allEntities(): T[] { - return this.screenStateService.allEntities; + return this.entitiesService.all; } private get _sortedDisplayedEntities$(): Observable { - return this.sortingService.sortingOption$.pipe( - switchMap(() => this.screenStateService.displayedEntities$.pipe(map(entities => this.sortingService.defaultSort(entities)))) - ); + const sort = entities => this.sortingService.defaultSort(entities); + const sortedEntities = () => this.entitiesService.displayed$.pipe(map(sort)); + return this.sortingService.sortingOption$.pipe(switchMap(sortedEntities)); } private get _noMatch$(): Observable { - return combineLatest([this.screenStateService.allEntitiesLength$, this.screenStateService.displayedLength$]).pipe( + return combineLatest([this.entitiesService.allLength$, this.entitiesService.displayedLength$]).pipe( map(([hasEntities, hasDisplayedEntities]) => hasEntities && !hasDisplayedEntities), distinctUntilChanged() ); @@ -70,28 +63,24 @@ export abstract class BaseListingComponent extends AutoUnsubscribeComponent i this.searchService.setSearchKey(this._primaryKey); } - ngOnDestroy(): void { - super.ngOnDestroy(); - } - canBulkDelete$(hasPermission = true): Observable { - return this.screenStateService.areSomeEntitiesSelected$.pipe( + return this.entitiesService.areSomeSelected$.pipe( map(areSomeEntitiesSelected => areSomeEntitiesSelected && hasPermission), distinctUntilChanged() ); } toggleSelectAll() { - return this.screenStateService.selectEntities(); + return this.entitiesService.selectAll(); } toggleEntitySelected(event: MouseEvent, entity: T) { event.stopPropagation(); - return this.screenStateService.selectEntities([entity]); + return this.entitiesService.select(entity); } isSelected(entity: T): boolean { - return this.screenStateService.isSelected(entity); + return this.entitiesService.isSelected(entity); } trackByPrimaryKey(index: number, item: T) { diff --git a/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.ts b/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.ts index 8a9b71032..40cce4227 100644 --- a/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; -import { User } from '@redaction/red-ui-http'; -import { UserService } from '@services/user.service'; +import { UserService, UserWrapper } from '@services/user.service'; @Component({ selector: 'redaction-assign-user-dropdown', @@ -9,25 +8,25 @@ import { UserService } from '@services/user.service'; changeDetection: ChangeDetectionStrategy.OnPush }) export class AssignUserDropdownComponent { - oldUser: User | string; - @Input() options: (User | string)[]; - @Output() save = new EventEmitter(); + oldUser: UserWrapper | string; + @Input() options: (UserWrapper | string)[]; + @Output() save = new EventEmitter(); @Output() cancel = new EventEmitter(); - private _currentUser: User | string; + private _currentUser: UserWrapper | string; constructor(private readonly _userService: UserService) {} - get value(): User | string { + get value(): UserWrapper | string { return this._currentUser; } @Input() - set value(value: User | string) { + set value(value: UserWrapper | string) { if (this.oldUser === undefined) this.oldUser = value; this._currentUser = value; } - getContext(user: User | string) { - return { userId: typeof user === 'string' ? user : user?.userId }; + getContext(user: UserWrapper | string) { + return { userId: typeof user === 'string' ? user : user?.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 92241ad31..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 ce0e9d4cd..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 @@ -1,8 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy } from '@angular/core'; -import { UserService } from '@services/user.service'; -import { User } from '@redaction/red-ui-http'; +import { UserService, UserWrapper } from '@services/user.service'; import { TranslateService } from '@ngx-translate/core'; -import { Subscription } from 'rxjs'; +import { AutoUnsubscribeComponent } from '@iqser/common-ui'; @Component({ selector: 'redaction-initials-avatar', @@ -10,7 +9,7 @@ import { Subscription } from 'rxjs'; styleUrls: ['./initials-avatar.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class InitialsAvatarComponent implements OnChanges, OnDestroy { +export class InitialsAvatarComponent extends AutoUnsubscribeComponent implements OnChanges, OnDestroy { @Input() userId: string; @Input() color = 'lightgray'; @Input() size: 'small' | 'large' = 'small'; @@ -21,26 +20,25 @@ export class InitialsAvatarComponent implements OnChanges, OnDestroy { displayName: string; initials: string; colorClass: string; - user: User; - - private _subscription: Subscription; + user: UserWrapper; constructor( private readonly _userService: UserService, private readonly _translateService: TranslateService, private readonly _changeDetectorRef: ChangeDetectorRef ) { - this._subscription = _userService.usersReloaded$.subscribe(() => { + super(); + this.addSubscription = _userService.usersReloaded$.subscribe(() => { this.detectChanges(); }); } get hasBorder(): boolean { - return !!this.user && !this._isCurrentUser && this._userService.isManager(this.user); + return !!this.user && !this._isCurrentUser && this.user.isManager; } get disabled(): boolean { - return !this._userService.isActive(this.user); + return !this.user?.isActive; } private get _colorClass() { @@ -52,11 +50,7 @@ export class InitialsAvatarComponent implements OnChanges, OnDestroy { } private get _isCurrentUser(): boolean { - return this._userService.userId === this.user?.userId; - } - - ngOnDestroy() { - this._subscription?.unsubscribe(); + return this._userService.currentUser.id === this.user?.id; } ngOnChanges(): void { diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts index 2a3e72672..f9552a534 100644 --- a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts @@ -1,8 +1,7 @@ import { Component, Input, Optional } from '@angular/core'; import { ActionConfig } from '@shared/components/page-header/models/action-config.model'; import { ButtonConfig } from '@shared/components/page-header/models/button-config.model'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; +import { FilterService, SearchService } from '@iqser/common-ui'; import { distinctUntilChanged, map } from 'rxjs/operators'; import { combineLatest, Observable, of } from 'rxjs'; import { SearchPosition, SearchPositions } from '@shared/components/page-header/models/search-positions.type'; @@ -12,7 +11,7 @@ import { SearchPosition, SearchPositions } from '@shared/components/page-header/ templateUrl: './page-header.component.html', styleUrls: ['./page-header.component.scss'] }) -export class PageHeaderComponent { +export class PageHeaderComponent { readonly searchPositions = SearchPositions; @Input() pageLabel: string; @@ -26,7 +25,7 @@ export class PageHeaderComponent { readonly filters$ = this.filterService?.filterGroups$.pipe(map(all => all.filter(f => f.icon))); readonly showResetFilters$ = this._showResetFilters$; - constructor(@Optional() readonly filterService: FilterService, @Optional() readonly searchService: SearchService) {} + constructor(@Optional() readonly filterService: FilterService, @Optional() readonly searchService: SearchService) {} get _showResetFilters$(): Observable { if (!this.filterService) return of(false); diff --git a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.html b/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.html deleted file mode 100644 index da89f5a0d..000000000 --- a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
- - {{ label }} - - - -
- - -
- -
diff --git a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.scss b/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.scss deleted file mode 100644 index b8d3cb571..000000000 --- a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.scss +++ /dev/null @@ -1,51 +0,0 @@ -@import '../../../../../assets/styles/variables'; - -:host { - display: flex; - height: 30px; - flex: 1; - - > div { - align-items: center; - display: flex; - width: 100%; - line-height: 11px; - padding: 0 24px; - - > mat-icon { - width: 10px; - height: 10px; - margin-right: 6px; - opacity: 0.7; - - &:not(:first-child) { - margin-left: 6px; - } - } - } - - .flex-end { - min-width: 58px; - } - - .sort-arrows-container { - display: none; - color: $primary; - margin-left: 8px; - - mat-icon { - height: 14px; - width: 6px; - } - } - - &:hover { - .sort-arrows-container { - display: initial; - } - } - - .sort-arrows-container.force-display { - display: initial; - } -} diff --git a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.ts b/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.ts deleted file mode 100644 index f3dd88176..000000000 --- a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Component, Input, Optional } from '@angular/core'; -import { SortingService } from '@services/sorting.service'; - -export interface TableColConfig { - readonly column?: string; - readonly label: string; - readonly withSort?: boolean; - readonly class?: string; - readonly leftIcon?: string; - readonly rightIcon?: string; - readonly rightIconTooltip?: string; -} - -@Component({ - selector: 'redaction-table-col-name', - templateUrl: './table-col-name.component.html', - styleUrls: ['./table-col-name.component.scss'] -}) -export class TableColNameComponent { - @Input() column: string; - @Input() label: string; - @Input() withSort = false; - @Input() class: string; - @Input() leftIcon: string; - @Input() rightIcon: string; - @Input() rightIconTooltip: string; - - constructor(@Optional() readonly sortingService: SortingService) {} -} diff --git a/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html b/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html index bf7465f3f..447aaded7 100644 --- a/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html +++ b/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html @@ -1,13 +1,13 @@
- {{ tableHeaderLabel | translate: { length: (screenStateService.displayedLength$ | async) } }} + {{ tableHeaderLabel | translate: { length: (entitiesService.displayedLength$ | async) } }} @@ -18,8 +18,8 @@
- + >
diff --git a/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.ts b/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.ts index 671e9ad91..24bdc72db 100644 --- a/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, Component, Input, TemplateRef } from '@angular/core'; -import { TableColConfig } from '@shared/components/table-col-name/table-col-name.component'; -import { ScreenStateService } from '@shared/services/screen-state.service'; +import { EntitiesService, Required, TableColumnConfig } from '@iqser/common-ui'; @Component({ selector: 'redaction-table-header', @@ -8,12 +7,12 @@ import { ScreenStateService } from '@shared/services/screen-state.service'; styleUrls: ['./table-header.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class TableHeaderComponent { - @Input() tableHeaderLabel: string; - @Input() tableColConfigs: TableColConfig[]; +export class TableHeaderComponent { + @Input() @Required() tableHeaderLabel: string; + @Input() @Required() tableColumnConfigs: TableColumnConfig[]; @Input() hasEmptyColumn = false; @Input() selectionEnabled = false; @Input() bulkActions: TemplateRef; - constructor(readonly screenStateService: ScreenStateService) {} + constructor(readonly entitiesService: EntitiesService) {} } diff --git a/apps/red-ui/src/app/modules/shared/pipes/humanize.pipe.ts b/apps/red-ui/src/app/modules/shared/pipes/humanize.pipe.ts deleted file mode 100644 index 1d9b329bf..000000000 --- a/apps/red-ui/src/app/modules/shared/pipes/humanize.pipe.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { humanize } from '@utils/functions'; - -@Pipe({ - name: 'humanize' -}) -export class HumanizePipe implements PipeTransform { - transform(item: string, lowercase: boolean = false): any { - return humanize(item, lowercase); - } -} diff --git a/apps/red-ui/src/app/modules/shared/pipes/sort-by.pipe.ts b/apps/red-ui/src/app/modules/shared/pipes/sort-by.pipe.ts deleted file mode 100644 index bb2ade371..000000000 --- a/apps/red-ui/src/app/modules/shared/pipes/sort-by.pipe.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { SortingService } from '@services/sorting.service'; - -@Pipe({ name: 'sortBy' }) -export class SortByPipe implements PipeTransform { - constructor(private readonly _sortingService: SortingService) {} - - transform(value: T[], order = '', column: string = ''): T[] { - return this._sortingService.sort(value, order, column); - } -} diff --git a/apps/red-ui/src/app/modules/shared/services/screen-state.service.ts b/apps/red-ui/src/app/modules/shared/services/screen-state.service.ts deleted file mode 100644 index 0229c72c6..000000000 --- a/apps/red-ui/src/app/modules/shared/services/screen-state.service.ts +++ /dev/null @@ -1,135 +0,0 @@ -import { Injectable } from '@angular/core'; -import { BehaviorSubject, combineLatest, Observable, pipe } from 'rxjs'; -import { distinctUntilChanged, map, tap } from 'rxjs/operators'; -import { FilterService } from '@iqser/common-ui'; -import { SearchService } from '@shared/services/search.service'; -import { getFilteredEntities } from '@iqser/common-ui'; - -const toLengthValue = (entities: unknown[]) => entities?.length ?? 0; -const getLength = pipe(map(toLengthValue), distinctUntilChanged()); - -@Injectable() -export class ScreenStateService { - private readonly _allEntities$ = new BehaviorSubject([]); - readonly allEntities$ = this._allEntities$.asObservable(); - readonly allEntitiesLength$ = this._allEntities$.pipe(getLength); - - private readonly _displayedEntities$ = new BehaviorSubject([]); - readonly displayedEntities$ = this._getDisplayedEntities$; - readonly displayedLength$ = this._displayedEntities$.pipe(getLength); - - private readonly _selectedEntities$ = new BehaviorSubject([]); - readonly selectedEntities$ = this._selectedEntities$.asObservable(); - readonly selectedLength$ = this._selectedEntities$.pipe(getLength); - - readonly noData$ = this._noData$; - readonly areAllEntitiesSelected$ = this._areAllEntitiesSelected$; - readonly areSomeEntitiesSelected$ = this._areSomeEntitiesSelected$; - readonly notAllEntitiesSelected$ = this._notAllEntitiesSelected$; - - constructor(private readonly _filterService: FilterService, private readonly _searchService: SearchService) { - // setInterval(() => { - // console.log('All entities subs: ', this._allEntities$.observers); - // console.log('Displayed entities subs: ', this._displayedEntities$.observers); - // console.log('Selected entities subs: ', this._selectedEntities$.observers); - // }, 10000); - } - - get allEntities(): T[] { - return Object.values(this._allEntities$.getValue()); - } - - get selectedEntities(): T[] { - return Object.values(this._selectedEntities$.getValue()); - } - - get displayedEntities(): T[] { - return Object.values(this._displayedEntities$.getValue()); - } - - get _getDisplayedEntities$(): Observable { - const filterGroups$ = this._filterService.filterGroups$; - const searchValue$ = this._searchService.valueChanges$; - - return combineLatest([this.allEntities$, filterGroups$, searchValue$]).pipe( - map(([entities, filterGroups]) => getFilteredEntities(entities, filterGroups)), - map(entities => this._searchService.searchIn(entities)), - tap(entities => this._displayedEntities$.next(entities)) - ); - } - - private get _areAllEntitiesSelected$(): Observable { - return combineLatest([this.displayedLength$, this.selectedLength$]).pipe( - map(([displayedLength, selectedLength]) => displayedLength && displayedLength === selectedLength), - distinctUntilChanged() - ); - } - - private get _areSomeEntitiesSelected$(): Observable { - return this.selectedLength$.pipe( - map(value => !!value), - distinctUntilChanged() - ); - } - - private get _notAllEntitiesSelected$(): Observable { - return combineLatest([this.areAllEntitiesSelected$, this.areSomeEntitiesSelected$]).pipe( - map(([allEntitiesAreSelected, someEntitiesAreSelected]) => !allEntitiesAreSelected && someEntitiesAreSelected), - distinctUntilChanged() - ); - } - - private get _noData$(): Observable { - return this.allEntitiesLength$.pipe( - map(length => length === 0), - distinctUntilChanged() - ); - } - - private get _allEntitiesSelected() { - return this.displayedEntities.length !== 0 && this.displayedEntities.length === this.selectedEntities.length; - } - - setEntities(newEntities: T[]): void { - this._allEntities$.next(newEntities); - } - - setSelectedEntities(newEntities: T[]): void { - this._selectedEntities$.next(newEntities); - } - - isSelected(entity: T): boolean { - return this.selectedEntities.indexOf(entity) !== -1; - } - - selectEntities(entities?: T[]): void { - if (entities?.length > 0) { - return entities.forEach(entity => this._selectOne(entity)); - } - return this._selectAll(); - } - - updateSelection(): void { - const items = this.displayedEntities.filter(item => this.selectedEntities.includes(item)); - this.setSelectedEntities(items); - } - - logCurrentState(): void { - console.log('Entities', this.allEntities); - console.log('Displayed', this.displayedEntities); - console.log('Selected', this.selectedEntities); - } - - private _selectOne(entity: T): void { - const currentEntityIdx = this.selectedEntities.indexOf(entity); - if (currentEntityIdx === -1) { - return this.setSelectedEntities([...this.selectedEntities, entity]); - } - this.setSelectedEntities(this.selectedEntities.filter((el, idx) => idx !== currentEntityIdx)); - } - - private _selectAll(): void { - if (this._allEntitiesSelected) return this.setSelectedEntities([]); - this.setSelectedEntities(this.displayedEntities); - } -} diff --git a/apps/red-ui/src/app/modules/shared/services/search.service.ts b/apps/red-ui/src/app/modules/shared/services/search.service.ts deleted file mode 100644 index d0049343c..000000000 --- a/apps/red-ui/src/app/modules/shared/services/search.service.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Injectable } from '@angular/core'; -import { FormBuilder } from '@angular/forms'; -import { startWith } from 'rxjs/operators'; - -@Injectable() -export class SearchService { - readonly searchForm = this._formBuilder.group({ - query: [''] - }); - readonly valueChanges$ = this.searchForm.get('query').valueChanges.pipe(startWith('')); - private _searchKey: string; - - constructor(private readonly _formBuilder: FormBuilder) {} - - get searchValue(): string { - return this.searchForm.get('query').value; - } - - set searchValue(value: string) { - this.searchForm.patchValue({ query: value }); - } - - searchIn(entities: T[]) { - if (!this._searchKey) return entities; - - const searchValue = this.searchValue.toLowerCase(); - return entities.filter(entity => this._searchField(entity).includes(searchValue)); - } - - setSearchKey(value: string): void { - this._searchKey = value; - } - - reset(): void { - this.searchForm.reset({ query: '' }, { emitEvent: true }); - } - - private _searchField(entity: T): string { - return entity[this._searchKey].toString().toLowerCase(); - } -} diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 4062c0c0f..35ebd9184 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -4,7 +4,6 @@ import { FullPageLoadingIndicatorComponent } from './components/full-page-loadin import { TranslateModule } from '@ngx-translate/core'; import { InitialsAvatarComponent } from './components/initials-avatar/initials-avatar.component'; import { ScrollingModule } from '@angular/cdk/scrolling'; -import { TableColNameComponent } from './components/table-col-name/table-col-name.component'; import { PaginationComponent } from './components/pagination/pagination.component'; import { FileDownloadBtnComponent } from './components/buttons/file-download-btn/file-download-btn.component'; import { UserButtonComponent } from './components/buttons/user-button/user-button.component'; @@ -14,14 +13,13 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; import { SimpleDoughnutChartComponent } from './components/simple-doughnut-chart/simple-doughnut-chart.component'; import { StatusBarComponent } from './components/status-bar/status-bar.component'; -import { HumanizePipe } from './pipes/humanize.pipe'; import { SyncWidthDirective } from './directives/sync-width.directive'; import { HasScrollbarDirective } from './directives/has-scrollbar.directive'; import { DictionaryAnnotationIconComponent } from './components/dictionary-annotation-icon/dictionary-annotation-icon.component'; import { HiddenActionComponent } from './components/hidden-action/hidden-action.component'; import { ConfirmationDialogComponent } from './dialogs/confirmation-dialog/confirmation-dialog.component'; import { EmptyStateComponent } from './components/empty-state/empty-state.component'; -import { SortByPipe } from './pipes/sort-by.pipe'; +import { CommonUiModule } from '@iqser/common-ui'; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; import { MomentDateAdapter } from '@angular/material-moment-adapter'; import { SelectComponent } from './components/select/select.component'; @@ -36,14 +34,13 @@ import { InputWithActionComponent } from '@shared/components/input-with-action/i import { PageHeaderComponent } from './components/page-header/page-header.component'; import { DatePipe } from '@shared/pipes/date.pipe'; import { TableHeaderComponent } from './components/table-header/table-header.component'; -import { CommonUiModule } from '@iqser/common-ui'; const buttons = [FileDownloadBtnComponent, UserButtonComponent]; const components = [ FullPageLoadingIndicatorComponent, InitialsAvatarComponent, - TableColNameComponent, + TableHeaderComponent, PaginationComponent, InputWithActionComponent, AnnotationIconComponent, @@ -54,7 +51,6 @@ const components = [ PopupFilterComponent, ConfirmationDialogComponent, EmptyStateComponent, - SortByPipe, SelectComponent, SideNavComponent, DictionaryManagerComponent, @@ -65,7 +61,7 @@ const components = [ ...buttons ]; -const utils = [HumanizePipe, DatePipe, SyncWidthDirective, HasScrollbarDirective, NavigateLastDossiersScreenDirective]; +const utils = [DatePipe, SyncWidthDirective, HasScrollbarDirective, NavigateLastDossiersScreenDirective]; const modules = [MatConfigModule, TranslateModule, ScrollingModule, IconsModule, FormsModule, ReactiveFormsModule, CommonUiModule]; 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 990c5bf9e..506c3f81c 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; import { UserService, UserWrapper } from './user.service'; import { FileStatusWrapper } from '@models/file/file-status.wrapper'; -import { User, Comment } from '@redaction/red-ui-http'; +import { Comment } from '@redaction/red-ui-http'; import { DossierWrapper } from '@state/model/dossier.wrapper'; @Injectable({ @@ -11,10 +11,6 @@ import { DossierWrapper } from '@state/model/dossier.wrapper'; export class PermissionsService { constructor(private readonly _appStateService: AppStateService, private readonly _userService: UserService) {} - get currentUser(): UserWrapper { - return this._userService.user; - } - private get _activeFile(): FileStatusWrapper | undefined { return this._appStateService.activeFile; } @@ -23,10 +19,6 @@ export class PermissionsService { return this._appStateService.activeDossier; } - isManager(user?: User) { - return this._userService.isManager(user); - } - isReviewerOrApprover(fileStatus?: FileStatusWrapper): boolean { return this.isFileReviewer(fileStatus) || this.isApprover(); } @@ -44,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 { @@ -55,7 +47,7 @@ export class PermissionsService { } isFileReviewer(fileStatus = this._activeFile): boolean { - return fileStatus.currentReviewer === this._userService.userId; + return fileStatus.currentReviewer === this._userService.currentUser.id; } canDeleteFile(fileStatus = this._activeFile, dossier?: DossierWrapper): boolean { @@ -112,19 +104,19 @@ export class PermissionsService { return fileStatus?.isUnderReview && this.isReviewerOrApprover(fileStatus); } - isOwner(dossier = this._activeDossier, user = this.currentUser): boolean { + isOwner(dossier = this._activeDossier, user = this._userService.currentUser): boolean { return dossier?.ownerId === user.id; } - isApprover(dossier = this._activeDossier, user = this.currentUser): boolean { + isApprover(dossier = this._activeDossier, user = this._userService.currentUser): boolean { return dossier?.approverIds.indexOf(user.id) >= 0; } - isDossierReviewer(dossier = this._activeDossier, user = this.currentUser): boolean { + isDossierReviewer(dossier = this._activeDossier, user = this._userService.currentUser): boolean { return this.isDossierMember(dossier, user) && !this.isApprover(dossier, user); } - isDossierMember(dossier = this._activeDossier, user = this.currentUser): boolean { + isDossierMember(dossier = this._activeDossier, user = this._userService.currentUser): boolean { return dossier?.memberIds.includes(user.id); } @@ -156,29 +148,21 @@ export class PermissionsService { } canDeleteDossier(dossier = this._activeDossier): boolean { - return dossier.ownerId === this.currentUser.userId; + return dossier.ownerId === this._userService.currentUser.id; } - isAdmin(user = this.currentUser): boolean { + isAdmin(user = this._userService.currentUser): boolean { return user.isAdmin; } - isUserAdmin(user = this.currentUser): boolean { - return user.isUserAdmin; - } - - isUser(user = this.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 { @@ -190,6 +174,6 @@ export class PermissionsService { } canDeleteComment(comment: Comment, fileStatus = this._activeFile) { - return (comment.user === this._userService.userId || this.isApprover()) && !fileStatus.isApproved; + return (comment.user === this._userService.currentUser.id || this.isApprover()) && !fileStatus.isApproved; } } diff --git a/apps/red-ui/src/app/services/sorting.service.ts b/apps/red-ui/src/app/services/sorting.service.ts deleted file mode 100644 index 4b5fa976e..000000000 --- a/apps/red-ui/src/app/services/sorting.service.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { Injectable } from '@angular/core'; -import { orderBy } from 'lodash'; -import { BehaviorSubject } from 'rxjs'; - -export const SortingOrders = { - asc: 'asc', - desc: 'desc' -} as const; - -export type SortingOrder = keyof typeof SortingOrders; - -export interface SortingOption { - readonly order: SortingOrder; - readonly column: string; -} - -@Injectable({ - providedIn: 'root' -}) -export class SortingService { - private readonly _sortingOption$ = new BehaviorSubject(null); - readonly sortingOption$ = this._sortingOption$.asObservable(); - - get sortingOption(): SortingOption { - return this._sortingOption$.getValue(); - } - - setSortingOption(value: SortingOption): void { - this._sortingOption$.next(value); - } - - sort(values: T[], order?: string, column?: string): T[] { - if (!values || !order) { - return values; - } // no array - if (!column) { - if (order === SortingOrders.asc) { - return values.sort(); - } else { - return values.sort().reverse(); - } - } // sort 1d array - if (values.length <= 1) { - return values; - } // array with only one item - return orderBy(values, [column], [order]); - } - - defaultSort(values: T[]) { - return this.sort(values, this.sortingOption?.order, this.sortingOption?.column); - } - - toggleSort(column: string) { - if (this.sortingOption.column === column) { - this._sortingOption$.next({ - column, - order: this.sortingOption.order === SortingOrders.asc ? SortingOrders.desc : SortingOrders.asc - }); - } else { - this._sortingOption$.next({ column, order: SortingOrders.asc }); - } - } -} diff --git a/apps/red-ui/src/app/services/user.service.ts b/apps/red-ui/src/app/services/user.service.ts index fe54e6647..8ab66e8c5 100644 --- a/apps/red-ui/src/app/services/user.service.ts +++ b/apps/red-ui/src/app/services/user.service.ts @@ -1,10 +1,11 @@ -import { EventEmitter, Inject, Injectable } from '@angular/core'; +import { Inject, Injectable } from '@angular/core'; import { KeycloakService } from 'keycloak-angular'; import { KeycloakProfile } from 'keycloak-js'; import jwt_decode from 'jwt-decode'; import { User, UserControllerService } from '@redaction/red-ui-http'; import { wipeCaches } from '@redaction/red-cache'; import { BASE_HREF } from '../tokens'; +import { Subject } from 'rxjs'; export interface ProfileModel { username?: string; @@ -15,62 +16,28 @@ export interface ProfileModel { } export class UserWrapper { - name: string; + constructor(private readonly _user: KeycloakProfile | User, public roles: string[], public id: string) {} - constructor(private readonly _currentUser: KeycloakProfile | User, public roles: string[], public id: string) { - this.name = this.firstName && this.lastName ? `${this.firstName} ${this.lastName}` : this.username; - } + email = this._user.email; + username = this._user.username || this.email; + firstName = this._user.firstName; + lastName = this._user.lastName; + name = this.firstName && this.lastName ? `${this.firstName} ${this.lastName}` : this.username; + searchKey = this.name + this.username + this.email; - get username() { - return this._currentUser.username || this.email; - } - - get userId() { - return this.id; - } - - get email() { - return this._currentUser.email; - } - - get firstName() { - return this._currentUser.firstName; - } - - get lastName() { - return this._currentUser.lastName; - } - - get searchKey() { - return this.name + this.username + this.email; - } - - get isManager() { - return this.roles.indexOf('RED_MANAGER') >= 0; - } - - get isUserAdmin() { - return this.roles.indexOf('RED_USER_ADMIN') >= 0; - } - - get isUser() { - return this.roles.indexOf('RED_USER') >= 0; - } - - get isAdmin() { - return this.roles.indexOf('RED_ADMIN') >= 0; - } - - get hasAnyREDRoles() { - return this.isUser || this.isManager || this.isAdmin || this.isUserAdmin; - } + 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; + isAdmin = this.roles.indexOf('RED_ADMIN') >= 0; + hasAnyREDRoles = this.isUser || this.isManager || this.isAdmin || this.isUserAdmin; } @Injectable({ providedIn: 'root' }) export class UserService { - usersReloaded$: EventEmitter = new EventEmitter(); + usersReloaded$ = new Subject(); private _currentUser: UserWrapper; private _allUsers: UserWrapper[]; @@ -82,35 +49,18 @@ export class UserService { private _allRedUsers: UserWrapper[]; - get allRedUsers(): UserWrapper[] { - return this._allRedUsers; - } - - get userId(): string { - return this._currentUser.id; - } - get managerUsers(): UserWrapper[] { - return this._allRedUsers.filter(u => u.roles.indexOf('RED_MANAGER') >= 0); + return this._allRedUsers.filter(user => user.isManager); } get eligibleUsers(): UserWrapper[] { - return this._allRedUsers.filter(u => u.roles.indexOf('RED_USER') >= 0 || u.roles.indexOf('RED_MANAGER') >= 0); + return this._allRedUsers.filter(user => user.isUser || user.isManager); } - get user() { + get currentUser(): UserWrapper { return this._currentUser; } - private static _hasAnyRedRole(user: UserWrapper) { - return ( - user.roles.indexOf('RED_USER') >= 0 || - user.roles.indexOf('RED_MANAGER') >= 0 || - user.roles.indexOf('RED_ADMIN') >= 0 || - user.roles.indexOf('RED_USER_ADMIN') >= 0 - ); - } - logout() { wipeCaches().then(); this._keycloakService.logout(window.location.origin + this._baseHref).then(); @@ -123,14 +73,14 @@ export class UserService { } async loadAllUsers() { - let allUsers = []; + let allUsers: User[]; if (this._currentUser.isUserAdmin) { allUsers = await this._userControllerService.getAllUsers().toPromise(); } else { allUsers = await this._userControllerService.getUsers().toPromise(); } this._allUsers = allUsers.map(user => new UserWrapper(user, user.roles, user.userId)); - this._allRedUsers = this._allUsers.filter(u => UserService._hasAnyRedRole(u)); + this._allRedUsers = this._allUsers.filter(user => user.hasAnyREDRoles); this.usersReloaded$.next(); return this._allUsers; } @@ -147,42 +97,27 @@ export class UserService { } getRedUserById(id: string) { - return this._allRedUsers.find(u => u.userId === id); + return this._allRedUsers.find(u => u.id === id); } getUserById(id: string) { - return this._allUsers ? this._allUsers.find(u => u.userId === id) : this.getRedUserById(id); + return this._allUsers ? this._allUsers.find(u => u.id === id) : this.getRedUserById(id); } - getNameForId(userId: string) { - return this.getName(this.getUserById(userId)); + getNameForId(userId: string): string | undefined { + const user = this.getUserById(userId); + return user ? this.getName(user) : undefined; } - getName({ firstName, lastName, username }: User = {}) { + getName({ firstName, lastName, username }: UserWrapper) { return firstName && lastName ? `${firstName} ${lastName}` : username; } - isManager(user: User | UserWrapper = this.user): boolean { + isManager(user: UserWrapper = this._currentUser): boolean { return user.roles.indexOf('RED_MANAGER') >= 0; } - isUser(user: User | UserWrapper = this.user): boolean { - return user.roles?.indexOf('RED_USER') >= 0; - } - - isUserAdmin(user: User | UserWrapper = this.user): boolean { - return user.roles?.indexOf('RED_USER_ADMIN') >= 0; - } - - isAdmin(user: User | UserWrapper = this.user): boolean { - return user.roles?.indexOf('RED_ADMIN') >= 0; - } - - isActive(user: User | UserWrapper = this.user): boolean { - return user.roles?.length > 0; - } - - hasAnyRole(requiredRoles: string[], user: User | UserWrapper = this.user) { + 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 aed5ee2ef..39c225494 100644 --- a/apps/red-ui/src/app/state/app-state.guard.ts +++ b/apps/red-ui/src/app/state/app-state.guard.ts @@ -14,17 +14,17 @@ export class AppStateGuard implements CanActivate { ) {} async canActivate(route: ActivatedRouteSnapshot): Promise { - if (this._userService.user.isUserAdmin) { + if (this._userService.currentUser.isUserAdmin) { await this._userService.loadUsersIfNecessary(); } - if (this._userService.user.isUser || this._userService.user.isAdmin) { + if (this._userService.currentUser.isUser || this._userService.currentUser.isAdmin) { await this._userService.loadUsersIfNecessary(); await this._appStateService.loadDossierTemplatesIfNecessary(); await this._appStateService.loadDictionaryDataIfNecessary(); } - if (this._userService.isUser()) { + if (this._userService.currentUser.isUser) { await this._appStateService.loadAllDossiersIfNecessary(); } 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 537dd0a0a..f2b6befb1 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -15,13 +15,14 @@ import { Event, NavigationEnd, ResolveStart, Router } from '@angular/router'; import { UserService } from '@services/user.service'; import { forkJoin, Observable, of } from 'rxjs'; import { catchError, tap } from 'rxjs/operators'; -import { FALLBACK_COLOR, hexToRgb, humanize } from '@utils/functions'; +import { FALLBACK_COLOR, hexToRgb } from '@utils/functions'; import { FileStatusWrapper } from '@models/file/file-status.wrapper'; import { DossierWrapper } from './model/dossier.wrapper'; import { TypeValueWrapper } from '@models/file/type-value.wrapper'; import { DossierTemplateModelWrapper } from '@models/file/dossier-template-model.wrapper'; import { DossiersService } from '../modules/dossier/services/dossiers.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { humanize } from '@iqser/common-ui'; export interface AppState { dossiers: DossierWrapper[]; diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts index 83f1a5ed5..183aae547 100644 --- a/apps/red-ui/src/app/utils/functions.ts +++ b/apps/red-ui/src/app/utils/functions.ts @@ -7,25 +7,6 @@ export function groupBy(xs: any[], key: string) { }, {}); } -export function computerize(str: string) { - if (!str) { - return undefined; - } - const frags = str.toLowerCase().split(/[ \-_]+/); - return frags.join('_'); -} - -export function humanize(str: string, lowercase: boolean = true) { - if (!str) { - return undefined; - } - const frags = (lowercase ? str.toLowerCase() : str).split(/[ \-_]+/); - for (let i = 0; i < frags.length; i++) { - frags[i] = frags[i].charAt(0).toUpperCase() + frags[i].slice(1); - } - return frags.join(' '); -} - export function hexToRgb(hex) { const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); return result @@ -37,14 +18,6 @@ export function hexToRgb(hex) { : null; } -export function keypress(key: string) { - document.dispatchEvent(new KeyboardEvent('keypress', { key: key })); -} - -export function reference(x: any) { - return x; -} - export function getFirstRelevantTextPart(text, direction: 'FORWARD' | 'BACKWARD') { let spaceCount = 0; let accumulator = ''; @@ -58,11 +31,7 @@ export function getFirstRelevantTextPart(text, direction: 'FORWARD' | 'BACKWARD' accumulator += char; - if (spaceCount >= 2) { - return true; - } else { - return false; - } + return spaceCount >= 2; }; if (direction === 'FORWARD') { diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 6ce14af7a..19b17b1e8 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1016,7 +1016,7 @@ "form": { "forgot-password": "" }, - "subtitle": "", + "subtitle": " ", "title": "" }, "subtitle": "Mit SMTP (Simple Mail Transfer Protocol) können Sie Ihre E-Mails über die angegebenen Servereinstellungen senden.", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index a7ce2794a..befe97755 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1028,7 +1028,7 @@ "form": { "forgot-password": "Show Forgot password link on Login screen" }, - "subtitle": "", + "subtitle": " ", "title": "General Configurations" }, "subtitle": "SMTP (Simple Mail Transfer Protocol) enables you to send your emails through the specified server settings.", diff --git a/apps/red-ui/src/assets/icons/general/sort-asc.svg b/apps/red-ui/src/assets/icons/general/sort-asc.svg deleted file mode 100644 index 812184785..000000000 --- a/apps/red-ui/src/assets/icons/general/sort-asc.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/sort-desc.svg b/apps/red-ui/src/assets/icons/general/sort-desc.svg deleted file mode 100644 index f9211f8d1..000000000 --- a/apps/red-ui/src/assets/icons/general/sort-desc.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/apps/red-ui/src/assets/styles/red-tables.scss b/apps/red-ui/src/assets/styles/red-tables.scss index f0ec2d474..c745443f2 100644 --- a/apps/red-ui/src/assets/styles/red-tables.scss +++ b/apps/red-ui/src/assets/styles/red-tables.scss @@ -12,25 +12,6 @@ } } -.table-header { - display: flex; - border-bottom: 1px solid $separator; - - &.no-data:not([synced='true']) { - padding-left: 30px; - } - - redaction-table-col-name:last-of-type { - > div { - padding-right: 13px; - } - } - - &.selection-enabled redaction-table-col-name > div { - padding-left: 10px; - } -} - cdk-virtual-scroll-viewport { height: calc(100vh - 50px - 31px - 111px); overflow-y: hidden !important; diff --git a/apps/red-ui/src/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss index 6da1afefc..52c509f6a 100644 --- a/apps/red-ui/src/assets/styles/red-text-styles.scss +++ b/apps/red-ui/src/assets/styles/red-text-styles.scss @@ -55,29 +55,6 @@ pre { padding: 0 20px; } -.all-caps-label { - text-transform: uppercase; - opacity: 0.7; - font-size: 11px; - font-weight: 600; - letter-spacing: 0; - line-height: 14px; - transition: opacity 0.2s; - - &.cancel { - cursor: pointer; - - &:hover { - opacity: 1; - } - - &.disabled { - opacity: 0.3; - cursor: default; - } - } -} - .small-label { opacity: 0.7; font-size: 11px; diff --git a/libs/common-ui b/libs/common-ui index 3f9915434..98ae1d569 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 3f9915434d96fc93a41b7b448826e1ba6ea85839 +Subproject commit 98ae1d5698a838ed1e3febf0b30dfa81f44b2c16 diff --git a/package.json b/package.json index 3e44ad9dd..a2630e3fd 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "husky": { "hooks": { - "pre-commit": "pretty-quick --staged && ng lint --project=red-ui-http && ng lint --project=red-ui --fix" + "pre-commit": "pretty-quick --staged && ng lint --project=red-ui-http && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix" } }, "dependencies": { @@ -92,6 +92,7 @@ "@nrwl/workspace": "12.3.6", "@types/cypress": "^1.1.3", "@types/jest": "26.0.23", + "@types/lodash": "^4.14.172", "@types/node": "15.12.2", "@typescript-eslint/eslint-plugin": "4.26.1", "@typescript-eslint/parser": "4.26.1", diff --git a/yarn.lock b/yarn.lock index e71c35272..fde77360b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3178,6 +3178,11 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/lodash@^4.14.172": + version "4.14.172" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" + integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw== + "@types/minimatch@*", "@types/minimatch@^3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"