Merge pull request #351 from smaht-dac/utk_file_search_view

FileSearchView for type=File search

CHANGELOG.rst

@@ -7,6 +7,14 @@ smaht-portal
 Change Log
 ----------
 
+0.138.0
+=======
+`PR 351: FileSearchView for type=File search <https://github.com/smaht-dac/smaht-portal/pull/351>`
+
+* New FileSearchView component to handle type=File searches
+* Refactoring and improvements to BrowseView
+
+
 0.137.4
 =======
 `PR 358: Cypress homepage and benchmarking facets test updates <https://github.com/smaht-dac/smaht-portal/pull/358>`

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "encoded"
-version = "0.137.4"
+version = "0.138.0"
 description = "SMaHT Data Analysis Portal"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"

src/encoded/static/components/app.js

@@ -1661,9 +1661,19 @@ const ContentRenderer = React.memo(function ContentRenderer(props) {
         // error catching
         content = <ErrorPage currRoute={routeLeaf} status={status} />;
     } else if (context) {
+        // Hack for associating the /browse/ searches with BrowseView.
+        // Otherwise it will use FileSearchView since Registry.lookup checks for first matching view 
+        let lookupContext = context;
+        const browseIdx = context?.['@type']?.indexOf('Browse') || -1;
+        if (browseIdx > -1) {
+            const cloned = context['@type'].slice();
+            cloned.splice(browseIdx, 1);
+            cloned.unshift('Browse');
+            lookupContext = { '@type': cloned };
+        }
         // What should occur (success)
         const ContentView = (contentViews || globalContentViews).lookup(
-            context,
+            lookupContext,
             currentAction
         );