Merge pull request #68 from ali1k/v1.3.7

V1.3.7
ali1k · Dec 9, 2019 · b3e757b · b3e757b
2 parents a759929 + f03c92f
commit b3e757b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 30 deletions.
diff --git a/components/object/editor/individual/PrefixBasedInput.js b/components/object/editor/individual/PrefixBasedInput.js
@@ -23,14 +23,13 @@ class PrefixBasedInput extends React.Component {
         };
     }
     componentDidMount() {
+        //to initialize value in Property state
+        this.props.onDataEdit(this.state.value);
+        //focus on the input
         if (!this.props.noFocus) {
             ReactDOM.findDOMNode(this.refs.prefixBasedInput).focus();
         }
     }
-    componentWillMount() {
-        //to initialize value in Property state
-        this.props.onDataEdit(this.state.value);
-    }
     handleKeyDown(evt) {
         if (this.props.allowActionByKey) {
             switch (evt.keyCode) {

diff --git a/data/prefixes.js b/data/prefixes.js
@@ -621,7 +621,6 @@ module.exports = {
         'uniprot': 'http://purl.uniprot.org/core/',
         'unit': 'http://qudt.org/vocab/unit#',
         'units': 'http://eulersharp.sourceforge.net/2003/03swap/unitsExtension#',
-        'urn': 'http://fliqz.com/',
         'user': 'http://schemas.talis.com/2005/user/schema#',
         'usgov': 'http://www.rdfabout.com/rdf/schema/usgovt/',
         'uta': 'http://uptheasset.org/ontology#',

diff --git a/package.json b/package.json
@@ -91,12 +91,12 @@
     "yasgui-yasqe": "^2.11.22"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0-bridge.0",
+    "@babel/core": "^7.7.5",
     "babel-cli": "^7.0.0-beta.3",
-    "babel-eslint": "^10.0.1",
-    "babel-loader": "^8.0.4",
-    "babel-plugin-add-module-exports": "^1.0.0",
-    "babel-plugin-dev-expression": "^0.2.1",
+    "babel-eslint": "^10.0.3",
+    "babel-loader": "^8.0.6",
+    "babel-plugin-add-module-exports": "^1.0.2",
+    "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",
     "babel-plugin-transform-class-properties": "^7.0.0-beta.3",
@@ -106,26 +106,26 @@
     "babel-preset-react": "^7.0.0-beta.3",
     "babel-register": "^7.0.0-beta.3",
     "bundle-loader": "^0.5.6",
-    "clean-webpack-plugin": "^2.0.0",
-    "coveralls": "^3.0.2",
-    "css-loader": "^2.0.2",
-    "es6-promise": "^4.2.5",
-    "eslint": "^5.6.1",
-    "eslint-plugin-babel": "^5.2.1",
-    "eslint-plugin-react": "^7.11.1",
+    "clean-webpack-plugin": "^3.0.0",
+    "coveralls": "^3.0.9",
+    "css-loader": "^3.2.1",
+    "es6-promise": "^4.2.8",
+    "eslint": "^6.7.2",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-react": "^7.17.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "husky": "^2.2.0",
+    "husky": "^3.1.0",
     "json-loader": "^0.5.7",
-    "nodemon": "^1.18.4",
+    "nodemon": "^2.0.1",
     "postcss-loader": "^3.0.0",
-    "react-hot-loader": "^4.3.11",
-    "shelljs": "^0.8.2",
-    "sloc": "^0.2.0",
-    "style-loader": "^0.23.0",
-    "webpack": "^4.20.2",
-    "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.9",
-    "webpack-stats-plugin": "^0.2.1",
+    "react-hot-loader": "^4.12.18",
+    "shelljs": "^0.8.3",
+    "sloc": "^0.2.1",
+    "style-loader": "^1.0.1",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.9.0",
+    "webpack-stats-plugin": "^0.3.0",
     "webpack-vendor-chunk-plugin": "^1.0.0",
     "webpack-visualizer-plugin": "^0.1.11"
   }

diff --git a/services/sparql/ImportQuery.js b/services/sparql/ImportQuery.js
@@ -41,13 +41,13 @@ class ImportQuery{
             let propsSt = '';
             for(let prop in node){
                 if(prop && prop !== '@type' && prop !=='@id'){
-                    propsSt = propsSt + `${validUrl.is_web_uri(prop.toString()) ? '<'+prop+'>': prop} ${validUrl.is_web_uri(node[prop].toString()) ? '<'+node[prop]+'>': '"""'+node[prop]+'"""'} ; `;
+                    propsSt = propsSt + `${validUrl.isUri(prop.toString()) ? '<'+prop+'>': prop} ${validUrl.isUri(node[prop].toString()) ? '<'+node[prop]+'>': '"""'+node[prop]+'"""'} ; `;
                 }
             }
             this.query = this.query + `
             INSERT DATA {
                 ${gStart}
-                    ${validUrl.is_web_uri(node['@id'].toString()) ? '<'+node['@id']+'>': node['@id']} a ${node['@type']} ;
+                    ${validUrl.isUri(node['@id'].toString()) ? '<'+node['@id']+'>': node['@id']} a ${node['@type']} ;
                     ${propsSt}
                     ${userSt}
                     ldr:createdOn "${currentDate}"^^xsd:dateTime .

diff --git a/services/utils/helpers.js b/services/utils/helpers.js
@@ -262,7 +262,7 @@ export default {
             case 'bnode':
             case 'literal':
                 // automatically detect uris even in literal values
-                if(validUrl.is_web_uri(objectValue.toString())){
+                if(validUrl.isUri(objectValue.toString())){
                     newValue='<'+objectValue+'>';
                     dtype = 'uri';
                 }else{