Skip to content
Snippets Groups Projects
Commit a19abc11 authored by François Agneray's avatar François Agneray
Browse files

Merge branch '1-fixed-bug-compilation-metareducers' into 'develop'

Resolve "Fixed bug: Compilation metareducers"

Closes #1

See merge request !2
parents fdf10888 bcf6242c
No related branches found
No related tags found
2 merge requests!68Develop,!2Resolve "Fixed bug: Compilation metareducers"
Pipeline #1081 passed
......@@ -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>;
......
......@@ -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');
......@@ -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>
......
......@@ -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
<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
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