From ad5974f20e775cc04639a0be4cde1133a552cc5c Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Mon, 15 Nov 2021 10:03:21 +0100 Subject: [PATCH] Added slutredovisning to active features for prod --- .../pages/deltagare-details/deltagare-details.module.ts | 2 +- .../deltagare-tab-reports.component.ts | 8 ++++---- apps/mina-sidor-fa/src/app/shared/enums/feature.enum.ts | 3 ++- apps/mina-sidor-fa/src/environments/active-features.ts | 4 +++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts index 98058b9..3301e4e 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts @@ -110,7 +110,7 @@ activeFeatures.forEach(feature => { } ); break; - case Feature.SLUTREDOVISNING: + case Feature.REPORTING_SLUTREDOVISNING: routes.push( { path: 'slutredovisning', diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts index b93f17e..c0bdcb7 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Feature } from '@msfa-enums/feature.enum'; import { environment } from '@msfa-environment'; +import { PaginationParams } from '@msfa-models/api/params.model'; import { ReportsData } from '@msfa-models/report.model'; +import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; -import { ActivatedRoute } from '@angular/router'; -import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; -import { PaginationParams } from '@msfa-models/api/params.model'; @Component({ selector: 'msfa-deltagare-tab-reports', @@ -37,7 +37,7 @@ export class DeltagareTabReportsComponent { return this._activeFeatures.includes(Feature.REPORTING_INFORMATIV_RAPPORT); } get slutredovisningButtonVisible(): boolean { - return this._activeFeatures.includes(Feature.SLUTREDOVISNING); + return this._activeFeatures.includes(Feature.REPORTING_SLUTREDOVISNING); } constructor(private activatedRoute: ActivatedRoute, private deltagareApiService: DeltagareApiService) {} diff --git a/apps/mina-sidor-fa/src/app/shared/enums/feature.enum.ts b/apps/mina-sidor-fa/src/app/shared/enums/feature.enum.ts index ff90c25..bef990f 100644 --- a/apps/mina-sidor-fa/src/app/shared/enums/feature.enum.ts +++ b/apps/mina-sidor-fa/src/app/shared/enums/feature.enum.ts @@ -15,7 +15,8 @@ export enum Feature { REPORTING_SIGNAL, REPORTING_PERIODISK_REDOVISNING, REPORTING_INFORMATIV_RAPPORT, + REPORTING_SLUTREDOVISNING, EXPORTS, - SLUTREDOVISNING, NEWS, + REPORTING_SLUTREDOVISNING, } diff --git a/apps/mina-sidor-fa/src/environments/active-features.ts b/apps/mina-sidor-fa/src/environments/active-features.ts index b0f8cd2..bf54224 100644 --- a/apps/mina-sidor-fa/src/environments/active-features.ts +++ b/apps/mina-sidor-fa/src/environments/active-features.ts @@ -11,6 +11,7 @@ export const ACTIVE_FEATURES_PROD: Feature[] = [ Feature.LOGGING, Feature.REPORTING_PERIODISK_REDOVISNING, Feature.REPORTING_INFORMATIV_RAPPORT, + Feature.REPORTING_SLUTREDOVISNING, Feature.EXPORTS, ]; @@ -28,7 +29,8 @@ export const ACTIVE_FEATURES_TEST: Feature[] = [ Feature.VERSION_INFO, Feature.REPORTING_PERIODISK_REDOVISNING, Feature.REPORTING_INFORMATIV_RAPPORT, - Feature.SLUTREDOVISNING, + Feature.REPORTING_SLUTREDOVISNING, + Feature.REPORTING_SIGNAL, Feature.EXPORTS, Feature.NEWS, ];