From e3206c7b0dee583f46d29fedbfaf089a107f3457 Mon Sep 17 00:00:00 2001
From: Victor Felder <victor@draft.li>
Date: Thu, 28 Feb 2019 11:56:07 +0100
Subject: [PATCH] fix: improve prefixes handling

---
 components/proposal/ClassForm.vue             |   1 +
 components/proposal/PropertyForm.vue          |   2 +
 .../proposal/ProposalPropertiesTable.vue      |   9 +-
 package-lock.json                             | 103 +++++++++---------
 package.json                                  |   4 +-
 plugins/libs/rdf.js                           |  39 +++++--
 6 files changed, 94 insertions(+), 64 deletions(-)

diff --git a/components/proposal/ClassForm.vue b/components/proposal/ClassForm.vue
index 24dc52f4..0230b45f 100644
--- a/components/proposal/ClassForm.vue
+++ b/components/proposal/ClassForm.vue
@@ -210,6 +210,7 @@
               Add "<em>{{ clss['label'] }}</em>" to the proposal
             </button>
           </div>
+
           <div class="column is-6">
             <!-- <button
               class="button is-dark-info is-pulled-right subform-cancel">
diff --git a/components/proposal/PropertyForm.vue b/components/proposal/PropertyForm.vue
index ea2112d3..4354be22 100644
--- a/components/proposal/PropertyForm.vue
+++ b/components/proposal/PropertyForm.vue
@@ -106,12 +106,14 @@
                 <label class="checkbox">
                   <input
                     type="checkbox"
+                    :disabled="disabled"
                     v-model.lazy="prop['isDeprecated']">
                   Deprecate Property
                 </label>
               </div>
             </div>
           </div>
+
           <div class="column">
             <div class="field long-description">
               <label class="label">Long Description (optional)</label>
diff --git a/components/proposal/ProposalPropertiesTable.vue b/components/proposal/ProposalPropertiesTable.vue
index aba4f062..faa6381e 100644
--- a/components/proposal/ProposalPropertiesTable.vue
+++ b/components/proposal/ProposalPropertiesTable.vue
@@ -45,7 +45,7 @@
                 :href="$rebaseIRI(range.value)"
                 rel="noopener noreferrer"
                 target="_blank">
-                {{ term(range.value) }}
+                {{ label(range) }}
               </a>
             </li>
           </ul>
@@ -183,6 +183,13 @@ export default {
   },
   methods: {
     term,
+    label (aTerm) {
+      const label = this.$store.getters['graph/ontology'].match(aTerm, this.$termIRI.label).toArray()[0]
+      if (!label) {
+        return this.$unPrefix(aTerm.value)
+      }
+      return term(label)
+    },
     reselectDomain (index) {
       this.$emit('reselectDomain', index)
     },
diff --git a/package-lock.json b/package-lock.json
index 2d02eba6..5af138bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2853,18 +2853,18 @@
       "integrity": "sha512-pX/Sf9q9HNzAC5F+hPgxt8v3eQVZkXL/+8HpAnrDJXFmma80F2aHAAeWTql3BsG87lc3T6A7CFPNWMTl97L/7Q=="
     },
     "apollo-cache": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.0.tgz",
-      "integrity": "sha512-aZduG7o75crjWeONq9kVzkqO9hAcEklo3oN6Rd+ANpB+ImRklCFkz88XdXQ2/GHV26jh8VtQJIhiNIow10QzIg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz",
+      "integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==",
       "requires": {
-        "apollo-utilities": "^1.2.0",
+        "apollo-utilities": "^1.2.1",
         "tslib": "^1.9.3"
       },
       "dependencies": {
         "apollo-utilities": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.0.tgz",
-          "integrity": "sha512-4+vxCpEuirQjPqLCckBnOMGZxK/c+2eJtYEbh3xhccNM1pYB5Gx/lrfCdZS5MKDykuWZYY08EvidDy21nr049w==",
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+          "integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
           "requires": {
             "fast-json-stable-stringify": "^2.0.0",
             "ts-invariant": "^0.2.1",
@@ -2893,21 +2893,21 @@
       }
     },
     "apollo-cache-inmemory": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.0.tgz",
