Skip to content

Commit

Permalink
Add scopeNote as searchable field. #285
Browse files Browse the repository at this point in the history
Added test for scopeNote.
Added documentation on how to add searchable fields.
  • Loading branch information
sroertgen committed Mar 28, 2024
1 parent 0f62218 commit 9ebdd20
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 22 deletions.
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ You can configure the following settings:
- Logo
- Colors
- Fonts
- Searchable Fields

The settings are explained in the following sections.

Expand Down Expand Up @@ -275,6 +276,25 @@ url: [String]
This will add the `url` field, being an array of strings.
For other types, compare with already existing properties and just copy as you need.

## Adding Searchable Fields

To add a field to be searchable you have to make the following adjustments:

- Add the field in the `config.yaml` file to `searchableAttributes`, e.g. `editorialNote`
- In `src/queries.js` add it to `ConceptFields` (around line 176):
```graphql
editorialNote {
${[...languages].join(" ")}
}
```
- Add it to the labels to be indexed. Go to `gatsby-node.js` and add it the document object around line 341. For fields being *single* language tagged labels (e.g. `skos:prefLabel`) use `prefLabel` as an example. For fields being arrays of language tagged labels (e.g. `skos:altLabel`) use `altLabel` as an example. For `skos:editorialNote` it would be:
```js
...(concept.editorialNote &&
Object.hasOwn(concept.editorialNote, language) && {
editorialNote: i18n(language)(concept.editorialNote),
}),
```

## Troubleshooting

Depending on special circumstances you may get errors in the log files, e.g.
Expand Down
1 change: 1 addition & 0 deletions cypress/config.e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ searchableAttributes:
- "hiddenLabel"
- "example"
- "definition"
- "scopeNote"
ui:
title: "SkoHub Vocabs" # Title is mandatory
logo: "skohub-signet-color.svg" # Path
Expand Down
14 changes: 14 additions & 0 deletions cypress/e2e/searchAndFilter.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,18 @@ describe("search and filter", () => {
cy.get("#closeModal").click()
cy.get("span").contains("Konzept 1").should("exist")
})

it("turning on scopeNote checkbox returns scopeNote matches", () => {
cy.visit("/w3id.org/index.html", {
onBeforeLoad(win) {
Object.defineProperty(win.navigator, "language", { value: "de-DE" })
},
})
cy.findByRole("textbox").type("Scope")
cy.get("p").contains("Nothing found").should("exist")
cy.get("#settings").click()
cy.get("#scopeNoteCheckBox").click()
cy.get("#closeModal").click()
cy.get("span").contains("Konzept 1").should("exist")
})
})
10 changes: 1 addition & 9 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,7 @@ exports.createPages = async ({ graphql, actions: { createPage } }) => {
document: {
id: "id",
// store: ["prefLabel", "altLabel"], /* not working when importing, bug in flexsearch */
index: [
"notation",
"prefLabel",
"altLabel",
"hiddenLabel",
"definition",
"example",
"scopeNote"
],
index: [...config.searchableAttributes],
},
})
return [l, index]
Expand Down
1 change: 1 addition & 0 deletions src/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const parseLanguages = (graph) => {
* @property {string} tokenizer
* @property {Object} colors
* @property {string} customDomain
* @property {string[]} searchableAttributes
*/

/**
Expand Down
40 changes: 40 additions & 0 deletions src/hooks/configAndConceptSchemes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,45 @@
import { useStaticQuery, graphql } from "gatsby"

/**
* @returns {{
* config: {
* colors: {
* skoHubWhite: string,
* skoHubDarkColor: string,
* skoHubMiddleColor: string,
* skoHubLightColor: string,
* skoHubThinColor: string,
* skoHubBlackColor: string,
* skoHubAction: string,
* skoHubNotice: string,
* skoHubDarkGrey: string,
* skoHubMiddleGrey: string,
* skoHubLightGrey: string
* },
* logo: string,
* title: string,
* fonts: {
* bold: {
* font_family: string,
* font_style: string,
* font_weight: string,
* name: string
* },
* regular: {
* font_family: string,
* font_style: string,
* font_weight: string,
* name: string
* }
* },
* searchableAttributes: string[],
* customDomain: string,
* failOnValidation: boolean
* },
* conceptSchemes: Object<string, { languages: string[] }>
* }} An object containing `config` and `conceptSchemes`
*
*/
export const getConfigAndConceptSchemes = () => {
const { site, allConceptScheme } = useStaticQuery(graphql`
query Colors {
Expand Down
2 changes: 1 addition & 1 deletion src/templates/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const App = ({ pageContext, children, location }) => {
labels,
data.selectedLanguage,
setIndex,
config.customDomain
config
)
}, [data, language, labels])

Expand Down
18 changes: 6 additions & 12 deletions src/templates/helpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect } from "react"
import Document from "flexsearch/dist/module/document.js"
import { i18n, getFilePath } from "../common"
import { getFilePath } from "../common"
import { withPrefix } from "gatsby"

export const handleKeypresses = (labels, setLabels) => {
Expand Down Expand Up @@ -62,7 +62,7 @@ export const importIndex = async (
labels,
language,
setIndex,
customDomain
config
) => {
if (!conceptSchemeId) return
const idx = new Document({
Expand All @@ -72,15 +72,7 @@ export const importIndex = async (
document: {
id: "id",
// store: ["prefLabel", "altLabel"], /* not working flexsearchside */
index: [
"notation",
"prefLabel",
"altLabel",
"hiddenLabel",
"definition",
"example",
"scopeNote"
],
index: [...config.searchableAttributes],
},
})
// filter from labels object the selected entries
Expand All @@ -102,7 +94,9 @@ export const importIndex = async (
try {
const path =
getFilePath(conceptSchemeId) + `-cs/search/${language}/${key}`
data = await fetch(withPrefix(getFilePath(path, `json`, customDomain)))
data = await fetch(
withPrefix(getFilePath(path, `json`, config.customDomain))
)
const jsonData = await data.json()
idx.import(key, jsonData ?? null)
} catch (e) {
Expand Down

0 comments on commit 9ebdd20

Please sign in to comment.