Skip to content

Commit 2bd2f1f

Browse files
committed
fix(networks): clusters info for patents and projects
1 parent 44f44f7 commit 2bd2f1f

File tree

4 files changed

+24
-20
lines changed

4 files changed

+24
-20
lines changed

client/src/api/networks/network/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export const CONFIG = {
251251
institutions: {
252252
index: projectsIndex,
253253
field: "participants.structure.id",
254-
topics: "domains.keyword",
254+
topics: "project_domains.label.default.keyword",
255255
search_fields: projectsFields,
256256
source_fields: [...projectsSourceFields, "participants.structure.id"],
257257
aggregation: "participants.structure.id.keyword",
@@ -272,7 +272,7 @@ export const CONFIG = {
272272
structures: {
273273
index: projectsIndex,
274274
field: "participants.structure.id",
275-
topics: "domains.keyword",
275+
topics: "project_domains.label.default.keyword",
276276
search_fields: projectsFields,
277277
source_fields: [...projectsSourceFields, "participants.structure.id"],
278278
aggregation: "participants.structure.id.keyword",

client/src/pages/networks/components/clusters/items.tsx

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,19 @@ function ClusterItem({ currentModel, community }: ClusterItemArgs) {
6767
color="pink-macaron"
6868
>
6969
{`${metadata?.documentsCount} ${intl.formatMessage({
70-
id: "networks.section.clusters.badge-publications",
70+
id: `networks.source.${currentSource}`,
7171
})}`}
7272
</Badge>
73-
<Badge noIcon size="sm" color={oaColor(metadata?.oaPercent)}>
74-
{`${intl.formatMessage({
75-
id: "networks.section.clusters.open-access",
76-
})}: ${metadata?.oaPercent.toFixed(1)}%`}
77-
</Badge>
73+
{metadata?.oaPercent && (
74+
<Badge noIcon size="sm" color={oaColor(metadata?.oaPercent)}>
75+
{`${intl.formatMessage({
76+
id: "networks.section.clusters.open-access",
77+
})}: ${metadata?.oaPercent.toFixed(1)}%`}
78+
</Badge>
79+
)}
7880
<Badge size="sm" color="yellow-tournesol">
7981
{`${intl.formatMessage({
80-
id: "networks.section.clusters.last-activity",
82+
id: `networks.section.clusters.last-activity.${currentSource}`,
8183
})}: ${community?.maxYear || "N/A"}`}
8284
</Badge>
8385
{currentSource === "publications" && (
@@ -123,7 +125,7 @@ function ClusterItem({ currentModel, community }: ClusterItemArgs) {
123125
.map(([domain], k) => (
124126
<Fragment key={k}>
125127
{k > 0 ? ", " : ""}
126-
<Link key={k} href={`/search/publications?q="${encode(domain)}"`}>
128+
<Link key={k} href={`/search/${currentSource}?q="${encode(domain)}"`}>
127129
#{domain}
128130
</Link>
129131
</Fragment>
@@ -149,18 +151,18 @@ function ClusterItem({ currentModel, community }: ClusterItemArgs) {
149151
<Modal isOpen={showDocumentsModal} hide={() => setShowDocumentsModal(false)}>
150152
<ModalTitle>
151153
{intl.formatMessage({
152-
id: "networks.section.clusters.badge-publications",
154+
id: `networks.source.${currentSource}`,
153155
})}
154156
</ModalTitle>
155157
<ModalContent>
156-
{metadata?.documents?.map((publication) => (
157-
<li key={publication.id} className="fr-mt-1w">
158+
{metadata?.documents?.map((document) => (
159+
<li key={document.id} className="fr-mt-1w">
158160
<Link
159-
key={publication.id}
161+
key={document.id}
160162
target="_blank"
161-
href={window.location.origin + "/publications/" + encode(publication.id as string)}
163+
href={window.location.origin + `/${currentSource}/` + encode(document.id as string)}
162164
>
163-
{publication.title}
165+
{document?.title || document.id}
164166
</Link>
165167
</li>
166168
))}

client/src/pages/networks/locales/en.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,11 @@
189189
"networks.section.clusters.subclasses": "{count, plural, one {# Subclasses community} other {Subclasses communities (#)}}",
190190
"networks.section.clusters.classes": "{count, plural, one {# Classes community} other {Classes communities (#)}}",
191191
"networks.section.clusters.open-modal-button": "See full list",
192-
"networks.section.clusters.last-activity": "Last publication",
192+
"networks.section.clusters.last-activity.publications": "Last publication",
193+
"networks.section.clusters.last-activity.patents": "Last patent",
194+
"networks.section.clusters.last-activity.projects": "Last funding",
193195
"networks.section.clusters.citations": "{count, plural, one {# Citation} other {# Citations}}",
194196
"networks.section.clusters.open-access": "Open access",
195-
"networks.section.clusters.badge-publications": "Publications",
196197
"networks.section.clusters.see-more": "See more ({count})",
197198
"networks.section.clusters.see-less": "Show less",
198199
"networks.contribute.button": "Report an error",

client/src/pages/networks/locales/fr.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,11 @@
193193
"networks.section.clusters.subclasses": "{count, plural, one {# Communauté de sous classes} other {Communautés de sous classes (#)}}",
194194
"networks.section.clusters.classes": "{count, plural, one {# Communauté de classes} other {Communautés de classes (#)}}",
195195
"networks.section.clusters.open-modal-button": "Voir la liste complète",
196-
"networks.section.clusters.last-activity": "Dernière publication",
196+
"networks.section.clusters.last-activity.publications": "Dernière publication",
197+
"networks.section.clusters.last-activity.patents": "Dernier brevet",
198+
"networks.section.clusters.last-activity.projects": "Dernier financement",
197199
"networks.section.clusters.citations": "{count, plural, one {# Citation} other {# Citations}}",
198200
"networks.section.clusters.open-access": "Accès ouvert",
199-
"networks.section.clusters.badge-publications": "Publications",
200201
"networks.section.clusters.see-more": "En voir plus ({count})",
201202
"networks.section.clusters.see-less": "Réduire",
202203
"networks.contribute.button": "Signaler une erreur",

0 commit comments

Comments
 (0)