diff --git a/src/app/core/containers/app.component.ts b/src/app/core/containers/app.component.ts index 7629ad352515be00fca747dc73995f1245254329..3b4bc72fe5434df9e96ebd6619d47dc780c9eab7 100644 --- a/src/app/core/containers/app.component.ts +++ b/src/app/core/containers/app.component.ts @@ -15,7 +15,7 @@ import * as loginSelector from '../../login/store/login.selector'; encapsulation: ViewEncapsulation.None }) export class AppComponent implements OnInit { - private year = (new Date()).getFullYear(); + public year = (new Date()).getFullYear(); public isAuthenticated: Observable<boolean>; public loginToken: Observable<LoginToken>; diff --git a/src/app/metamodel/reducers/index.ts b/src/app/metamodel/reducers/index.ts index 09fb6b859486d3b51e3aac539a5e919bcdf918f4..9c74e5b303ff9038fabe2f2fb3fe17555f83cf8b 100644 --- a/src/app/metamodel/reducers/index.ts +++ b/src/app/metamodel/reducers/index.ts @@ -10,10 +10,16 @@ export interface State { output: output.State; } -export const reducer = combineReducers({ +const reducers = { dataset: dataset.reducer, criteria: criteria.reducer, output: output.reducer -}); +}; + +const productionReducer = combineReducers(reducers); + +export function reducer(state: any, action: any) { + return productionReducer(state, action); +} export const getMetamodelState = createFeatureSelector<State>('metamodel'); diff --git a/src/app/search/containers/output.component.html b/src/app/search/containers/output.component.html index b994dbb027807c41c048edb48431d2ac63b0c499..42f3d1fb033f2a9484f6ef7f5c325447b858b2dd 100644 --- a/src/app/search/containers/output.component.html +++ b/src/app/search/containers/output.component.html @@ -16,8 +16,7 @@ [datasetList]="datasetList | async" [criteriaList]="criteriaList | async" [datasetAttributeList]="datasetAttributeList | async" - [outputList]="outputList | async" - (deleteCriterion)="deleteCriterion($event)"> + [outputList]="outputList | async"> </app-summary> </div> </div> diff --git a/src/app/search/containers/result.component.html b/src/app/search/containers/result.component.html index efb55e3375a2223ec9205fa1ccc1e07c0a02a4bd..c95846831f0a68107b8d82a039edd17717ebdb9f 100644 --- a/src/app/search/containers/result.component.html +++ b/src/app/search/containers/result.component.html @@ -9,8 +9,7 @@ [datasetList]="datasetList | async" [criteriaList]="criteriaList | async" [datasetAttributeList]="datasetAttributeList | async" - [outputList]="outputList | async" - (deleteCriterion)="deleteCriterion($event)"> + [outputList]="outputList | async"> </app-summary> </div> </div> \ No newline at end of file diff --git a/src/app/search/containers/search.component.html b/src/app/search/containers/search.component.html index 7f468be966dd8fc2987edafd6735ab44b17b9ac8..07329c2f6c210554222a64168b958cfaac98dc0a 100644 --- a/src/app/search/containers/search.component.html +++ b/src/app/search/containers/search.component.html @@ -1,6 +1,5 @@ <app-progress [currentStep]="currentStep | async" - [datasetName]="datasetName | async" - (clearForm)="clearForm()"> + [datasetName]="datasetName | async"> </app-progress> <router-outlet></router-outlet> \ No newline at end of file