Skip to content
Snippets Groups Projects
Commit 046901b3 authored by Tifenn Guillas's avatar Tifenn Guillas
Browse files

Reset search when user switch between search type

parent 9ed4f591
No related branches found
No related tags found
2 merge requests!147Develop,!137Resolve "[Module Multiple] : ajouter le nouveau module"
import { Component, ViewEncapsulation, OnInit } from '@angular/core';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
import { Observable } from 'rxjs';
import { LoginToken } from '../../login/store/model';
import * as loginActions from '../../login/store/login.action';
import * as loginReducer from '../../login/store/login.reducer';
......
......@@ -6,6 +6,8 @@ import * as searchMultipleReducer from '../store/search-multiple.reducer';
import * as searchMultipleSelector from '../store/search-multiple.selector';
import * as coneSearchSelector from '../../shared/cone-search/store/cone-search.selector';
import { SearchMultipleQueryParams } from "../store/model";
import * as searchActions from '../../search/store/search.action';
import * as coneSearchActions from '../../shared/cone-search/store/cone-search.action';
@Component({
selector: 'app-search-multiple',
......@@ -28,5 +30,7 @@ export class SearchMultipleComponent {
this.isValidConeSearch = store.select(coneSearchSelector.getIsValidConeSearch);
this.noSelectedDatasets = store.select(searchMultipleSelector.getNoSelectedDatasets);
this.queryParams = store.select(searchMultipleSelector.getQueryParams);
this.store.dispatch(new searchActions.ResetSearchAction());
this.store.dispatch(new coneSearchActions.DeleteConeSearchAction());
}
}
......@@ -21,6 +21,7 @@ export const RETRIEVE_DATA_SUCCESS = '[SearchMultiple] Retrieve Data Success';
export const RETRIEVE_DATA_FAIL = '[SearchMultiple] Retrieve Data Fail';
export const UPDATE_SELECTED_DATA = '[Search] Update Selected Data';
export const DESTROY_RESULTS = '[SearchMultiple] Destroy Results';
export const RESET_SEARCH = '[SearchMultiple] Reset Search';
export class InitSearchByUrlAction implements Action {
......@@ -125,6 +126,12 @@ export class DestroyResultsAction implements Action {
constructor(public payload: {} = null) { }
}
export class ResetSearchAction implements Action {
readonly type = RESET_SEARCH;
constructor(public payload: {} = null) { }
}
export type Actions
= InitSearchByUrlAction
| InitSelectedDatasetsAction
......@@ -142,4 +149,5 @@ export type Actions
| RetrieveDataSuccessAction
| RetrieveDataFailAction
| UpdateSelectedDataAction
| DestroyResultsAction;
| DestroyResultsAction
| ResetSearchAction;
......@@ -115,6 +115,9 @@ export function reducer(state: State = initialState, action: actions.Actions): S
selectedData: []
};
case actions.RESET_SEARCH:
return { ...initialState };
default:
return state;
}
......
......@@ -5,6 +5,8 @@ import { Store } from '@ngrx/store';
import { SearchQueryParams } from '../store/model';
import * as searchReducer from '../store/search.reducer';
import * as searchSelector from '../store/search.selector';
import * as searchMultipleActions from '../../search-multiple/store/search-multiple.action';
import * as coneSearchActions from '../../shared/cone-search/store/cone-search.action';
@Component({
selector: 'app-search',
......@@ -27,5 +29,7 @@ export class SearchComponent {
this.resultStepChecked = store.select(searchSelector.getResultStepChecked);
this.queryParams = this.store.select(searchSelector.getQueryParams);
this.outputListEmpty = this.store.select(searchSelector.getOutputListEmpty);
this.store.dispatch(new searchMultipleActions.ResetSearchAction());
this.store.dispatch(new coneSearchActions.DeleteConeSearchAction());
}
}
......@@ -27,6 +27,7 @@ export const EXECUTE_PROCESS_WIP = '[Search] Execute Process WIP';
export const EXECUTE_PROCESS_SUCCESS = '[Search] Execute Process Success';
export const EXECUTE_PROCESS_FAIL = '[Search] Execute Process Fail';
export const DESTROY_RESULTS = '[Search] Destroy Results';
export const RESET_SEARCH = '[Search] Reset Search';
export class InitSearchByUrl implements Action {
......@@ -180,6 +181,12 @@ export class DestroyResultsAction implements Action {
constructor(public payload: {} = null) { }
}
export class ResetSearchAction implements Action {
readonly type = RESET_SEARCH;
constructor(public payload: {} = null) { }
}
export type Actions
= InitSearchByUrl
| ChangeStepAction
......@@ -205,4 +212,5 @@ export type Actions
| ExecuteProcessWipAction
| ExecuteProcessSuccessAction
| ExecuteProcessFailAction
| DestroyResultsAction;
| DestroyResultsAction
| ResetSearchAction;
......@@ -197,6 +197,9 @@ export function reducer(state: State = initialState, action: actions.Actions): S
dataLength: null
};
case actions.RESET_SEARCH:
return { ...initialState };
default:
return state;
}
......
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