add input data type filters

Sage-Bionetworks · Apr 22, 2024 · 93c996c · 93c996c
1 parent db9369e
commit 93c996c
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 93 deletions.
diff --git a/libs/openchallenges/challenge-search/src/lib/challenge-search-data.service.ts b/libs/openchallenges/challenge-search/src/lib/challenge-search-data.service.ts
@@ -11,6 +11,8 @@ import {
   ChallengePlatformSearchQuery,
   ChallengePlatformService,
   ChallengePlatformSort,
+  EdamConceptSearchQuery,
+  EdamConceptService,
   Image,
   ImageAspectRatio,
   ImageHeight,
@@ -28,44 +30,48 @@ import { Filter } from '@sagebionetworks/openchallenges/ui';
   providedIn: 'root',
 })
 export class ChallengeSearchDataService {
-  private platformSearchTerms: BehaviorSubject<string> =
-    new BehaviorSubject<string>('');
+  private edamConceptSearchTerms: BehaviorSubject<EdamConceptSearchQuery> =
+    new BehaviorSubject<EdamConceptSearchQuery>({ searchTerms: '' });
 
   private organizationSearchTerms: BehaviorSubject<string> =
     new BehaviorSubject<string>('');
 
+  private platformSearchTerms: BehaviorSubject<string> =
+    new BehaviorSubject<string>('');
+
   constructor(
+    private edamConceptService: EdamConceptService,
     private challengePlatformService: ChallengePlatformService,
     private organizationService: OrganizationService,
     private imageService: ImageService
   ) {}
 
-  setPlatformSearchTerms(searchTerms: string) {
-    this.platformSearchTerms.next(searchTerms);
+  setEdamConceptSearchTerms(searchQuery: EdamConceptSearchQuery) {
+    this.edamConceptSearchTerms.next(searchQuery);
   }
 
   setOriganizationSearchTerms(searchTerms: string) {
     this.organizationSearchTerms.next(searchTerms);
   }
 
-  searchPlatforms(): Observable<Filter[]> {
-    return this.platformSearchTerms.pipe(
+  setPlatformSearchTerms(searchTerms: string) {
+    this.platformSearchTerms.next(searchTerms);
+  }
+
+  searchEdamConcepts(): Observable<Filter[]> {
+    return this.edamConceptSearchTerms.pipe(
       debounceTime(400),
       distinctUntilChanged(),
-      switchMap((searchTerm: string) => {
-        const sortedBy: ChallengePlatformSort = 'name';
-        const platformQuery: ChallengePlatformSearchQuery = {
-          searchTerms: searchTerm,
-          sort: sortedBy,
-        };
-        return this.challengePlatformService.listChallengePlatforms(
-          platformQuery
-        );
+      switchMap((searchQuery: EdamConceptSearchQuery) => {
+        // const sortedBy: EdamSort = 'name';
+        const edamQuery: EdamConceptSearchQuery = searchQuery;
+        console.log(edamQuery);
+        return this.edamConceptService.listEdamConcepts(edamQuery);
       }),
       map((page) =>
-        page.challengePlatforms.map((platform) => ({
-          value: platform.slug,
-          label: platform.name,
+        page.edamConcepts.map((edamConcept) => ({
+          value: edamConcept.classId,
+          label: edamConcept.preferredLabel,
           active: false,
         }))
       )
@@ -123,4 +129,28 @@ export class ChallengeSearchDataService {
       })
     );
   }
+
+  searchPlatforms(): Observable<Filter[]> {
+    return this.platformSearchTerms.pipe(
+      debounceTime(400),
+      distinctUntilChanged(),
+      switchMap((searchTerm: string) => {
+        const sortedBy: ChallengePlatformSort = 'name';
+        const platformQuery: ChallengePlatformSearchQuery = {
+          searchTerms: searchTerm,
+          sort: sortedBy,
+        };
+        return this.challengePlatformService.listChallengePlatforms(
+          platformQuery
+        );
+      }),
+      map((page) =>
+        page.challengePlatforms.map((platform) => ({
+          value: platform.slug,
+          label: platform.name,
+          active: false,
+        }))
+      )
+    );
+  }
 }
diff --git a/libs/openchallenges/challenge-search/src/lib/challenge-search-filter-panels.ts b/libs/openchallenges/challenge-search/src/lib/challenge-search-filter-panels.ts
@@ -18,18 +18,10 @@ export const challengeStartYearRangeFilterPanel: FilterPanel = {
   collapsed: false,
 };
 
-// checkbox filters
-export const challengeStatusFilterPanel: FilterPanel = {
-  query: 'status',
-  label: 'Status',
-  options: challengeStatusFilter,
-  collapsed: false,
-};
-
-export const challengeSubmissionTypesFilterPanel: FilterPanel = {
-  query: 'submissionTypes',
-  label: 'Submission Type',
-  options: challengeSubmissionTypesFilter,
+export const challengeCategoriesFilterPanel: FilterPanel = {
+  query: 'categories',
+  label: 'Category',
+  options: challengeCategoriesFilter,
   collapsed: false,
 };
 
@@ -40,27 +32,11 @@ export const challengeIncentivesFilterPanel: FilterPanel = {
   collapsed: false,
 };
 
-export const challengePlatformsFilterPanel: FilterPanel = {
-  query: 'platforms',
-  label: 'Platform',
-  options: challengePlatformsFilter,
-  collapsed: false,
-};
-
-// dropdown filters
 export const challengeInputDataTypesFilterPanel: FilterPanel = {
   query: 'inputDataTypes',
   label: 'Input Data Type',
   options: challengeInputDataTypesFilter,
   collapsed: false,
-  showAvatar: false,
-};
-
-export const challengeCategoriesFilterPanel: FilterPanel = {
-  query: 'categories',
-  label: 'Category',
-  options: challengeCategoriesFilter,
-  collapsed: false,
 };
 
 export const challengeOrganizationsFilterPanel: FilterPanel = {
@@ -78,3 +54,24 @@ export const challengeOrganizatersFilterPanel: FilterPanel = {
   collapsed: false,
   showAvatar: true,
 };
+
+export const challengePlatformsFilterPanel: FilterPanel = {
+  query: 'platforms',
+  label: 'Platform',
+  options: challengePlatformsFilter,
+  collapsed: false,
+};
+
+export const challengeStatusFilterPanel: FilterPanel = {
+  query: 'status',
+  label: 'Status',
+  options: challengeStatusFilter,
+  collapsed: false,
+};
+
+export const challengeSubmissionTypesFilterPanel: FilterPanel = {
+  query: 'submissionTypes',
+  label: 'Submission Type',
+  options: challengeSubmissionTypesFilter,
+  collapsed: false,
+};
diff --git a/libs/openchallenges/challenge-search/src/lib/challenge-search.component.html b/libs/openchallenges/challenge-search/src/lib/challenge-search.component.html
@@ -89,6 +89,22 @@ <h2>Challenges</h2>
         />
       </p-panel>
       <p-divider></p-divider>
+      <p-panel
+        header="{{ inputDataTypesFilter.label }}"
+        [toggleable]="true"
+        [collapsed]="inputDataTypesFilter.collapsed"
+      >
+        <openchallenges-search-dropdown-filter
+          [options]="inputDataTypesFilter.options"
+          [selectedOptions]="selectedInputDataTypes"
+          placeholder="{{ inputDataTypesFilter.label.toLowerCase() + '(s)' }}  "
+          [showAvatar]="inputDataTypesFilter.showAvatar"
+          [filterByApiClient]="true"
+          (selectionChange)="onParamChange({ inputDataTypes: $event })"
+          (searchChange)="onSearchChange('inputDataTypes', $event)"
+        />
+      </p-panel>
+      <p-divider></p-divider>
       <p-panel
         header="{{ organizationsFilter.label }}"
         [toggleable]="true"