-      "integrity": "sha512-hyg8R7G3XOfZhl8fQLs0vGEwi2rr8PuEIiumCY4qmwviaGsmwjs/Dm63cyeMm3Sfu05vzFQkwMdBf5u7xBg3cQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz",
+      "integrity": "sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==",
       "requires": {
-        "apollo-cache": "^1.2.0",
-        "apollo-utilities": "^1.2.0",
+        "apollo-cache": "^1.2.1",
+        "apollo-utilities": "^1.2.1",
         "optimism": "^0.6.9",
         "ts-invariant": "^0.2.1",
         "tslib": "^1.9.3"
       },
       "dependencies": {
         "apollo-utilities": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.0.tgz",
-          "integrity": "sha512-4+vxCpEuirQjPqLCckBnOMGZxK/c+2eJtYEbh3xhccNM1pYB5Gx/lrfCdZS5MKDykuWZYY08EvidDy21nr049w==",
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+          "integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
           "requires": {
             "fast-json-stable-stringify": "^2.0.0",
             "ts-invariant": "^0.2.1",
@@ -2917,15 +2917,15 @@
       }
     },
     "apollo-client": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.0.tgz",
-      "integrity": "sha512-px2qCsbxrJFy+nkEOmtCMTl7svPMYlmoqKVfJx3ZAdE4mdlQp9BMm47nT7l9pHdez5U/QJmpgz5OICHLfjloGg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz",
+      "integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==",
       "requires": {
         "@types/zen-observable": "^0.8.0",
-        "apollo-cache": "1.2.0",
+        "apollo-cache": "1.2.1",
         "apollo-link": "^1.0.0",
         "apollo-link-dedup": "^1.0.0",
-        "apollo-utilities": "1.2.0",
+        "apollo-utilities": "1.2.1",
         "symbol-observable": "^1.0.2",
         "ts-invariant": "^0.2.1",
         "tslib": "^1.9.3",
@@ -2933,9 +2933,9 @@
       },
       "dependencies": {
         "apollo-utilities": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.0.tgz",
-          "integrity": "sha512-4+vxCpEuirQjPqLCckBnOMGZxK/c+2eJtYEbh3xhccNM1pYB5Gx/lrfCdZS5MKDykuWZYY08EvidDy21nr049w==",
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+          "integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
           "requires": {
             "fast-json-stable-stringify": "^2.0.0",
             "ts-invariant": "^0.2.1",
@@ -2954,16 +2954,16 @@
       }
     },
     "apollo-engine-reporting": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.5.tgz",
-      "integrity": "sha512-G4KcA6/eKWtH/WwvOtLoH7o4c1l3EuZsX6ZscBIEPYI78LmhjztG+UI+i3FW1BodURsqimBrbSM+h/JsYIrj+Q==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.7.tgz",
+      "integrity": "sha512-mFsXvd+1/o5jSa9tI2RoXYGcvCLcwwcfLwchjSTxqUd4ViB8RbqYKynzEZ+Omji7PBRM0azioBm43f7PSsQPqA==",
       "requires": {
         "apollo-engine-reporting-protobuf": "0.2.1",
         "apollo-graphql": "^0.1.0",
-        "apollo-server-core": "2.4.6",
+        "apollo-server-core": "2.4.8",
         "apollo-server-env": "2.2.0",
         "async-retry": "^1.2.1",
-        "graphql-extensions": "0.5.5"
+        "graphql-extensions": "0.5.7"
       }
     },
     "apollo-engine-reporting-protobuf": {
@@ -3089,23 +3089,23 @@
       }
     },
     "apollo-server-core": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.6.tgz",
