refactor: use getXBlockAssetsApiUrl to get the library endpoint

openedx · Nov 11, 2024 · 9c189e4 · 9c189e4
1 parent 3bdd84a
commit 9c189e4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/editors/data/services/cms/api.test.ts b/src/editors/data/services/cms/api.test.ts
@@ -125,7 +125,7 @@ describe('cms api', () => {
           blockId, learningContextId, studioEndpointUrl, pageNumber: 0,
         });
         expect(get).toHaveBeenCalledWith(
-          urls.libraryAssets({ studioEndpointUrl, blockId }),
+          urls.libraryAssets({ blockId }),
         );
       });
     });
@@ -289,7 +289,7 @@ describe('cms api', () => {
           asset,
         });
         expect(put).toHaveBeenCalledWith(
-          `${urls.libraryAssets({ blockId, studioEndpointUrl })}static/${encodeURI(filename)}`,
+          `${urls.libraryAssets({ blockId, assetName: asset.name })}`,
           mockFormdata,
         );
       });

diff --git a/src/editors/data/services/cms/api.ts b/src/editors/data/services/cms/api.ts
@@ -125,7 +125,7 @@ export const apiMethods = {
   }): Promise<{ data: AssetResponse & Pagination }> => {
     if (isLibraryKey(learningContextId)) {
       return get(
-        `${urls.libraryAssets({ studioEndpointUrl, blockId })}`,
+        `${urls.libraryAssets({ blockId })}`,
       );
     }
     const params = {
@@ -157,7 +157,7 @@ export const apiMethods = {
     if (isLibraryKey(learningContextId)) {
       data.set('content', asset);
       return put(
-        `${urls.libraryAssets({ blockId, studioEndpointUrl })}static/${encodeURI(asset.name)}`,
+        `${urls.libraryAssets({ blockId, assetName: asset.name })}`,
         data,
       );
     }

diff --git a/src/editors/data/services/cms/urls.ts b/src/editors/data/services/cms/urls.ts
@@ -1,4 +1,5 @@
 import { isLibraryKey, isLibraryV1Key } from '../../../../generic/key-utils';
+import { getXBlockAssetsApiUrl } from '../../../../library-authoring/data/api';
 
 /**
  * A little helper so we can write the types of these functions more compactly
@@ -61,8 +62,10 @@ export const courseAssets = (({ studioEndpointUrl, learningContextId }) => (
   `${studioEndpointUrl}/assets/${learningContextId}/`
 )) satisfies UrlFunction;
 
-export const libraryAssets = (({ blockId, studioEndpointUrl }) => (
-  `${studioEndpointUrl}/api/libraries/v2/blocks/${blockId}/assets/`
+export const libraryAssets = (({ blockId, assetName }) => (
+  assetName
+    ? `${getXBlockAssetsApiUrl(blockId)}static/${encodeURI(assetName)}`
+    : `${getXBlockAssetsApiUrl(blockId)}`
 )) satisfies UrlFunction;
 
 export const thumbnailUpload = (({ studioEndpointUrl, learningContextId, videoId }) => (