Fixes the JSON buttons by removing th clickableRoute function which is no longer needed and was causing the button to fail (do nothing). Removed some commented out code that has been there a while. Update version in helm README.

Author: downiec

frontend/src/api/routes.ts

@@ -45,12 +45,6 @@ type ApiRoutes = {
   introMarkdown: ApiRoute;
 };
 
-/**
- * Stripping the prefix proxy string is necessary if the route needs to be
- * served as a clickable link within the browser.
- */
-export const clickableRoute = (route: string): string => route.replace('/proxy/search', '');
-
 // Any path with parameters (e.g. '/:datasetID/') must be in camelCase
 // https://mswjs.io/docs/basics/path-matching#path-with-parameters
 const apiRoutes: ApiRoutes = {

frontend/src/components/Cart/SearchesCard.tsx

@@ -9,7 +9,6 @@ import React from 'react';
 import { useAsync } from 'react-async';
 import { useNavigate } from 'react-router-dom';
 import { fetchSearchResults, generateSearchURLQuery } from '../../api';
-import { clickableRoute } from '../../api/routes';
 import { savedSearchTourTargets } from '../../common/reactJoyrideSteps';
 import { CSSinJS } from '../../common/types';
 import { stringifyFilters } from '../Search';
@@ -104,7 +103,7 @@ const SearchesCard: React.FC<React.PropsWithChildren<Props>> = ({
           <Tooltip title="View results in JSON format">
             <a
               className={savedSearchTourTargets.jsonBtn.class()}
-              href={clickableRoute(url)}
+              href={url}
               rel="noopener noreferrer"
               target="blank_"
             >

frontend/src/components/NavBar/index.tsx

@@ -43,6 +43,7 @@ const NavBar: React.FC<React.PropsWithChildren<Props>> = ({
         <div className="navbar-logo">
           <Link
             href="https://esgf.github.io/nodes.html"
+            target="_blank"
             style={{
               fontWeight: 'bold',
               fontSize: '.9em',

frontend/src/components/Search/Tabs.tsx

@@ -196,115 +196,6 @@ const Tabs: React.FC<React.PropsWithChildren<Props>> = ({ record, filenameVars }
   }
 
   return <TabsD activeKey={record.retracted === true ? '2' : undefined} items={tabList} />;
-  // Disable all tabs excep metadata if the record is retracted
-  /* <TabsD activeKey={record.retracted === true ? '2' : undefined} />;
-  <TabsD.TabPane
-        disabled={record.retracted === true}
-        tab={<div className={innerDataRowTargets.filesTab.class()}>Files</div>}
-        key="1"
-      >
-        <FilesTable
-          id={record.id}
-          numResults={record.number_of_files}
-          filenameVars={filenameVars}
-        />
-      </TabsD.TabPane>
-  <TabsD.TabPane
-        tab={
-          <div className={innerDataRowTargets.metadataTab.class()}>
-            Metadata
-          </div>
-        }
-        key="2"
-      >
-        <h4>Displaying {Object.keys(record).length} keys</h4>
-        <AutoComplete
-          style={{ width: '100%' }}
-          className={innerDataRowTargets.metadataLookupField.class()}
-          options={metaData}
-          placeholder="Lookup a key..."
-          filterOption={
-            /* istanbul ignore next  (inputValue, option) =>
-              (option as Record<'value', string>).value
-                .toUpperCase()
-                .indexOf(inputValue.toUpperCase()) !== -1
-          }
-        />
-        <Divider />
-        {Object.keys(record).map((key) => (
-          <p key={key} style={{ margin: 0 }}>
-            <span style={{ fontWeight: 'bold' }}>{key}</span>:{' '}
-            {String(record[key])}
-          </p>
-        ))}
-      </TabsD.TabPane>
-  {showCitation && (
-        <TabsD.TabPane
-          disabled={record.retracted === true}
-          tab={
-            <div className={innerDataRowTargets.citationTab.class()}>
-              Citation
-            </div>
-          }
-          key="3"
-        >
-          <Citation
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            url={record.citation_url![0]}
-          />
-        </TabsD.TabPane>
-      )}
-  {showAdditionalTab && (
-        <TabsD.TabPane
-          disabled={record.retracted === true}
-          tab={
-            <div className={innerDataRowTargets.additionalTab.class()}>
-              Additional
-            </div>
-          }
-          key="4"
-        >
-          {showAdditionalLinks && additionalLinks}
-          {showESDOC &&
-            ((record.further_info_url as unknown) as string)[0] !== '' && (
-              <Button
-                type="link"
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                href={record.further_info_url![0]}
-                target="_blank"
-              >
-                ES-DOC
-              </Button>
-            )}
-          {showQualityFlags && (
-            <Button
-              type="link"
-              href="https://esgf-node.llnl.gov/projects/obs4mips/DatasetIndicators"
-              target="_blank"
-            >
-              <Popover
-                placement="topLeft"
-                content={
-                  <img
-                    src={qualityFlagsImg}
-                    alt="Quality Flags Indicator"
-                  ></img>
-                }
-              >
-                <span style={styles.qualityFlagsRow}>
-                  {Object.keys(qualityFlags).map((key) => (
-                    <QualityFlag
-                      index={key}
-                      color={qualityFlags[key]}
-                      key={key}
-                    />
-                  ))}
-                </span>
-              </Popover>
-            </Button>
-          )}
-        </TabsD.TabPane>
-      )}*/
 };
 
 export default Tabs;

frontend/src/components/Search/index.tsx

@@ -13,7 +13,6 @@ import {
   fetchSearchResults,
   generateSearchURLQuery,
 } from '../../api';
-import { clickableRoute } from '../../api/routes';
 import { searchTableTargets } from '../../common/reactJoyrideSteps';
 import { CSSinJS } from '../../common/types';
 import { objectIsEmpty } from '../../common/utils';
@@ -392,12 +391,7 @@ const Search: React.FC<React.PropsWithChildren<Props>> = ({
           </div>
         </Col>
         {results && currentRequestURL && (
-          <Button
-            type="default"
-            href={clickableRoute(currentRequestURL)}
-            target="_blank"
-            icon={<ExportOutlined />}
-          >
+          <Button type="default" href={currentRequestURL} target="_blank" icon={<ExportOutlined />}>
             Open as JSON
           </Button>
         )}

helm/README.md

@@ -17,7 +17,7 @@
 
 ## Install
 ```shell
-helm install <name> oci://ghcr.io/esgf2-us/metagrid --version v1.3.4
+helm install <name> oci://ghcr.io/esgf2-us/metagrid --version v1.3.5
 ```
 
 ## Testing locally