Fix performance issue when displaying concept mapping properties

controller/Controller.php

@@ -115,6 +115,56 @@ public function getBaseHref()
         return ($this->model->getConfig()->getBaseHref() !== null) ? $this->model->getConfig()->getBaseHref() : $this->guessBaseHref();
     }
 
+    /**
+     * Creates Skosmos links from uris.
+     * @param string $uri
+     * @param Vocabulary $vocab
+     * @param string $lang
+     * @param string $type
+     * @param string $clang content
+     * @param string $term
+     * @throws Exception if the vocabulary ID is not found in configuration
+     * @return string containing the Skosmos link
+     */
+    public function linkUrlFilter($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) {
+        // $vocab can either be null, a vocabulary id (string) or a Vocabulary object
+        if ($vocab === null) {
+            // target vocabulary is unknown, best bet is to link to the plain URI
+            return $uri;
+        } elseif (is_string($vocab)) {
+            $vocid = $vocab;
+            $vocab = $this->model->getVocabulary($vocid);
+        } else {
+            $vocid = $vocab->getId();
+        }
+
+        $params = array();
+        if (isset($clang) && $clang !== $lang) {
+            $params['clang'] = $clang;
+        }
+
+        if (isset($term)) {
+            $params['q'] = $term;
+        }
+
+        // case 1: URI within vocabulary namespace: use only local name
+        $localname = $vocab->getLocalName($uri);
+        if ($localname !== $uri && $localname === urlencode($localname)) {
+            // check that the prefix stripping worked, and there are no problematic chars in localname
+            $paramstr = count($params) > 0 ? '?' . http_build_query($params) : '';
+            if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) {
+                return "$vocid/$lang/$type/$localname" . $paramstr;
+            }
+
+            return "$vocid/$lang/$localname" . $paramstr;
+        }
+
+        // case 2: URI outside vocabulary namespace, or has problematic chars
+        // pass the full URI as parameter instead
+        $params['uri'] = $uri;
+        return "$vocid/$lang/$type/?" . http_build_query($params);
+    }
+
     /**
      * Echos an error message when the request can't be fulfilled.
      * @param string $code

controller/RestController.php

@@ -635,14 +635,15 @@ public function data($request)
      * Get the mappings associated with a concept, enriched with labels and notations.
      * Returns a JSKOS-compatible JSON object.
      * @param Request $request
+     * @throws Exception if the vocabulary ID is not found in configuration
      */
     public function mappings(Request $request)
     {
+        $this->setLanguageProperties($request->getLang());
         $vocab = $request->getVocab();
 
-        if ($request->getUri()) {
-            $uri = $request->getUri();
-        } else {
+        $uri = $request->getUri();
+        if (!$uri) {
             return $this->returnError(400, 'Bad Request', "uri parameter missing");
         }
 
@@ -655,13 +656,19 @@ public function mappings(Request $request)
 
         $concept = $results[0];
 
-        $ret = [];
+        $mappings = [];
         foreach ($concept->getMappingProperties() as $mappingProperty) {
             foreach ($mappingProperty->getValues() as $mappingPropertyValue) {
-                $ret[] = $mappingPropertyValue->asJskos($queryExVocabs);
+                $hrefLink = $this->linkUrlFilter($mappingPropertyValue->getUri(), $mappingPropertyValue->getExVocab(), $request->getLang(), 'page', $request->getContentLang());
+                $mappings[] = $mappingPropertyValue->asJskos($queryExVocabs, $request->getLang(), $hrefLink);
             }
         }
 
+        $ret = array(
+            'mappings' => $mappings,
+            'graph' => $concept->dumpJsonLd()
+        );
+
         return $this->returnJson($ret);
     }
 

controller/WebController.php

@@ -78,54 +78,6 @@ public function __construct($model)
         $this->twig->addGlobal('honeypot', $this->honeypot);
     }
 
