diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index fbf716a2e..e3faf2cc2 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -67,7 +67,7 @@ const screens = [ WatermarkScreenComponent, SmtpConfigScreenComponent, ReportsScreenComponent, - DossierAttributesListingScreenComponent + DossierAttributesListingScreenComponent, TrashScreenComponent ]; 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 1e2f4d616..39e47a368 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,22 +20,22 @@
-
+
- {{ 'dossier-attributes-listing.table-header.title' | translate: { length: displayedEntities.length } }} + {{ 'dossier-attributes-listing.table-header.title' | translate: { length: (displayedEntities$ | async)?.length } }}
-
+
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 b907dbb2d..88d6c4e42 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 @@ -5,17 +5,17 @@ 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 { ScreenNames, SortingService } from '../../../../services/sorting.service'; +import { FilterService } from '../../../shared/services/filter.service'; +import { SearchService } from '../../../shared/services/search.service'; +import { ScreenStateService } from '../../../shared/services/screen-state.service'; @Component({ - selector: 'redaction-dossier-attributes', templateUrl: './dossier-attributes-listing-screen.component.html', - styleUrls: ['./dossier-attributes-listing-screen.component.scss'] + styleUrls: ['./dossier-attributes-listing-screen.component.scss'], + providers: [FilterService, SearchService, ScreenStateService, SortingService] }) export class DossierAttributesListingScreenComponent extends BaseListingComponent implements OnInit { - protected readonly _searchKey = 'label'; - protected readonly _selectionKey = 'id'; - protected readonly _sortKey = 'dossier-attributes-listing'; - constructor( protected readonly _injector: Injector, private readonly _appStateService: AppStateService, @@ -25,7 +25,10 @@ export class DossierAttributesListingScreenComponent extends BaseListingComponen private readonly _dossierAttributesService: DossierAttributesControllerService ) { super(_injector); - this._appStateService.activateDossierTemplate(_activatedRoute.snapshot.params.dossierTemplateId); + this._searchService.setSearchKey('label'); + this._screenStateService.setIdKey('id'); + this._sortingService.setScreenName(ScreenNames.DOSSIER_ATTRIBUTES_LISTING); + _appStateService.activateDossierTemplate(_activatedRoute.snapshot.params.dossierTemplateId); } async ngOnInit() { @@ -35,7 +38,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.selectedEntitiesIds; + const ids = dossierAttribute ? [dossierAttribute.id] : this._screenStateService.selectedEntitiesIds; await this._dossierAttributesService .deleteDossierAttributesConfig(ids, this._appStateService.activeDossierTemplateId) .toPromise(); @@ -59,8 +62,8 @@ export class DossierAttributesListingScreenComponent extends BaseListingComponen const response = await this._dossierAttributesService .getDossierAttributesConfig(this._appStateService.activeDossierTemplateId) .toPromise(); - this.allEntities = response?.dossierAttributeConfigs || []; - this._executeSearchImmediately(); + this._screenStateService.setEntities(response?.dossierAttributeConfigs || []); + this.filterService.filterEntities(); this._loadingService.stop(); } }