Merge branch 'master' into theme-istex-for-istex-corpus

update branch theme-istex-for-istex-corpus
Inist-CNRS · Aug 9, 2024 · 9128c9c · 9128c9c
2 parents d4497b1 + 4e86dc8
commit 9128c9c
Show file tree

Hide file tree

Showing 16 changed files with 286 additions and 308 deletions.
diff --git a/Makefile b/Makefile
@@ -54,8 +54,8 @@ build:
 ## Deploy =================================================================
 
 publish: build  ## publish version to docker hub
-	docker build -t cnrsinist/lodex:14.0.58 --build-arg http_proxy --build-arg https_proxy .
-	docker push cnrsinist/lodex:14.0.58
+	docker build -t cnrsinist/lodex:14.0.59 --build-arg http_proxy --build-arg https_proxy .
+	docker push cnrsinist/lodex:14.0.59
 
 ## Development =================================================================
 

diff --git a/config.json b/config.json
@@ -71,6 +71,7 @@
         "json-lines",
         "query-istex",
         "query-conditor",
+        "query-conditor-for-halcnrs",
         "query-openalex",
         "rss",
         "atom",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
         "node": ">= 16"
     },
     "name": "lodex",
-    "version": "14.0.58",
+    "version": "14.0.59",
     "description": "",
     "main": "src/api/index.js",
     "browser": {
@@ -76,8 +76,8 @@
         "@emotion/styled": "11.6.0",
         "@ezs/analytics": "2.3.2",
         "@ezs/basics": "2.7.1",
-        "@ezs/conditor": "2.12.1",
-        "@ezs/core": "3.10.2",
+        "@ezs/conditor": "2.12.2",
+        "@ezs/core": "3.10.3",
         "@ezs/istex": "1.5.9",
         "@ezs/lodex": "file:./packages/ezsLodex",
         "@ezs/sparql": "1.2.3",
@@ -121,7 +121,6 @@
         "from": "0.1.7",
         "history": "^4.7.2",
         "inist-ark": "^2.1.3",
-        "inist-roadmap": "^1.2.0",
         "js-sentencecase": "^1.2.1",
         "jsonstream": "1.0.3",
         "jsonwebtoken": "9.0.2",
@@ -154,7 +153,6 @@
         "react": "^16.14.0",
         "react-ace": "10.1.0",
         "react-dom": "^16.14.0",
-        "react-event-timeline": "^1.6.3",
         "react-grid-layout": "1.3.4",
         "react-helmet": "^5.2.1",
         "react-imask": "^7.1.3",

diff --git a/packages/ezsLodex/src/formatOutput.js b/packages/ezsLodex/src/formatOutput.js
@@ -47,7 +47,7 @@ function formatOutput(data, feed) {
         if (keys.length > 0) {
             let check = false;
             keys.forEach((k, index) => {
-                if (values[index]) {
+                if (values[index] !== undefined) {
                     feed.write(!check ? ' ' : ',');
                     check = true;
                     feed.write(json(k));

diff --git a/src/api/services/import.js b/src/api/services/import.js
@@ -70,16 +70,18 @@ export const startImport = async (ctx) => {
         const source = url ? url : filename;
         const parser =
             !loaderName || loaderName === 'automatic' ? extension : loaderName;
-        const loaderEnvironment = {
-            source,
-            parser,
-        };
+
         fusible = await createFusible();
         await enableFusible(fusible);
         ctx.job.update({
             ...ctx.job.data,
             fusible,
         });
+        const loaderEnvironment = {
+            source,
+            parser,
+            fusible,
+        };
         let parseStream;
         if (customLoader) {
             loaderEnvironment.parser =

diff --git a/src/app/custom/themes/voscouleurs/index.ejs b/src/app/custom/themes/voscouleurs/index.ejs
@@ -14,7 +14,7 @@
     <meta name="msapplication-TileColor" content="#ffc40d" />
     <meta name="theme-color" content="#ffc40d" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" />
-    <% if(custom.font.family){ %>
+    <% if (custom.font) { %>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=<%= custom.font.family %>:700" />
     <% } %>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Quicksand:400,500" />
@@ -23,14 +23,13 @@
     /* import palette */
         <%=theme.cssVariable %>
     /* import config theme color */    
-        <% if(custom.font) {%> 
+        <% if (custom.font) {%> 
         :root {
         --font-title: <%= custom.font.title %>;
-        --font-text: <%= custom.font.text %>;
         }
-        <%}%>
+        <% } %>
     /* import config theme color */    
-        <% if(custom.color) {%> 
+        <% if (custom.color) {%> 
         :root {
         --bgBody: <%= custom.color.bgBody %>;
         --bgHeader: <%= custom.color.bgHeader %>;
@@ -47,7 +46,7 @@
         --textContrast: <%= custom.color.textContrast %>;
         --bgContrast: <%= custom.color.bgContrast %>;
         }
-        <%}%>        
+        <% } %>        
     </style>
 </head>