Merge remote-tracking branch 'origin/staging'

Author: ericjeangirard

client/package-lock.json

@@ -31,6 +31,7 @@
     "highcharts-react-official": "^3.2.1",
     "leaflet": "^1.9.4",
     "ml-regression-simple-linear": "^3.0.1",
+    "proj4": "^2.17.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-intersection-observer": "^9.5.3",

client/package.json

@@ -77,7 +77,7 @@ async function getStructurePublicationsById(id: string): Promise<any> {
       },
       bySupportEntity: {
         terms: {
-          field: "structured_acknowledgments.support.entity.keyword",
+          field: "structured_acknowledgments.private_support.entity.keyword",
           size: 50,
         }
       },

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

@@ -1,5 +1,6 @@
 export const FIELDS = [
   "id.keyword^10",
+  "title_abs_text^3",
   "inpadocFamily.keyword^10",
   "patents.id.keyword^10",
   "patents.publicationNumber.keyword^10",

client/src/api/patents/_utils/constants.ts

@@ -0,0 +1,99 @@
+import { patentsIndex, postHeaders } from "../../../config/api";
+import { AggregationArgs } from "../../../types/commons";
+import { PatentsAggregationsForAnalyticTool } from "../../../types/patent";
+import { fillWithMissingYears } from "../../utils/years";
+import { FIELDS } from "../_utils/constants";
+
+
+export async function aggregatePatentsForAnalyticTool(
+  { query }: AggregationArgs
+  ): Promise<PatentsAggregationsForAnalyticTool> {
+  const body: any = {
+    size: 0,
+    query: {
+      bool: {
+        must: [
+          {
+            query_string: {
+              query: query || '*',
+              fields: FIELDS,
+            },
+          }
+        ]
+      }
+    },
+    aggs: {
+      byYear: {
+        terms: {
+          field: "year",
+          size: 25,
+        },
+      },
+      patentsCount: {
+        value_count: { field: "id.keyword" },
+      },
+      byApplicants: {
+        terms: {
+          field: "applicants.id_name.keyword",
+          size: 15,
+          order: {
+            _count: "desc"
+          }
+        }
+      },
+      byInventors: {
+        terms: {
+          field: "inventors.name.keyword",
+          size: 15,
+          // min_doc_count: 5,
+          order: {
+            _count: "desc"
+          }
+        }
+      },
+    }
+  }
+  const res = await fetch(
+    `${patentsIndex}/_search`,
+    { method: 'POST', body: JSON.stringify(body), headers: postHeaders })
+  const result = await res.json()
+  const { aggregations: data} = result;
+
+  const _100Year =
+    data?.byYear?.buckets &&
+    Math.max(...data.byYear.buckets.map((el) => el.doc_count));
+  const byYear =
+    data?.byYear?.buckets
+      ?.map((element) => {
+        return {
+          value: element.key,
+          label: element.key,
+          count: element.doc_count,
+          normalizedCount: (element.doc_count * 100) / _100Year,
+        };
+      })
+      .sort((a, b) => a.label - b.label)
+      .reduce(fillWithMissingYears, []) || [];
+
+  const byApplicants = data?.byApplicants?.buckets?.map((element) => {
+    return {
+      value: element.key?.split('###')?.[0] || element.key,
+      label: element.key?.split('###')?.[1] || element.key,
+      count: element.doc_count,
+    }
+  }).filter(el => el) || [];
+  const byInventors = data?.byInventors?.buckets?.map((element) => {
+    return {
+      value: element.key,
+      label: element.key,
+      count: element.doc_count,
+    }
+  }).filter(el => el) || [];
+  const patentsCount = data.patentsCount?.value;
+  return {
+    byInventors,
+    byApplicants,
+    patentsCount,
+    byYear,
+  };
+}

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

@@ -1,6 +1,7 @@
 export const FIELDS = [
   "id^3",
   "label.*^3",
+  "title_abs_text^3",
   "acronym.*^3",
   "description.*^2",
   "domains.label.*",

client/src/api/projects/_utils/constants.ts

@@ -0,0 +1,83 @@
+import { projectsIndex, postHeaders } from "../../../config/api";
+import { AggregationArgs } from "../../../types/commons";
+import { ProjectAggregationsForAnalyticsTool } from "../../../types/project";
+import { fillWithMissingYears } from "../../utils/years";
+import { FIELDS } from "../_utils/constants";
+
+export async function aggregateProjectsForAnalyticsTool(
+  { query }: AggregationArgs
+  ): Promise<ProjectAggregationsForAnalyticsTool> {
+  const body: any = {
+    size: 0,
+    query: {
+      bool: {
+        must: [
+          {
+            query_string: {
+              query: query || '*',
+              fields: FIELDS,
+            },
+          }
+        ]
+      }
+    },
+    aggs: {
+      projectsCount: {
+        value_count: { field: "id.keyword" },
+      },
+      byType: {
+        terms: {
+          field: "type.keyword",
+          size: 500,
+        }
+      },
+      byYear: {
+        terms: {
+          field: "year",
+          size: 25,
+        }
+      },
+      byInstitution: {
+        terms: {
+          field: "participants.structure.id_name.keyword",
+          size: 500,
+        }
+      }
+    }
+  }
+  const res = await fetch(
+    `${projectsIndex}/_search`,
+    { method: 'POST', body: JSON.stringify(body), headers: postHeaders })
+  const result = await res.json()
+  const { aggregations: data } = result;
+  const byInstitution = data?.byInstitution?.buckets
+    ?.filter((element) => element.key.split('###')?.[0].match(/^[0-9]{9}[A-Z]{1}$/))
+    .map((element) => {
+      return {
+        value: element.key.split('###')?.[0],
+        label: element.key.split('###')?.[1]?.split('_')?.[1]?.split('|||')?.[0],
+        count: element.doc_count,
+      }
+    })
+    .filter(el => el) || [];
+
+  const _100Year = data?.byYear?.buckets && Math.max(...data.byYear.buckets.map((el) => el.doc_count));
+  const byYear = data?.byYear?.buckets?.map((element) => {
+    return {
+      value: element.key,
+      label: element.key,
+      count: element.doc_count,
+      normalizedCount: element.doc_count * 100 / _100Year,
+    }
+  }).sort((a, b) => a.label - b.label).reduce(fillWithMissingYears, []) || [];
+  const byType = data?.byType?.buckets?.map((element) => {
+    return {
+      value: element.key,
+      label: element.key,
+      count: element.doc_count,
+    }
+  }).filter(el => el) || [];
+  const projectsCount = data?.projectsCount?.value || 0;
+  return { byInstitution, byYear, byType, projectsCount};
+
+}

client/src/api/projects/aggregate/anaytic-tool.ts

@@ -2,6 +2,7 @@ export const FIELDS = [
   "id^10",
   "externalIds.id^3",
   "title.*^3",
+  "title_abs_text^3",
   "summary.*^2",
   "domains.label.*^2",
   "domains.code^2",