diff --git a/docker-compose.yml b/docker-compose.yml index c23660a7c..f74ad11b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: RABBITMQ_HOST: ${RABBITMQ_HOST:-rabbitmq} RABBITMQ_USER: ${RABBITMQ_USER:-guest} RABBITMQ_PASS: ${RABBITMQ_PASS:-guest} - API_HOST: ${API_HOST:-http://localhost} + API_HOST: ${API_HOST:-http://backend} elasticsearch_url: http://elasticsearch:9200 auth_base: http://localhost auth_realm: clowder diff --git a/frontend/src/actions/dataset.js b/frontend/src/actions/dataset.js index d8dc6575a..53cb01d57 100644 --- a/frontend/src/actions/dataset.js +++ b/frontend/src/actions/dataset.js @@ -142,6 +142,7 @@ export function submitDatasetExtractionAction( return V2.DatasetsService.getDatasetExtractApiV2DatasetsDatasetIdExtractPost( datasetId, extractorName, + null, requestBody ) .then((json) => { diff --git a/frontend/src/actions/file.js b/frontend/src/actions/file.js index 274aeaeca..dfc736a0a 100644 --- a/frontend/src/actions/file.js +++ b/frontend/src/actions/file.js @@ -344,12 +344,18 @@ export function generateFilePresignedUrl( export const SUBMIT_FILE_EXTRACTION = "SUBMIT_FILE_EXTRACTION"; -export function submitFileExtractionAction(fileId, extractorName, requestBody) { +export function submitFileExtractionAction( + fileId, + extractorName, + datasetId, + requestBody +) { return (dispatch) => { return V2.FilesService.postFileExtractApiV2FilesFileIdExtractPost( fileId, extractorName, null, + datasetId, requestBody ) .then((json) => { diff --git a/frontend/src/components/listeners/SubmitExtraction.tsx b/frontend/src/components/listeners/SubmitExtraction.tsx index 066015dbc..da79345c0 100644 --- a/frontend/src/components/listeners/SubmitExtraction.tsx +++ b/frontend/src/components/listeners/SubmitExtraction.tsx @@ -55,8 +55,12 @@ export default function SubmitExtraction(props: SubmitExtractionProps) { const submitFileExtraction = ( fileId: string | undefined, extractorName: string | undefined, + datasetId: string | undefined, requestBody: FormData - ) => dispatch(submitFileExtractionAction(fileId, extractorName, requestBody)); + ) => + dispatch( + submitFileExtractionAction(fileId, extractorName, datasetId, requestBody) + ); const submitDatasetExtraction = ( datasetId: string | undefined, extractorName: string | undefined, @@ -74,7 +78,7 @@ export default function SubmitExtraction(props: SubmitExtractionProps) { submitDatasetExtraction(datasetId, extractorName, formData); handleNext(); } else if (fileId !== undefined) { - submitFileExtraction(fileId, extractorName, formData); + submitFileExtraction(fileId, extractorName, datasetId, formData); handleNext(); } };