fix: initialize

openedx · Nov 13, 2023 · 2674607 · 2674607
1 parent 65eee08
commit 2674607
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 46 deletions.
diff --git a/src/editors/containers/LibraryContentEditor/LibrarySelector.jsx b/src/editors/containers/LibraryContentEditor/LibrarySelector.jsx
@@ -72,11 +72,11 @@ LibrarySelector.defaultProps = {
 LibrarySelector.propTypes = {
   studioEndpointUrl: PropTypes.string.isRequired,
   // redux
-  libraries: PropTypes.shape([]),
+  libraries: PropTypes.array,
   loadLibrary: PropTypes.func.isRequired,
   selectedLibrary: PropTypes.number,
   onSelectLibrary: PropTypes.func.isRequired,
-  settings: PropTypes.shape({}),
+  settings: PropTypes.object,
   unloadLibrary: PropTypes.func.isRequired,
 };
 

diff --git a/src/editors/containers/LibraryContentEditor/data/urls.js b/src/editors/containers/LibraryContentEditor/data/urls.js
@@ -1,5 +1,5 @@
 export const contentStore = ({ studioEndpointUrl }) => (
-  `${studioEndpointUrl}/api/libraries/v1/home/`
+  `${studioEndpointUrl}/api/contentstore/v1/home/`
 );
 
 export const libraryProperty = ({ studioEndpointUrl, libraryId }) => (

diff --git a/src/editors/containers/LibraryContentEditor/hooks.js b/src/editors/containers/LibraryContentEditor/hooks.js
@@ -3,55 +3,52 @@ import { modes } from './constants';
 import api from './data/api';
 
 export const useLibraryHook = ({
-  blockFailed,
-  blockFinished,
   blockValue,
   initialize,
   libraryPayload,
   studioEndpointUrl,
 }) => {
-  useEffect(() => {
-    if (blockFinished && !blockFailed) {
-      const libraries = api.fetchContentStore({ studioEndpointUrl }).libraries;
-      const metadata = blockValue?.data?.metadata;
-      const selectedLibraryId = metadata?.source_library_id;
-      let selectedLibrary = null;
-      let selectedLibraryVersion = null;
-      let blocksInSelectedLibrary = [];
-      let settings = {};
-      if (!!selectedLibraryId) {
-        selectedLibrary = libraries.findIndex(library => {
-          library.library_key === selectedLibraryId
-        });
-        selectedLibraryVersion = api.fetchLibraryProperty({
-          studioEndpointUrl,
-          libraryId: selectedLibraryId,
-        }).version;
-        settings = {
-          [selectedLibrary]: {
-            mode: metadata?.mode,
-            count: metadata?.count,
-            showReset: metadata?.allow_resetting_children,
-            candidates: metadata?.candidates,
-          },
-        };
-        blocksInSelectedLibrary = api.fetchLibraryContent({
-          studioEndpointUrl,
-          libraryId: selectedLibraryId,
-        })?.results;
-      }
-      initialize({
-        libraries,
-        selectedLibrary,
-        selectedLibraryId: selectedLibraryId ? selectedLibraryId : null,
-        selectedLibraryVersion,
-        settings,
-        blocksInSelectedLibrary: blocksInSelectedLibrary ? blocksInSelectedLibrary : [],
+  const useInitialize = () => useEffect(() => {
+    const libraries = api.fetchContentStore({ studioEndpointUrl }).libraries;
+    const metadata = blockValue?.data?.metadata;
+    const selectedLibraryId = metadata?.source_library_id;
+    let selectedLibrary = null;
+    let selectedLibraryVersion = null;
+    let blocksInSelectedLibrary = [];
+    let settings = {};
+    if (!!selectedLibraryId) {
+      selectedLibrary = libraries.findIndex(library => {
+        library.library_key === selectedLibraryId
       });
+      selectedLibraryVersion = api.fetchLibraryProperty({
+        studioEndpointUrl,
+        libraryId: selectedLibraryId,
+      }).version;
+      settings = {
+        [selectedLibrary]: {
+          mode: metadata?.mode,
+          count: metadata?.count,
+          showReset: metadata?.allow_resetting_children,
+          candidates: metadata?.candidates,
+        },
+      };
+      blocksInSelectedLibrary = api.fetchLibraryContent({
+        studioEndpointUrl,
+        libraryId: selectedLibraryId,
+      })?.results;
     }
+    initialize({
+      libraries,
+      selectedLibrary,
+      selectedLibraryId: selectedLibraryId ? selectedLibraryId : null,
+      selectedLibraryVersion,
+      settings,
+      blocksInSelectedLibrary: blocksInSelectedLibrary ? blocksInSelectedLibrary : [],
+    });
   }, []);
 
   return {
+    useInitialize,
     getContent: () => libraryPayload,
   };
 };

diff --git a/src/editors/containers/LibraryContentEditor/index.jsx b/src/editors/containers/LibraryContentEditor/index.jsx
@@ -31,16 +31,19 @@ export const LibraryContentEditor = ({
   console.log("WE GOT THIS FAR");
   const {
     getContent,
+    useInitialize,
   } = useLibraryHook({
-    blockFailed,
-    blockFinished,
     blockValue,
     initialize,
     libraryPayload,
     studioEndpointUrl,
   });
   console.log("WE GOT THIS Hook FAR");
 
+  if (blockFinished && !blockFailed) {
+    useInitialize();
+  }
+
   const loading = () => (
     <div className="text-center p-6">
       <Spinner
@@ -84,6 +87,7 @@ LibraryContentEditor.defaultProps = {
   libraryPayload: {},
   selectedLibraryId: null,
   settings: {},
+  studioEndpointUrl: '',
 };
 
 LibraryContentEditor.propTypes = {
@@ -95,11 +99,10 @@ LibraryContentEditor.propTypes = {
   blockFailed: PropTypes.bool.isRequired,
   blockFinished: PropTypes.bool.isRequired,
   initialize: PropTypes.func.isRequired,
-  initializeEditor: PropTypes.func.isRequired,
   libraryPayload: PropTypes.shape({}),
   selectedLibraryId: PropTypes.string,
   settings: PropTypes.shape({}),
-  studioEndpointUrl: PropTypes.string.isRequired,
+  studioEndpointUrl: PropTypes.string,
   // inject
   intl: intlShape.isRequired,
 };