Merge pull request #848 from OpenKnowledgeMaps/dev

release: aquanavi geomap

Author: chreman

.babelrc.json

@@ -6,7 +6,12 @@
         "targets": "> 0.25%, not dead"
       }
     ],
-    "@babel/preset-react",
+    [
+      "@babel/preset-react",
+      {
+        "runtime": "automatic"
+      }
+    ],
     "@babel/preset-typescript"
   ]
 }

eslint.config.mjs

@@ -2,6 +2,7 @@ import js from "@eslint/js";
 import parserBabel from "@babel/eslint-parser";
 import parserTs from "@typescript-eslint/parser";
 import pluginReact from "eslint-plugin-react";
+import globals from "globals";
 import pluginReactHooks from "eslint-plugin-react-hooks";
 import pluginTs from "@typescript-eslint/eslint-plugin";
 import pluginSimpleImportSort from "eslint-plugin-simple-import-sort";
@@ -21,6 +22,10 @@ export default [
         ecmaFeatures: { jsx: true },
         project: true,
       },
+      globals: {
+        ...globals.browser,
+        ...globals.es2021,
+      },
     },
     plugins: {
       "@typescript-eslint": pluginTs,
@@ -81,6 +86,10 @@ export default [
         ecmaFeatures: {
           jsx: true,
         },
+        globals: {
+          ...globals.browser,
+          ...globals.es2021,
+        },
       },
     },
     plugins: {

local_dev/searchflow-container/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.2-apache
+FROM php:8.2-apache-bookworm
 
 LABEL maintainer="Chris Kittel <christopher.kittel@openknowledgemaps.org>"
 

package-lock.json

@@ -9,7 +9,7 @@
   "scripts": {
     "test": "TZ='Europe/Vienna' vitest",
     "dev": "webpack --progress --watch --mode=development",
-    "prod": "webpack --progress",
+    "prod": "webpack",
     "start": "webpack serve --progress --mode=development --env example=base",
     "example:base": "npm start",
     "example:pubmed": "npm start -- --env example=pubmed",
@@ -44,12 +44,14 @@
     "hypher": "^0.2.5",
     "iso-639-1": "^3.1.5",
     "jquery": "^3.7.1",
+    "leaflet": "^1.9.4",
     "mark.js": "^8.11.1",
     "react": "^18.3.1",
     "react-bootstrap": "^0.33.1",
     "react-dom": "^18.3.1",
     "react-highlight-words": "^0.21.0",
     "react-hyphen": "^1.4.0",
+    "react-leaflet": "^4.2.1",
     "react-redux": "^8.1.3",
     "react-test-renderer": "^18.3.1",
     "redux": "^5.0.1",
@@ -70,6 +72,7 @@
     "@types/dateformat": "^5.0.3",
     "@types/jest": "^29.5.14",
     "@types/jquery": "^3.5.32",
+    "@types/leaflet": "^1.9.20",
     "@types/node": "^22.15.18",
     "@types/react": "^18.3.1",
     "@types/react-bootstrap": "^0.32.37",
@@ -80,13 +83,14 @@
     "@vitejs/plugin-react": "^4.4.1",
     "babel-loader": "^10.0.0",
     "bootstrap-sass": "^3.3.6",
+    "copy-webpack-plugin": "^13.0.1",
     "css-loader": "^7.1.2",
     "eslint": "^9.29.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "file-loader": "^6.2.0",
-    "globals": "^15.13.0",
+    "globals": "^15.15.0",
     "html-webpack-plugin": "^5.5.0",
     "imports-loader": "^5.0.0",
     "jsdom": "^26.1.0",

package.json

@@ -52,7 +52,11 @@ get_papers <- function(query, params) {
                          funder = funder,
                          format = 'xml')
     pubs_metadata <- parse_response(response)
-    pubs_metadata <- fill_dois(pubs_metadata)
+    # FYI: The deactivation of the fill_dois() function is a hotfix
+    # to enable creation of OpenAIRE project maps
+    # TODO: root cause analysis of failure mode
+    # TODO: refactor/replace/remove the function, decision pending
+    #pubs_metadata <- fill_dois(pubs_metadata)
   },
   error = function(err){
     olog$warn(paste0("vis_id:", .GlobalEnv$VIS_ID, "publications: ", err))

server/classes/headstart/evaluation/logger/FileLogger.php

@@ -101,6 +101,7 @@ function search(
     "base" => "BASE",
     "openaire" => "OpenAire",
     "orcid" => "ORCID",
+    "aquanavi" => "AQUANAVI",
   );
 
   $query = ($do_clean_query === true)

server/classes/headstart/evaluation/logger/Logger.php

@@ -0,0 +1,34 @@
+<?php
+header('Content-type: application/json');
+
+require_once dirname(__FILE__) . '/../classes/headstart/library/CommUtils.php';
+require_once dirname(__FILE__) . '/search.php';
+
+use headstart\library;
+
+// Get real request parameters
+$query = library\CommUtils::getParameter($_POST, "q");
+$precomputed_id = $_POST["unique_id"] ?? null;
+
+// Mock some request parameters
+$post_params = $_POST;
+$post_params["min_descsize"] = "0";
+$post_params["lang_id"] = ["all-lang"];
+$post_params["vis_type"] = "geomap";
+$post_params["from"] = "1665-01-01";
+$post_params["to"] = "2026-01-21";
+$post_params["document_types"] = ["F"];
+$post_params["sorting"] = "most-relevant";
+$post_params["time_range"] = "user-defined";
+
+// And some others...
+$params_array = ["from", "to", "document_types", "sorting", "min_descsize", "lang_id"];
+
+$is_custom_array_set = isset($post_params["custom_title"]);
+if ($is_custom_array_set) {
+  $params_array[] = "custom_title";
+}
+
+$result = search("aquanavi", $query, $post_params, $params_array, true, true, null, $precomputed_id, false);
+echo $result
+?>