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

#1 => done

parent fdf10888
No related branches found
No related tags found
2 merge requests!68Develop,!2Resolve "Fixed bug: Compilation metareducers"
...@@ -15,7 +15,7 @@ import * as loginSelector from '../../login/store/login.selector'; ...@@ -15,7 +15,7 @@ import * as loginSelector from '../../login/store/login.selector';
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
private year = (new Date()).getFullYear(); public year = (new Date()).getFullYear();
public isAuthenticated: Observable<boolean>; public isAuthenticated: Observable<boolean>;
public loginToken: Observable<LoginToken>; public loginToken: Observable<LoginToken>;
......
...@@ -10,10 +10,16 @@ export interface State { ...@@ -10,10 +10,16 @@ export interface State {
output: output.State; output: output.State;
} }
export const reducer = combineReducers({ const reducers = {
dataset: dataset.reducer, dataset: dataset.reducer,
criteria: criteria.reducer, criteria: criteria.reducer,
output: output.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'); export const getMetamodelState = createFeatureSelector<State>('metamodel');
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
[datasetList]="datasetList | async" [datasetList]="datasetList | async"
[criteriaList]="criteriaList | async" [criteriaList]="criteriaList | async"
[datasetAttributeList]="datasetAttributeList | async" [datasetAttributeList]="datasetAttributeList | async"
[outputList]="outputList | async" [outputList]="outputList | async">
(deleteCriterion)="deleteCriterion($event)">
</app-summary> </app-summary>
</div> </div>
</div> </div>
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
[datasetList]="datasetList | async" [datasetList]="datasetList | async"
[criteriaList]="criteriaList | async" [criteriaList]="criteriaList | async"
[datasetAttributeList]="datasetAttributeList | async" [datasetAttributeList]="datasetAttributeList | async"
[outputList]="outputList | async" [outputList]="outputList | async">
(deleteCriterion)="deleteCriterion($event)">
</app-summary> </app-summary>
</div> </div>
</div> </div>
\ No newline at end of file
<app-progress <app-progress
[currentStep]="currentStep | async" [currentStep]="currentStep | async"
[datasetName]="datasetName | async" [datasetName]="datasetName | async">
(clearForm)="clearForm()">
</app-progress> </app-progress>
<router-outlet></router-outlet> <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