Skip to content
Snippets Groups Projects
Commit 336576ee authored by Peter Buschmann's avatar Peter Buschmann
Browse files

SI-329 comments from review + first unit tests


Signed-off-by: default avatarPeter Buschmann <peter.buschmann@pta.de>
parent dd89d4c6
No related branches found
No related tags found
No related merge requests found
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
class="form-control" class="form-control"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureClassificationId']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureClassificationId']"
> >
<option [value]="" selected>{{ 'SelectOption' | translate }}</option> <option [value]="null" selected>{{ 'SelectOption' | translate }}</option>
<option *ngFor="let classification of gridFailureDetailsSandbox.gridFailureClassifications$ | async" [value]="classification.id">{{ <option *ngFor="let classification of gridFailureDetailsSandbox.gridFailureClassifications$ | async" [value]="classification.id">{{
classification.classification classification.classification
}}</option> }}</option>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
class="form-control" class="form-control"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureTypeId']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureTypeId']"
> >
<option [value]="" selected>{{ 'SelectOption' | translate }}</option> <option [value]="null" selected>{{ 'SelectOption' | translate }}</option>
<option *ngFor="let type of gridFailureDetailsSandbox.gridFailureTypes$ | async" [value]="type.id">{{ type.type }}</option> <option *ngFor="let type of gridFailureDetailsSandbox.gridFailureTypes$ | async" [value]="type.id">{{ type.type }}</option>
</select> </select>
</div> </div>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
id="publicationStatus" id="publicationStatus"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['publicationStatus']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['publicationStatus']"
> >
<option [value]="" selected>{{ 'SelectOption' | translate }}</option> <option [value]="null" selected>{{ 'SelectOption' | translate }}</option>
<option *ngFor="let enum of gridFailureDetailsSandbox.publicationStatusEnum | keyvalue" [value]="enum.key">{{ enum.value }}</option> <option *ngFor="let enum of gridFailureDetailsSandbox.publicationStatusEnum | keyvalue" [value]="enum.key">{{ enum.value }}</option>
</select> </select>
</div> </div>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
id="voltageLevel" id="voltageLevel"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['voltageLevel']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['voltageLevel']"
> >
<option [value]="" selected disabled>{{ 'SelectOption' | translate }}</option> <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
<option *ngFor="let enum of gridFailureDetailsSandbox.voltageLevelEnum | keyvalue" [value]="enum.key">{{ enum.value }}</option> <option *ngFor="let enum of gridFailureDetailsSandbox.voltageLevelEnum | keyvalue" [value]="enum.key">{{ enum.value }}</option>
</select> </select>
</div> </div>
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
id="pressureLevel" id="pressureLevel"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['pressureLevel']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['pressureLevel']"
> >
<option [value]="" selected>{{ 'SelectOption' | translate }}</option> <option [value]="null" selected>{{ 'SelectOption' | translate }}</option>
<option *ngFor="let enum of gridFailureDetailsSandbox.pressureLevelEnum | keyvalue" [value]="enum.key">{{ enum.value }}</option> <option *ngFor="let enum of gridFailureDetailsSandbox.pressureLevelEnum | keyvalue" [value]="enum.key">{{ enum.value }}</option>
</select> </select>
</div> </div>
...@@ -209,6 +209,8 @@ ...@@ -209,6 +209,8 @@
<app-date-time-picker <app-date-time-picker
(dateTimeChange)="setGridFailureDateTime($event, 'failureBegin')" (dateTimeChange)="setGridFailureDateTime($event, 'failureBegin')"
[dateString]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureBegin']?.value" [dateString]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureBegin']?.value"
[disabled]="!gridFailureDetailsSandbox.saveEnabled"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
></app-date-time-picker> ></app-date-time-picker>
</div> </div>
...@@ -220,6 +222,7 @@ ...@@ -220,6 +222,7 @@
id="failureBegin" id="failureBegin"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureBegin']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureBegin']"
[ngrxValueConverter]="gridFailureDetailsSandbox.dateTimeValueConverter" [ngrxValueConverter]="gridFailureDetailsSandbox.dateTimeValueConverter"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
readonly readonly
/> />
<div class="input-group-append"> <div class="input-group-append">
...@@ -227,6 +230,8 @@ ...@@ -227,6 +230,8 @@
class="btn btn-outline-primary calendar" class="btn btn-outline-primary calendar"
(click)="resetGridFailureDateTime(gridFailureDetailsSandbox.datePickerResetEnum.FailureBegin)" (click)="resetGridFailureDateTime(gridFailureDetailsSandbox.datePickerResetEnum.FailureBegin)"
type="button" type="button"
[disabled]="!gridFailureDetailsSandbox.saveEnabled"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
> >
<em class="fa fa-times-circle" aria-hidden="true"></em> <em class="fa fa-times-circle" aria-hidden="true"></em>
</button> </button>
...@@ -242,6 +247,8 @@ ...@@ -242,6 +247,8 @@
<app-date-time-picker <app-date-time-picker
(dateTimeChange)="setGridFailureDateTime($event, 'failureEndPlanned')" (dateTimeChange)="setGridFailureDateTime($event, 'failureEndPlanned')"
[dateString]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndPlanned']?.value" [dateString]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndPlanned']?.value"
[disabled]="!gridFailureDetailsSandbox.saveEnabled"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
></app-date-time-picker> ></app-date-time-picker>
</div> </div>
...@@ -252,6 +259,7 @@ ...@@ -252,6 +259,7 @@
id="failureEndPlanned" id="failureEndPlanned"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndPlanned']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndPlanned']"
[ngrxValueConverter]="gridFailureDetailsSandbox.dateTimeValueConverter" [ngrxValueConverter]="gridFailureDetailsSandbox.dateTimeValueConverter"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
readonly readonly
/> />
<div class="input-group-append"> <div class="input-group-append">
...@@ -259,6 +267,8 @@ ...@@ -259,6 +267,8 @@
class="btn btn-outline-primary calendar" class="btn btn-outline-primary calendar"
(click)="resetGridFailureDateTime(gridFailureDetailsSandbox.datePickerResetEnum.FailureEndPlanned)" (click)="resetGridFailureDateTime(gridFailureDetailsSandbox.datePickerResetEnum.FailureEndPlanned)"
type="button" type="button"
[disabled]="!gridFailureDetailsSandbox.saveEnabled"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
> >
<em class="fa fa-times-circle" aria-hidden="true"></em> <em class="fa fa-times-circle" aria-hidden="true"></em>
</button> </button>
...@@ -273,6 +283,8 @@ ...@@ -273,6 +283,8 @@
<app-date-time-picker <app-date-time-picker
(dateTimeChange)="setGridFailureDateTime($event, 'failureEndResupplied')" (dateTimeChange)="setGridFailureDateTime($event, 'failureEndResupplied')"
[dateString]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndResupplied']?.value" [dateString]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndResupplied']?.value"
[disabled]="!gridFailureDetailsSandbox.saveEnabled"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
></app-date-time-picker> ></app-date-time-picker>
<input <input
class="form-control editable" class="form-control editable"
...@@ -281,6 +293,7 @@ ...@@ -281,6 +293,7 @@
id="failureEndResupplied" id="failureEndResupplied"
[ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndResupplied']" [ngrxFormControlState]="((gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async)?.controls)['failureEndResupplied']"
[ngrxValueConverter]="gridFailureDetailsSandbox.dateTimeValueConverter" [ngrxValueConverter]="gridFailureDetailsSandbox.dateTimeValueConverter"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
readonly readonly
/> />
<div class="input-group-append"> <div class="input-group-append">
...@@ -288,6 +301,8 @@ ...@@ -288,6 +301,8 @@
class="btn btn-outline-primary calendar" class="btn btn-outline-primary calendar"
(click)="resetGridFailureDateTime(gridFailureDetailsSandbox.datePickerResetEnum.FailureEndResupplied)" (click)="resetGridFailureDateTime(gridFailureDetailsSandbox.datePickerResetEnum.FailureEndResupplied)"
type="button" type="button"
[disabled]="!gridFailureDetailsSandbox.saveEnabled"
[class.isDisabled]="!gridFailureDetailsSandbox.saveEnabled"
> >
<em class="fa fa-times-circle" aria-hidden="true"></em> <em class="fa fa-times-circle" aria-hidden="true"></em>
</button> </button>
......
/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
********************************************************************************/
import {
GridFailurePublicationTextsReducer,
INITIAL_STATE,
getData,
getLoading,
getLoaded,
getFailed,
reducer,
} from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-publication-texts.reducer';
import * as gridFailureActions from '@grid-failure-information-app/shared/store/actions/grid-failures.action';
import { FailurePublicationText } from '@grid-failure-information-app/shared/models';
describe('GridFailurePublicationTextsReducer', () => {
it('should return the initial state', () => {
const action = { type: 'NOOP' } as any;
const result = reducer(undefined, action);
expect(result).toBe(INITIAL_STATE);
});
it('should trigger loading state', () => {
const action = gridFailureActions.loadGridFailurePublicationTexts();
const result = GridFailurePublicationTextsReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
loading: true,
});
});
it('should trigger loaded state', () => {
const items = { payload: [new FailurePublicationText()] };
const action = gridFailureActions.loadGridFailurePublicationTextsSuccess(items);
const result = GridFailurePublicationTextsReducer(INITIAL_STATE, action);
expect(result.loaded).toBe(true);
});
it('should trigger failed state', () => {
const error = { payload: 'err_msg' };
const action = gridFailureActions.loadGridFailurePublicationTextsFail(error);
const result = GridFailurePublicationTextsReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
failed: true,
});
});
it('getData return state.data', () => {
const state = { ...INITIAL_STATE };
const result = getData(state);
expect(result).toBe(state.data);
});
it('getLoading return state.loading', () => {
const state = { ...INITIAL_STATE };
const result = getLoading(state);
expect(result).toBe(state.loading);
});
it('getLoaded return state.loaded', () => {
const state = { ...INITIAL_STATE };
const result = getLoaded(state);
expect(result).toBe(state.loaded);
});
it('getFailed return state.failed', () => {
const state = { ...INITIAL_STATE };
const result = getFailed(state);
expect(result).toBe(state.failed);
});
});
/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
********************************************************************************/
import {
GridFailureRadiiReducer,
INITIAL_STATE,
getData,
getLoading,
getLoaded,
getFailed,
reducer,
} from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-radii.reducer';
import * as gridFailureActions from '@grid-failure-information-app/shared/store/actions/grid-failures.action';
import { FailureRadius } from '@grid-failure-information-app/shared/models';
describe('GridFailureRadiiReducer', () => {
it('should return the initial state', () => {
const action = { type: 'NOOP' } as any;
const result = reducer(undefined, action);
expect(result).toBe(INITIAL_STATE);
});
it('should trigger loading state', () => {
const action = gridFailureActions.loadGridFailureRadii();
const result = GridFailureRadiiReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
loading: true,
});
});
it('should trigger loaded state', () => {
const items = { payload: [new FailureRadius()] };
const action = gridFailureActions.loadGridFailureRadiiSuccess(items);
const result = GridFailureRadiiReducer(INITIAL_STATE, action);
expect(result.loaded).toBe(true);
});
it('should trigger failed state', () => {
const error = { payload: 'err_msg' };
const action = gridFailureActions.loadGridFailureRadiiFail(error);
const result = GridFailureRadiiReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
failed: true,
});
});
it('getData return state.data', () => {
const state = { ...INITIAL_STATE };
const result = getData(state);
expect(result).toBe(state.data);
});
it('getLoading return state.loading', () => {
const state = { ...INITIAL_STATE };
const result = getLoading(state);
expect(result).toBe(state.loading);
});
it('getLoaded return state.loaded', () => {
const state = { ...INITIAL_STATE };
const result = getLoaded(state);
expect(result).toBe(state.loaded);
});
it('getFailed return state.failed', () => {
const state = { ...INITIAL_STATE };
const result = getFailed(state);
expect(result).toBe(state.failed);
});
});
/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
********************************************************************************/
import {
GridFailureStatesReducer,
INITIAL_STATE,
getData,
getLoading,
getLoaded,
getFailed,
reducer,
} from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-states.reducer';
import * as gridFailureActions from '@grid-failure-information-app/shared/store/actions/grid-failures.action';
import { FailureState } from '@grid-failure-information-app/shared/models';
describe('GridFailureStatesReducer', () => {
it('should return the initial state', () => {
const action = { type: 'NOOP' } as any;
const result = reducer(undefined, action);
expect(result).toBe(INITIAL_STATE);
});
it('should trigger loading state', () => {
const action = gridFailureActions.loadGridFailureStates();
const result = GridFailureStatesReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
loading: true,
});
});
it('should trigger loaded state', () => {
const items = { payload: [new FailureState()] };
const action = gridFailureActions.loadGridFailureStatesSuccess(items);
const result = GridFailureStatesReducer(INITIAL_STATE, action);
expect(result.loaded).toBe(true);
});
it('should trigger failed state', () => {
const error = { payload: 'err_msg' };
const action = gridFailureActions.loadGridFailureStatesFail(error);
const result = GridFailureStatesReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
failed: true,
});
});
it('getData return state.data', () => {
const state = { ...INITIAL_STATE };
const result = getData(state);
expect(result).toBe(state.data);
});
it('getLoading return state.loading', () => {
const state = { ...INITIAL_STATE };
const result = getLoading(state);
expect(result).toBe(state.loading);
});
it('getLoaded return state.loaded', () => {
const state = { ...INITIAL_STATE };
const result = getLoaded(state);
expect(result).toBe(state.loaded);
});
it('getFailed return state.failed', () => {
const state = { ...INITIAL_STATE };
const result = getFailed(state);
expect(result).toBe(state.failed);
});
});
/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
********************************************************************************/
import {
GridFailureTypesReducer,
INITIAL_STATE,
getData,
getLoading,
getLoaded,
getFailed,
reducer,
} from '@grid-failure-information-app/shared/store/reducers/grid-failures/grid-failure-types.reducer';
import * as gridFailureActions from '@grid-failure-information-app/shared/store/actions/grid-failures.action';
import { FailureType } from '@grid-failure-information-app/shared/models';
describe('GridFailureTypesReducer', () => {
it('should return the initial state', () => {
const action = { type: 'NOOP' } as any;
const result = reducer(undefined, action);
expect(result).toBe(INITIAL_STATE);
});
it('should trigger loading state', () => {
const action = gridFailureActions.loadGridFailureTypes();
const result = GridFailureTypesReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
loading: true,
});
});
it('should trigger loaded state', () => {
const items = { payload: [new FailureType()] };
const action = gridFailureActions.loadGridFailureTypesSuccess(items);
const result = GridFailureTypesReducer(INITIAL_STATE, action);
expect(result.loaded).toBe(true);
});
it('should trigger failed state', () => {
const error = { payload: 'err_msg' };
const action = gridFailureActions.loadGridFailureTypesFail(error);
const result = GridFailureTypesReducer(INITIAL_STATE, action);
expect(result).toEqual({
...INITIAL_STATE,
failed: true,
});
});
it('getData return state.data', () => {
const state = { ...INITIAL_STATE };
const result = getData(state);
expect(result).toBe(state.data);
});
it('getLoading return state.loading', () => {
const state = { ...INITIAL_STATE };
const result = getLoading(state);
expect(result).toBe(state.loading);
});
it('getLoaded return state.loaded', () => {
const state = { ...INITIAL_STATE };
const result = getLoaded(state);
expect(result).toBe(state.loaded);
});
it('getFailed return state.failed', () => {
const state = { ...INITIAL_STATE };
const result = getFailed(state);
expect(result).toBe(state.failed);
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment