Closes #431

aertslab · Jul 1, 2021 · 54955aa · 54955aa
1 parent 4d1da68
commit 54955aa
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/src/components/Search/Search.test.ts b/src/components/Search/Search.test.ts
@@ -51,7 +51,13 @@ const results = [
 
 describe('Model.findResult', () => {
     it('Makes a selection from valid results', () => {
-        expect(Model.findResult({ title: 'c' }, 'red', results)).toStrictEqual({
+        expect(
+            Model.findResult(
+                { title: 'c', category: 'regulon' },
+                'red',
+                results
+            )
+        ).toStrictEqual({
             title: 'c',
             category: 'regulon',
             description: '',
@@ -61,7 +67,15 @@ describe('Model.findResult', () => {
 
     it('Makes a selection from more valid results', () => {
         expect(
-            Model.findResult({ title: 'All Clusters' }, 'green', results)
+            Model.findResult(
+                {
+                    title: 'All Clusters',
+                    category:
+                        'Clustering: Leiden resolution 0.4 (default, 397)',
+                },
+                'green',
+                results
+            )
         ).toStrictEqual({
             title: 'All Clusters',
             category: 'Clustering: Leiden resolution 0.4 (default, 397)',
@@ -71,12 +85,18 @@ describe('Model.findResult', () => {
     });
 
     it('Makes a selection from empty results', () => {
-        expect(Model.findResult({ title: 'c' }, 'red', [])).toBe(undefined);
+        expect(
+            Model.findResult({ title: 'c', category: 'gene' }, 'red', [])
+        ).toBe(undefined);
     });
 
     it('Makes a selection where no results match', () => {
         expect(
-            Model.findResult({ title: 'does not exist' }, 'blue', results)
+            Model.findResult(
+                { title: 'does not exist', category: 'gene' },
+                'blue',
+                results
+            )
         ).toBe(undefined);
     });
 });

diff --git a/src/components/Search/model.ts b/src/components/Search/model.ts
@@ -34,7 +34,7 @@ const makeSelection = (
     }) => FeatureSearchSelection;
 
 export const findResult = (
-    query: { title: string },
+    query: { title: string; category: string },
     colour: string,
     results: readonly Features[]
 ): FeatureSearchSelection | undefined => {
@@ -43,6 +43,17 @@ export const findResult = (
         results
     );
 
+    if (query.category.startsWith('Clustering:')) {
+        return R.head(
+            R.filter(
+                R.propEq<keyof FeatureSearchSelection>(
+                    'category',
+                    query.category
+                ),
+                searchSpace
+            )
+        );
+    }
     return R.head(
         R.filter(
             R.propEq<keyof FeatureSearchSelection>('title', query.title),
@@ -83,6 +94,7 @@ export const featuresToResults = (
             results: features.results.map((result) => {
                 return {
                     ...result,
+                    category: features.category,
                     id: window.btoa(result.title + result.description),
                 };
             }) as unknown as typeof SearchResult[],