Merge pull request #15 from blue-core-lod/t11-search-bluecore

jermnelson · web-flow · commit 9a18b95f3fe4 · 2025-09-04T08:04:54.000-06:00
Initial Support for Blue Core Search
diff --git a/__tests__/actionCreators/resources.newResourceFromDataset.test.js b/__tests__/actionCreators/resources.newResourceFromDataset.test.js
@@ -296,7 +296,6 @@ describe("newResourceFromDataset", () => {
         (action) => action.type === "ADD_SUBJECT"
       )
 
-      // console.log(JSON.safeStringify(addSubjectAction))
       expect(safeAction(addSubjectAction)).toEqual(expectedOrderedAction)
 
       expect(actions).toHaveAction("SET_UNUSED_RDF", {
diff --git a/__tests__/components/search/SinopiaSearchResults.test.js b/__tests__/components/search/SinopiaSearchResults.test.js
@@ -5,24 +5,9 @@ import { screen } from "@testing-library/react"
 import { createStore, renderComponent } from "testUtils"
 import { createState } from "stateUtils"
 
-let mockKeycloak
-
-jest.mock("keycloak-js", () => {
-  mockKeycloak = {
-    init: jest.fn(() => Promise.resolve(true)),
-    token: "Secret-Token",
-    authenticated: true,
-    isTokenExpired: jest.fn(),
-    updateToken: jest.fn(),
-    tokenParsed: {
-      preferred_username: "Foo McBar",
-    },
-  }
-
-  return jest.fn().mockImplementation((config) => {
-    return mockKeycloak
-  })
-})
+jest.mock("KeycloakContext", () => ({
+  useKeycloak: jest.fn().mockReturnValue({}),
+}))
 
 describe("<SinopiaSearchResults />", () => {
   describe("when there are no search results", () => {
diff --git a/__tests__/components/search/SinopiaSort.test.js b/__tests__/components/search/SinopiaSort.test.js
@@ -44,6 +44,10 @@ describe("<SinopiaSort />", () => {
 
   it("clicking changes the sort order", async () => {
     const mockGetSearchResults = jest.fn()
+    const keycloak = jest.fn().mockReturnValue({
+      token: "abcdefg12345",
+    })
+
     server.getSearchResultsWithFacets = mockGetSearchResults.mockResolvedValue([
       {
         totalHits: 1,
@@ -67,20 +71,22 @@ describe("<SinopiaSort />", () => {
     }
 
     const store = createStore(state)
-    const keycloak = jest.fn().mockReturnValue({
-      token: "abcdefg12345",
-    })
+
     renderComponent(<SinopiaSort />, store)
 
     fireEvent.click(screen.getByText("Sort by"))
     fireEvent.click(screen.getByText("Label, ascending"))
 
     await screen.findByText("Label, ascending", { selector: ".active" })
-    expect(server.getSearchResultsWithFacets).toHaveBeenCalledWith("twain", {
-      startOfRange: 0,
-      resultsPerPage: 15,
-      sortField: "label",
-      sortOrder: "asc",
-    })
+    expect(server.getSearchResultsWithFacets).toHaveBeenCalledWith(
+      "twain",
+      {
+        startOfRange: 0,
+        resultsPerPage: 15,
+        sortField: "label",
+        sortOrder: "asc",
+      },
+      undefined
+    )
   })
 })
diff --git a/__tests__/feature/search.test.js b/__tests__/feature/search.test.js
@@ -15,13 +15,13 @@ describe("sinopia resource search", () => {
     _index: "sinopia_resources",
     _type: "sinopia",
     _id: "resource/cornell/34ef053e-f558-4299-a8a7-c8b79a598d99",
-    _score: 0.2876821,
-    _source: {
-      title: ["foo bar"],
-      uri: "http://platform:8080/resource/cornell/34ef053e-f558-4299-a8a7-c8b79a598d99",
-      label: "foo bar",
-      type: ["http://id.loc.gov/ontologies/bibframe/AbbreviatedTitle"],
-      group: "cornell",
+    uri: "http://platform:8080/resource/cornell/34ef053e-f558-4299-a8a7-c8b79a598d99",
+    data: {
+      title: {
+        mainTitle: "foo bar"
+      },
+      "@type": ["http://id.loc.gov/ontologies/bibframe/AbbreviatedTitle"],
+      group: "blue core",
       created: "2019-11-27T19:05:50.496Z",
       modified: "2019-11-27T19:05:50.496Z",
     },
@@ -31,13 +31,13 @@ describe("sinopia resource search", () => {
     _index: "sinopia_resources",
     _type: "sinopia",
     _id: "resource/cornell/a96f16c1-a15c-4f4f-8a25-7ed49ba1eebe",
-    _score: 0.2876819,
-    _source: {
-      title: ["foo"],
-      uri: "http://platform:8080/resource/cornell/a96f16c1-a15c-4f4f-8a25-7ed49ba1eebe",
-      label: "foo",
-      type: ["http://id.loc.gov/ontologies/bibframe/AbbreviatedTitle"],
-      group: "cornell",
+    uri: "http://platform:8080/resource/cornell/a96f16c1-a15c-4f4f-8a25-7ed49ba1eebe",
+    data: {
+      title: {
+        mainTitle: "foo"
+      },
+      "@type": ["http://id.loc.gov/ontologies/bibframe/AbbreviatedTitle"],
+      group: "blue core",
       created: "2019-11-27T19:05:52.496Z",
       modified: "2019-11-27T19:05:52.496Z",
     },
@@ -48,12 +48,13 @@ describe("sinopia resource search", () => {
     _type: "sinopia",
     _id: "resource/stanford/a96f16c1-a15c-4f4f-8a25-7ed49ba1eebe",
     _score: 0.2876822,
-    _source: {
-      title: ["baz"],
-      uri: "http://platform:8080/resource/stanford/d7b0eb50-17bb-4258-83be-2cef2e9fc3ad",
-      label: "baz",
-      type: ["http://id.loc.gov/ontologies/bibframe/Title"],
-      group: "stanford",
+    uri: "http://platform:8080/resource/stanford/d7b0eb50-17bb-4258-83be-2cef2e9fc3ad",
+    data: {
+      title: {
+        mainTitle: "baz"
+      } ,
+      "@type": ["http://id.loc.gov/ontologies/bibframe/Title"],
+      group: "blue core",
       created: "2019-11-27T19:05:48.496Z",
       modified: "2019-11-27T19:05:48.496Z",
     },
@@ -68,11 +69,8 @@ describe("sinopia resource search", () => {
       skipped: 0,
       failed: 0,
     },
-    hits: {
-      total: { value: 3 },
-      max_score: 0.2876821,
-      hits: [fooBarHit, fooHit, bazHit],
-    },
+    results: [fooBarHit, fooHit, bazHit],
+    total: 3,
   }
 
   const successResultResorted = {
@@ -84,11 +82,12 @@ describe("sinopia resource search", () => {
       skipped: 0,
       failed: 0,
     },
-    hits: {
-      total: { value: 3 },
-      max_score: 0.2876821,
-      hits: [bazHit, fooBarHit, fooHit],
-    },
+    results: [bazHit, fooBarHit, fooHit],
+    // hits: {
+    //   total: { value: 3 },
+    //   max_score: 0.2876821,
+    //   results: [bazHit, fooBarHit, fooHit],
+    // },
   }
 
   const successResultPage1 = {
diff --git a/__tests__/sinopiaApi.test.js b/__tests__/sinopiaApi.test.js
@@ -175,8 +175,6 @@ describe("fetchResource", () => {
 describe("postResource", () => {
   const state = createState({ hasResourceWithLiteral: true })
   const currentUser = selectUser(state)
-  console.log(`state`, state)
-  console.log(`currentUser`, currentUser)
 
   describe("with a new resource", () => {
     const resource = selectFullSubject(state, "t9zVwg2zO")
diff --git a/src/Config.js b/src/Config.js
@@ -69,7 +69,8 @@ class Config {
    * This is the public endpont for the sinopia search.
    */
   static get searchPath() {
-    return "/api/search/sinopia_resources/_search"
+    // return "/api/search/sinopia_resources/_search"
+    return "/search"
   }
 
   static get templateSearchPath() {
diff --git a/src/KeycloakContext.js b/src/KeycloakContext.js
@@ -27,6 +27,7 @@ export const KeycloakProvider = ({ children }) => {
   const [initialized, setInitialized] = useState(false)
 
   useEffect(() => {
+    if (keycloak.initialized) return
     keycloak.init().then((authenticated) => {
       setAuthenticated(authenticated)
       setInitialized(true)
diff --git a/src/actionCreators/authenticate.js b/src/actionCreators/authenticate.js
@@ -16,7 +16,7 @@ export const authenticate = (keycloak) => async (dispatch, getState) => {
     }
     const userInfo = keycloak.tokenParsed
     dispatch(setUser(toUser(userInfo)))
-    dispatch(loadUserData(userInfo.preferred_username))
+    dispatch(loadUserData(userInfo.preferred_username, keycloak))
     return Promise.resolve(true)
   }
   dispatch(removeUser())
diff --git a/src/actionCreators/history.js b/src/actionCreators/history.js
@@ -33,14 +33,19 @@ export const loadTemplateHistory = (templateIds) => (dispatch) => {
     .catch((err) => console.error(err))
 }
 
-export const loadSearchHistory = (searches) => (dispatch) => {
+export const loadSearchHistory = (searches, keycloak) => (dispatch) => {
   if (_.isEmpty(searches)) return
   searches.reverse().forEach((search) => {
     const authorityConfig = findAuthorityConfig(search.authorityUri)
     if (!authorityConfig) return
 
     dispatch(
-      addSearchHistory(search.authorityUri, authorityConfig.label, search.query)
+      addSearchHistory(
+        search.authorityUri,
+        authorityConfig.label,
+        search.query,
+        keycloak
+      )
     )
   })
 }
diff --git a/src/actionCreators/search.js b/src/actionCreators/search.js
@@ -16,12 +16,19 @@ import { isBfWorkInstanceItem } from "utilities/Bibframe"
 import { loadSearchRelationships } from "./relationships"
 
 export const fetchSinopiaSearchResults =
-  (query, options, errorKey) => (dispatch) => {
+  (query, options, errorKey, keycloak) => (dispatch) => {
     dispatch(clearErrors(errorKey))
-    return getSearchResultsWithFacets(query, options).then(
+    return getSearchResultsWithFacets(query, options, keycloak).then(
       ([response, facetResponse]) => {
-        dispatch(addSearchHistory(sinopiaSearchUri, "Sinopia resources", query))
-        dispatch(addApiSearchHistory(sinopiaSearchUri, query))
+        dispatch(
+          addSearchHistory(
+            sinopiaSearchUri,
+            "Sinopia resources",
+            query,
+            keycloak
+          )
+        )
+        dispatch(addApiSearchHistory(sinopiaSearchUri, query, keycloak))
         dispatch(
           setSearchResults(
             "resource",
diff --git a/src/actionCreators/user.js b/src/actionCreators/user.js
@@ -7,7 +7,7 @@ import {
 } from "actionCreators/history"
 import md5 from "crypto-js/md5"
 
-export const loadUserData = (userId) => (dispatch) =>
+export const loadUserData = (userId, keycloak) => (dispatch) =>
   fetchUser(userId)
     .then((userData) => {
       const templateIds = userData.data.history.template.map(
@@ -17,22 +17,23 @@ export const loadUserData = (userId) => (dispatch) =>
       const searches = userData.data.history.search.map((historyItem) =>
         JSON.parse(historyItem.payload)
       )
-      dispatch(loadSearchHistory(searches))
+      dispatch(loadSearchHistory(searches, keycloak))
       const resourceUris = userData.data.history.resource.map(
         (historyItem) => historyItem.payload
       )
       dispatch(loadResourceHistory(resourceUris))
     })
     .catch((err) => console.error(err))
 
-const addHistory = (historyType, payload) => (dispatch, getState) => {
+const addHistory = (historyType, payload, keycloak) => (dispatch, getState) => {
   const user = selectUser(getState())
   if (!user) return
   return putUserHistory(
     user.username,
     historyType,
     md5(payload).toString(),
-    payload
+    payload,
+    keycloak
   ).catch((err) => console.error(err))
 }
 
@@ -42,7 +43,8 @@ export const addTemplateHistory = (templateId) => (dispatch) =>
 export const addResourceHistory = (uri) => (dispatch) =>
   dispatch(addHistory("resource", uri))
 
-export const addSearchHistory = (authorityUri, query) => (dispatch) => {
-  const payload = JSON.stringify({ authorityUri, query })
-  return dispatch(addHistory("search", payload))
-}
+export const addSearchHistory =
+  (authorityUri, query, keycloak) => (dispatch) => {
+    const payload = JSON.stringify({ authorityUri, query })
+    return dispatch(addHistory("search", payload, keycloak))
+  }
diff --git a/src/actions/history.js b/src/actions/history.js
@@ -8,10 +8,18 @@ export const addTemplateHistoryByResult = (result) => ({
   payload: result,
 })
 
-export const addSearchHistory = (authorityUri, authorityLabel, query) => ({
-  type: "ADD_SEARCH_HISTORY",
-  payload: { authorityUri, authorityLabel, query },
-})
+export const addSearchHistory = (
+  authorityUri,
+  authorityLabel,
+  query,
+  keycloak
+) => {
+  const payload = { authorityUri, authorityLabel, query, keycloak }
+  return {
+    type: "ADD_SEARCH_HISTORY",
+    payload: payload,
+  }
+}
 
 export const addResourceHistory = (resourceUri, type, group, modified) => ({
   type: "ADD_RESOURCE_HISTORY",
diff --git a/src/components/search/HeaderSearch.jsx b/src/components/search/HeaderSearch.jsx
@@ -8,13 +8,15 @@ import { Popover } from "bootstrap"
 import searchConfig from "../../../static/searchConfig.json"
 import { sinopiaSearchUri } from "utilities/authorityConfig"
 import useSearch from "hooks/useSearch"
+import { useKeycloak } from "../../KeycloakContext"
 import { selectHeaderSearch } from "selectors/search"
 import { setHeaderSearch } from "actions/search"
 import useAlerts from "hooks/useAlerts"
 
 const HeaderSearch = () => {
   const dispatch = useDispatch()
   const currentSearch = useSelector((state) => selectHeaderSearch(state))
+  const { keycloak } = useKeycloak()
   const [uri, setUri] = useState(currentSearch.uri)
   const [query, setQuery] = useState(currentSearch.query || "")
   const popoverRef = useRef()
@@ -73,7 +75,7 @@ const HeaderSearch = () => {
         searchUri = baseUri
       }
     }
-    fetchNewSearchResults(query, searchUri, options)
+    fetchNewSearchResults(query, searchUri, options, keycloak)
     if (uri === "urn:ld4p:sinopia" && query !== "*") {
       fetchTemplateGuessSearchResults(query)
     } else {
diff --git a/src/components/search/Search.jsx b/src/components/search/Search.jsx
@@ -21,10 +21,13 @@ import ContextAlert from "components/alerts/ContextAlert"
 import { searchErrorKey } from "utilities/errorKeyFactory"
 import TemplateGuessSearchResults from "./TemplateGuessSearchResults"
 import PreviewModal from "../editor/preview/PreviewModal"
+import { useKeycloak } from "../../KeycloakContext"
 
 const Search = (props) => {
   const { fetchSearchResults } = useSearch()
 
+  const { keycloak } = useKeycloak()
+
   const searchOptions = useSelector((state) =>
     selectSearchOptions(state, "resource")
   )
@@ -37,7 +40,7 @@ const Search = (props) => {
   )
 
   const changeSearchPage = (startOfRange) => {
-    fetchSearchResults(queryString, uri, searchOptions, startOfRange)
+    fetchSearchResults(queryString, uri, searchOptions, startOfRange, keycloak)
   }
 
   return (
diff --git a/src/components/search/SinopiaSort.jsx b/src/components/search/SinopiaSort.jsx
@@ -3,11 +3,13 @@ import React from "react"
 import { useSelector, useDispatch } from "react-redux"
 import { fetchSinopiaSearchResults } from "actionCreators/search"
 import { selectSearchOptions, selectSearchQuery } from "selectors/search"
+import { useKeycloak } from "../../KeycloakContext"
 import useAlerts from "hooks/useAlerts"
 
 const SinopiaSort = () => {
   const query = useSelector((state) => selectSearchQuery(state, "resource"))
   const errorKey = useAlerts()
+  const { keycloak } = useKeycloak()
 
   const searchOptions = useSelector((state) =>
     selectSearchOptions(state, "resource")
@@ -26,7 +28,8 @@ const SinopiaSort = () => {
           sortField,
           sortOrder,
         },
-        errorKey
+        errorKey,
+        keycloak
       )
     )
 
diff --git a/src/hooks/useSearch.js b/src/hooks/useSearch.js
diff --git a/src/reducers/history.js b/src/reducers/history.js
diff --git a/src/sinopiaApi.js b/src/sinopiaApi.js
diff --git a/src/sinopiaSearch.js b/src/sinopiaSearch.js

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,6 @@ describe("newResourceFromDataset", () => {`
`296`	`296`	`(action) => action.type === "ADD_SUBJECT"`
`297`	`297`	`)`
`298`	`298`
`299`		`- // console.log(JSON.safeStringify(addSubjectAction))`
`300`	`299`	`expect(safeAction(addSubjectAction)).toEqual(expectedOrderedAction)`
`301`	`300`
`302`	`301`	`expect(actions).toHaveAction("SET_UNUSED_RDF", {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ class Config {`
`69`	`69`	`* This is the public endpont for the sinopia search.`
`70`	`70`	`*/`
`71`	`71`	`static get searchPath() {`
`72`		`- return "/api/search/sinopia_resources/_search"`
	`72`	`+ // return "/api/search/sinopia_resources/_search"`
	`73`	`+ return "/search"`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`static get templateSearchPath() {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export const authenticate = (keycloak) => async (dispatch, getState) => {`
`16`	`16`	`}`
`17`	`17`	`const userInfo = keycloak.tokenParsed`
`18`	`18`	`dispatch(setUser(toUser(userInfo)))`
`19`		`- dispatch(loadUserData(userInfo.preferred_username))`
	`19`	`+ dispatch(loadUserData(userInfo.preferred_username, keycloak))`
`20`	`20`	`return Promise.resolve(true)`
`21`	`21`	`}`
`22`	`22`	`dispatch(removeUser())`