From 29e9f2575d31ccff0a10f48abb38a48f31b590ae Mon Sep 17 00:00:00 2001 From: Greg Rushton Date: Thu, 9 Nov 2023 08:42:31 -0500 Subject: [PATCH 1/3] handle empty query terms --- src/libs/ajax.js | 8 +++++++- src/libs/ontologyService.js | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libs/ajax.js b/src/libs/ajax.js index 5116559c8..886e086a5 100644 --- a/src/libs/ajax.js +++ b/src/libs/ajax.js @@ -249,8 +249,14 @@ export const DAR = { }, searchOntologyIdList: async ids => { + if (isNil(ids) || ids.length === 0) { + return []; + } const url = `${await getOntologyUrl()}/search?id=${ids}`; - const res = await fetchOk(url, Config.authOpts()); + const res = await fetchAny(url, Config.authOpts()); + if (res.status >= 400) { + return []; + } return await res.json(); }, diff --git a/src/libs/ontologyService.js b/src/libs/ontologyService.js index 5a0b84755..956914336 100644 --- a/src/libs/ontologyService.js +++ b/src/libs/ontologyService.js @@ -1,10 +1,14 @@ import axios from 'axios'; -import { Notifications } from '../libs/utils'; +import { Notifications } from './utils'; import { getOntologyUrl } from './ajax'; +import isNil from 'lodash'; export const OntologyService = { searchOntology: async (obolibraryURL) => { + if (isNil(obolibraryURL) || obolibraryURL.length === 0) { + return []; + } const baseURL = await getOntologyUrl(); const params = {id: obolibraryURL}; try{ From 634ccfeb9fb0134596f2404eedd65a4b10ce0a6b Mon Sep 17 00:00:00 2001 From: Greg Rushton Date: Thu, 9 Nov 2023 08:42:41 -0500 Subject: [PATCH 2/3] cleanup --- src/pages/DACDatasets.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/DACDatasets.js b/src/pages/DACDatasets.js index 97224e56b..350318ad8 100644 --- a/src/pages/DACDatasets.js +++ b/src/pages/DACDatasets.js @@ -8,7 +8,6 @@ import {consoleTypes} from '../components/dac_dataset_table/DACDatasetTableCellD import style from './DACDatasets.module.css'; import {Button} from '@mui/material'; import {DatasetService} from '../utils/DatasetService'; -import {isDevEnv} from '../utils/EnvironmentUtils'; export default function DACDatasets(props) { From 571aec85b70918d8f3bd94a4dad799aed213fecd Mon Sep 17 00:00:00 2001 From: Greg Rushton Date: Thu, 9 Nov 2023 08:43:16 -0500 Subject: [PATCH 3/3] fix non-unique key warning --- src/components/dac_dataset_table/DACDatasetTableCellData.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dac_dataset_table/DACDatasetTableCellData.js b/src/components/dac_dataset_table/DACDatasetTableCellData.js index 9ee1789a9..101b2d392 100644 --- a/src/components/dac_dataset_table/DACDatasetTableCellData.js +++ b/src/components/dac_dataset_table/DACDatasetTableCellData.js @@ -59,8 +59,8 @@ export function dataCustodianCellData({dataset, label = 'dataCustodianCellData'} } export function dataUseCellData({dataset, label = 'dataUseCellData'}) { - const translationList = map((translation) => { - return
  • {translation.code}: {translation.description}
  • ; + const translationList = map((translation, index) => { + return
  • {translation.code}: {translation.description}
  • ; })(dataset.translations); const display =