diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage/StorageBrowserTabContents/StorageBrowserTabContent.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage/StorageBrowserTabContents/StorageBrowserTabContent.tsx index 24cb46a570b..8c5715970b0 100644 --- a/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage/StorageBrowserTabContents/StorageBrowserTabContent.tsx +++ b/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage/StorageBrowserTabContents/StorageBrowserTabContent.tsx @@ -60,8 +60,7 @@ const StorageBrowserTabContent = ({ data: filesData, loading, reloadData - } = useLoadData(filePath, { - urlPrefix: VIEWFILES_API_URl, + } = useLoadData(`${VIEWFILES_API_URl}${filePath}`, { params: { pagesize: pageSize.toString(), pagenum: pageNumber.toString(), diff --git a/desktop/core/src/desktop/js/reactComponents/FileChooser/FileChooserModal/FileChooserModal.tsx b/desktop/core/src/desktop/js/reactComponents/FileChooser/FileChooserModal/FileChooserModal.tsx index afbc270eb45..340b1dc8bc9 100644 --- a/desktop/core/src/desktop/js/reactComponents/FileChooser/FileChooserModal/FileChooserModal.tsx +++ b/desktop/core/src/desktop/js/reactComponents/FileChooser/FileChooserModal/FileChooserModal.tsx @@ -72,10 +72,12 @@ const FileChooserModal: React.FC = ({ show, onCancel, title, okText } } }, [fileSystemsData]); - const { data: filesData, loading: loadingFiles } = useLoadData(filePath, { - urlPrefix: VIEWFILES_API_URl, - skip: !!filePath - }); + const { data: filesData, loading: loadingFiles } = useLoadData( + `${VIEWFILES_API_URl}${filePath}`, + { + skip: !!filePath + } + ); return ( { }); }); - it('should handle URL prefix correctly', async () => { - const { result } = renderHook(() => useLoadData(mockEndpoint, { urlPrefix: mockUrlPrefix })); - - expect(result.current.data).toBeUndefined(); - expect(result.current.error).toBeUndefined(); - expect(result.current.loading).toBe(true); - - await waitFor(() => { - expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object)); - expect(result.current.data).toEqual(mockData); - expect(result.current.error).toBeUndefined(); - expect(result.current.loading).toBe(false); - }); - }); - it('should update options correctly', async () => { const { result, rerender } = renderHook( (props: { url: string; options }) => useLoadData(props.url, props.options), diff --git a/desktop/core/src/desktop/js/utils/hooks/useLoadData.ts b/desktop/core/src/desktop/js/utils/hooks/useLoadData.ts index 408656ee2a5..fd4c326cc75 100644 --- a/desktop/core/src/desktop/js/utils/hooks/useLoadData.ts +++ b/desktop/core/src/desktop/js/utils/hooks/useLoadData.ts @@ -18,7 +18,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { ApiFetchOptions, get } from '../../api/utils'; export interface Options { - urlPrefix?: string; params?: U; fetchOptions?: ApiFetchOptions; skip?: boolean; @@ -63,8 +62,7 @@ const useLoadData = ( setError(undefined); try { - const fetchUrl = localOptions?.urlPrefix ? `${localOptions.urlPrefix}${url}` : url; - const response = await get(fetchUrl, localOptions?.params, fetchOptions); + const response = await get(url, localOptions?.params, fetchOptions); setData(response); if (localOptions?.onSuccess) { localOptions.onSuccess(response);