Skip to content
This repository was archived by the owner on Jun 1, 2026. It is now read-only.

Commit 1e14453

Browse files
committed
fix(ror): using locale or fallback on first name
1 parent 3acadac commit 1e14453

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/components/ExternalImport/ImportExternal.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState } from "react";
22
import { OrcidList, RorList, Metadore } from "./";
33
import { useTranslation } from "react-i18next";
44

5-
function ImportExternal({ fragment, setFragment, externalImports = {} }) {
5+
function ImportExternal({ fragment, setFragment, externalImports = {}, locale }) {
66
const { t } = useTranslation();
77

88
const [importsState, setImportsState] = useState(
@@ -22,7 +22,7 @@ function ImportExternal({ fragment, setFragment, externalImports = {} }) {
2222

2323
const externalImportComponent = (type, fragment, setFragment) => {
2424
const importComponents = {
25-
ror: (fragment, setFragment, mapping) => <RorList key={`${type}-import-component`} fragment={fragment} setFragment={setFragment} mapping={mapping} />,
25+
ror: (fragment, setFragment, mapping) => <RorList key={`${type}-import-component`} fragment={fragment} setFragment={setFragment} mapping={mapping} locale={locale} />,
2626
orcid: (fragment, setFragment, mapping) => <OrcidList key={`${type}-import-component`} fragment={fragment} setFragment={setFragment} mapping={mapping} />,
2727
metadore: (fragment, setFragment, mapping) => <Metadore key={`${type}-import-component`} fragment={fragment} setFragment={setFragment} mapping={mapping} />
2828
};

src/components/ExternalImport/RorList.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import CustomError from "../Shared/CustomError";
1111
import Pagination from "../Shared/Pagination";
1212
import { flattenObject } from "../../utils/utils";
1313

14-
function RorList({ fragment, setFragment, mapping = {} }) {
14+
function RorList({ fragment, setFragment, mapping = {}, locale }) {
1515
const { t } = useTranslation();
1616
const pageSize = 8;
1717
const [data, setData] = useState([]);
@@ -24,6 +24,8 @@ function RorList({ fragment, setFragment, mapping = {} }) {
2424
const [text, setText] = useState('');
2525
const [selectedCountry, setSelectedCountry] = useState(null);
2626

27+
const localeCode = locale.split('_').at(0);
28+
2729
/**
2830
* The function `getData` makes an API call to get data, sets the retrieved data in state variables, and creates an array of distinct countries from the
2931
* data.
@@ -253,7 +255,7 @@ function RorList({ fragment, setFragment, mapping = {} }) {
253255
}
254256
</td>
255257
<td>
256-
{el.name[Object.keys(el.name)[0]]}&nbsp;
258+
{el?.name?.[localeCode] || el?.name?.[Object.keys(el.name).at(0)]}&nbsp;
257259
<a href={el.links[0]} target="_blank" rel="noopener noreferrer">
258260
<FaLink></FaLink>
259261
</a>

src/components/Forms/DynamicForm.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function DynamicForm({
167167
{error && <p>error</p>}
168168
{!error && template && (
169169
<>
170-
{!readonly && Object.keys(externalImports)?.length > 0 && <ExternalImport fragment={methods} setFragment={setValues} externalImports={externalImports} />}
170+
{!readonly && Object.keys(externalImports)?.length > 0 && <ExternalImport fragment={methods} setFragment={setValues} externalImports={externalImports} locale={locale} />}
171171
{!readonly && !fragmentId && template.topics.includes('generic') && <FormSelector
172172
classname={className}
173173
dataType={dataType}

src/components/Forms/ModalForm.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function ModalForm({ data, template, mainFormDataType, mainFormTopic, label, rea
5858
<Modal.Title style={{ color: "var(--rust)", fontWeight: "bold" }}>{label}</Modal.Title>
5959
</Modal.Header>
6060
<Modal.Body style={{ padding: "20px !important" }}>
61-
{Object.keys(externalImports)?.length > 0 && <ExternalImport fragment={methods} setFragment={setValues} externalImports={externalImports} />}
61+
{Object.keys(externalImports)?.length > 0 && <ExternalImport fragment={methods} setFragment={setValues} externalImports={externalImports} locale={locale} />}
6262
<FormProvider {...methods}>
6363
<form name="modal-form" id="modal-form" style={{ margin: '15px' }} onSubmit={(e) => handleModalSubmit(e)}>
6464
<FormBuilder

src/components/Forms/NestedForm.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function NestedForm({ propName, data, template, mainFormDataType, mainFormTopic,
5252
<>
5353
{Object.keys(externalImports)?.length > 0 && (
5454
<div style={{ marginTop: '20px' }}>
55-
<ExternalImport fragment={methods} setFragment={setValues} externalImports={externalImports} />
55+
<ExternalImport fragment={methods} setFragment={setValues} externalImports={externalImports} locale={locale} />
5656
</div>
5757
)}
5858
<FormProvider {...methods}>

0 commit comments

Comments
 (0)