-      "integrity": "sha512-sz/a9AKCx5ifnQAehmgXhnmEWv43LCbRnL1V1Z2P5C8xSmWubCskgu6jKPMc2cG1QFLWAXaA8cF4gD9sNGOFTQ==",
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.8.tgz",
+      "integrity": "sha512-N+5UOzHhMOnHizEiArJtNvEe/cGhSHQyTn5tlU4RJ36FDBJ/WlYZfPbGDMLISSUCJ6t+aP8GLL4Mnudt9d2PDQ==",
       "requires": {
         "@apollographql/apollo-tools": "^0.3.3",
         "@apollographql/graphql-playground-html": "^1.6.6",
         "@types/ws": "^6.0.0",
         "apollo-cache-control": "0.5.2",
         "apollo-datasource": "0.3.1",
-        "apollo-engine-reporting": "1.0.5",
+        "apollo-engine-reporting": "1.0.7",
         "apollo-server-caching": "0.3.1",
         "apollo-server-env": "2.2.0",
         "apollo-server-errors": "2.2.1",
-        "apollo-server-plugin-base": "0.3.5",
+        "apollo-server-plugin-base": "0.3.7",
         "apollo-tracing": "0.5.2",
         "fast-json-stable-stringify": "^2.0.0",
-        "graphql-extensions": "0.5.5",
+        "graphql-extensions": "0.5.7",
         "graphql-subscriptions": "^1.0.0",
         "graphql-tag": "^2.9.2",
         "graphql-tools": "^4.0.0",
@@ -3137,9 +3137,9 @@
       "integrity": "sha512-wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g=="
     },
     "apollo-server-express": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.6.tgz",
-      "integrity": "sha512-YlWUjxrveKFSOCyExTa5rTwePeELhjolzP6cAlFIak+kJTnOiJWoTCYzaftkpwmK+c4IyA5XUgC0YhowcrIgEw==",
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.8.tgz",
+      "integrity": "sha512-i60l32mfVe33jnKDPNYgUKUKu4Al0xEm2HLOSMgtJ9Wbpe/MbOx5X8M5F27fnHYdM+G5XfAErsakAyRGnQJ48Q==",
       "requires": {
         "@apollographql/graphql-playground-html": "^1.6.6",
         "@types/accepts": "^1.3.5",
@@ -3147,7 +3147,7 @@
         "@types/cors": "^2.8.4",
         "@types/express": "4.16.1",
         "accepts": "^1.3.5",
-        "apollo-server-core": "2.4.6",
+        "apollo-server-core": "2.4.8",
         "body-parser": "^1.18.3",
         "cors": "^2.8.4",
         "graphql-subscriptions": "^1.0.0",
@@ -3156,9 +3156,9 @@
       }
     },
     "apollo-server-plugin-base": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.5.tgz",
-      "integrity": "sha512-z6xAgQip1RAXf0lQ2T8szCAbD8bCcbcwq4gGJ37ELcMGGTCTp2XOAz/PwIe9Re2Hzuk+OPlKK0AZng7qpXtDkg=="
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.7.tgz",
+      "integrity": "sha512-hW1jaLKf9qNOxMTwRq2CSqz3eqXsZuEiCc8/mmEtOciiVBq1GMtxFf19oIYM9HQuPvQU2RWpns1VrYN59L3vbg=="
     },
     "apollo-tracing": {
       "version": "0.5.2",
@@ -3190,11 +3190,12 @@
       }
     },
     "apollo-utilities": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.3.tgz",
-      "integrity": "sha512-pF9abhiClX5gfj/WFWZh8DiI33nOLGxRhXH9ZMquaM1V8bhq1WLFPt2QjShWH3kGQVeIGUK+FQefnhe+ZaaAYg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+      "integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
       "requires": {
         "fast-json-stable-stringify": "^2.0.0",
+        "ts-invariant": "^0.2.1",
         "tslib": "^1.9.3"
       }
     },
@@ -9874,18 +9875,18 @@
       }
     },
     "graphql-anywhere": {
-      "version": "4.1.28",
-      "resolved": "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.28.tgz",
-      "integrity": "sha512-NtLN0qmu2AasvZ31kwWte1UOw1mYRbfuSICbcVTshA2S5/BNZ7IVMl0X4wA2HPHc3mxN6rvrU4rS3+/Is2QsVw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.1.tgz",
+      "integrity": "sha512-4zlzTFzixGXtIYjX7BiXQOGhQ5yQVohj/EKNxUHUTAR7lHnCmrXU17gGtZ+108l9TkoHNfc33ieJ9U8trnHE1w==",
       "requires": {
-        "apollo-utilities": "^1.1.3",
+        "apollo-utilities": "^1.2.1",
         "tslib": "^1.9.3"
       }
     },
     "graphql-extensions": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.5.tgz",
