Skip to content

Commit 95bdbd2

Browse files
authored
Merge pull request #1463 from CarnegieLearningWeb/bugfix/experiment-list-context-chips-issue
experiment list context chip issue is resolved
2 parents e79c02b + 83a4083 commit 95bdbd2

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

frontend/projects/upgrade/src/app/core/experiments/experiments.service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ export class ExperimentService {
8282
selectSearchExperimentParams(): Observable<Record<string, unknown>> {
8383
return combineLatest([this.selectSearchKey$, this.selectSearchString$]).pipe(
8484
filter(([searchKey, searchString]) => !!searchKey && !!searchString),
85-
map(([searchKey, searchString]) => ({ searchKey, searchString })),
86-
first()
85+
map(([searchKey, searchString]) => ({ searchKey, searchString }))
8786
);
8887
}
8988

frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-list/experiment-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<mat-select
99
class="ft-14-400"
1010
[(ngModel)]="selectedExperimentFilterOption"
11-
(selectionChange)="applyFilter(searchValue); setSearchKey()"
11+
(selectionChange)="applyFilter(searchValue); setSearchKey(selectedExperimentFilterOption)"
1212
>
1313
<mat-option class="ft-14-400" *ngFor="let filterOption of experimentFilterOptions" [value]="filterOption">
1414
{{ filterOption | titlecase }}

frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-list/experiment-list.component.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ export class ExperimentListComponent implements OnInit, OnDestroy, AfterViewInit
153153
}
154154
}
155155

156-
setSearchKey() {
157-
this.experimentService.setSearchKey(this.selectedExperimentFilterOption);
156+
setSearchKey(searchKey: EXPERIMENT_SEARCH_KEY) {
157+
this.experimentService.setSearchKey(searchKey);
158158
}
159159

160160
setSearchString(searchString: FLAG_SEARCH_SORT_KEY) {
@@ -172,9 +172,7 @@ export class ExperimentListComponent implements OnInit, OnDestroy, AfterViewInit
172172
}
173173

174174
filterExperimentByChips(tagValue: FLAG_SEARCH_SORT_KEY, type: EXPERIMENT_SEARCH_KEY) {
175-
this.selectedExperimentFilterOption = type;
176-
this.applyFilter(tagValue);
177-
this.setSearchKey();
175+
this.setSearchKey(type);
178176
this.setSearchString(tagValue);
179177
}
180178

0 commit comments

Comments
 (0)