Merge pull request #1525 from zazuko/shared-dimension-uri

Correct links to shared dimensions
zazuko · Jun 19, 2024 · ab4c883 · ab4c883
2 parents 8d5e92b + 2181698
commit ab4c883
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/.changeset/friendly-dryers-kick.md b/.changeset/friendly-dryers-kick.md
@@ -0,0 +1,5 @@
+---
+"@cube-creator/shared-dimensions-api": patch
+---
+
+Correct links to shared dimension terms (fixes #1498)
diff --git a/apis/shared-dimensions/lib/handlers/shared-dimension.ts b/apis/shared-dimensions/lib/handlers/shared-dimension.ts
@@ -7,6 +7,7 @@ import { serializers } from '@rdfjs-elements/formats-pretty'
 import error from 'http-errors'
 import { md, meta } from '@cube-creator/core/namespace'
 import * as ns from '@tpluscode/rdf-ns-builders'
+import { oa } from '@tpluscode/rdf-ns-builders'
 import { createTerm, getExportedDimension } from '../domain/shared-dimension'
 import { store } from '../store'
 import { shaclValidate } from '../middleware/shacl'
@@ -19,6 +20,8 @@ export const post = protectedResource(shaclValidate, asyncMiddleware(async (req,
     store: store(),
   })
 
+  term.addOut(oa.canonical, term)
+
   res.setHeader('Location', term.value)
   res.status(201)
   return res.dataset(term.dataset)

diff --git a/apis/shared-dimensions/lib/middleware/canonicalRewrite.ts b/apis/shared-dimensions/lib/middleware/canonicalRewrite.ts
@@ -23,7 +23,7 @@ export interface ShouldRewrite {
 const defaultShouldRewrite: ShouldRewrite = ({ predicate }) => {
   if (predicate.equals(oa.canonical)) {
     return {
-      subject: false,
+      object: false,
     }
   }
 

diff --git a/e2e-tests/shared-dimensions/term-set.hydra b/e2e-tests/shared-dimensions/term-set.hydra
@@ -4,6 +4,7 @@ PREFIX schema: <http://schema.org/>
 PREFIX qudt: <http://qudt.org/schema/qudt/>
 PREFIX meta: <https://cube.link/meta/>
 PREFIX sh: <http://www.w3.org/ns/shacl#>
+PREFIX oa: <http://www.w3.org/ns/oa#>
 
 ENTRYPOINT "dimension/technologies"
 
@@ -39,6 +40,9 @@ With Class meta:SharedDimension {
             Expect Property schema:inDefinedTermSet
             Expect Property schema:validFrom
             Expect Property schema:validThrough
+            Expect Property oa:canonical {
+                Expect Id <https://ld.admin.ch/cube/dimension/technologies/node-js>
+            }
         }
 
         Invoke {

diff --git a/e2e-tests/shared-dimensions/term.hydra b/e2e-tests/shared-dimensions/term.hydra
@@ -4,6 +4,7 @@ PREFIX schema: <http://schema.org/>
 PREFIX qudt: <http://qudt.org/schema/qudt/>
 PREFIX meta: <https://cube.link/meta/>
 PREFIX sh: <http://www.w3.org/ns/shacl#>
+PREFIX oa: <http://www.w3.org/ns/oa#>
 
 ENTRYPOINT "dimension/technologies/rdf"
 
@@ -37,6 +38,9 @@ With Class schema:DefinedTerm {
 
             Expect Type schema:DefinedTerm
             Expect Property schema:name "Resource Description Framework"
+            Expect Property oa:canonical {
+                Expect Id <https://ld.admin.ch/cube/dimension/technologies/rdf>
+            }
         }
     }
 }