From 74633106de21d17457f349d501783a81b4b111f2 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 5 May 2025 16:54:35 -0700 Subject: [PATCH 1/4] #111 - update rawdata endpoint usage --- src/api/endpoints/index.ts | 12 ++++++++++++ .../SingleTermView/OverView/RawDataViewer.jsx | 9 +++------ src/components/SingleTermView/index.jsx | 4 ++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/api/endpoints/index.ts b/src/api/endpoints/index.ts index cba7a7d1..a58f744b 100644 --- a/src/api/endpoints/index.ts +++ b/src/api/endpoints/index.ts @@ -229,6 +229,18 @@ export const patchTerm = async (group, termID, term) => { }); } +export const getRawData = async (group, termID, term) => { + const {getEndpointsIlx} = useApi(); + + /** Call Endpoint */ + return getEndpointsIlx(group, termID, term).then((data) => { + return data; + }) + .catch((error) => { + return error; + }); +} + export const addTerm = async (group, term) => { const { postPrivEntityNew } = useApi(); diff --git a/src/components/SingleTermView/OverView/RawDataViewer.jsx b/src/components/SingleTermView/OverView/RawDataViewer.jsx index 7053417a..716c0c57 100644 --- a/src/components/SingleTermView/OverView/RawDataViewer.jsx +++ b/src/components/SingleTermView/OverView/RawDataViewer.jsx @@ -2,13 +2,11 @@ import PropTypes from 'prop-types'; import { useState, useEffect } from 'react'; import { Light as SyntaxHighlighter } from 'react-syntax-highlighter'; import { a11yLight } from 'react-syntax-highlighter/dist/esm/styles/hljs'; -import * as mockApi from './../../../api/endpoints/interLexURIStructureAPI'; +import { getRawData } from "../../../api/endpoints"; import { vars } from '../../../theme/variables'; const { gray25, gray200, gray500 } = vars; -const useMockApi = () => mockApi; - const customStyle = { fontSize: '1rem', backgroundColor: '#fff', @@ -20,7 +18,7 @@ const customStyle = { // eslint-disable-next-line no-unused-vars const formatExtensions = { - 'JSON-LD': 'jsonld', + 'jsonld': 'jsonld', 'Turtle': 'ttl', 'N3': 'n3', 'OWL': 'owl', @@ -31,10 +29,9 @@ const RawDataViewer = ({ dataId, dataFormat }) => { const [formattedData, setFormattedData] = useState(null); // eslint-disable-next-line no-unused-vars const [loading, setLoading] = useState(true); - const { getEndpointsIlxGet } = useMockApi(); useEffect(() => { - getEndpointsIlxGet("base",dataId, dataFormat).then( rawResponse => { + getRawData("base",dataId, dataFormat).then( rawResponse => { setFormattedData(JSON.stringify(rawResponse, null, 2)); setLoading(false) }) diff --git a/src/components/SingleTermView/index.jsx b/src/components/SingleTermView/index.jsx index 3ccda1ce..a7b47083 100644 --- a/src/components/SingleTermView/index.jsx +++ b/src/components/SingleTermView/index.jsx @@ -46,7 +46,7 @@ import TermDialog from "../TermEditor/TermDialog"; const { gray200, brand700, gray600 } = vars; -const dataFormats = ['JSON-LD', 'Turtle', 'N3', 'OWL', 'CSV'] +const dataFormats = ['jsonld', 'Turtle', 'N3', 'OWL', 'CSV'] const SingleTermView = () => { const [open, setOpen] = React.useState(false); @@ -56,7 +56,7 @@ const SingleTermView = () => { const [tabValue, setTabValue] = React.useState(0); const [isCodeViewVisible, setIsCodeViewVisible] = React.useState(false); const [toggleButtonValue, setToggleButtonValue] = useState('defaultView'); - const [selectedDataFormat, setSelectedDataFormat] = React.useState('JSON-LD'); + const [selectedDataFormat, setSelectedDataFormat] = React.useState('jsonld'); const [openRequestMergeDialog, setOpenRequestMergeDialog] = React.useState(false); const [editTermDialogOpen, setEditTermDialogOpen] = React.useState(false); const query = useQuery(); From ac8568c6f9dc708b003b717773d113ccf3dc6928 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 5 May 2025 18:50:49 -0700 Subject: [PATCH 2/4] #ilex-111 - fix menu item for text types --- .../SingleTermView/OverView/RawDataViewer.jsx | 10 ++++++---- src/components/SingleTermView/index.jsx | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/SingleTermView/OverView/RawDataViewer.jsx b/src/components/SingleTermView/OverView/RawDataViewer.jsx index 716c0c57..c84ad0d6 100644 --- a/src/components/SingleTermView/OverView/RawDataViewer.jsx +++ b/src/components/SingleTermView/OverView/RawDataViewer.jsx @@ -3,6 +3,8 @@ import { useState, useEffect } from 'react'; import { Light as SyntaxHighlighter } from 'react-syntax-highlighter'; import { a11yLight } from 'react-syntax-highlighter/dist/esm/styles/hljs'; import { getRawData } from "../../../api/endpoints"; +import { GlobalDataContext } from "../../../contexts/DataContext"; +import { useContext } from "react"; import { vars } from '../../../theme/variables'; const { gray25, gray200, gray500 } = vars; @@ -16,9 +18,8 @@ const customStyle = { padding: 0 }; -// eslint-disable-next-line no-unused-vars const formatExtensions = { - 'jsonld': 'jsonld', + 'JSON-LD': 'jsonld', 'Turtle': 'ttl', 'N3': 'n3', 'OWL': 'owl', @@ -29,9 +30,10 @@ const RawDataViewer = ({ dataId, dataFormat }) => { const [formattedData, setFormattedData] = useState(null); // eslint-disable-next-line no-unused-vars const [loading, setLoading] = useState(true); - + const { user } = useContext(GlobalDataContext); + useEffect(() => { - getRawData("base",dataId, dataFormat).then( rawResponse => { + getRawData(user?.name || "base",dataId, formatExtensions[dataFormat]).then( rawResponse => { setFormattedData(JSON.stringify(rawResponse, null, 2)); setLoading(false) }) diff --git a/src/components/SingleTermView/index.jsx b/src/components/SingleTermView/index.jsx index a7b47083..792ff4c4 100644 --- a/src/components/SingleTermView/index.jsx +++ b/src/components/SingleTermView/index.jsx @@ -46,7 +46,7 @@ import TermDialog from "../TermEditor/TermDialog"; const { gray200, brand700, gray600 } = vars; -const dataFormats = ['jsonld', 'Turtle', 'N3', 'OWL', 'CSV'] +const dataFormats = ['JSON-LD', 'Turtle', 'N3', 'OWL', 'CSV'] const SingleTermView = () => { const [open, setOpen] = React.useState(false); From 0f73bac0fbeabed178e5f9a20f43a15ba042c166 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 5 May 2025 19:42:24 -0700 Subject: [PATCH 3/4] #111 - revert mismatch tag --- src/components/SingleTermView/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SingleTermView/index.jsx b/src/components/SingleTermView/index.jsx index 792ff4c4..3ccda1ce 100644 --- a/src/components/SingleTermView/index.jsx +++ b/src/components/SingleTermView/index.jsx @@ -56,7 +56,7 @@ const SingleTermView = () => { const [tabValue, setTabValue] = React.useState(0); const [isCodeViewVisible, setIsCodeViewVisible] = React.useState(false); const [toggleButtonValue, setToggleButtonValue] = useState('defaultView'); - const [selectedDataFormat, setSelectedDataFormat] = React.useState('jsonld'); + const [selectedDataFormat, setSelectedDataFormat] = React.useState('JSON-LD'); const [openRequestMergeDialog, setOpenRequestMergeDialog] = React.useState(false); const [editTermDialogOpen, setEditTermDialogOpen] = React.useState(false); const query = useQuery(); From 047e2973b9d9e4f726a17d9613f5fee92e2b9f6f Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 5 May 2025 20:17:59 -0700 Subject: [PATCH 4/4] #111 - better name for third parameter --- src/api/endpoints/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/endpoints/index.ts b/src/api/endpoints/index.ts index a58f744b..9c66e7c6 100644 --- a/src/api/endpoints/index.ts +++ b/src/api/endpoints/index.ts @@ -229,11 +229,11 @@ export const patchTerm = async (group, termID, term) => { }); } -export const getRawData = async (group, termID, term) => { +export const getRawData = async (group, termID, format) => { const {getEndpointsIlx} = useApi(); /** Call Endpoint */ - return getEndpointsIlx(group, termID, term).then((data) => { + return getEndpointsIlx(group, termID, format).then((data) => { return data; }) .catch((error) => {