Merge remote-tracking branch 'origin/staging'

Author: ericjeangirard

client/public/icons/sort-desc.svg

@@ -29,10 +29,10 @@ function processAuthorsByLabsForStackedChart(buckets: any): StackedChartData {
     const authorName = parts[1];
     const labs = bucket.byLabs.buckets
       ?.filter(lab => lab.key.startsWith(idref))
-      ?.map(lab => lab.key.split('###')[3])
+      ?.map(lab => lab.key.split('###')[3]?.split('_')?.[1]?.split('|||')?.[0])
     const labsWithCount = bucket.byLabs.buckets
       ?.filter(lab => lab.key.startsWith(idref))
-      ?.map(lab => [lab.key.split('###')[3], lab.doc_count])
+      ?.map(lab => [lab.key.split('###')[3]?.split('_')?.[1]?.split('|||')?.[0], lab.doc_count])
 
     allAuthors.set(authorName, labs);
     labs?.forEach(lab => categories.add(lab));
@@ -41,8 +41,6 @@ function processAuthorsByLabsForStackedChart(buckets: any): StackedChartData {
     });
   });
 
-  console.log(categoriesCounts.get('IRIG'))
-
   const categoryTotals = new Map<string, number>();
   [...categories].forEach(lab => {
     const singleCount = [...allAuthors].filter(([, authorLabs]) => authorLabs.includes(lab) && authorLabs.length === 1).length;
@@ -264,11 +262,11 @@ export async function aggregatePublicationsForAnalyticTool(
     .filter(el => el) || [];
   const byLabsMap = data?.byLabs?.buckets
     ?.filter((element) => element.key.split('###')?.[0].match(/^[0-9]{9}[A-Z]{1}$/))
-    ?.filter((element) => element.key.split('###')?.[2])
+    ?.filter((element) => element.key.split('###')?.[3])
     .map((element) => {
       return {
-        lat: Number(element.key.split('###')?.[2].split('|')?.[0]),
-        lon: Number(element.key.split('###')?.[2].split('|')?.[1]),
+        lat: Number(element.key.split('###')?.[3].split('|')?.[0]),
+        lon: Number(element.key.split('###')?.[3].split('|')?.[1]),
         name: element.key.split('###')?.[1]?.split('_')?.[1]?.split('|||')?.[0],
         z: element.doc_count,
       }

client/src/api/publications/aggregate/analytic-tool.ts

@@ -50,21 +50,31 @@ function computeTrends(
   const filteredItems = sortedItems.filter(({ label }: { label: string }) => label.toLowerCase().includes(includes))
 
   // Compute top items
-  const topCount = filteredItems.slice(minItems, maxItems)
-  const topSlope = filteredItems
+  const countDesc = filteredItems.slice(minItems, maxItems)
+  const trendDesc = filteredItems
     .slice()
     .sort((a, b) => (normalized ? b.norm_slope - a.norm_slope : b.slope - a.slope))
     .slice(minItems, maxItems)
-  const botSlope = filteredItems
+  const trendAsc = filteredItems
     .slice()
     .sort((a, b) => (normalized ? a.norm_slope - b.norm_slope : a.slope - b.slope))
     .slice(minItems, maxItems)
+  const variationDesc = filteredItems
+    .slice()
+    .sort((a, b) => b.variation - a.variation)
+    .slice(minItems, maxItems)
+  const variationAsc = filteredItems
+    .slice()
+    .sort((a, b) => a.variation - b.variation)
+    .slice(minItems, maxItems)
 
   const trends = {
     ranking: {
-      "count-top": topCount,
-      "trend-top": topSlope,
-      "trend-bot": botSlope,
+      "count-desc": countDesc,
+      "variation-desc": variationDesc,
+      "variation-asc": variationAsc,
+      "trend-desc": trendDesc,
+      "trend-asc": trendAsc,
     },
     searchTotal: sortedItems.length,
     searchPages: Math.ceil(sortedItems.length / ITEMS_PER_PAGE),

client/src/api/trends/trends.ts

@@ -71,7 +71,7 @@ export default function Analytics() {
     <Row gutters>
       <Col xs="12">
         <div className="fr-mb-3w" style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-        <Title as="h2" look="h4" className="fr-mb-0">{`${publicationsCount} publications`}</Title>
+        <Title as="h2" look="h4" className="fr-mb-0">{`${publicationsCount} publications françaises`}</Title>
         <ResultExports />
         </div>
         <hr />
@@ -99,8 +99,8 @@ export default function Analytics() {
       </Col>
       <Col xs="4">
         <AnalyticsGraph
-        title="Pays"
-        description="Top 15 des pays représentés dans les publications"
+        title="Collaboration internationale de la France"
+        description="Top 15 des pays qui collaborent avec la France"
         options={countriesOptions}
         />
       </Col>
@@ -119,15 +119,15 @@ export default function Analytics() {
       </Col>
       <Col xs="6">
         <AnalyticsGraph
-        title="Auteurs identifiés avec idRef"
-        description={`${authorsWithMoreThan5Publications} auteurs ont plus de 5 publications`}
+        title="Auteurs identifiés (avec idRef)"
+        description={`${authorsWithMoreThan5Publications} auteurs ont plus de 5 publications - après alignement sur le référentiel auteur idref`}
         options={authorsOptions}
         />
       </Col>
       <Col xs="6">
         <AnalyticsGraph
         title="Auteurs par nom complet dans la publication"
-        description={`${authorsFullNamesWithMoreThan5Publications} auteurs ont plus de 5 publications`}
+        description={`${authorsFullNamesWithMoreThan5Publications} auteurs ont plus de 5 publications - sans alignement, uniquement à partir du nom/prénom`}
         options={authorsFullNamesOptions}
         />
       </Col>

client/src/pages/tools/publications-analytics/components/analytics.tsx

@@ -34,9 +34,6 @@ export default function useNetworks(currentModel: "authors" | "structures") {
       }),
   })
 
-  console.log(currentModel, data)
-
-
   const values = useMemo(() => {
     return {
       currentQuery,

client/src/pages/tools/publications-analytics/hooks/useAuthorsNetwork.ts

@@ -5,6 +5,7 @@ import TrendsSelectSourceButton from "../select-source/button"
 import TrendsFiltersButton from "../filters/button"
 import TrendsParametersButton from "../parameters/button"
 import useIntegration from "../../hooks/useIntegration"
+import TrendsSelectSortButton from "../select-sort/button"
 
 export default function TrendsOptionsBar() {
   const { integrationOptions } = useIntegration()
@@ -20,6 +21,7 @@ export default function TrendsOptionsBar() {
           <TrendsSelectSourceButton />
         </Container>
         <Container fluid style={{ display: "flex", flexWrap: "wrap" }}>
+          <TrendsSelectSortButton />
           <TrendsFiltersButton />
           <TrendsParametersButton />
         </Container>

client/src/pages/tools/publications-analytics/hooks/useNetwork.ts

@@ -4,13 +4,15 @@ import TrendsSearchBarModal from "../search-bar/modal"
 import TrendsSelectSourceModal from "../select-source/modal"
 import TrendsSelectModelModal from "../select-model/modal"
 import TrendsFiltersModal from "../filters/modal"
+import TrendsSelectSortModal from "../select-sort/modal"
 
 export default function TrendsOptionsModals() {
   return (
     <Container fluid>
       <TrendsSearchBarModal />
       <TrendsSelectModelModal />
       <TrendsSelectSourceModal />
+      <TrendsSelectSortModal />
       <TrendsFiltersModal />
       <TrendsParametersModal />
     </Container>

client/src/pages/trends/components/options-bar/index.tsx

@@ -2,15 +2,13 @@ import { Button, Container } from "@dataesr/dsfr-plus"
 import Modal from "../../../../components/modal"
 import ToggleNormalize from "./toggle-normalize"
 import { useIntl } from "react-intl"
-import useTrends from "../../hooks/useTrends"
 import useOptions from "../../hooks/useOptions"
 
 export default function TrendsParametersModal() {
   const intl = useIntl()
-  const { isFetching } = useTrends()
   const { setNormalized } = useOptions()
 
-  const resetParameters = () => setNormalized(true)
+  const resetParameters = () => setNormalized(false)
 
   const id = "trends-options-parameters-modal"
 
@@ -25,16 +23,7 @@ export default function TrendsParametersModal() {
             {intl.formatMessage({ id: "trends.parameters.modal.reset" })}
           </Button>
         </div>
-        <Button
-          disabled={isFetching}
-          onClick={() => {
-            const element = document.getElementById(id)
-            // @ts-expect-error dsfr does not have types
-            window.dsfr(element).modal.conceal()
-          }}
-        >
-          {intl.formatMessage({ id: "trends.parameters.modal.display" })}
-        </Button>
+        <Button aria-controls={id}>{intl.formatMessage({ id: "trends.parameters.modal.display" })}</Button>
       </div>
     </Modal>
   )

client/src/pages/trends/components/options-bar/modals.tsx

@@ -1,51 +1,42 @@
+import cn from "classnames"
 import { useIntl } from "react-intl"
 import useTrends from "../../../hooks/useTrends"
-import { useTrendsContext } from "../../../context"
 import useOptions from "../../../hooks/useOptions"
-import { trendsRankingSortFromId, trendsRankingSortFromLabel } from "../../../config/sorting"
-
-function SortIcon({ sort, currentSort, sortIcon }: { sort: string; currentSort: string; sortIcon: string }) {
-  if (sort !== currentSort) return null
-  return <span className={`fr-icon-${sortIcon}`} aria-hidden="true" />
-}
+import { useTrendsContext } from "../../../context"
+import { useState } from "react"
+import { TextInput } from "@dataesr/dsfr-plus"
 
 export default function TrendsTableHeader() {
   const intl = useIntl()
+  const [openSearch, setOpenSearch] = useState(false)
+  const { includes, setIncludes } = useTrendsContext()
   const { trendsYears } = useTrends()
-  const { sort, setSort, setFocus } = useTrendsContext()
-  const { currentModel, handlePageChange } = useOptions()
-  const currentSort = trendsRankingSortFromId(sort)
+  const { currentModel } = useOptions()
 
-  const handleSortChange = (sortLabel: string) => {
-    const headerSort = trendsRankingSortFromLabel(sortLabel)
-    // set next sort
-    sortLabel === currentSort.label ? currentSort?.nextSort && setSort(currentSort.nextSort) : setSort(headerSort.id) // change sorting
-    handlePageChange(1) // reset page
-    setFocus("") // reset focus
+  const handleOpenSearchChange = () => {
+    if (openSearch === true) setIncludes("") // reset includes if closing
+    setOpenSearch(!openSearch)
   }
 
-  const sortIcon = currentSort.order === "top" ? "arrow-up-line" : "arrow-down-line"
-
   return (
     <thead>
       <tr>
-        <th>Rank</th>
-        <th onClick={() => console.log("domains")}>{intl.formatMessage({ id: `trends.ranking.header.domains` })}</th>
-        <th className="sort-button" onClick={() => handleSortChange("count")}>
-          {intl.formatMessage({ id: `trends.ranking.header.count` }, { max: trendsYears.max })}
-          <SortIcon sort="count" currentSort={currentSort.label} sortIcon={sortIcon} />
+        <th className={cn("action", openSearch ? "open" : "")} onClick={handleOpenSearchChange}>
+          {<span className="fr-icon-search-line" />}
+        </th>
+        <th>
+          {openSearch ? (
+            <TextInput value={includes} placeholder="Search topics" onChange={(event) => setIncludes(event.target.value)} />
+          ) : (
+            intl.formatMessage({ id: `trends.ranking.header.domains` })
+          )}
         </th>
-        <th
-          className="sort-button"
-          onClick={() => handleSortChange("variation")}
-          title={`The variation between the volume in ${trendsYears.max} and the previous years average volume`}
-        >
-          Growth
-          <SortIcon sort="variation" currentSort={currentSort.label} sortIcon={sortIcon} />
+        <th>{intl.formatMessage({ id: `trends.ranking.header.count` }, { max: trendsYears.max })}</th>
+        <th title={`The variation between the volume in ${trendsYears.max} and the previous years average volume`}>
+          {intl.formatMessage({ id: `trends.ranking.header.variation` })}
         </th>
-        <th className="sort-button" onClick={() => handleSortChange("trend")}>
+        <th>
           {intl.formatMessage({ id: `trends.ranking.header.trend` }, { count: trendsYears.max - trendsYears.min + 1 })}
-          <SortIcon sort="trend" currentSort={currentSort.label} sortIcon={sortIcon} />
         </th>
         {currentModel === "entity-fishing" && <th>Description</th>}
         {currentModel !== "entity-fishing" && currentModel !== "open-alex-domains" && <th>Category</th>}