SI-519 publicationStatus zu expectedReason + SI-523 Label-Anpassung Signed-off-by: Peter Buschmann <peter.buschmann@pta.de>

diff --git a/i18n/grid-failure.de.json b/i18n/grid-failure.de.json
index d9cfdae..75ffd6d 100644
--- a/i18n/grid-failure.de.json
+++ b/i18n/grid-failure.de.json

@@ -34,7 +34,7 @@
     "StationDescription": "Bezeichnung",
     "StatusExtern": "Status (extern)",
     "StatusIntern": "Status (intern)",
-    "Street": "Straße (betroffene Straße)",
+    "Street": "Straße (betroffene Straßen)",
     "VoltageLevel": "Spannungsebene",
     "PublicationStatus": "Veröffentlichungsstatus"
   },

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-api-client.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-api-client.ts
index e1df839..d165316 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-api-client.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-api-client.ts

@@ -98,8 +98,8 @@
   }
 
   @GET('/expected-reasons')
-  @Adapter(GridFailureService.publicationTextListAdapter)
-  public getGridFailurePublicationTexts(): Observable<FailureExpectedReason[]> {
+  @Adapter(GridFailureService.expectedReasonListAdapter)
+  public getGridFailureExpectedReasons(): Observable<FailureExpectedReason[]> {
     return null;
   }
 }

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
index 23e96d8..f2bd0f0 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html

@@ -90,7 +90,7 @@
                 <select
                   type="text"
                   class="form-control"
-                  id="publicationStatus"
+                  id="internExtern"
                   [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['internExtern']"
                 >
                   <option [value]="null" selected>{{ 'SelectOption' | translate }}</option>
@@ -322,7 +322,7 @@
                   [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['expectedReasonId']"
                 >
                   <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                  <option *ngFor="let item of gridFailureDetailsSandbox.gridFailurePublicationTexts$ | async" [value]="item.id">{{ item.text }}</option>
+                  <option *ngFor="let item of gridFailureDetailsSandbox.gridFailureExpectedReasons$ | async" [value]="item.id">{{ item.text }}</option>
                 </select>
               </div>
               <!-- freetext feld (planned) -->

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.spec.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.spec.ts
index e284873..193939f 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.spec.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.spec.ts

@@ -74,8 +74,8 @@
     expect(appState.dispatch).toHaveBeenCalledWith(gridFailureActions.loadGridFailureRadii());
   });
 
-  it('should dispatch loadGridFailurePublicationTexts Action via loadGridFailurePublicationTexts()', () => {
-    service.loadGridFailurePublicationTexts();
+  it('should dispatch loadGridFailureExpectedReasons Action via loadGridFailureExpectedReasons()', () => {
+    service.loadGridFailureExpectedReasons();
     expect(appState.dispatch).toHaveBeenCalledWith(gridFailureActions.loadGridFailureExpectedReasons());
   });
 

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
index 4df3771..93b1edb 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts

@@ -58,7 +58,7 @@
     .select(store.getGridFailureStatesData)
     .pipe(map(states => states.filter(item => item.external)));
   public gridFailureRadii$: Observable<FailureRadius[]> = this.appState$.select(store.getGridFailureRadiiData);
-  public gridFailurePublicationTexts$: Observable<FailureExpectedReason[]> = this.appState$.select(store.getGridFailurePublicationTextsData);
+  public gridFailureExpectedReasons$: Observable<FailureExpectedReason[]> = this.appState$.select(store.getGridFailureExpectedReasonsData);
   public datePickerResetEnum = DatePickerResetEnum;
   public voltageLevelEnum = VoltageLevelEnum;
   public pressureLevelEnum = PressureLevelEnum;
@@ -105,7 +105,7 @@
     this.appState$.dispatch(gridFailureActions.loadGridFailureRadii());
   }
 
-  public loadGridFailurePublicationTexts(): void {
+  public loadGridFailureExpectedReasons(): void {
     this.appState$.dispatch(gridFailureActions.loadGridFailureExpectedReasons());
   }
 

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.spec.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.spec.ts
index 44520d9..b90658e 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.spec.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.spec.ts

@@ -30,7 +30,7 @@
       loadGridFailureTypes() {},
       loadGridFailureStates() {},
       loadGridFailureRadii() {},
-      loadGridFailurePublicationTexts() {},
+      loadGridFailureExpectedReasons() {},
     } as any;
   });
 

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.ts
index cb9acee..e04536c 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.resolver.ts

@@ -34,6 +34,6 @@
     this._detailSandbox.loadGridFailureTypes();
     this._detailSandbox.loadGridFailureStates();
     this._detailSandbox.loadGridFailureRadii();
-    this._detailSandbox.loadGridFailurePublicationTexts();
+    this._detailSandbox.loadGridFailureExpectedReasons();
   }
 }

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.spec.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.spec.ts
index c83e1af..a0320a3 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.spec.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.spec.ts

