Merge pull request #135 from ezpaarse-project/development

Development

docker-compose.debug.yml

@@ -182,7 +182,7 @@ services:
       - 24678:24678
     environment:
       - NODE_ENV=development
-      - NUXT_PUBLIC_NODE_ENV=development
+      - NUXT_PUBLIC_ENVIRONMENT=development
       - NUXT_PUBLIC_ELASTIC_ENV=development
       - NUXT_PUBLIC_VERSION=development
       - NUXT_PUBLIC_UNPAYWALL_HOMEPAGE_HOST

docker-compose.yml

@@ -184,7 +184,7 @@ services:
     container_name: ezunpaywall-frontend-prod
     environment:
       - NODE_ENV=development
-      - NUXT_PUBLIC_NODE_ENV=development
+      - NUXT_PUBLIC_ENVIRONMENT=development
       - NUXT_PUBLIC_ELASTIC_ENV=development
       - NUXT_PUBLIC_VERSION=development
       - NUXT_PUBLIC_UNPAYWALL_HOMEPAGE_HOST

package.json

@@ -1,6 +1,6 @@
 {
    "name": "ezunpaywall",
-   "version": "1.3.2",
+   "version": "1.3.3",
    "description": "",
    "author": "felixleo22",
    "license": "CeCILL",

src/apikey/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezunpaywall-apikey",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "app.js",
   "author": "felixleo22",

src/enrich/lib/services/graphql.js

@@ -22,7 +22,9 @@ async function requestGraphql(data, args, index, apikey) {
   let dois = [];
   let res = [];
   // contain index of doi
+
   const map1 = await data.map((elem) => elem?.doi);
+
   // contain array of doi to request ezunpaywall
   dois = await map1.filter((elem) => elem !== undefined);
   dois = dois.join('","');

src/enrich/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezunpaywall-enrich",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "app.js",
   "author": "felixleo22",

src/fakeUnpaywall/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fakeunpaywall",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "app.js",
   "author": "felixleo22",

src/frontend/Dockerfile

@@ -2,7 +2,7 @@ FROM node:18.17-alpine3.18 as build
 
 LABEL maintainer="ezTeam <[email protected]>"
 
-ARG NUXT_PUBLIC_NODE_ENV
+ARG NUXT_PUBLIC_ENVIRONMENT
 ARG NUXT_PUBLIC_UNPAYWALL_HOST
 ARG NUXT_PUBLIC_UNPAYWALL_API_HOST
 ARG NUXT_PUBLIC_DASHBOARD_HOST

src/frontend/README.md

@@ -6,7 +6,7 @@ frontend service of ezunpaywall
 
 | name | default | description |
 | --- | --- | --- |
-| NUXT_PUBLIC_NODE_ENV | development | environment of node |
+| NUXT_PUBLIC_ENVIRONMENT | development | environment of node |
 | NUXT_PUBLIC_UNPAYWALL_HOST | https://unpaywall.org | Host of unpaywall |
 | NUXT_PUBLIC_UNPAYWALL_API_HOST | http://api.unpaywall.org | Host of API of unpaywall |
 | NUXT_PUBLIC_DASHBOARD_HOST | https://ezmesure.couperin.org/kibana/s/ezunpaywall/app/dashboards | Host of ezmesure dashboard |

src/frontend/components/graphql/request/RequestTab.vue

@@ -123,7 +123,7 @@ function copyText() {
     snackStore.error(t('error.graphql.copyRequest'));
     return;
   }
-  snackStore.info(t('info.graphql.copyResult'));
+  snackStore.info(t('info.graphql.copyRequest'));
 }
 
 function setGraphqlData(data) {

src/frontend/nuxt.config.ts

@@ -2,7 +2,7 @@
 export default defineNuxtConfig({
   runtimeConfig: {
     public: {
-      environment: process.env.NUXT_PUBLIC_NODE_ENV || 'development',
+      environment: process.env.NUXT_PUBLIC_ENVIRONMENT || 'development',
       unpaywallHost: process.env.NUXT_PUBLIC_UNPAYWALL_HOST || 'https://unpaywall.org',
       unpaywallAPIHost: process.env.NUXT_PUBLIC_UNPAYWALL_API_HOST || 'http://api.unpaywall.org',
       dashbordHost: process.env.NUXT_PUBLIC_DASHBOARD_HOST || 'https://ezmesure.couperin.org/kibana/s/ezunpaywall/app/dashboards',

src/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "private": true,
   "scripts": {
     "build": "nuxt build",

src/graphql/app.js

@@ -35,6 +35,7 @@ fs.ensureDir(path.resolve(logDir, 'access'));
 const server = new ApolloServer({
   typeDefs,
   resolvers,
+  introspection: true,
   csrfPrevention: false,
 });
 

src/graphql/lib/middlewares/args.js

@@ -1,5 +1,8 @@
+const logger = require('../logger');
+
 function getNumberOfDOI(req) {
   const patternBetweenBracket = /.*?(\[.*?\]).*?$/i;
+  const patternBetweenBracketQuery = /.*?(\[".*?"\]\)).*?$/i;
   // BODY
   // {
   //  query: 'query ($dois: [ID!]!) {GetByDOI(dois: $dois) {doi, is_oa}}',
@@ -11,9 +14,14 @@ function getNumberOfDOI(req) {
   // BODY
   // query: '{GetByDOI(dois:["10.1186/s40510-015-0109-6","Coin Coin"]){doi, is_oa}}'
   if (req?.body?.query) {
-    const match = patternBetweenBracket.exec(req?.body?.query);
+    const match = patternBetweenBracketQuery.exec(req?.body?.query);
     if (match?.length >= 1) {
-      const listOfDOI = JSON.parse(match[1]);
+      let listOfDOI;
+      try {
+        listOfDOI = match[1].split(',').length;
+      } catch (err) {
+        logger.error(`[Apollo] Cannot parse ${match[1]}`);
+      }
       return listOfDOI.length;
     }
   }

src/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezunpaywall-graphql-api",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "app.js",
   "author": "felixleo22",

src/health/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezunpaywall-health",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "app.js",
   "author": "felixleo22",

src/mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mail",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "app.js",
   "scripts": {

src/update/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezunpaywall-update",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "app.js",
   "author": "felixleo22",