new parameters need to be reflected on frontend

clowder-framework · Jul 24, 2024 · 5b22727 · 5b22727
1 parent 82f7be6
commit 5b22727
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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();
  }
  };