chore(patents): use organisation request instead of patents for bubble graph

Author: Mihoub2

client/src/api/organizations/[id]/index.ts

@@ -208,7 +208,7 @@ async function getStructurePublicationsById(id: string): Promise<any> {
     }
   }).filter(el => el) || [];
 
-  return { publicationsCount, byYear, byType, bySource, byAuthors, byWiki, byOpenAlexFields, byInfrastructureName, byGrantsFunder, bySupportEntity } || {}
+  return { publicationsCount, byYear, byType, bySource, byAuthors, byWiki, byOpenAlexFields, byInfrastructureName, byGrantsFunder, bySupportEntity } 
 }
 
 async function getStructureProjectsById(id: string): Promise<any> {
@@ -290,7 +290,21 @@ async function getStructurePatentsById(id: string): Promise<any> {
           size: 25,
 
         }
-      }
+      },
+      byCpc: {
+          terms: {
+            field: "cpc.classe.code.keyword",
+            size: 10000,
+          },
+          aggs: {
+            bySectionLabel: {
+              terms: {
+                field: "cpc.section.label.keyword",
+                size: 1,
+              },
+            },
+        },
+      },
     }
   }
   const res = await fetch(
@@ -309,5 +323,15 @@ async function getStructurePatentsById(id: string): Promise<any> {
       normalizedCount: element.doc_count * 100 / _100Year,
     }
   }).sort((a, b) => a.label - b.label).reduce(fillWithMissingYears, []) || [];
-  return { byYear, patentsCount }
+  const byCpc =
+    data?.byCpc?.buckets
+      ?.map((element) => {
+        return {
+          value: element.key.split("###")?.[0],
+          label: element.key.split("###")?.[1],
+          count: element.doc_count,
+        };
+      })
+      .filter((el) => el) || [];
+  return { byYear, byCpc, patentsCount }
 }

client/src/api/patents/[id]/index.ts

@@ -32,71 +32,3 @@ export async function getPatentById(id: string): Promise<Patent> {
   if (!patent) throw new Error("404");
   return { ...patent, _id: data?.hits?.hits?.[0]._id };
 }
-
-export async function getCpcAggregation(value: string): Promise<Patent> {
-  const body: any = {
-    size: 10000,
-    query: {
-      bool: {
-        must: [
-          {
-            term: {
-              "applicants.ids.id.keyword": value,
-            },
-          },
-        ],
-      },
-    },
-    aggs: {
-      byCpc: {
-        terms: {
-          field: "cpc.classe.code.keyword",
-          size: 10000,
-        },
-        aggs: {
-          bySectionLabel: {
-            terms: {
-              field: "cpc.section.label.keyword",
-              size: 1,
-            },
-          },
-        },
-      },
-    },
-  };
-
-  const res = await fetch(`${patentsIndex}/_search`, {
-    method: "POST",
-    body: JSON.stringify(body),
-    headers: postHeaders,
-  });
-
-  const data = await res.json();
-
-  const buckets = data?.aggregations?.byCpc?.buckets;
-  const hits = data?.hits?.hits;
-
-  const labelsByCode = hits.reduce((acc: any, hit: any) => {
-    const cpcGroups = hit._source.cpc?.classe ?? [];
-    cpcGroups.forEach((cpc: any) => {
-      if (!acc[cpc.code]) {
-        acc[cpc.code] = cpc.label;
-      }
-    });
-    return acc;
-  }, {});
-
-  const patent = buckets.map((bucket: any) => {
-    const sectionLabel =
-      bucket.bySectionLabel?.buckets?.[0]?.key || "Label de section non trouvé";
-
-    return {
-      code: bucket.key,
-      doc_count: bucket.doc_count,
-      label: labelsByCode[bucket.key] || "Label non trouvé",
-      sectionLabel,
-    };
-  });
-
-  return patent;
-}

client/src/components/patent-chart/index.tsx

@@ -3,15 +3,12 @@ import Highcharts from "highcharts";
 import HighchartsReact from "highcharts-react-official";
 import HighchartsMore from "highcharts/highcharts-more";
 import { useIntl } from "react-intl";
