feat: Saves Resource Template to Blue Core API

Author: jermnelson

src/actionCreators/resources.js

@@ -54,7 +54,6 @@ export const loadResource =
   (uri, errorKey, { asNewResource = false, version = null } = {}) =>
   (dispatch) => {
     dispatch(clearErrors(errorKey))
-    console.log(`In actionCreators/resources.js loadResource`, uri)
     return fetchResource(uri, { version })
       .then(([dataset, response]) => {
         if (!dataset) return false
@@ -104,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
@@ -124,7 +123,7 @@ export const dispatchResourceForEditor =
     )
     dispatch(setCurrentResource(resource.key))
     if (!asNewResource) {
-      dispatch(addUserResourceHistory(uri))
+      dispatch(addUserResourceHistory(uri, keycloak))
       dispatch(
         addResourceHistory(
           resource.uri,
@@ -312,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/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/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/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