Automatically detect whether proxy is needed.

- Remove checkbox for proxy on start view.
- Put proxy url into separate config files for development and production.

Author: marc92w

.gitignore

@@ -3,3 +3,5 @@ coverage/
 dist/
 .idea/
 .vscode/
+production.conf.json
+development.conf.json

app/components/start/start.ctrl.js

@@ -5,18 +5,15 @@
  * @param {$location} $location
  * @param {Data} Data
  * @param {View} View
- * @param {Requests} Requests
  * @param {RequestConfig} RequestConfig
  * @param {Endpoints} Endpoints
  *
  * @ngInject
  */
-function startCtrl($log, $location, Data, View, Requests, RequestConfig, Endpoints) {
+function startCtrl($log, $location, Data, View, RequestConfig, Endpoints) {
 
   const start = this;
 
-  start.proxyAvailable = __PROXY__; // eslint-disable-line no-undef
-
   start.endpoints = [];
 
   start.endpoint = RequestConfig.getEndpointURL() || '';
@@ -25,15 +22,6 @@ function startCtrl($log, $location, Data, View, Requests, RequestConfig, Endpoin
 
   start.endpointAlert = true;
 
-  /**
-   * This function is triggered every time the proxy flag is toggled.
-   */
-  start.updateUseProxy = function () {
-    Requests.clear();
-    $log.warn('[Start] Cleared old requests.');
-    start.loadProxyEndpoints();
-  };
-
   /**
    * Shows the graph for the current endpoint and clears all data if endpoint has changed.
    */
@@ -51,7 +39,7 @@ function startCtrl($log, $location, Data, View, Requests, RequestConfig, Endpoin
       Data.initMaps();
     }
 
-    RequestConfig.setUseProxy(start.useProxy);
+    RequestConfig.setUseProxy(false);
 
     if (start.endpoint !== undefined && start.endpoint.length > 0) {
       $log.debug('[Start] Show Graph!');
@@ -104,14 +92,6 @@ function startCtrl($log, $location, Data, View, Requests, RequestConfig, Endpoin
    */
   start.loadEndpoints = function () {
     Endpoints.getNonProxyEndpoints().then(handleEndpointListResponse, handleEndpointListError);
-
-    if (start.useProxy) {
-      start.loadProxyEndpoints();
-    }
-  };
-
-  start.loadProxyEndpoints = function () {
-    $log.debug('[Start] Also load endpoints only accessible via proxy.');
     Endpoints.getProxyEndpoints().then(handleEndpointListResponse, handleEndpointListError);
   };
 

app/components/start/start.html

@@ -38,17 +38,6 @@ <h1>LD-VOWL</h1>
           </uib-alert>
         </div>
       </div>
-
-      <div class="form-group" ng-if="start.proxyAvailable">
-        <div class="col-sm-offset-2 col-sm-10">
-          <div class="checkbox">
-            <label>
-              <input type="checkbox" ng-model="start.useProxy" ng-change="start.updateUseProxy()">
-              Use local proxy
-            </label>
-          </div>
-        </div>
-      </div><!-- end of .form-group -->
     </form><!-- end of .form-horizontal -->
   </div><!-- end of .well -->
 </div><!-- end of .container -->

app/nonproxy_endpoints.json

@@ -6,50 +6,42 @@
   {
     "name": "BCN Datos",
     "url": "http://datos.bcn.cl/sparql",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "Database Center for Life Science (DBCLS)",
     "url": "http://data.allie.dbcls.jp/sparql",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "dbpedia",
     "url": "http://dbpedia.org/sparql",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "Dutch Ships and Sailors (DSS)",
     "url": "http://dutchshipsandsailors.nl/data/sparql/",
-    "description": "maritime historical data set",
-    "proxyNeeded": false
+    "description": "maritime historical data set"
   },
   {
     "name": "Dutch Ships and Sailors (DSS) Semantic Layer",
     "url": "http://semanticweb.cs.vu.nl/dss/sparql/",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "EBI BioModels Database",
     "url": "https://www.ebi.ac.uk/rdf/services/biomodels/sparql",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "EBI Biosamples Database",
     "url": "https://www.ebi.ac.uk/rdf/services/biosamples/sparql",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "EBI ChEMBL",
     "url": "https://www.ebi.ac.uk/rdf/services/chembl/sparql",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "Enipedia",
@@ -58,14 +50,12 @@
   {
     "name": "Environment Agency Bathing Water Quality",
     "url": "http://environment.data.gov.uk/sparql/bwq/query",
-    "description": "",
-    "proxyNeeded": false
+    "description": ""
   },
   {
     "name": "EUscreen Linked Open Data Pilot",
     "url": "http://lod.euscreen.eu/sparql",
-    "description": "about television",
-    "proxyNeeded": false
+    "description": "about television"
   },
   {
     "name": "FOODpedia",
@@ -107,8 +97,7 @@
   {
     "name": "MORElab",
     "url": "http://apps.morelab.deusto.es/labman/sparql",
-    "description": "",
-    "proxyNeeded": true
+    "description": ""
   },
   {
     "name": "Nobelprize.org",
@@ -125,34 +114,29 @@
   {
     "name": "Springer LOD Conference Portal",
     "url": "http://lod.springer.com/sparql",
-    "description": "about scientific publications at springer",
-    "proxyNeeded": false
+    "description": "about scientific publications at springer"
   },
   {
     "name": "Swiss Federal Statistics Office Linked Data",
     "url": "http://bfs.270a.info/sparql",
-    "description": "swiss statistics",
-    "proxyNeeded": false
+    "description": "swiss statistics"
   },
   {
     "name": "Transparency International Linked Data",
     "url": "http://transparency.270a.info/sparql",
-    "description": "data set about corruption",
-    "proxyNeeded": false
+    "description": "data set about corruption"
   },
   {
     "name": "WKD - Arbeitsrechtsthesaurus",
     "url": "http://vocabulary.wolterskluwer.de/PoolParty/sparql/arbeitsrecht"
   },
   {
     "name": "WKD - Gerichtsthesaurus",
-    "url": "http://vocabulary.wolterskluwer.de/PoolParty/sparql/court",
-    "proxyNeeded": false
+    "url": "http://vocabulary.wolterskluwer.de/PoolParty/sparql/court"
   },
   {
     "name": "ww1lod",
     "url": "http://ldf.fi/ww1lod/sparql",
-    "description": "about WW1",
-    "proxyNeeded": false
+    "description": "about WW1"
   }
 ]

app/services/extractors/class-extractor.srv.js

@@ -44,9 +44,9 @@ class ClassExtractor extends Extractor {
       this.setBlacklist(classInput.split(','));
     } else {
       // set up new blacklists
-      for (var type in CLASS_BLACKLIST) {
+      for (let type in CLASS_BLACKLIST) {
         if (CLASS_BLACKLIST.hasOwnProperty(type) && type !== 'SKOS') {
-          for (var i = 0; i < CLASS_BLACKLIST[type].length; i++) {
+          for (let i = 0; i < CLASS_BLACKLIST[type].length; i++) {
             this.blacklist.push(PREFIX[type] + CLASS_BLACKLIST[type][i]);
           }
         }
@@ -69,11 +69,10 @@ class ClassExtractor extends Extractor {
 
     let limit = this.reqConfig.getLimit() || 10;
 
-    const requestURL = this.reqConfig.getRequestURL();
-
     const self = this;
 
     function doQuery(lastTry = false, offset = 0, limit = 10) {
+      let requestURL = self.reqConfig.getRequestURL();
       let query = self.queryFactory.getClassQuery(limit, offset);
 
       self.$log.debug(`[Classes] Send Request with offset ${offset}...`);
@@ -89,31 +88,30 @@ class ClassExtractor extends Extractor {
 
               let fetchMore = 0;
 
-              for (let i = 0; i < bindings.length; i++) {
-
-                var currentClassURI = bindings[i].class.value;
+              bindings.forEach((binding) => {
+                let currentClassURI = binding.class.value;
 
                 if (currentClassURI.match(/^http.*/) && !self.inBlacklist(currentClassURI) &&
-                    bindings[i].instanceCount !== undefined) {
-                  var node = {};
+                    binding.instanceCount !== undefined) {
+                  let node = {};
 
                   node.uri = currentClassURI;
-                  node.name = (bindings[i].label !== undefined) ? bindings[i].label.value : '';
-                  node.value = parseInt(bindings[i].instanceCount.value);
+                  node.name = (binding.label !== undefined) ? binding.label.value : '';
+                  node.value = parseInt(binding.instanceCount.value);
                   node.type = 'class';
                   node.active = false;
-                  var newClassId = self.nodes.addNode(node);
+                  const newClassId = self.nodes.addNode(node);
 
                   classIds.push(newClassId);
 
-                  if (bindings[i].class !== undefined && bindings[i].class.value !== undefined) {
+                  if (binding.class !== undefined && binding.class.value !== undefined) {
                     self.requestClassLabel(newClassId, currentClassURI);
                   }
                 } else {
                   self.$log.debug(`[Classes] Class '${currentClassURI}' is either blacklisted or has an invalid URI!`);
                   fetchMore++;
                 }
-              }
+              });
 
               if (fetchMore === 0) {
                 deferred.resolve(classIds);
@@ -142,19 +140,25 @@ class ClassExtractor extends Extractor {
         }, function handleErrorExtractingClasses(err) {
           if (err.config.timeout.$$state.value === 'canceled') {
             self.$log.warn('[Class Extractor] Class extraction was canceled!');
+            deferred.reject(classIds);
           } else {
             self.$log.error(err);
-          }
 
-          // TODO check whether this was because of CORS
-          deferred.reject(classIds);
+            if (!self.reqConfig.getUseProxy()) {
+              self.$log.warn('Might need a proxy here, try again...');
+              self.reqConfig.setUseProxy(true);
+              doQuery(false, 0, limit);
+            } else {
+              deferred.reject(classIds);
+            }
+          }
         })
         .finally(function () {
           self.promises.removePromise(promiseId);
         });
     } // end of doQuery()
 
-    doQuery(false, 0,limit);
+    doQuery(false, 0, limit);
 
     return deferred.promise;
   }

app/services/model/nodes.srv.js

@@ -11,13 +11,13 @@
  */
 function nodesService($log, Properties, Prefixes, RequestConfig) {
 
-  var classUriIdMap = new Map();
-  var nodes = new Map();
+  let classUriIdMap = new Map();
+  let nodes = new Map();
   let equivalentClasses = new Map();
 
   const classDatatypesMap = new Map();
 
-  var subClassSet = new Set();
+  let subClassSet = new Set();
 
   const that = this;
 
@@ -131,7 +131,7 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
   /**
    * Add a new node to the graph.
    *
-   * @param {*} newNode - the node which should be added to the graph
+   * @param {{uri: string, type: string}} newNode - the node which should be added to the graph
    * @return {string} id of the new node
    */
   that.addNode = function (newNode) {
@@ -206,7 +206,7 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
    * @returns {*}
    */
   that.getById = function (idToSearch) {
-    var nodeToReturn = null;
+    let nodeToReturn = null;
 
     if (idToSearch !== undefined && typeof idToSearch === 'string') {
       nodeToReturn = nodes.get(idToSearch);
@@ -221,9 +221,9 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
    * @returns {number} number of instances
    */
   that.getInstanceCountById = function (id) {
-    var instanceCount = -1;
+    let instanceCount = -1;
 
-    var searchedItem = nodes.get(id);
+    const searchedItem = nodes.get(id);
 
     if (searchedItem !== undefined && searchedItem.hasOwnProperty('value')) {
       instanceCount = searchedItem.value;
@@ -275,7 +275,7 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
    * @param {string} commentToAdd - the comment to add to the node with the given id
    */
   that.insertComment = function (id, commentToAdd) {
-    var searchedItem = nodes.get(id);
+    const searchedItem = nodes.get(id);
 
     if (searchedItem !== undefined) {
       searchedItem.comment = commentToAdd;
@@ -285,8 +285,14 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
     }
   };
 
+  /**
+   * Set the given URI for the node with the also given id.
+   * 
+   * @param {string} id
+   * @param {string} newUri
+   */
   that.setURI = function (id, newUri) {
-    var nodeToChange = nodes.get(id);
+    const nodeToChange = nodes.get(id);
 
     if (nodeToChange !== undefined) {
       nodeToChange.uri = newUri;
@@ -304,7 +310,7 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
   that.setTypesLoaded = function (classId) {
     if (classId !== undefined && typeof classId === 'string') {
 
-      var clazz = nodes.get(classId);
+      const clazz = nodes.get(classId);
 
       if (clazz !== undefined && clazz.type === 'class') {
         clazz.typesLoaded = true;
@@ -398,11 +404,16 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
     return nodeToReturn;
   };
 
+  /**
+   * Removes all given nodes from the node map.
+   * 
+   * @param {Array} nodeArr - an array of nodes to be removed
+   */
   that.removeNodes = function (nodeArr) {
     if (nodeArr !== undefined && nodeArr.length > 0) {
-      for (let i = 0; i < nodeArr.length; i++) {
-        nodes.delete(nodeArr[i]);
-      }
+      nodeArr.forEach((node) => {
+        nodes.delete(node);
+      });
     }
   };
 
@@ -413,7 +424,7 @@ function nodesService($log, Properties, Prefixes, RequestConfig) {
    * @return {number} the new value of the node or -1 if node was not found 
    */
   that.incValueOfId = function (id) {
-    var searchedItem = nodes.get(id);
+    const searchedItem = nodes.get(id);
 
     if (searchedItem !== undefined && searchedItem.hasOwnProperty('value')) {
       searchedItem.value += 1;

app/services/requests/request-config.srv.js

@@ -9,7 +9,7 @@
 function requestConfig($cookies) {
 
   const cookiePrefix = 'ldvowl_';
-  const proxyURL = 'http://localhost/proxy.php';
+  const proxyURL = __PROXY_URL__ || 'http://localhost/proxy.php';  // eslint-disable-line no-undef
 
   let endpointURL = $cookies.get(cookiePrefix + 'endpoint') || '';
   let useProxy = $cookies.get(cookiePrefix + 'proxy') || 'false';
@@ -97,8 +97,8 @@ function requestConfig($cookies) {
    * @param {boolean} useProxy - true if proxy should be used, false otherwise
    */
   self.setUseProxy = function (useProxy) {
-    useProxy = (useProxy) ? 'true' : 'false';
-    $cookies.put(cookiePrefix + 'proxy', useProxy);
+    const proxyFlag = (useProxy) ? 'true' : 'false';
+    $cookies.put(cookiePrefix + 'proxy', proxyFlag);
   };
 
   self.getLimit = function () {
@@ -125,7 +125,7 @@ function requestConfig($cookies) {
   };
 
   self.getLabelLanguage = function () {
-    var cookieLang = $cookies.get(cookiePrefix + 'lang');
+    const cookieLang = $cookies.get(cookiePrefix + 'lang');
     if (cookieLang !== undefined) {
       labelLanguage = cookieLang;
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ld-vowl",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Extract ontology information out of arbitrary SPARQL endpoints and visualize it using a slightly adjusted form of VOWL.",
   "author": "Marc Weise <weisemc@studi.informatik.uni-stuttgart.de>",
   "scripts": {
@@ -19,12 +19,7 @@
   "bugs": {
     "url": "https://github.com/VisualDataWeb/LD-VOWL/issues"
   },
-  "keywords": [
-    "Linked Data",
-    "SPARQL",
-    "Visualization",
-    "VOWL"
-  ],
+  "keywords": ["Linked Data", "SPARQL", "Visualization", "VOWL"],
   "dependencies": {
     "angular": "1.4.8",
     "angular-animate": "1.4.8",
@@ -66,6 +61,7 @@
     "isparta-loader": "~2.0.0",
     "istanbul-instrumenter-loader": "~0.2.0",
     "jasmine-core": "~2.4.1",
+    "jest": "^17.0.3",
     "jest-cli": "^17.0.0",
     "karma": "~0.13.19",
     "karma-babel-preprocessor": "~6.0.1",
@@ -89,8 +85,8 @@
   },
   "jest": {
     "verbose": true,
-    "globals": { 
-      "__LOGGING__": true, 
+    "globals": {
+      "__LOGGING__": true,
       "__SESSION_STORAGE__": false,
       "__VERSION__": "1.1.1",
       "__PROXY__": true

webpack.config.js

@@ -34,6 +34,7 @@ module.exports = {
       new webpack.DefinePlugin({
         __LOGGING__: true,
         __PROXY__: true,
+        __PROXY_URL__: JSON.stringify(require('./development.conf.json').proxyUrl),
         __SESSION_STORAGE__: true,
         __SHOW_ENDPOINT__: true,
         __VERSION__: JSON.stringify(require('./package.json').version)

webpack.production.config.js

@@ -18,7 +18,6 @@ module.exports = {
       'angular-animate',
       'angular-cookies',
       'd3',
-      'bootstrap-webpack',
       'angular-ui-bootstrap'
     ]
   },
@@ -47,6 +46,7 @@ module.exports = {
     new webpack.DefinePlugin({
       __LOGGING__: false,
       __PROXY__: true,
+      __PROXY_URL__: JSON.stringify(require('./production.conf.json').proxyUrl),
       __SESSION_STORAGE__: false,
       __SHOW_ENDPOINT__: true,
       __VERSION__: JSON.stringify(require('./package.json').version)