Merge branch 'develop' into feat/upload-blobs

dsi-icl · Jun 28, 2020 · 1087134 · 1087134
2 parents 354ab0b + b402d8b
commit 1087134
Show file tree

Hide file tree

Showing 7 changed files with 804 additions and 497 deletions.
diff --git a/package.json b/package.json
@@ -32,22 +32,22 @@
         ]
     },
     "devDependencies": {
-        "@types/jest": "26.0.0",
-        "@typescript-eslint/eslint-plugin": "3.3.0",
-        "@typescript-eslint/parser": "3.3.0",
+        "@types/jest": "26.0.3",
+        "@typescript-eslint/eslint-plugin": "3.4.0",
+        "@typescript-eslint/parser": "3.4.0",
         "babel-eslint": "10.1.0",
-        "eslint": "7.2.0",
+        "eslint": "7.3.1",
         "eslint-config-react-app": "5.2.1",
         "eslint-plugin-cypress": "2.11.1",
         "eslint-plugin-flowtype": "5.1.3",
-        "eslint-plugin-import": "2.21.2",
-        "eslint-plugin-jest": "23.13.2",
+        "eslint-plugin-jest": "23.17.1",
+        "eslint-plugin-import": "2.22.0",
         "eslint-plugin-jsx-a11y": "6.2.3",
         "eslint-plugin-react": "7.20.0",
         "eslint-plugin-react-hooks": "4.0.4",
         "husky": "4.2.5",
-        "jest-environment-node": "26.0.1",
         "start-server-and-test": "1.11.0",
+        "jest-environment-node": "26.1.0",
         "lerna": "3.22.1",
         "typescript": "3.9.5"
     },

diff --git a/packages/itmat-commons/package.json b/packages/itmat-commons/package.json
@@ -27,15 +27,15 @@
     },
     "devDependencies": {
         "@types/express": "4.17.6",
-        "@types/jest": "26.0.0",
+        "@types/jest": "26.0.3",
         "@types/minio": "7.0.5",
-        "@types/mongodb": "3.5.22",
+        "@types/mongodb": "3.5.25",
         "@types/node": "13.13.12",
         "@types/supertest": "2.0.9",
         "chalk": "4.1.0",
-        "jest": "26.0.1",
+        "jest": "26.1.0",
         "rimraf": "3.0.2",
-        "ts-jest": "26.1.0",
+        "ts-jest": "26.1.1",
         "typescript": "3.9.5"
     },
     "eslintConfig": {

diff --git a/packages/itmat-interface/package.json b/packages/itmat-interface/package.json
@@ -33,21 +33,21 @@
         "itmat-commons": "0.6.0",
         "mongodb": "3.5.9",
         "multer": "2.0.0-rc.2",
-        "nodemailer": "6.4.8",
+        "nodemailer": "6.4.10",
         "os2": "0.0.13",
         "passport": "0.4.1",
         "passport-local": "1.0.0",
         "saslprep": "1.0.3",
-        "uuid": "8.1.0"
+        "uuid": "8.2.0"
     },
     "devDependencies": {
         "@types/bcrypt": "3.0.0",
         "@types/connect-mongo": "3.1.3",
         "@types/express": "4.17.6",
         "@types/express-session": "1.17.0",
         "@types/graphql": "14.5.0",
-        "@types/jest": "26.0.0",
-        "@types/mongodb": "3.5.22",
+        "@types/jest": "26.0.3",
+        "@types/mongodb": "3.5.25",
         "@types/mongodb-memory-server": "2.3.0",
         "@types/multer": "1.4.3",
         "@types/node": "13.13.12",
@@ -64,13 +64,13 @@
         "cross-spawn": "7.0.3",
         "eslint-plugin-typescript": "0.14.0",
         "get-port": "5.1.1",
-        "jest": "26.0.1",
+        "jest": "26.1.0",
         "mongodb-memory-server": "6.6.1",
         "node-fetch": "2.6.0",
         "rimraf": "3.0.2",
         "start-server-webpack-plugin": "2.2.5",
         "supertest": "4.0.2",
-        "ts-jest": "26.1.0",
+        "ts-jest": "26.1.1",
         "ts-loader": "7.0.5",
         "typescript": "3.9.5",
         "typescript-eslint-parser": "22.0.0",

diff --git a/packages/itmat-interface/src/server/router.ts b/packages/itmat-interface/src/server/router.ts
@@ -1,21 +1,21 @@
 import { ApolloServer } from 'apollo-server-express';
 import bodyParser from 'body-parser';
-import connectMongo from 'connect-mongo';
+// import connectMongo from 'connect-mongo';
 import cors from 'cors';
 import express from 'express';
 import { Express, Request, Response } from 'express';
 import session from 'express-session';
 import http from 'http';
 import { CustomError } from 'itmat-commons';
 import passport from 'passport';
-import { db } from '../database/database';
+// import { db } from '../database/database';
 import { resolvers } from '../graphql/resolvers';
 import { schema } from '../graphql/schema';
 import { fileDownloadController } from '../rest/fileDownload';
 import { userLoginUtils } from '../utils/userLoginUtils';
 import { IConfiguration } from '../utils/configManager';
 
-const MongoStore = connectMongo(session);
+// const MongoStore = connectMongo(session);
 
 export class Router {
     private readonly app: Express;
@@ -35,7 +35,7 @@ export class Router {
             secret: config.sessionsSecret,
             resave: true,
             saveUninitialized: true,
-            store: new MongoStore({ client: db.client })
+            // store: new MongoStore({ client: db.client })
         }));
 
 