+import { Aggregation } from "../../types/commons";
 
 HighchartsMore(Highcharts);
 
 type CpcChartProps = {
-  data: {
-    label: string;
-    doc_count: number;
-    code: string;
-  }[];
+  data: Aggregation[];
 };
 
 const sectionLabels: Record<string, string> = {
@@ -40,11 +37,11 @@ const CpcChart: React.FC<CpcChartProps> = ({ data }) => {
     "#AEA397",
   ];
   const groupedData = data.reduce((acc, item) => {
-    const firstLetter = item.code.charAt(0).toUpperCase();
+    const firstLetter = item.value.charAt(0).toUpperCase();
     if (!acc[firstLetter]) acc[firstLetter] = [];
     acc[firstLetter].push({
-      name: item.code,
-      value: item.doc_count,
+      name: item.value,
+      value: item.count,
       label: item.label,
     });
     return acc;
@@ -54,9 +51,9 @@ const CpcChart: React.FC<CpcChartProps> = ({ data }) => {
     ([letter, items], index) => {
       const totalCount = items.reduce((sum, item) => sum + item.value, 0);
       return {
-        name:
-          intl.formatMessage({ id: sectionLabels[letter] }) ||
-          `Section ${letter}`,
+        name: sectionLabels[letter]
+          ? intl.formatMessage({ id: sectionLabels[letter] })
+          : `Section ${letter}`,
         color: colorPalette[index % colorPalette.length],
         data: items.map((item) => ({
           name: item.name,
@@ -105,18 +102,19 @@ const CpcChart: React.FC<CpcChartProps> = ({ data }) => {
         );
         const totalFamiliesText = intl.formatMessage(
           {
-            id: "organizations.patents.chart.families",
-            defaultMessage: "{count} famille{plural}",
+            id: "organizations.patents.chart.totalFamilies",
+            defaultMessage:
+              "{count, plural, one {# famille} other {# familles}}",
           },
           {
             count: totalCount,
-            plural: totalCount > 1 ? "s" : "",
           }
         );
 
-        if (!pointName && !pointLabel) {
-          return `<b>${sectionName}</b>: ${totalFamiliesText}`;
-        }
+        if (!pointName && !pointLabel)
+          if (!pointName && !pointLabel) {
+            return `<b>${sectionName}</b>: ${totalFamiliesText}`;
+          }
 
         return `${pointName} ${
           pointLabel ? `- ${pointLabel}` : ""
@@ -126,11 +124,12 @@ const CpcChart: React.FC<CpcChartProps> = ({ data }) => {
 
     plotOptions: {
       packedbubble: {
-        minSize: "45%",
-        maxSize: "120%",
+        minSize: "30%",
+        maxSize: "100%",
         zMin: zMin,
         zMax: zMax,
         layoutAlgorithm: {
+          enableSimulation: false,
           gravitationalConstant: 0.05,
           splitSeries: true,
           seriesInteraction: false,

client/src/pages/organizations/[id]/components/patents/index.tsx

@@ -3,8 +3,6 @@ import { Button, Row, Col, Text } from "@dataesr/dsfr-plus";
 import useScreenSize from "../../../../../hooks/useScreenSize";
 import YearBars from "../../../../../components/year-bars";
 import { useState } from "react";
-import { useQuery } from "@tanstack/react-query";
-import { getCpcAggregation } from "../../../../../api/patents/[id]";
 import { OrganizationPatentsData } from "../../../../../types/organization";
 import CpcWordCloud from "../../../../../components/patent-chart";
 
@@ -26,24 +24,6 @@ export default function OrganizationPatents({
   const searchFilters = {
     "applicants.ids.id": { values: [{ value, label }], type: "terms" },
   };
-
-  const patentId = searchFilters["applicants.ids.id"].values[0].value;
-  const { data: patentsData = [] } = useQuery({
-    queryKey: ["patent", patentId],
-    queryFn: () => getCpcAggregation(patentId),
-    throwOnError: true,
-  });
-
-  const prepareCpcGraphData = (patentsData) => {
-    return patentsData.map((item) => ({
-      code: item.code,
-      doc_count: item.doc_count,
-      label: item.label,
-    }));
-  };
-
-  const graphData = prepareCpcGraphData(patentsData);
-
   const patentsFilterUrl = `/search/patents?filters=${encodeURIComponent(
     JSON.stringify(searchFilters)
   )}`;
@@ -161,8 +141,8 @@ export default function OrganizationPatents({
             />
           )}
           <>
-            {projectGraph === "cpc" && patentsData && (
-              <CpcWordCloud data={graphData} />
+            {projectGraph === "cpc" && patents.byCpc && (
+              <CpcWordCloud data={patents.byCpc} />
             )}
           </>
         </Col>

client/src/pages/organizations/[id]/locales/fr.json

@@ -56,6 +56,7 @@
   "organizations.sectionLabels.other": "Technologies émergentes ou celles qui couvrent plusieurs sections",
   "organizations.patents.search": "Voir la liste des brevets",
   "organizations.patents.chart.families": "{value} {value, plural, one {famille de brevets} other {familles de brevets}}",
+  "organizations.patents.chart.totalFamilies": "{count, plural, one {# famille} other {# familles}}",
   "organizations.patents.chart.title": "Domaines technogiques identifiés dans les familles de brevets de la structure (par section et classe)",
   "organizations.patents.nav.year": "Répartition par année",
   "organizations.patents.year-bars.name": "Familles de brevets",

client/src/types/organization.ts

@@ -30,6 +30,7 @@ export type OrganizationPatentsData = {
   level: any;
   kind: any;
   byYear: Aggregation[];
+  byCpc: Aggregation[];
   patentsCount: number;
 };