Merge branch '287-deprecated-concepts' into dev

Author: sroertgen

README.md

@@ -17,6 +17,18 @@ In general we advise the use of slash URIs for SKOS vocabularies.
 
 If you would like more support of hash URIs for SkoHub Vocabs, [please open an issue](https://github.com/skohub-io/skohub-vocabs/issues/new/choose).
 
+## Internationalization
+
+To determine the language displayed of the vocabulary the browser language is used.
+If the browser language is not present in the vocabulary a default language is chosen.
+If you want to link to a specific language, you can use a URL parameter: `?lang=de`.
+
+## Deprecation of Concepts
+
+To mark a concept as deprecated you can mark it with `owl:deprecated true`.
+To point to a successor add `dct:isReplacedBy`.
+The information will be available in the machine readable version as well as in the html page.
+
 ## Set up
 
 ### Install Node.js

gatsby-node.js

@@ -143,6 +143,7 @@ exports.onPreBootstrap = async ({ createContentDigest, actions, getNode }) => {
         topConceptOf,
         hasTopConcept,
         member,
+        deprecated,
         ...properties
       } = graph
       const type = Array.isArray(properties.type)
@@ -173,6 +174,7 @@ exports.onPreBootstrap = async ({ createContentDigest, actions, getNode }) => {
          * a concept scheme not present in the graphql data layer would not be found and not
          * be shown on the concepts page.
          */
+        deprecated: Boolean(deprecated) || null,
         inSchemeAll:
           inSchemeFiltered.map((inScheme) => ({ id: inScheme.id })) || null,
         // topConceptOf nodes are also set to inScheme to facilitate parsing and filtering later

src/components/Concept.jsx

@@ -20,12 +20,27 @@ const Concept = ({
 
   return (
     <div className="content block main-block" id={getDomId(concept.id)}>
+      <h1 style={{ color: "red" }}>{concept.deprecated ? "Deprecated" : ""}</h1>
       <h1>
         {concept.notation && <span>{concept.notation.join(",")}&nbsp;</span>}
         {i18n(language)(concept.prefLabel)}
       </h1>
       <ConceptURI id={concept.id} />
       <JsonLink to={getFilePath(concept.id, "json", customDomain)} />
+      {concept.isReplacedBy && concept.isReplacedBy.length > 0 && (
+        <div>
+          <h3>Is replaced by</h3>
+          <ul>
+            {concept.isReplacedBy.map((isReplacedBy) => (
+              <li key={isReplacedBy.id}>
+                <Link to={getFilePath(isReplacedBy.id, `html`, customDomain)}>
+                  {isReplacedBy.id}
+                </Link>
+              </li>
+            ))}
+          </ul>
+        </div>
+      )}
       {concept.definition && (
         <div className="markdown">
           <h3>Definition</h3>
@@ -88,9 +103,7 @@ const Concept = ({
           <ul>
             {concept.related.map((related) => (
               <li key={related.id}>
-                <Link
-                  to={getFilePath(related.id, `${language}.html`, customDomain)}
-                >
+                <Link to={getFilePath(related.id, `html`, customDomain)}>
                   {i18n(language)(related.prefLabel) || related.id}
                 </Link>
               </li>

src/components/nestedList.jsx

@@ -191,6 +191,9 @@ const NestedList = ({
     const renderPrefLabel = () => {
       // Function for handling highlighting
       function handleHighlight(text, highlight) {
+        text = item.deprecated
+          ? `<span style="color: red">(DEPRECATED)</span> ${text}`
+          : text
         if (highlight) {
           return text.replace(highlight, (str) => `<strong>${str}</strong>`)
         } else {

src/context.js

@@ -9,6 +9,7 @@ const jsonld = {
     schema: "https://schema.org/",
     vann: "http://purl.org/vocab/vann/",
     ldp: "http://www.w3.org/ns/ldp#",
+    owl: "http://www.w3.org/2002/07/owl#",
     title: {
       "@id": "dct:title",
       "@container": "@language",
@@ -95,6 +96,14 @@ const jsonld = {
     topConceptOf: {
       "@container": "@set",
     },
+    deprecated: {
+      "@id": "owl:deprecated",
+      "@type": "xsd:boolean",
+    },
+    isReplacedBy: {
+      "@id": "dct:isReplacedBy",
+      "@container": "@set",
+    },
   },
 }
 

src/queries.js

@@ -119,6 +119,10 @@ module.exports.allConcept = (inScheme, languages) => `
               ${[...languages].join(" ")}
             }
           }
+          deprecated
+          isReplacedBy {
+            id
+          }
         }
       }
     }
@@ -178,6 +182,7 @@ module.exports.allConceptScheme = (languages) => `
     example {
       ${[...languages].join(" ")}
     }
+    deprecated
   }
 `
 module.exports.tokenizer = `{

src/types.js

@@ -37,7 +37,9 @@ module.exports = (languages) => `
     exactMatch: [Concept],
     inScheme: [ConceptScheme] @link(from: "inScheme___NODE"),
     inSchemeAll: [ConceptScheme],
-    hub: String
+    hub: String,
+    deprecated: Boolean,
+    isReplacedBy: [Concept]
   }
 
   type LanguageMap {

test/concept.test.jsx

@@ -4,7 +4,7 @@ import * as Gatsby from "gatsby"
 
 import React from "react"
 import Concept from "../src/components/Concept.jsx"
-import { ConceptPC } from "./data/pageContext"
+import { ConceptPC, ConceptPCDeprecated } from "./data/pageContext"
 import mockFetch from "./mocks/mockFetch"
 import { mockConfig } from "./mocks/mockConfig"
 import { useSkoHubContext } from "../src/context/Context.jsx"
@@ -130,7 +130,10 @@ describe.concurrent("Concept", () => {
     expect(
       screen.getByRole("heading", { name: /^related$/i })
     ).toBeInTheDocument()
-    expect(screen.getByRole("link", { name: /konzept 4/i })).toBeInTheDocument()
+    const href = screen.getByRole("link", { name: /konzept 4/i })
+    expect(href).toBeInTheDocument()
+    // ensure there is no language tag in the link
+    expect(href.getAttribute("href")).not.toMatch(/\..{2}\.html$/)
   })
 
   it("renders narrow matches", () => {
@@ -226,4 +229,26 @@ describe.concurrent("Concept", () => {
       screen.getByRole("link", { name: /just-another-scheme/i })
     ).toHaveAttribute("href", "http://just-another-scheme.org/")
   })
+
+  it("renders deprecated notice, if concept is deprecaed", () => {
+    render(<Concept pageContext={ConceptPCDeprecated} />)
+    expect(
+      screen.getByRole("heading", { name: /Deprecated/i })
+    ).toBeInTheDocument()
+  })
+
+  it("adds a isReplacedBy notice if concept is replaced", () => {
+    render(<Concept pageContext={ConceptPCDeprecated} />)
+    expect(
+      screen.getByRole("heading", { name: /isReplacedBy/i })
+    ).toBeInTheDocument()
+    const linkElement = screen.getByRole("link", {
+      name: "http://w3id.org/replacement",
+    }) // Adjust the query to match your link
+    const href = linkElement.getAttribute("href")
+
+    // Assert the URL ends with .html but not .xx.html
+    expect(href).toMatch(/\.html$/)
+    expect(href).not.toMatch(/\..{2}\.html$/)
+  })
 })

test/data/pageContext.js

@@ -14,6 +14,20 @@ const concept2 = {
   inScheme: [{ id: "http://w3id.org/" }],
 }
 
+const topConceptDeprecated = {
+  id: "http://w3id.org/c1",
+  type: "Concept",
+  deprecated: true,
+  isReplacedBy: [{ id: "http://w3id.org/replacement" }],
+  hub: "https://test.skohub.io/hub",
+  prefLabel: {
+    de: "Konzept 1",
+    en: "Concept 1",
+  },
+  narrower: [concept2],
+  topConceptOf: null,
+}
+
 export const topConcept = {
   id: "http://w3id.org/c1",
   type: "Concept",
@@ -98,6 +112,28 @@ export const ConceptPC = {
   ],
 }
 
+export const ConceptPCDeprecated = {
+  node: topConceptDeprecated,
+  language: "de",
+  collections: [
+    {
+      id: "http://w3id.org/collection",
+      prefLabel: { de: "Meine Collection", en: "My Collection" },
+      member: [topConcept, concept2],
+    },
+  ],
+}
+
+export const ConceptSchemeDeprecated = {
+  id: "http://w3id.org/",
+  type: "ConceptScheme",
+  title: {
+    de: "Test Vokabular",
+    en: "Test Vocabulary",
+  },
+  hasTopConcept: [topConceptDeprecated],
+}
+
 export const ConceptScheme = {
   id: "http://w3id.org/",
   type: "ConceptScheme",

test/nestedList.test.jsx

@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest"
 import { render, screen } from "@testing-library/react"
 import React from "react"
 import NestedList from "../src/components/nestedList"
-import { ConceptScheme } from "./data/pageContext"
+import { ConceptScheme, ConceptSchemeDeprecated } from "./data/pageContext"
 import userEvent from "@testing-library/user-event"
 import * as Gatsby from "gatsby"
 import { mockConfig } from "./mocks/mockConfig"
@@ -59,4 +59,19 @@ describe("Nested List", () => {
     await user.click(screen.getByRole("button", { expanded: true }))
     expect(screen.getByRole("button", { expanded: false }))
   })
+
+  it("shows deprecation notice for deprecated concepts", () => {
+    render(
+      <NestedList
+        items={ConceptSchemeDeprecated.hasTopConcept}
+        current={"http://w3id.org/c1"}
+        filter={null}
+        highlight={null}
+        language={"de"}
+      />
+    )
+    expect(
+      screen.getByRole("link", { name: "(DEPRECATED) Konzept 1" })
+    ).toBeInTheDocument()
+  })
 })