-    /**
-     * Creates Skosmos links from uris.
-     * @param string $uri
-     * @param Vocabulary $vocab
-     * @param string $lang
-     * @param string $type
-     * @param string $clang content
-     * @param string $term
-     */
-    public function linkUrlFilter($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) {
-        // $vocab can either be null, a vocabulary id (string) or a Vocabulary object
-        if ($vocab === null) {
-            // target vocabulary is unknown, best bet is to link to the plain URI
-            return $uri;
-        } elseif (is_string($vocab)) {
-            $vocid = $vocab;
-            $vocab = $this->model->getVocabulary($vocid);
-        } else {
-            $vocid = $vocab->getId();
-        }
-
-        $params = array();
-        if (isset($clang) && $clang !== $lang) {
-            $params['clang'] = $clang;
-        }
-
-        if (isset($term)) {
-            $params['q'] = $term;
-        }
-
-        // case 1: URI within vocabulary namespace: use only local name
-        $localname = $vocab->getLocalName($uri);
-        if ($localname !== $uri && $localname === urlencode($localname)) {
-            // check that the prefix stripping worked, and there are no problematic chars in localname
-            $paramstr = sizeof($params) > 0 ? '?' . http_build_query($params) : '';
-            if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) {
-                return "$vocid/$lang/$type/$localname" . $paramstr;
-            }
-
-            return "$vocid/$lang/$localname" . $paramstr;
-        }
-
-        // case 2: URI outside vocabulary namespace, or has problematic chars
-        // pass the full URI as parameter instead
-        $params['uri'] = $uri;
-        return "$vocid/$lang/$type/?" . http_build_query($params);
-    }
-
     /**
      * Guess the language of the user. Return a language string that is one
      * of the supported languages defined in the $LANGUAGES setting, e.g. "fi".

model/Concept.php

@@ -391,6 +391,9 @@ private function addResourceReifications($sub, $pred, $obj, &$seen)
         }
     }
 
+    /**
+     * @return ConceptProperty[]
+     */
     public function getMappingProperties(array $whitelist = null)
     {
         $ret = array();

model/ConceptMappingPropertyValue.php

@@ -170,10 +170,20 @@ public function getNotation()
      * Return the mapping as a JSKOS-compatible array.
      * @return array
      */
-    public function asJskos($queryExVocabs = true)
+    public function asJskos($queryExVocabs = true, $lang = null, $hrefLink = null)
     {
+        $propertyLabel = $this->getLabel($lang, $queryExVocabs);
+        $propertyLang = $lang;
+        if (!is_string($propertyLabel)) {
+            $propertyLang = $propertyLabel->getLang();
+            $propertyLabel = $propertyLabel->getValue();
+        }
         $ret = [
+            // JSKOS
+            'uri' => $this->source->getUri(),
+            'notation' => $this->getNotation(),
             'type' => [$this->type],
+            'prefLabel' => $propertyLabel,
             'from' => [
                 'memberSet' => [
                     [
@@ -187,7 +197,13 @@ public function asJskos($queryExVocabs = true)
                         'uri' => (string) $this->getUri()
                     ]
                 ]
-            ]
+            ],
+            // EXTRA
+            'description' => gettext($this->type . "_help"), // pop-up text
+            'hrefLink' => $hrefLink, // link to resource as displayed in the UI
+            'lang' => $propertyLang, // TBD: could it be part of the prefLabel?
+            'vocabName' => (string) $this->getVocabName(), // vocabulary as displayed in the UI
+            'typeLabel' => gettext($this->type), // a text used in the UI instead of, for example, skos:closeMatch
         ];
 
         $fromScheme = $this->vocab->getDefaultConceptScheme();

resource/js/docready.js

@@ -251,6 +251,22 @@ $(function() { // DOCUMENT READY
     loading = setTimeout(function() { $('.concept-spinner').show() }, 500);
   }
 
+  function ajaxConceptMapping(data) {
+    // ajaxing the concept mapping properties on the concept page
+    var $conceptAppendix = $('.concept-appendix');
+    if ($conceptAppendix.length) {
+      var concept = {
+        uri: $conceptAppendix.data('concept-uri'),
+        type: $conceptAppendix.data('concept-type')
+      };
+
+      // Defined in scripts.js. Will load the mapping properties via Ajax request to JSKOS REST service, and render them.
+      loadMappingProperties(concept, lang, clang, $conceptAppendix, data);
+    } else {
+      makeCallbacks(data);
+    }
+  }
+
   // event handler for clicking the hierarchy concepts
   $(document).on('click', '.concept-hierarchy a',
       function(event) {
@@ -275,7 +291,7 @@ $(function() { // DOCUMENT READY
               updateJsonLD(data);
               updateTitle(data);
               updateTopbarLang(data);
-              makeCallbacks(data);
+              ajaxConceptMapping(data);
               // take the content language buttons from the response
               $('.header-float .dropdown-menu').empty().append($('.header-float .dropdown-menu', data).html());
             }
@@ -304,7 +320,7 @@ $(function() { // DOCUMENT READY
               updateJsonLD(data);
               updateTitle(data);
               updateTopbarLang(data);
-              makeCallbacks(data);
+              ajaxConceptMapping(data);
               // take the content language buttons from the response
               $('.header-float .dropdown-menu').empty().append($('.header-float .dropdown-menu', data).html());
             }
@@ -432,7 +448,7 @@ $(function() { // DOCUMENT READY
               $('.nav').scrollTop(0);
               if (window.history.pushState) { window.history.pushState({}, null, event.target.href); }
               updateTitle(data);
-              makeCallbacks(data);
+              ajaxConceptMapping(data);
               // take the content language buttons from the response
               $('.header-float .dropdown-menu').empty().append($('.header-float .dropdown-menu', data).html());
             }
@@ -1098,6 +1114,18 @@ $(function() { // DOCUMENT READY
     })});
   }
 
-  makeCallbacks();
+  // ajaxing the concept mapping properties on the concept page
+  var $conceptAppendix = $('.concept-appendix');
+  if ($conceptAppendix.length) {
+    var concept = {
+      uri: $conceptAppendix.data('concept-uri'),
+      type: $conceptAppendix.data('concept-type')
+    };
+
+    // Defined in scripts.js. Will load the mapping properties via Ajax request to JSKOS REST service, and render them.
+    loadMappingProperties(concept, lang, clang, $conceptAppendix, null);
+  } else {
+    makeCallbacks();
+  }
 
 });