Merge pull request #87 from ali1k/temp

upgraded packages and several bug fixes

Dockerfile

@@ -1,6 +1,5 @@
-FROM node:10.15
-MAINTAINER Ali Khalili "[email protected]"
-
+FROM node:14.10
+LABEL maintainer="Ali Khalili [email protected]"
 # Update aptitude with new repo
 RUN apt-get update
 # Install software

package.json

@@ -30,72 +30,72 @@
   "license": "Apache-2.0",
   "dependencies": {
     "animate.css": "^4.1.1",
-    "async": "^3.1.0",
-    "body-parser": "^1.18.3",
+    "async": "^3.2.0",
+    "body-parser": "^1.19.0",
     "camelcase": "^6.0.0",
-    "chroma-js": "^2.0.2",
+    "chroma-js": "^2.1.0",
     "classnames": "^2.2.6",
-    "codemirror": "^5.40.2",
-    "compression": "^1.7.3",
+    "codemirror": "^5.57.0",
+    "compression": "^1.7.4",
     "continuation-local-storage": "^3.2.1",
-    "cookie-parser": "^1.4.3",
-    "cookie-session": "^2.0.0-beta.3",
-    "csurf": "^1.9.0",
-    "debug": "^4.0.1",
-    "es5-shim": "^4.5.12",
+    "cookie-parser": "^1.4.5",
+    "cookie-session": "^2.0.0-rc.1",
+    "csurf": "^1.11.0",
+    "debug": "^4.2.0",
+    "es5-shim": "^4.5.14",
     "es6-shim": "^0.35.3",
-    "express": "^4.16.3",
-    "express-fileupload": "^1.1.6",
+    "express": "^4.17.1",
+    "express-fileupload": "^1.2.0",
     "express-state": "^2.0.0",
     "fast-csv": "^4.3.2",
     "flashtext.js": "^1.0.5",
     "fluxible": "^1.4.0",
-    "fluxible-addons-react": "^0.2.15",
+    "fluxible-addons-react": "^0.2.16",
     "fluxible-plugin-fetchr": "^0.3.11",
     "fluxible-router": "^1.5.1",
     "hogan-express": "^0.5.2",
     "jqcloud2": "^2.0.3",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.1",
     "json2csv": "^5.0.1",
     "json3": "^3.3.2",
-    "leaflet": "^1.3.4",
-    "log4js": "^6.1.0",
-    "moment": "^2.22.2",
-    "nodemailer": "^6.0.0",
+    "leaflet": "^1.7.1",
+    "log4js": "^6.3.0",
+    "moment": "^2.27.0",
+    "nodemailer": "^6.4.11",
     "nodemailer-smtp-transport": "^2.7.4",
-    "npm": "^6.13.2",
-    "passport": "^0.4.0",
+    "npm": "^6.14.8",
+    "passport": "^0.4.1",
     "passport-local": "^1.0.0",
     "password-hash": "^1.2.2",
-    "prop-types": "^15.6.2",
-    "query-string": "^6.2.0",
-    "rc-calendar": "^9.7.9",
-    "react": "^16.5.2",
-    "react-dom": "^16.5.2",
+    "prop-types": "^15.7.2",
+    "query-string": "^6.13.1",
+    "rc-calendar": "^9.15.11",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "react-dropzone": "^11.1.0",
-    "react-leaflet": "^2.0.1",
+    "react-leaflet": "^2.7.0",
     "react-loadable": "^5.5.0",
-    "react-markdown": "^4.0.4",
+    "react-markdown": "^4.3.1",
     "react-search-input": "^0.11.3",
-    "react-sigma": "^1.2.30",
-    "recharts": "^1.3.1",
-    "request-promise": "^4.2.2",
+    "react-sigma": "^1.2.35",
+    "recharts": "^1.8.5",
+    "request-promise": "^4.2.6",
     "semantic-ui-css": "^2.4.1",
-    "semantic-ui-react": "^0.88.1",
-    "serialize-javascript": "^4.0.0",
+    "semantic-ui-react": "^1.2.1",
+    "serialize-javascript": "^5.0.0",
     "serve-favicon": "^2.5.0",
-    "simplify-js": "^1.2.3",
+    "simplify-js": "^1.2.4",
     "superagent": "^6.1.0",
     "valid-url": "^1.0.9",
-    "wicket": "^1.3.3",
+    "wicket": "^1.3.6",
     "yasgui-yasqe": "^2.11.22"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.5",
+    "@babel/core": "^7.11.6",
     "babel-cli": "^7.0.0-beta.3",
-    "babel-eslint": "^10.0.3",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-add-module-exports": "^1.0.2",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.1.0",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-dev-expression": "^0.2.2",
     "babel-plugin-syntax-decorators": "^7.0.0-beta.3",
     "babel-plugin-syntax-dynamic-import": "^7.0.0-beta.3",
@@ -107,27 +107,27 @@
     "babel-register": "^7.0.0-beta.3",
     "bundle-loader": "^0.5.6",
     "clean-webpack-plugin": "^3.0.0",
-    "coveralls": "^3.0.9",
+    "coveralls": "^3.1.0",
     "css-loader": "^4.3.0",
     "es6-promise": "^4.2.8",
     "eslint": "^7.8.1",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-react": "^7.20.6",
     "extract-css-chunks-webpack-plugin": "^4.7.5",
     "extract-loader": "^5.1.0",
     "file-loader": "^6.1.0",
     "husky": "^4.3.0",
     "json-loader": "^0.5.7",
-    "nodemon": "^2.0.1",
+    "nodemon": "^2.0.4",
     "postcss-loader": "^4.0.1",
     "react-hot-loader": "^4.12.21",
-    "shelljs": "^0.8.3",
+    "shelljs": "^0.8.4",
     "sloc": "^0.2.1",
     "style-loader": "^1.2.1",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
-    "webpack-stats-plugin": "^0.3.0",
+    "webpack-stats-plugin": "^0.3.2",
     "webpack-vendor-chunk-plugin": "^1.0.0",
     "webpack-visualizer-plugin": "^0.1.11"
   }

plugins/dynamicConfiguration/DynamicConfigurator.js

@@ -1451,8 +1451,10 @@ class DynamicConfigurator {
             output.sparqlEndpoint[datasetURI].protocol = el.protocol && el.protocol.value ? el.protocol.value : 'http';
             output.sparqlEndpoint[datasetURI].endpointType = el.endpointType.value;
             //username/pw config
-            output.sparqlEndpoint[datasetURI].username = el.username.value;
-            output.sparqlEndpoint[datasetURI].password = el.password.value;
+            if(el.username) 
+                output.sparqlEndpoint[datasetURI].username = el.username.value;
+            if(el.password) 
+                output.sparqlEndpoint[datasetURI].password = el.password.value;
             //assume that all values will be stored in an array expect numbers: Not-a-Number
             settingProp = el.setting.value.replace(ldr_prefix, '').trim();
             if(!isNaN(el.settingValue.value)){

server.js

@@ -34,7 +34,7 @@ import HtmlComponent from './components/DefaultHTMLLayout';
 import { createElementWithContext } from 'fluxible-addons-react';
 
 const env = process.env.NODE_ENV;
-const htmlComponent = React.createFactory(HtmlComponent);
+const htmlComponent = HtmlComponent;
 const debug = debugLib('linked-data-reactor');
 const publicRoutes = ['/', '/about'];