Skip to content

Commit

Permalink
Reset alert store state when navigating to search page. (#583)
Browse files Browse the repository at this point in the history
  • Loading branch information
NatalieEO authored Mar 14, 2019
1 parent 7237330 commit 53c54c0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion src/app/search/search.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { ELASTIC_SEARCH_CLIENT } from './elastic-search-client';
import { QueryBuilderService } from './query-builder.service';
import { SearchQuery } from './state/search.query';
import { SearchService } from './state/search.service';
import { AlertService } from '../shared/alert/state/alert.service';

@Component({
selector: 'app-search',
Expand Down Expand Up @@ -114,7 +115,7 @@ export class SearchComponent implements OnInit, OnDestroy {
*/
constructor(private queryBuilderService: QueryBuilderService,
public searchService: SearchService, private searchQuery: SearchQuery,
private advancedSearchService: AdvancedSearchService) {
private advancedSearchService: AdvancedSearchService, private alertService: AlertService) {
this.shortUrl$ = this.searchQuery.shortUrl$;
this.filterKeys$ = this.searchQuery.filterKeys$;
this.suggestTerm$ = this.searchQuery.suggestTerm$;
Expand All @@ -134,6 +135,8 @@ export class SearchComponent implements OnInit, OnDestroy {
}

ngOnInit() {
// Set alert store back to its initial state. Otherwise an error created on another page might appear when search page is loaded.
this.alertService.clearEverything();
this.searchService.toSaveSearch$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(toSaveSearch => {
if (toSaveSearch) {
this.saveSearchFilter();
Expand Down
4 changes: 3 additions & 1 deletion src/app/search/search.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import { SearchToolTableComponent } from './search-tool-table/search-tool-table.
import { SearchWorkflowTableComponent } from './search-workflow-table/search-workflow-table.component';
import { SearchComponent } from './search.component';
import { searchRouting } from './search.routing';
import { RefreshAlertModule } from '../shared/alert/alert.module';

@NgModule({
declarations: [
Expand Down Expand Up @@ -70,7 +71,8 @@ import { searchRouting } from './search.routing';
ClipboardModule,
searchRouting,
HttpClientModule,
PrivateIconModule
PrivateIconModule,
RefreshAlertModule
],
providers: [AdvancedSearchService, QueryBuilderService, {provide: TooltipConfig, useFactory: getTooltipConfig}],
exports: [SearchComponent]
Expand Down

0 comments on commit 53c54c0

Please sign in to comment.