-      "integrity": "sha512-jCUt/WVayiQvmXVPMetmq3wpV3RyzXOXFfssoTz9/YFuoSg1Y7BwzgNuilSybQqMPRdfGAsqf/OIa1DZwrnggw==",
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.7.tgz",
+      "integrity": "sha512-HrU6APE1PiehZ46scMB3S5DezSeCATd8v+e4mmg2bqszMyCFkmAnmK6hR1b5VjHxhzt5/FX21x1WsXfqF4FwdQ==",
       "requires": {
         "@apollographql/apollo-tools": "^0.3.3"
       }
diff --git a/package.json b/package.json
index 37a01ed6..49bd1dcf 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,8 @@
     "@rdfjs/serializer-ntriples": "^1.0.1",
     "@rdfjs/to-ntriples": "^1.0.1",
     "apicache": "^1.4.0",
-    "apollo-cache-inmemory": "^1.5.0",
-    "apollo-client": "^2.5.0",
+    "apollo-cache-inmemory": "^1.5.1",
+    "apollo-client": "^2.5.1",
     "apollo-link": "^1.2.8",
     "apollo-link-http": "^1.5.11",
     "babel-plugin-dynamic-import-node": "^2.2.0",
diff --git a/plugins/libs/rdf.js b/plugins/libs/rdf.js
index 29864e10..24553144 100644
--- a/plugins/libs/rdf.js
+++ b/plugins/libs/rdf.js
@@ -83,20 +83,39 @@ export default ({ app, store }, inject) => {
   inject('buildSearchIndex', buildSearchIndex)
   inject('buildTree', buildTree)
   inject('findClassProperties', findClassProperties)
+  inject('unPrefix', unPrefix)
 
   const createExternalType = ([iri, label]) =>
     rdf.quad(rdf.namedNode(iri), termIRI.label, rdf.literal(label))
 
-  const externalTypes = [
-    ['http://www.w3.org/2001/XMLSchema#boolean', 'Boolean (xsd:boolean)'],
-    ['http://www.w3.org/2001/XMLSchema#date', 'Date (xsd:date)'],
-    ['http://www.w3.org/2001/XMLSchema#dateTime', 'Date and time (xsd:dateTime)'],
-    ['http://www.w3.org/2001/XMLSchema#double', 'Double (xsd:double)'],
-    ['http://www.w3.org/2001/XMLSchema#decimal', 'Decimal (xsd:decimal)'],
-    ['http://www.w3.org/2001/XMLSchema#int', 'Integer (xsd:int)'],
-    ['http://www.w3.org/2001/XMLSchema#string', 'String (xsd:string)'],
-    ['http://www.w3.org/2001/XMLSchema#time', 'Time (xsd:time)']
-  ].map(createExternalType)
+  const prefixes = [{
+    prefix: 'http://www.w3.org/2001/XMLSchema#',
+    short: 'xsd:'
+  }, {
+    prefix: 'http://www.w3.org/2000/01/rdf-schema#',
+    short: 'rdfs:'
+  }]
+
+  const allExternalTypes = [
+    ['http://www.w3.org/2000/01/rdf-schema#literal', 'rdfs:literal'],
+    ['http://www.w3.org/2001/XMLSchema#boolean', 'xsd:boolean'],
+    ['http://www.w3.org/2001/XMLSchema#date', 'xsd:date'],
+    ['http://www.w3.org/2001/XMLSchema#dateTime', 'xsd:dateTime'],
+    ['http://www.w3.org/2001/XMLSchema#double', 'xsd:double'],
+    ['http://www.w3.org/2001/XMLSchema#decimal', 'xsd:decimal'],
+    ['http://www.w3.org/2001/XMLSchema#int', 'xsd:int'],
+    ['http://www.w3.org/2001/XMLSchema#string', 'xsd:string'],
+    ['http://www.w3.org/2001/XMLSchema#time', 'xsd:time']
+  ]
+  const externalTypes = allExternalTypes.map(createExternalType)
+
+  function unPrefix (iri) {
+    const found = prefixes.find(p => iri.startsWith(p.prefix))
+    if (found) {
+      return iri.replace(new RegExp(`^${found.prefix}`), found.short)
+    }
+    return iri
+  }
 
   function toObject (domain, dataset) {
     let label = dataset.match(domain.subject, termIRI.label).toArray()