diff --git a/packages/itmat-job-executor/package.json b/packages/itmat-job-executor/package.json
@@ -20,7 +20,7 @@
         "prepublishOnly": "yarn run build"
     },
     "dependencies": {
-        "@babel/preset-env": "7.10.2",
+        "@babel/preset-env": "7.10.3",
         "body-parser": "1.19.0",
         "connect-timeout": "1.9.0",
         "csv-parse": "4.10.1",
@@ -32,27 +32,27 @@
         "node-fetch": "2.6.0",
         "saslprep": "1.0.3",
         "JSONStream": "1.3.5",
-        "uuid": "8.1.0"
+        "uuid": "8.2.0"
     },
     "devDependencies": {
-        "@babel/preset-env": "7.10.2",
+        "@babel/preset-env": "7.10.3",
         "@types/connect-timeout": "0.0.34",
         "@types/express": "4.17.6",
-        "@types/jest": "26.0.0",
+        "@types/jest": "26.0.3",
         "@types/json2csv": "5.0.1",
-        "@types/mongodb": "3.5.22",
+        "@types/mongodb": "3.5.25",
         "@types/multer": "1.4.3",
         "@types/node": "13.13.12",
         "@types/node-fetch": "2.5.7",
         "@types/supertest": "2.0.9",
         "@types/uuid": "8.0.0",
         "cross-env": "7.0.2",
         "eslint-plugin-typescript": "0.14.0",
-        "jest": "26.0.1",
+        "jest": "26.1.0",
         "rimraf": "3.0.2",
         "start-server-webpack-plugin": "2.2.5",
         "supertest": "4.0.2",
-        "ts-jest": "26.1.0",
+        "ts-jest": "26.1.1",
         "ts-loader": "7.0.5",
         "typescript": "3.9.5",
         "typescript-eslint-parser": "22.0.0",

diff --git a/packages/itmat-ui-react/package.json b/packages/itmat-ui-react/package.json
@@ -20,7 +20,7 @@
         "prepublishOnly": "yarn run build"
     },
     "dependencies": {
-        "antd": "4.3.4",
+        "antd": "4.3.5",
         "apollo-cache-inmemory": "1.6.6",
         "apollo-client": "2.6.10",
         "apollo-link": "1.2.14",
@@ -42,21 +42,21 @@
         "@cypress/webpack-preprocessor": "5.4.1",
         "@types/apollo-upload-client": "8.1.3",
         "@types/graphql": "14.5.0",
-        "@types/jest": "26.0.0",
+        "@types/jest": "26.0.3",
         "@types/node": "13.13.12",
         "@types/react": "16.9.35",
         "@types/react-dom": "16.9.8",
         "@types/react-router-dom": "5.1.5",
         "cross-env": "7.0.2",
-        "cypress": "4.8.0",
+        "cypress": "4.9.0",
         "cypress-file-upload": "4.0.7",
-        "cypress-react-unit-test": "4.7.0",
+        "cypress-react-unit-test": "4.9.0",
         "enzyme": "3.11.0",
         "enzyme-adapter-react-16": "1.15.2",
         "jest-enzyme": "7.1.2",
         "rimraf": "3.0.2",
         "typescript": "3.9.5",
-        "uuid": "8.1.0"
+        "uuid": "8.2.0"
     },
     "resolutions": {
         "**/moment": "2.26.0"