From bcf6242caad95dca22d5501f217c5f2fd35f5a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Thu, 4 Apr 2019 17:58:32 +0200
Subject: [PATCH] #1 => done
---
src/app/core/containers/app.component.ts | 2 +-
src/app/metamodel/reducers/index.ts | 10 ++++++++--
src/app/search/containers/output.component.html | 3 +--
src/app/search/containers/result.component.html | 3 +--
src/app/search/containers/search.component.html | 3 +--
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/app/core/containers/app.component.ts b/src/app/core/containers/app.component.ts
index 7629ad35..3b4bc72f 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 09fb6b85..9c74e5b3 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 b994dbb0..42f3d1fb 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 efb55e33..c9584683 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 7f468be9..07329c2f 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
--
GitLab