@@ -77,6 +77,6 @@
     const response = [new FailureExpectedReason()];
     response[0].id = 'X';
 
-    expect(GridFailureService.publicationTextListAdapter(response)[0].id).toBe('X');
+    expect(GridFailureService.expectedReasonListAdapter(response)[0].id).toBe('X');
   });
 });

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.ts
index 09794b7..f7ed7bc 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure.service.ts

@@ -51,7 +51,7 @@
     return response.map(responseItem => new FailureRadius(responseItem));
   }
 
-  static publicationTextListAdapter(response: any): Array<FailureExpectedReason> {
+  static expectedReasonListAdapter(response: any): Array<FailureExpectedReason> {
     return response.map(responseItem => new FailureExpectedReason(responseItem));
   }
 }

diff --git a/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.spec.ts b/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.spec.ts
index 13e4883..7e6f2e4 100644
--- a/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.spec.ts
+++ b/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.spec.ts

@@ -46,7 +46,7 @@
       getGridFailureTypes() {},
       getGridFailureStates() {},
       getGridFailureRadii() {},
-      getGridFailurePublicationTexts() {},
+      getGridFailureExpectedReasons() {},
     } as any;
     store = {
       dispatch() {},
@@ -206,8 +206,8 @@
 
   it('should equal loadGridFailureExpectedReasons after getGridFailureExpectedReasons', done => {
     apiResponse = [new FailureExpectedReason({ id: '1' })];
-    spyOn(apiClient, 'getGridFailurePublicationTexts').and.returnValue(of(apiResponse));
-    effects.getGridFailurePublicationTexts$.pipe(take(1)).subscribe(result => {
+    spyOn(apiClient, 'getGridFailureExpectedReasons').and.returnValue(of(apiResponse));
+    effects.getGridFailureExpectedReasons$.pipe(take(1)).subscribe(result => {
       expect(result).toEqual(gridFailureActions.loadGridFailureExpectedReasonsSuccess({ payload: apiResponse }));
     });
     done();

diff --git a/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.ts b/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.ts
index fa06b8e..1e658b5 100644
--- a/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.ts
+++ b/projects/grid-failure-information-app/src/app/shared/store/effects/grid-failures.effect.ts

@@ -156,12 +156,12 @@
     )
   );
 
-  getGridFailurePublicationTexts$: any = createEffect(() =>
+  getGridFailureExpectedReasons$: any = createEffect(() =>
     this._actions$.pipe(
       ofType(gridFailureActions.loadGridFailureExpectedReasons),
       switchMap(action => {
         return this._apiClient
-          .getGridFailurePublicationTexts()
+          .getGridFailureExpectedReasons()
           .map((response: FailureExpectedReason[]) => gridFailureActions.loadGridFailureExpectedReasonsSuccess({ payload: response }))
           .catch(error => of(gridFailureActions.loadGridFailureExpectedReasonsFail({ payload: error })));
       })

diff --git a/projects/grid-failure-information-app/src/app/shared/store/index.ts b/projects/grid-failure-information-app/src/app/shared/store/index.ts
index 3db1be5..b706e0a 100644
--- a/projects/grid-failure-information-app/src/app/shared/store/index.ts
+++ b/projects/grid-failure-information-app/src/app/shared/store/index.ts

@@ -25,7 +25,7 @@
 import * as fromGridFailureTypes from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-types.reducer';
 import * as fromGridFailureStates from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-states.reducer';
 import * as fromGridFailureRadii from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-radii.reducer';
-import * as fromGridFailurePublicationTexts from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer';
+import * as fromGridFailureExpectedReasons from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer';
 import * as fromGridFailuresDetailForm from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-details-form.reducer';
 import { createFeatureSelector } from '@ngrx/store';
 import { createSelector } from 'reselect';
@@ -49,7 +49,7 @@
   gridFailureTypes: fromGridFailureTypes.State;
   gridFailureStates: fromGridFailureStates.State;
   gridFailureRadii: fromGridFailureRadii.State;
-  gridFailurePublicationTexts: fromGridFailurePublicationTexts.State;
+  gridFailureExpectedReasons: fromGridFailureExpectedReasons.State;
 }
 /**
  * Because metareducers take a reducer function and return a new reducer,
@@ -71,7 +71,7 @@
   gridFailureTypes: fromGridFailureTypes.reducer,
   gridFailureStates: fromGridFailureStates.reducer,
   gridFailureRadii: fromGridFailureRadii.reducer,
-  gridFailurePublicationTexts: fromGridFailurePublicationTexts.reducer,
+  gridFailureExpectedReasons: fromGridFailureExpectedReasons.reducer,
 };
 
 /**
@@ -151,9 +151,9 @@
 export const getGridFailureRadiiFailed = createSelector(selectGridFailureRadii, fromGridFailureRadii.getFailed);
 export const getGridFailureRadiiData = createSelector(selectGridFailureRadii, fromGridFailureRadii.getData);
 
-// GridFailure publication texts
-export const selectGridFailurePublicationTexts = createSelector(selectGridFailuresState, (state: GridFailureState) => state.gridFailurePublicationTexts);
-export const getGridFailurePublicationTextsLoaded = createSelector(selectGridFailurePublicationTexts, fromGridFailurePublicationTexts.getLoaded);
-export const getGridFailurePublicationTextsLoading = createSelector(selectGridFailurePublicationTexts, fromGridFailurePublicationTexts.getLoading);
-export const getGridFailurePublicationTextsFailed = createSelector(selectGridFailurePublicationTexts, fromGridFailurePublicationTexts.getFailed);
-export const getGridFailurePublicationTextsData = createSelector(selectGridFailurePublicationTexts, fromGridFailurePublicationTexts.getData);
+// GridFailure expected reasons
+export const selectGridFailureExpectedReasons = createSelector(selectGridFailuresState, (state: GridFailureState) => state.gridFailureExpectedReasons);
+export const getGridFailuresExpectedReasonsLoaded = createSelector(selectGridFailureExpectedReasons, fromGridFailureExpectedReasons.getLoaded);
+export const getGridFailureExpectedReasonsLoading = createSelector(selectGridFailureExpectedReasons, fromGridFailureExpectedReasons.getLoading);
+export const getGridFailureExpectedReasonsFailed = createSelector(selectGridFailureExpectedReasons, fromGridFailureExpectedReasons.getFailed);
+export const getGridFailureExpectedReasonsData = createSelector(selectGridFailureExpectedReasons, fromGridFailureExpectedReasons.getData);

diff --git a/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer.spec.ts b/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer.spec.ts
similarity index 86%
rename from projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer.spec.ts
rename to projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer.spec.ts
index 0f1c9f6..c5a959c 100644
--- a/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer.spec.ts
+++ b/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer.spec.ts

@@ -11,18 +11,18 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 import {
-  GridFailurePublicationTextsReducer,
+  GridFailureExpectedReasonsReducer,
   INITIAL_STATE,
   getData,
   getLoading,
   getLoaded,
   getFailed,
   reducer,
-} from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer';
+} from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer';
 import * as gridFailureActions from '@grid-failure-information-app/shared/store/actions/grid-failures.action';
 import { FailureExpectedReason } from '@grid-failure-information-app/shared/models';
 
-describe('GridFailurePublicationTextsReducer', () => {
+describe('GridFailureExpectedReasonsReducer', () => {
   it('should return the initial state', () => {
     const action = { type: 'NOOP' } as any;
     const result = reducer(undefined, action);
@@ -32,7 +32,7 @@
 
   it('should trigger loading state', () => {
     const action = gridFailureActions.loadGridFailureExpectedReasons();
-    const result = GridFailurePublicationTextsReducer(INITIAL_STATE, action);
+    const result = GridFailureExpectedReasonsReducer(INITIAL_STATE, action);
 
     expect(result).toEqual({
       ...INITIAL_STATE,
@@ -43,7 +43,7 @@
   it('should trigger loaded state', () => {
     const items = { payload: [new FailureExpectedReason()] };
     const action = gridFailureActions.loadGridFailureExpectedReasonsSuccess(items);
-    const result = GridFailurePublicationTextsReducer(INITIAL_STATE, action);
+    const result = GridFailureExpectedReasonsReducer(INITIAL_STATE, action);
 
     expect(result.loaded).toBe(true);
   });
@@ -51,7 +51,7 @@
   it('should trigger failed state', () => {
     const error = { payload: 'err_msg' };
     const action = gridFailureActions.loadGridFailureExpectedReasonsFail(error);
-    const result = GridFailurePublicationTextsReducer(INITIAL_STATE, action);
+    const result = GridFailureExpectedReasonsReducer(INITIAL_STATE, action);
 
     expect(result).toEqual({
       ...INITIAL_STATE,

diff --git a/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer.ts b/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer.ts
similarity index 93%
rename from projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer.ts
rename to projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer.ts
index fbbdf3a..81f9765 100644
--- a/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer.ts
+++ b/projects/grid-failure-information-app/src/app/shared/store/reducers/grid-failures/grid-failure-expected-reasons.reducer.ts

@@ -28,7 +28,7 @@
   data: [],
 };
 
-export const GridFailurePublicationTextsReducer = createReducer(
+export const GridFailureExpectedReasonsReducer = createReducer(
   INITIAL_STATE,
   on(gridFailureActions.loadGridFailureExpectedReasons, (state: any, action: any) => {
     return {
@@ -60,7 +60,7 @@
 );
 
 export function reducer(state = INITIAL_STATE, action: any): State {
-  return GridFailurePublicationTextsReducer(state, action);
+  return GridFailureExpectedReasonsReducer(state, action);
 }
 
 export const getData = (state: State) => state.data;