diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index de57e29c3..713f365da 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -16,7 +16,7 @@ import { CompositeRouteGuard, DEFAULT_REDIRECT_KEY, IqserPermissionsGuard, Iqser import { TenantSelectComponent } from '@iqser/common-ui/lib/tenants'; import { doesNotHaveAnyRole, hasAnyRole, IqserAuthGuard } from '@iqser/common-ui/lib/users'; import { CustomRouteReuseStrategy } from '@iqser/common-ui/lib/utils'; -import { ARCHIVE_ROUTE, BreadcrumbTypes, DOSSIER_ID, DOSSIER_TEMPLATE_ID, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE, FILE_ID } from '@red/domain'; +import { ARCHIVE_ROUTE, BreadcrumbTypes, DOSSIER_ID, DOSSIER_TEMPLATE_ID, DOSSIERS_ROUTE, FILE_ID } from '@red/domain'; import { RedRoleGuard } from '@users/red-role.guard'; import { Roles } from '@users/roles'; import { mainGuard } from '@utils/main.guard'; @@ -81,7 +81,6 @@ const dossierTemplateIdRoutes: IqserRoutes = [ canActivate: [CompositeRouteGuard, loadArchivedDossiersGuard()], data: { routeGuards: [FeaturesGuard], - features: [DOSSIERS_ARCHIVE], }, }, { 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 d0b3e4df2..a5c674642 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 @@ -8,8 +8,7 @@ import { SpotlightSearchAction } from '@components/spotlight-search/spotlight-se import { filter, map, startWith } from 'rxjs/operators'; import { getConfig, IqserPermissionsService } from '@iqser/common-ui'; import { BreadcrumbsService } from '@services/breadcrumbs.service'; -import { FeaturesService } from '@services/features.service'; -import { ARCHIVE_ROUTE, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE } from '@red/domain'; +import { ARCHIVE_ROUTE, DOSSIERS_ROUTE } from '@red/domain'; import { Roles } from '@users/roles'; import { REDDocumentViewer } from '../../modules/pdf-viewer/services/document-viewer.service'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @@ -36,7 +35,6 @@ export class BaseScreenComponent { { text: this._translateService.instant('search.active-dossiers'), icon: 'red:enter', - hide: () => !this._featuresService.isEnabled(DOSSIERS_ARCHIVE), action: (query): void => this.#search(query, [], true), }, { @@ -58,7 +56,6 @@ export class BaseScreenComponent { private readonly _router: Router, activatedRoute: ActivatedRoute, private readonly _translateService: TranslateService, - private readonly _featuresService: FeaturesService, readonly permissionsService: IqserPermissionsService, readonly userService: UserService, readonly userPreferenceService: UserPreferenceService, diff --git a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.html b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.html index c7564598f..ec029e356 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.html @@ -1,6 +1,6 @@
- + diff --git a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts index 9e811cb1c..c59b47b63 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/screen/dossiers-listing-screen.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { Dossier, DOSSIER_TEMPLATE_ID, DOSSIERS_ARCHIVE, DossierTemplate } from '@red/domain'; +import { Dossier, DOSSIER_TEMPLATE_ID, DossierTemplate } from '@red/domain'; import { PermissionsService } from '@services/permissions.service'; import { ButtonConfig, @@ -19,7 +19,6 @@ import { UserPreferenceService } from '@users/user-preference.service'; import { SharedDialogService } from '@shared/services/dialog.service'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { OnAttach } from '@iqser/common-ui/lib/utils'; -import { FeaturesService } from '@services/features.service'; import { DossiersTypeSwitchComponent } from '@shared/components/dossiers-type-switch/dossiers-type-switch.component'; import { TranslateModule } from '@ngx-translate/core'; import { DossiersListingDetailsComponent } from '../components/dossiers-listing-details/dossiers-listing-details.component'; @@ -51,7 +50,6 @@ export class DossiersListingScreenComponent extends ListingComponent im readonly buttonConfigs: ButtonConfig[]; readonly dossierTemplate: DossierTemplate; readonly computeFilters$ = this._activeDossiersService.all$.pipe(tap(() => this._computeAllFilters())); - readonly isArchiveEnabled = this._featuresService.isEnabled(DOSSIERS_ARCHIVE); @ViewChild('needsWorkFilterTemplate', { read: TemplateRef, static: true, @@ -68,7 +66,6 @@ export class DossiersListingScreenComponent extends ListingComponent im private readonly _userPreferenceService: UserPreferenceService, private readonly _loadingService: LoadingService, readonly dossierTemplatesService: DossierTemplatesService, - private readonly _featuresService: FeaturesService, ) { super(); const dossierTemplateId = router.routerState.snapshot.root.firstChild.firstChild.paramMap.get(DOSSIER_TEMPLATE_ID); diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 75cb6d922..e5227c862 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -7,7 +7,7 @@ import { SearchPositions, TableColumnConfig, } from '@iqser/common-ui'; -import { combineLatest, Observable, of } from 'rxjs'; +import { combineLatest, Observable } from 'rxjs'; import { debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -16,7 +16,6 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; import { Dossier, - DOSSIERS_ARCHIVE, DossierTemplate, IMatchedDocument, ISearchListItem, @@ -26,7 +25,6 @@ import { } from '@red/domain'; import { FilesMapService } from '@services/files/files-map.service'; import { PlatformSearchService } from '@services/entity-services/platform-search.service'; -import { FeaturesService } from '@services/features.service'; import { DossiersCacheService } from '@services/dossiers/dossiers-cache.service'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { UserService } from '@users/user.service'; @@ -68,7 +66,6 @@ export default class SearchScreenComponent extends ListingComponent { - const onlyActiveDossiers$ = this.#enabledArchive - ? this.filterService.getSingleFilter('onlyActiveDossiers').pipe(map(f => !!f.checked)) - : of(true); + const onlyActiveDossiers$ = this.filterService.getSingleFilter('onlyActiveDossiers').pipe(map(f => !!f.checked)); const filterGroups$ = this.filterService.filterGroups$; return combineLatest([filterGroups$, onlyActiveDossiers$]).pipe( map(([groups, onlyActive]) => { @@ -225,9 +216,7 @@ export default class SearchScreenComponent extends ListingComponent { @@ -46,7 +44,7 @@ export class ArchivedDossiersService extends DossiersService { } loadAll(): Observable { - return this.#featuresService.isEnabled(DOSSIERS_ARCHIVE) ? super.loadAll() : of([]); + return super.loadAll(); } #removeFromActiveDossiers(archivedDossiersIds: string[]): void { diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 69191b669..f1c283543 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -4,7 +4,6 @@ import { DashboardStats, Dictionary, Dossier, - DOSSIERS_ARCHIVE, DossierTemplate, File, IComment, @@ -13,7 +12,6 @@ import { WorkflowFileStatus, WorkflowFileStatuses, } from '@red/domain'; -import { FeaturesService } from '@services/features.service'; import { FilesMapService } from '@services/files/files-map.service'; import { Roles } from '@users/roles'; import { UserPreferenceService } from '@users/user-preference.service'; @@ -27,7 +25,6 @@ export class PermissionsService { constructor( private readonly _userService: UserService, private readonly _filesMapService: FilesMapService, - private readonly _featuresService: FeaturesService, private readonly _userPreferenceService: UserPreferenceService, private readonly _iqserPermissionsService: IqserPermissionsService, private readonly _dossierTemplatesService: DossierTemplatesService, @@ -290,12 +287,7 @@ export class PermissionsService { } canArchiveDossier(dossier: Dossier): boolean { - return ( - this._iqserPermissionsService.has(Roles.dossiers.archived) && - this._featuresService.isEnabled(DOSSIERS_ARCHIVE) && - dossier.isActive && - this.isOwner(dossier) - ); + return this._iqserPermissionsService.has(Roles.dossiers.archived) && dossier.isActive && this.isOwner(dossier); } canEditDossier(dossier: Dossier): boolean { diff --git a/apps/red-ui/src/assets/features/features.json b/apps/red-ui/src/assets/features/features.json index bbcfecc3a..0a8585355 100644 --- a/apps/red-ui/src/assets/features/features.json +++ b/apps/red-ui/src/assets/features/features.json @@ -1,8 +1,3 @@ { - "features": [ - { - "name": "DOSSIERS_ARCHIVE", - "minVersion": "3.3.0" - } - ] + "features": [] } diff --git a/libs/red-domain/src/lib/dossiers/constants.ts b/libs/red-domain/src/lib/dossiers/constants.ts index 95b78f4fa..4541b260b 100644 --- a/libs/red-domain/src/lib/dossiers/constants.ts +++ b/libs/red-domain/src/lib/dossiers/constants.ts @@ -1,5 +1,4 @@ export const DOSSIER_ID = 'dossierId'; -export const DOSSIERS_ARCHIVE = 'DOSSIERS_ARCHIVE'; export const ARCHIVE_ROUTE = 'archive'; export const DOSSIERS_ROUTE = 'dossiers';