Merge pull request #20 from blue-core-lod/t19-sinopia-templates

Support for Loading and Editing Sinopia Resource Templates

Author: jermnelson

src/Config.js

@@ -74,7 +74,7 @@ class Config {
   }
 
   static get templateSearchPath() {
-    return "/api/search/sinopia_templates/_search"
+    return "/profile"
   }
 
   static get sinopiaDomainName() {

src/actionCreators/authenticate.js

@@ -37,5 +37,5 @@ export const signOut = (keycloak) => (dispatch) => {
 
 const toUser = (keycloakUser) => ({
   username: keycloakUser.preferred_username,
-  groups: [], // This needs to be a separate call to the api
+  groups: ["blue core"], // This needs to be a separate call to the api
 })

src/actionCreators/resources.js

@@ -43,6 +43,8 @@ import { addResourceHistory } from "actionCreators/history"
 import _ from "lodash"
 import { setCurrentComponent } from "actions/index"
 import { loadRelationships } from "./relationships"
+import { useKeycloak } from "../KeycloakContext"
+
 
 /**
  * A thunk that loads an existing resource from Sinopia API and adds to state.
@@ -101,14 +103,14 @@ export const loadResource =
   }
 
 export const loadResourceForEditor =
-  (uri, errorKey, { asNewResource = false } = {}) =>
+  (uri, errorKey, { asNewResource = false } = {}, keycloak) =>
   (dispatch) =>
     dispatch(loadResource(uri, errorKey, { asNewResource })).then((result) =>
-      dispatch(dispatchResourceForEditor(result, uri, { asNewResource }))
+      dispatch(dispatchResourceForEditor(result, uri, { asNewResource }, keycloak))
     )
 
 export const dispatchResourceForEditor =
-  (result, uri, { asNewResource = false } = {}) =>
+  (result, uri, { asNewResource = false } = {}, keycloak) =>
   (dispatch) => {
     if (!result) return false
     const [response, resource] = result
@@ -121,13 +123,14 @@ export const dispatchResourceForEditor =
     )
     dispatch(setCurrentResource(resource.key))
     if (!asNewResource) {
-      dispatch(addUserResourceHistory(uri))
+      dispatch(addUserResourceHistory(uri, keycloak))
       dispatch(
         addResourceHistory(
           resource.uri,
           resource.subjectTemplate.class,
           response.group,
-          response.timestamp
+          response.timestamp,
+          keycloak
         )
       )
       dispatch(loadResourceFinished(resource.key))
@@ -308,11 +311,11 @@ export const saveResource =
 
     dispatch(clearErrors(errorKey))
 
-    return putResource(resource, currentUser, group, editGroups, keycloak)
+    return putResource(resource, currentUser, group, editGroups, null, keycloak)
       .then(() => {
         dispatch(setResourceGroup(resourceKey, group, editGroups))
         dispatch(saveResourceFinished(resourceKey))
-        dispatch(addUserResourceHistory(resource.uri))
+        dispatch(addUserResourceHistory(resource.uri, keycloak))
         dispatch(
           addResourceHistory(
             resource.uri,

src/actionCreators/user.js

@@ -40,8 +40,8 @@ const addHistory = (historyType, payload, keycloak) => (dispatch, getState) => {
 export const addTemplateHistory = (templateId) => (dispatch) =>
   dispatch(addHistory("template", templateId))
 
-export const addResourceHistory = (uri) => (dispatch) =>
-  dispatch(addHistory("resource", uri))
+export const addResourceHistory = (uri, keycloak) => (dispatch) =>
+  dispatch(addHistory("resource", uri, keycloak))
 
 export const addSearchHistory =
   (authorityUri, query, keycloak) => (dispatch) => {

src/components/editor/actions/SaveAndPublishButton.jsx

@@ -28,7 +28,7 @@ import useAlerts from "hooks/useAlerts"
 const SaveAndPublishButton = (props) => {
   const dispatch = useDispatch()
   const errorKey = useAlerts()
-  const keycloak = useKeycloak()
+  const { keycloak } = useKeycloak()
 
   const resourceKey = useSelector((state) => selectCurrentResourceKey(state))
   // selectPickSubject and shallowEqual prevents rerender from unrelated changed.

src/components/templates/ResourceTemplateRow.jsx

@@ -31,7 +31,7 @@ const ResourceTemplateRow = ({ row }) => {
     isLoadingEdit,
     isLoadingView,
   } = useResource(errorKey, {
-    resourceURI: row.uri,
+    resourceURI: row.originalURI,
     resourceTemplateId: row.id,
   })
 

src/hooks/useResource.js

@@ -17,13 +17,15 @@ import {
   setCurrentPreviewResource,
 } from "actions/resources"
 import { useHistory } from "react-router-dom"
+import { useKeycloak } from "../KeycloakContext"
 
 const useResource = (
   errorKey,
   { resourceTemplateId = null, resourceURI = null }
 ) => {
   const dispatch = useDispatch()
   const history = useHistory()
+  const { keycloak } = useKeycloak()
   const errors = useSelector((state) => selectErrors(state, errorKey))
   const resourceKey = useSelector((state) => selectCurrentResourceKey(state))
   // These are resources that are already loaded
@@ -52,7 +54,12 @@ const useResource = (
     if (event) event.preventDefault()
     setStatus("loading copy")
     dispatch(
-      loadResourceForEditor(resourceURI, errorKey, { asNewResource: true })
+      loadResourceForEditor(
+        resourceURI,
+        errorKey,
+        { asNewResource: true },
+        keycloak
+      )
     ).then((result) => {
       setStatus("ready")
       if (result) setNavigateEditor(true)
@@ -67,10 +74,12 @@ const useResource = (
       setNavigateEditor(true)
     } else {
       setStatus("loading edit")
-      dispatch(loadResourceForEditor(resourceURI, errorKey)).then((result) => {
-        setStatus("ready")
-        if (result) setNavigateEditor(true)
-      })
+      dispatch(loadResourceForEditor(resourceURI, errorKey, {}, keycloak)).then(
+        (result) => {
+          setStatus("ready")
+          if (result) setNavigateEditor(true)
+        }
+      )
     }
   }
 

src/sinopiaApi.js

@@ -105,10 +105,7 @@ export const fetchResourceRelationships = (uri) => {
 }
 
 // Fetches list of groups
-export const getGroups = () => {
-  return Promise.resolve([{ id: "blue core",
-                            label: "Blue Core" }])
-}
+export const getGroups = () => Promise.resolve([{ id: "blue core", label: "Blue Core" }])
 
 // Publishes (saves) a new resource
 export const postResource = (
@@ -252,17 +249,17 @@ const saveBodyForResource = (resource, user, group, editGroups) => {
 
   return jsonldFromDataset(dataset).then((jsonld) =>
     JSON.stringify({
-      data: jsonld,
-      user,
-      group,
-      editGroups,
-      templateId: resource.subjectTemplate.id,
-      types: [resource.subjectTemplate.class],
-      bfAdminMetadataRefs: resource.bfAdminMetadataRefs,
-      sinopiaLocalAdminMetadataForRefs: resource.localAdminMetadataForRefs,
-      bfItemRefs: resource.bfItemRefs,
-      bfInstanceRefs: resource.bfInstanceRefs,
-      bfWorkRefs: resource.bfWorkRefs,
+      data: JSON.stringify(jsonld),
+      // user,
+      // group,
+      // editGroups,
+      // templateId: resource.subjectTemplate.id,
+      // types: [resource.subjectTemplate.class],
+      // bfAdminMetadataRefs: resource.bfAdminMetadataRefs,
+      // sinopiaLocalAdminMetadataForRefs: resource.localAdminMetadataForRefs,
+      // bfItemRefs: resource.bfItemRefs,
+      // bfInstanceRefs: resource.bfInstanceRefs,
+      // bfWorkRefs: resource.bfWorkRefs,
     })
   )
 }

src/sinopiaSearch.js

@@ -165,7 +165,7 @@ const aggregationsToResult = (aggs) => {
 
 export const getTemplateSearchResults = (query, options = {}) => {
   const body = getTemplateSearchResultsBody(query, options)
-  return fetchTemplateSearchResults(body, templateHitsToResult).then(
+  return fetchTemplateSearchResults(query, templateHitsToResult).then(
     (searchResults) => {
       if (Config.useResourceTemplateFixtures) {
         const newResults = searchResults.results.filter(
@@ -243,11 +243,10 @@ const fetchTemplateSearchResults = async (body, hitsToResultFunc) => {
     }
   }
 
-  const url = `${Config.searchHost}${Config.templateSearchPath}`
+  const url = `${Config.searchHost}${Config.templateSearchPath}?${body}`
   return fetch(url, {
-    method: "POST",
+    method: "GET",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body),
   })
     .then((resp) => {
       if (resp.status >= 300) {
@@ -267,7 +266,7 @@ const fetchTemplateSearchResults = async (body, hitsToResultFunc) => {
           error: json.error.reason || json.error,
         }
       }
-      return hitsToResultFunc(json.hits)
+      return hitsToResultFunc(json.results)
     })
     .catch((err) => ({
       totalHits: 0,
@@ -276,9 +275,46 @@ const fetchTemplateSearchResults = async (body, hitsToResultFunc) => {
     }))
 }
 
+const templateModFromBlueCore = (hit) => {
+  // Formats Blue Core Template Result for editor's expectations
+  let resourceAuthor = "Unknown"
+  let resourceId = "Unknown"
+  let resourceDate = "Unknown"
+  let resourceLabel = "Unknown"
+  let resourceRemark = ""
+  let resourceURI = "Unknown"
+  hit.data.map((row) => {
+    if (row["@id"] === hit.uri) {
+      resourceAuthor =
+        row["http://sinopia.io/vocabulary/hasAuthor"][0]["@value"]
+      resourceDate = row["http://sinopia.io/vocabulary/hasDate"][0]["@value"]
+      resourceLabel =
+        row["http://www.w3.org/2000/01/rdf-schema#label"][0]["@value"]
+      resourceId =
+        row["http://sinopia.io/vocabulary/hasResourceId"][0]["@value"]
+      resourceURI = row["http://sinopia.io/vocabulary/hasClass"][0]["@id"]
+      resourceRemark = row["http://sinopia.io/vocabulary/hasRemark"]
+        ? row["http://sinopia.io/vocabulary/hasRemark"][0]["@value"]
+        : ""
+    }
+  })
+  const bcURI = `${Config.sinopiaApiBase}/resources/${hit.id}`
+  return {
+    author: resourceAuthor,
+    date: resourceDate,
+    group: "blue core", // hardcoded for now
+    id: resourceId,
+    originalURI: hit.uri,
+    remark: resourceRemark,
+    resourceLabel: resourceLabel,
+    resourceURI: resourceURI,
+    uri: bcURI,
+  }
+}
+
 const templateHitsToResult = (hits) => ({
-  totalHits: hits.total.value,
-  results: hits.hits.map((row) => row._source),
+  totalHits: hits.length,
+  results: hits.map((row) => templateModFromBlueCore(row)),
 })
 
 const templateLookupToResult = (hits) => ({

src/utilities/SinopiaApiHelper.js

@@ -16,7 +16,7 @@ export const checkResp = (resp) => {
     })
     .catch((err) => {
       if (err.name === "ApiError") throw err
-      throw new Error(`Sinopia API returned ${resp.statusText}`)
+      throw new Error(`Blue Core API returned ${resp.statusText}`)
     })
 }
 
@@ -50,6 +50,4 @@ export const templateIdFor = (resource) => {
   return resourceIdProperty.values[0].literal
 }
 
-export const getJwt = (keycloak) => {
-  return keycloak.token
-}
+export const getJwt = (keycloak) => keycloak.token