Merge branch 'main' into fix-timeline

openkfw · Sep 22, 2021 · cc43155 · cc43155
2 parents ced3ab3 + 9e99ea2
commit cc43155
Show file tree

Hide file tree

Showing 25 changed files with 2,487 additions and 2,017 deletions.
diff --git a/api/package.json b/api/package.json
@@ -6,7 +6,7 @@
   "main": "index.js",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "@types/mongoose": "^5.10.3",
+    "@hapi/joi": "^17.1.1",
     "applicationinsights": "^1.8.10",
     "azure-storage": "^2.10.1",
     "body-parser": "^1.18.3",
@@ -17,7 +17,6 @@
     "express-winston": "^3.1.0",
     "helmet": "^3.21.1",
     "http-status": "^1.2.0",
-    "joi": "^13.6.0",
     "js-yaml": "^4.0.0",
     "jwt-decode": "^3.1.2",
     "mongoose": "^5.11.11",

diff --git a/api/src/config/config.js b/api/src/config/config.js
@@ -1,11 +1,11 @@
-const Joi = require('joi');
+const Joi = require('@hapi/joi');
 
 // require and configure dotenv, will load vars in .env in PROCESS.ENV
 require('dotenv').config();
 
 // define validation for all the env vars
 const envVarsSchema = Joi.object({
-  NODE_ENV: Joi.string().allow(['development', 'production', 'test', 'provision']).default('development'),
+  NODE_ENV: Joi.string().allow('development', 'production', 'test', 'provision').default('development'),
   PORT: Joi.number().default(8080),
   LOG_LABEL: Joi.string().default('oscar-api'),
   MONGO_URI: Joi.string(),
@@ -19,7 +19,7 @@ const envVarsSchema = Joi.object({
   .unknown()
   .required();
 
-const { error, value: envVars } = Joi.validate(process.env, envVarsSchema);
+const { error, value: envVars } = envVarsSchema.validate(process.env);
 if (error) {
   throw new Error(`Config validation error: ${error.message}`);
 }

diff --git a/api/yarn.lock b/api/yarn.lock
diff --git a/frontend/package.json b/frontend/package.json
@@ -27,7 +27,7 @@
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "react-router-redux": "^5.0.0-alpha.4",
-    "react-scripts": "^4.0.1",
+    "react-scripts": "^4.0.3",
     "redux": "^3.7.2",
     "redux-axios-middleware": "^4.0.0",
     "redux-immutable": "^4.0.0",
@@ -45,7 +45,7 @@
   "description": "React frontend for Oscar app",
   "main": "index.js",
   "devDependencies": {
-    "babel-eslint": "^10.1.0",
+    "@babel/eslint-parser": "^7.15.7",
     "eslint": "^7.20.0",
     "eslint-config-airbnb": "^18.2.0",
     "eslint-config-prettier": "^8.0.0",

diff --git a/frontend/src/screens/Map/Legend/LegendItem.js b/frontend/src/screens/Map/Legend/LegendItem.js
@@ -90,12 +90,7 @@ const LegendItem = ({ legend }) => {
   }
 };
 
-LegendItem.defaultProps = {
-  classes: {},
-};
-
 LegendItem.propTypes = {
   legend: PropTypes.objectOf(PropTypes.any).isRequired,
-  classes: PropTypes.objectOf(PropTypes.any),
 };
 export default LegendItem;
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
diff --git a/functions/csvLoader/config.ts b/functions/csvLoader/config.ts
@@ -1,4 +1,4 @@
-import * as Joi from 'joi';
+import * as Joi from '@hapi/joi';
 import * as dotenv from 'dotenv';
 
 // require and configure dotenv, will load vars in .env in PROCESS.ENV

diff --git a/functions/csvLoader/db.ts b/functions/csvLoader/db.ts
@@ -1,6 +1,6 @@
 import Bottleneck from 'bottleneck';
 import { Context } from '@azure/functions';
-import Joi from 'joi';
+import Joi from '@hapi/joi';
 import mongoose from 'mongoose';
 import { Attribute } from './types';
 import config from './config';

diff --git a/functions/csvLoader/joiSchemas.ts b/functions/csvLoader/joiSchemas.ts
@@ -1,4 +1,4 @@
-import Joi from 'joi';
+import Joi from '@hapi/joi';
 
 export const dbDataSchema = Joi.array().items(
   Joi.object({

diff --git a/functions/library/KOBOFetcher/config.ts b/functions/library/KOBOFetcher/config.ts
@@ -1,4 +1,4 @@
-import * as Joi from 'joi';
+import * as Joi from '@hapi/joi';
 import * as dotenv from 'dotenv';
 
 // require and configure dotenv, will load vars in .env in PROCESS.ENV

diff --git a/functions/library/KOBOFetcher/db.ts b/functions/library/KOBOFetcher/db.ts
@@ -1,6 +1,6 @@
 import Bottleneck from 'bottleneck';
 import { Context } from '@azure/functions';
-import Joi from 'joi';
+import Joi from '@hapi/joi';
 import mongoose from 'mongoose';
 import { Attribute } from './types';
 import config from './config';

diff --git a/functions/library/KOBOFetcher/index.ts b/functions/library/KOBOFetcher/index.ts
@@ -2,7 +2,7 @@ import { AzureFunction, Context } from '@azure/functions';
 import fs from 'fs';
 import path from 'path';
 import yaml from 'js-yaml';
-import Joi from 'joi';
+import Joi from '@hapi/joi';
 
 import config from './config';
 import { initializeDBConnection } from './db';

diff --git a/functions/library/KOBOFetcher/joiSchemas.ts b/functions/library/KOBOFetcher/joiSchemas.ts
@@ -1,4 +1,4 @@
-import Joi from 'joi';
+import Joi from '@hapi/joi';
 
 export const dbDataSchema = Joi.array().items(
   Joi.object({

diff --git a/functions/package-lock.json b/functions/package-lock.json
diff --git a/functions/package.json b/functions/package.json
@@ -14,11 +14,11 @@
     "lint:ci": "eslint . --max-warnings=0"
   },
   "dependencies": {
+    "@hapi/joi": "^17.1.1",
     "axios": "^0.21.1",
     "bottleneck": "^2.19.5",
     "csvtojson": "^2.0.10",
     "dotenv": "^8.2.0",
-    "joi": "^17.3.0",
     "js-yaml": "^3.14.0",
     "mongoose": "^5.10.15",
     "winston": "^3.3.3"

diff --git a/functions/templates/loaderTemplate/config.ts b/functions/templates/loaderTemplate/config.ts
@@ -1,4 +1,4 @@
-import * as Joi from 'joi';
+import * as Joi from '@hapi/joi';
 import * as dotenv from 'dotenv';
 
 // require and configure dotenv, will load vars in .env in PROCESS.ENV

diff --git a/functions/templates/loaderTemplate/db.ts b/functions/templates/loaderTemplate/db.ts
@@ -1,6 +1,6 @@
 import Bottleneck from 'bottleneck';
 import { Context } from '@azure/functions';
-import Joi from 'joi';
+import Joi from '@hapi/joi';
 import mongoose from 'mongoose';
 import { Attribute } from './types';
 import config from './config';

diff --git a/functions/templates/loaderTemplate/joiSchemas.ts b/functions/templates/loaderTemplate/joiSchemas.ts
@@ -1,4 +1,4 @@
-import Joi from 'joi';
+import Joi from '@hapi/joi';
 
 export const dbDataSchema = Joi.array().items(
   Joi.object({

diff --git a/initial-data-load/package.json b/initial-data-load/package.json
@@ -7,15 +7,14 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@azure/storage-queue": "^12.2.0",
-    "@types/mongoose": "^5.10.3",
+    "@hapi/joi": "^17.1.1",
     "axios": "^0.21.1",
     "azure-storage": "^2.10.3",
     "bottleneck": "^2.19.5",
     "csvtojson": "^2.0.10",
     "dotenv": "^6.0.0",
     "fs": "^0.0.1-security",
     "https": "^1.0.0",
-    "joi": "^13.6.0",
     "js-yaml": "^4.0.0",
     "mongoose": "^5.11.11",
     "winston": "^3.2.1"

diff --git a/initial-data-load/src/azureStorage/storageQueue.js b/initial-data-load/src/azureStorage/storageQueue.js
@@ -2,8 +2,7 @@ const { QueueServiceClient } = require('@azure/storage-queue');
 const logger = require('../config/winston');
 const config = require('../config/config');
 
-// eslint-disable-next-line new-cap
-const queueServiceClient = new QueueServiceClient.fromConnectionString(config.azureStorageConnectionString);
+const queueServiceClient = QueueServiceClient.fromConnectionString(config.azureStorageConnectionString);
 
 const createStorageQueue = async (queueName) => {
   logger.info(`Creating storage queue: ${queueName}`);