@databiosphere/findable-ui 16.0.0 → 17.0.0

package/lib/hooks/useRequestManifest/utils.d.ts

@@ -0,0 +1,65 @@
+import { ManifestDownloadFormat } from "../../apis/azul/common/entities";
+import { Filters } from "../../common/entities";
+import { FormFacet } from "../../components/Export/common/entities";
+import { FileManifestState } from "../../providers/fileManifestState";
+import { UseRequestManifest } from "./types";
+/**
+ * Returns true if all form facets have all their terms selected.
+ * @param formFacet - Form related file facets.
+ * @returns true if all form facets have all their terms selected.
+ */
+export declare function areAllFormFilterTermsSelected(formFacet: FormFacet): boolean;
+/**
+ * Generates the filters for a request URL based on the file manifest state.
+ * - **all form facets have all their terms selected** - returns filters from state without form filters.
+ * - **at least one form facet has an unselected term** - returns filters from state.
+ * @param state - File manifest state.
+ * @param formFacet - Form related file facets.
+ * @returns filters for the request URL.
+ */
+export declare function buildRequestFilters(state: FileManifestState, formFacet: FormFacet): Filters;
+/**
+ * Build up file manifest request params and URL query string for the given search results, catalog and format.
+ * @param endpointUrl - Data URL.
+ * @param catalog - Configured catalog.
+ * @param filters - Selected filters.
+ * @param manifestFormat - Manifest format.
+ * @returns file manifest request params and URL query string.
+ */
+export declare function buildRequestManifest(endpointUrl: string, catalog: string, filters: Filters, manifestFormat: ManifestDownloadFormat): Required<UseRequestManifest>;
+/**
+ * Returns filters, without form related filters.
+ * @param state - File manifest state.
+ * @param formFacet - Form related file facets.
+ * @returns filters.
+ */
+export declare function excludeFullySelectedFormFilters(state: FileManifestState, formFacet: FormFacet): Filters;
+/**
+ * Returns true if the catalog is defined.
+ * The catalog is defined via the configuration and is required for the file manifest request.
+ * @param catalog - Catalog.
+ * @returns true if the catalog is defined.
+ */
+export declare function isCatalogReady(catalog: string | undefined): boolean;
+/**
+ * Returns true if the file manifest state is ready for a request.
+ * A file manifest state is considered ready if it is both enabled (`isEnabled` is `true`)
+ * and not currently loading (`isLoading` is `false`).
+ * @param fileManifestState - File manifest state.
+ * @returns true if the file manifest state is ready for a request.
+ */
+export declare function isFileManifestStateReady(fileManifestState: FileManifestState): boolean;
+/**
+ * Checks if the file manifest format is ready for use.
+ * The file manifest format is considered ready if `fileManifestFormat` is defined.
+ * @param fileManifestFormat - File manifest format.
+ * @returns `true` if the `fileManifestFormat` is defined.
+ */
+export declare function isFileManifestFormatReady(fileManifestFormat: ManifestDownloadFormat | undefined): boolean;
+/**
+ * Checks if the form is ready to request a manifest.
+ * A form is considered ready if all facets have the `selected` term set to `true`.
+ * @param formFacet - Form related file facets.
+ * @returns `true` if all facets in the form are selected.
+ */
+export declare function isFormSelectionReady(formFacet: FormFacet): boolean;

package/lib/hooks/useRequestManifest/utils.js

@@ -0,0 +1,118 @@
+import { AZUL_PARAM, MANIFEST_DOWNLOAD_FORMAT, } from "../../apis/azul/common/entities";
+import { transformFilters } from "../../apis/azul/common/filterTransformer";
+import { REQUEST_MANIFEST } from "./constants";
+/**
+ * Returns true if all form facets have all their terms selected.
+ * @param formFacet - Form related file facets.
+ * @returns true if all form facets have all their terms selected.
+ */
+export function areAllFormFilterTermsSelected(formFacet) {
+    return Object.values(formFacet)
+        .filter(Boolean)
+        .every(({ selectedTermCount, termCount }) => selectedTermCount === termCount);
+}
+/**
+ * Generates the filters for a request URL based on the file manifest state.
+ * - **all form facets have all their terms selected** - returns filters from state without form filters.
+ * - **at least one form facet has an unselected term** - returns filters from state.
+ * @param state - File manifest state.
+ * @param formFacet - Form related file facets.
+ * @returns filters for the request URL.
+ */
+export function buildRequestFilters(state, formFacet) {
+    // Form terms are fully selected; return filters excluding form filters.
+    if (areAllFormFilterTermsSelected(formFacet)) {
+        return excludeFullySelectedFormFilters(state, formFacet);
+    }
+    // Form terms are partially selected; return filters.
+    return state.filters;
+}
+/**
+ * Build up file manifest request params and URL query string for the given search results, catalog and format.
+ * @param endpointUrl - Data URL.
+ * @param catalog - Configured catalog.
+ * @param filters - Selected filters.
+ * @param manifestFormat - Manifest format.
+ * @returns file manifest request params and URL query string.
+ */
+export function buildRequestManifest(endpointUrl, catalog, filters, manifestFormat) {
+    const requestParams = new URLSearchParams({
+        [AZUL_PARAM.CATALOG]: catalog,
+        [AZUL_PARAM.FILTERS]: transformFilters(filters),
+        format: manifestFormat,
+    });
+    const requestUrl = `${endpointUrl}fetch/manifest/files?${requestParams.toString()}`;
+    return {
+        ...REQUEST_MANIFEST,
+        requestParams,
+        requestUrl,
+    };
+}
+/**
+ * Returns filters, without form related filters.
+ * @param state - File manifest state.
+ * @param formFacet - Form related file facets.
+ * @returns filters.
+ */
+export function excludeFullySelectedFormFilters(state, formFacet) {
+    const filters = [];
+    const formFacetNames = getFormFacetNamesSet(formFacet);
+    for (const filter of state.filters) {
+        if (formFacetNames.has(filter.categoryKey))
+            continue;
+        filters.push(filter);
+    }
+    return filters;
+}
+/**
+ * Returns a set of form facet names.
+ * @param formFacet - Form related file facets.
+ * @returns set of form facet names.
+ */
+function getFormFacetNamesSet(formFacet) {
+    return new Set(Object.values(formFacet)
+        .filter(Boolean)
+        .map(({ name }) => name));
+}
+/**
+ * Returns true if the catalog is defined.
+ * The catalog is defined via the configuration and is required for the file manifest request.
+ * @param catalog - Catalog.
+ * @returns true if the catalog is defined.
+ */
+export function isCatalogReady(catalog) {
+    return typeof catalog === "string";
+}
+/**
+ * Returns true if the file manifest state is ready for a request.
+ * A file manifest state is considered ready if it is both enabled (`isEnabled` is `true`)
+ * and not currently loading (`isLoading` is `false`).
+ * @param fileManifestState - File manifest state.
+ * @returns true if the file manifest state is ready for a request.
+ */
+export function isFileManifestStateReady(fileManifestState) {
+    return fileManifestState.isEnabled && !fileManifestState.isLoading;
+}
+/**
+ * Checks if the file manifest format is ready for use.
+ * The file manifest format is considered ready if `fileManifestFormat` is defined.
+ * @param fileManifestFormat - File manifest format.
+ * @returns `true` if the `fileManifestFormat` is defined.
+ */
+export function isFileManifestFormatReady(fileManifestFormat) {
+    if (!fileManifestFormat)
+        return false;
+    return Object.values(MANIFEST_DOWNLOAD_FORMAT).includes(fileManifestFormat);
+}
+/**
+ * Checks if the form is ready to request a manifest.
+ * A form is considered ready if all facets have the `selected` term set to `true`.
+ * @param formFacet - Form related file facets.
+ * @returns `true` if all facets in the form are selected.
+ */
+export function isFormSelectionReady(formFacet) {
+    const facets = Object.values(formFacet).filter(Boolean);
+    if (facets.length === 0)
+        return false;
+    return facets.every(({ selected }) => selected);
+}

package/lib/mocks/useRequestFileManifest.mocks.d.ts

@@ -0,0 +1,11 @@
+import { Filters } from "../common/entities";
+import { FormFacet } from "../components/Export/common/entities";
+import { FileFacet } from "../hooks/useFileManifest/common/entities";
+import { ConfigContextProps } from "../providers/config";
+import { FileManifestState } from "../providers/fileManifestState";
+export declare const CATALOG: string | undefined;
+export declare const CONFIG: ConfigContextProps;
+export declare const FILE_FACET: Record<string, FileFacet>;
+export declare const FILTERS: Record<string, Filters>;
+export declare const FILE_MANIFEST_STATE: FileManifestState;
+export declare const FORM_FACET: Record<string, FormFacet>;

package/lib/mocks/useRequestFileManifest.mocks.js

@@ -0,0 +1,100 @@
+export const CATALOG = "catalog";
+const CATEGORY_KEY_NAME = {
+    CATEGORY_FILES: "files",
+    CATEGORY_OTHER: "other",
+    CATEGORY_SPECIES: "species",
+};
+export const CONFIG = {
+    config: { dataSource: { url: "https://mock-endpoint.com" } },
+};
+const FACET_PARTIAL = {
+    selectedTerms: [],
+    terms: [],
+    termsByName: new Map(),
+    total: 0,
+}; // `name`, `selected`, `selectedTermCount`, and `termCount` properties are not used in this test.
+export const FILE_FACET = {
+    FACET_FILES: {
+        ...FACET_PARTIAL,
+        name: CATEGORY_KEY_NAME.CATEGORY_FILES,
+        selected: false,
+        selectedTermCount: 0,
+        termCount: 2,
+    },
+    FACET_OTHER: {
+        ...FACET_PARTIAL,
+        name: CATEGORY_KEY_NAME.CATEGORY_OTHER,
+        selected: false,
+        selectedTermCount: 0,
+        termCount: 1,
+    },
+    FACET_SPECIES: {
+        ...FACET_PARTIAL,
+        name: CATEGORY_KEY_NAME.CATEGORY_SPECIES,
+        selected: false,
+        selectedTermCount: 0,
+        termCount: 3,
+    },
+};
+const FILTER_FILES = {
+    categoryKey: CATEGORY_KEY_NAME.CATEGORY_FILES,
+    value: ["file01", "file02"],
+};
+const FILTER_FILES_SUBSET = {
+    categoryKey: CATEGORY_KEY_NAME.CATEGORY_FILES,
+    value: ["file01"],
+};
+const FILTER_OTHER = {
+    categoryKey: CATEGORY_KEY_NAME.CATEGORY_OTHER,
+    value: ["other"],
+};
+const FILTER_SPECIES = {
+    categoryKey: CATEGORY_KEY_NAME.CATEGORY_SPECIES,
+    value: ["species01", "species02", "species03"],
+};
+export const FILTERS = {
+    FORM_COMPLETE_SET: [FILTER_FILES, FILTER_OTHER, FILTER_SPECIES],
+    FORM_INCOMPLETE_SET: [FILTER_FILES, FILTER_OTHER],
+    FORM_INITIAL_SET: [FILTER_OTHER],
+    FORM_SUBSET: [FILTER_FILES_SUBSET, FILTER_OTHER, FILTER_SPECIES],
+};
+export const FILE_MANIFEST_STATE = {
+    filters: FILTERS.FORM_INITIAL_SET,
+    isEnabled: true,
+    isLoading: false,
+};
+export const FORM_FACET = {
+    COMPLETE_SET: {
+        fileSummaryFacet: {
+            ...FILE_FACET.FACET_FILES,
+            selected: true,
+            selectedTermCount: FILE_FACET.FACET_FILES.termCount, // All terms selected.
+        },
+        speciesFacet: {
+            ...FILE_FACET.FACET_SPECIES,
+            selected: true,
+            selectedTermCount: FILE_FACET.FACET_SPECIES.termCount, // All terms selected.
+        },
+    },
+    INCOMPLETE_SET: {
+        fileSummaryFacet: {
+            ...FILE_FACET.FACET_FILES,
+            selected: true,
+            selectedTermCount: FILE_FACET.FACET_FILES.termCount, // All terms selected.
+        },
+        speciesFacet: FILE_FACET.FACET_SPECIES, // Species facet is unselected.
+    },
+    INITIAL_SET: { fileSummaryFacet: undefined, speciesFacet: undefined },
+    SUBSET: {
+        fileSummaryFacet: {
+            ...FILE_FACET.FACET_FILES,
+            selected: true,
+            selectedTermCount: 1, // One of a possible two terms selected.
+        },
+        speciesFacet: {
+            ...FILE_FACET.FACET_SPECIES,
+            selected: true,
+            selectedTermCount: 1, // One of a possible three terms selected.
+        },
+    },
+};

package/lib/providers/fileManifestState/constants.d.ts

@@ -1,4 +1,2 @@
-import { FILE_MANIFEST_TYPE } from "../../hooks/useFileManifest/common/entities";
 import { FileManifestState } from "../fileManifestState";
-export declare const ENTITIES_FILE_MANIFEST_TYPES: FILE_MANIFEST_TYPE[];
 export declare const FILE_MANIFEST_STATE: FileManifestState;

package/lib/providers/fileManifestState/constants.js

@@ -1,17 +1,8 @@
-import { FILE_MANIFEST_TYPE, FILES_FACETS_STATUS, } from "../../hooks/useFileManifest/common/entities";
-export const ENTITIES_FILE_MANIFEST_TYPES = [
-    FILE_MANIFEST_TYPE.BULK_DOWNLOAD,
-    FILE_MANIFEST_TYPE.DOWNLOAD_MANIFEST,
-    FILE_MANIFEST_TYPE.EXPORT_TO_TERRA,
-];
 export const FILE_MANIFEST_STATE = {
-    fileManifestFormat: undefined,
-    fileManifestType: undefined,
     fileSummary: undefined,
     fileSummaryFacetName: undefined,
     fileSummaryFilters: [],
     filesFacets: [],
-    filesFacetsStatus: FILES_FACETS_STATUS.NOT_STARTED,
     filters: [],
     isEnabled: false,
     isFacetsLoading: false,
@@ -19,7 +10,5 @@ export const FILE_MANIFEST_STATE = {
     isFileSummaryLoading: false,
     isLoading: false,
     isSummaryLoading: false,
-    requestParams: undefined,
-    requestURL: undefined,
     summary: undefined,
 };

package/lib/providers/fileManifestState.d.ts

@@ -1,15 +1,12 @@
 import React, { Dispatch, ReactNode } from "react";
-import { AzulSummaryResponse, ManifestDownloadFormat } from "../apis/azul/common/entities";
+import { AzulSummaryResponse } from "../apis/azul/common/entities";
 import { CategoryKey, CategoryValueKey, Filters } from "../common/entities";
-import { FileFacet, FileManifestType, FILES_FACETS_STATUS } from "../hooks/useFileManifest/common/entities";
+import { FileFacet } from "../hooks/useFileManifest/common/entities";
 /**
  * File manifest state.
  */
 export type FileManifestState = {
-    fileManifestFormat?: ManifestDownloadFormat;
-    fileManifestType?: FileManifestType;
     filesFacets: FileFacet[];
-    filesFacetsStatus: FILES_FACETS_STATUS;
     fileSummary?: AzulSummaryResponse;
     fileSummaryFacetName?: string;
     fileSummaryFilters: Filters;
@@ -20,8 +17,6 @@ export type FileManifestState = {
     isFileSummaryLoading: boolean;
     isLoading: boolean;
     isSummaryLoading: boolean;
-    requestParams?: URLSearchParams;
-    requestURL?: string;
     summary?: AzulSummaryResponse;
 };
 /**
@@ -43,14 +38,13 @@ export declare enum FileManifestActionKind {
     ClearFileManifest = "CLEAR_FILE_MANIFEST",
     FetchFileManifest = "FETCH_FILE_MANIFEST",
     UpdateFileManifest = "UPDATE_FILE_MANIFEST",
-    UpdateFileManifestFormat = "UPDATE_FILE_MANIFEST_FORMAT",
     UpdateFilter = "UPDATE_FILTER",
     UpdateFiltersCategory = "UPDATE_FILTERS_CATEGORY"
 }
 /**
  * File manifest action.
  */
-export type FileManifestAction = ClearFileManifestAction | FetchFileManifestAction | UpdateFileManifestAction | UpdateFileManifestFormatAction | UpdateFilterAction | UpdateFiltersCategoryAction;
+export type FileManifestAction = ClearFileManifestAction | FetchFileManifestAction | UpdateFileManifestAction | UpdateFilterAction | UpdateFiltersCategoryAction;
 /**
  * Resets file manifest state.
  */
@@ -72,13 +66,6 @@ type UpdateFileManifestAction = {
     payload: UpdateFileManifestPayload;
     type: FileManifestActionKind.UpdateFileManifest;
 };
-/**
- * Update file manifest format action.
- */
-type UpdateFileManifestFormatAction = {
-    payload: ManifestDownloadFormat | undefined;
-    type: FileManifestActionKind.UpdateFileManifestFormat;
-};
 /**
  * Update filter action.
  */
@@ -97,8 +84,6 @@ type UpdateFiltersCategoryAction = {
  * Initialize file manifest payload.
  */
 type FetchFileManifestPayload = {
-    fileManifestFormat?: ManifestDownloadFormat;
-    fileManifestType?: FileManifestType;
     fileSummaryFacetName?: string;
     filters: Filters;
 };
@@ -123,11 +108,4 @@ export type UpdateFilterPayload = {
     selected: boolean;
     selectedValue: CategoryValueKey;
 };
-/**
- * File manifest context.
- */
-export interface FileManifestContext {
-    catalog: string;
-    URL: string;
-}
 export {};

package/lib/providers/fileManifestState.js

@@ -2,14 +2,9 @@ import React, { createContext, useEffect, useReducer, } from "react";
 import { getFilterParameterValue } from "../apis/azul/common/utils";
 import { useCatalog } from "../hooks/useCatalog";
 import { buildNextFilterState } from "../hooks/useCategoryFilter";
-import { buildFileManifestRequestURL } from "../hooks/useFileManifest/common/buildFileManifestRequestURL";
-import { FILES_FACETS_STATUS, } from "../hooks/useFileManifest/common/entities";
 import { useFetchFilesFacets } from "../hooks/useFileManifest/useFetchFilesFacets";
 import { useFetchSummary } from "../hooks/useFileManifest/useFetchSummary";
-import { useFileManifestURL } from "../hooks/useFileManifest/useFileManifestURL";
-import { updateFileManifestAction } from "./fileManifestState/actions";
 import { FILE_MANIFEST_STATE } from "./fileManifestState/constants";
-import { getRequestFilters } from "./fileManifestState/utils";
 export const FileManifestStateContext = createContext({
     // eslint-disable-next-line @typescript-eslint/no-empty-function -- allow dummy function for default state.
     fileManifestDispatch: () => { },
@@ -18,10 +13,8 @@ export const FileManifestStateContext = createContext({
 export function FileManifestStateProvider({ children, }) {
     // Determine catalog.
     const catalog = useCatalog(); // catalog should be defined.
-    // Determine file manifest request data URL.
-    const URL = useFileManifestURL();
     // File manifest state.
-    const [fileManifestState, fileManifestDispatch] = useReducer((s, a) => fileManifestReducer(s, a, { URL, catalog }), FILE_MANIFEST_STATE);
+    const [fileManifestState, fileManifestDispatch] = useReducer((s, a) => fileManifestReducer(s, a), FILE_MANIFEST_STATE);
     const { fileSummaryFacetName, fileSummaryFilters, filters, isEnabled } = fileManifestState;
     // Fetch files facets.
     const { filesFacets, isLoading: isFacetsLoading, isSuccess: isFacetsSuccess, } = useFetchFilesFacets(filters, catalog, { size: "25" }, isEnabled);
@@ -66,7 +59,6 @@ export var FileManifestActionKind;
     FileManifestActionKind["ClearFileManifest"] = "CLEAR_FILE_MANIFEST";
     FileManifestActionKind["FetchFileManifest"] = "FETCH_FILE_MANIFEST";
     FileManifestActionKind["UpdateFileManifest"] = "UPDATE_FILE_MANIFEST";
-    FileManifestActionKind["UpdateFileManifestFormat"] = "UPDATE_FILE_MANIFEST_FORMAT";
     FileManifestActionKind["UpdateFilter"] = "UPDATE_FILTER";
     FileManifestActionKind["UpdateFiltersCategory"] = "UPDATE_FILTERS_CATEGORY";
 })(FileManifestActionKind || (FileManifestActionKind = {}));
@@ -74,22 +66,16 @@ export var FileManifestActionKind;
  * File manifest reducer.
  * @param state - File manifest state.
  * @param action - File manifest action.
- * @param fileManifestContext - File manifest context.
  * @returns file manifest state.
  */
-function fileManifestReducer(state, action, fileManifestContext) {
+function fileManifestReducer(state, action) {
     const { payload, type } = action;
-    const { catalog, URL } = fileManifestContext;
     switch (type) {
         // Resets file manifest.
         case FileManifestActionKind.ClearFileManifest: {
             return {
                 ...state,
-                fileManifestFormat: undefined,
-                filesFacetsStatus: FILES_FACETS_STATUS.NOT_STARTED,
                 isEnabled: false,
-                requestParams: undefined,
-                requestURL: undefined,
             };
         }
         // Fetches file manifest.
@@ -101,24 +87,11 @@ function fileManifestReducer(state, action, fileManifestContext) {
                 ...payload,
                 fileSummaryFilters,
                 isEnabled: true,
-                requestParams: undefined,
-                requestURL: undefined,
             };
         }
         // Updates file manifest.
         case FileManifestActionKind.UpdateFileManifest: {
-            return updateFileManifestAction(state, payload, fileManifestContext);
-        }
-        // Updates file manifest format.
-        case FileManifestActionKind.UpdateFileManifestFormat: {
-            // Build request params and request URL.
-            const { requestParams, requestURL } = buildFileManifestRequestURL(URL, getRequestFilters(state), catalog, payload) || {};
-            return {
-                ...state,
-                fileManifestFormat: payload,
-                requestParams,
-                requestURL,
-            };
+            return { ...state, ...payload };
         }
         // Updates selected file manifest filters with given selected category value.
         case FileManifestActionKind.UpdateFilter: {
@@ -130,10 +103,7 @@ function fileManifestReducer(state, action, fileManifestContext) {
             return {
                 ...state,
                 fileSummaryFilters,
-                filesFacetsStatus: FILES_FACETS_STATUS.NOT_STARTED,
                 filters,
-                requestParams: undefined,
-                requestURL: undefined,
             };
         }
         // Updates selected file manifest filters by category.
@@ -145,10 +115,7 @@ function fileManifestReducer(state, action, fileManifestContext) {
             return {
                 ...state,
                 fileSummaryFilters,
-                filesFacetsStatus: FILES_FACETS_STATUS.NOT_STARTED,
                 filters,
-                requestParams: undefined,
-                requestURL: undefined,
             };
         }
         default:

package/lib/views/ExportView/exportView.js

@@ -3,12 +3,12 @@ import { ComponentCreator } from "../../components/ComponentCreator/ComponentCre
 import { BackPageView } from "../../components/Layout/components/BackPage/backPageView";
 import { useExploreState } from "../../hooks/useExploreState";
 import { useExportConfig } from "../../hooks/useExportConfig";
-import { useRequestFileManifest } from "../../hooks/useFileManifest/useRequestFileManifest";
+import { useFileManifest } from "../../hooks/useFileManifest/useFileManifest";
 import { useUpdateURLSearchParams } from "../../hooks/useUpdateURLSearchParams";
 export const ExportView = (props) => {
     const { exploreState: { filterState }, } = useExploreState();
     useUpdateURLSearchParams();
-    useRequestFileManifest(undefined, undefined, filterState, undefined);
+    useFileManifest(filterState, undefined);
     const { tabs, top } = useExportConfig();
     const currentTab = tabs[0];
     const { mainColumn, sideColumn } = currentTab;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@databiosphere/findable-ui",
-  "version": "16.0.0",
+  "version": "17.0.0",
   "description": "",
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",

package/src/components/Export/components/DownloadCurlCommand/downloadCurlCommand.tsx

@@ -4,13 +4,17 @@ import { Filters } from "../../../../common/entities";
 import { useExploreState } from "../../../../hooks/useExploreState";
 import { FileManifestType } from "../../../../hooks/useFileManifest/common/entities";
 import { useFileManifest } from "../../../../hooks/useFileManifest/useFileManifest";
-import { useRequestFileManifest } from "../../../../hooks/useFileManifest/useRequestFileManifest";
-import { FileLocation } from "../../../../hooks/useRequestFileLocation";
+import {
+  FileLocation,
+  useRequestFileLocation,
+} from "../../../../hooks/useRequestFileLocation";
+import { useRequestManifest } from "../../../../hooks/useRequestManifest/useRequestManifest";
 import { FileManifestState } from "../../../../providers/fileManifestState";
 import {
   BULK_DOWNLOAD_EXECUTION_ENVIRONMENT,
   ExecutionEnvironment,
   FormFacet,
+  ManifestDownloadFormat,
 } from "../../common/entities";
 import { trackBulkDownloadRequested } from "../../common/tracking";
 import { DownloadCurlCommandNotStarted } from "./components/DownloadCurlCommandNotStarted/downloadCurlCommandNotStarted";
@@ -25,6 +29,7 @@ interface DownloadCurlCommandProps {
   fileSummaryFacetName: string;
   filters: Filters; // Initializes bulk download filters.
   formFacet: FormFacet;
+  manifestDownloadFormat?: ManifestDownloadFormat;
 }
 
 export const DownloadCurlCommand = ({
@@ -32,23 +37,25 @@ export const DownloadCurlCommand = ({
   DownloadCurlStart,
   DownloadCurlSuccess,
   fileManifestState,
-  fileManifestType,
   fileSummaryFacetName,
   filters,
   formFacet,
+  manifestDownloadFormat = MANIFEST_DOWNLOAD_FORMAT.CURL,
 }: DownloadCurlCommandProps): JSX.Element => {
-  useRequestFileManifest(
-    fileManifestType,
-    MANIFEST_DOWNLOAD_FORMAT.CURL,
-    filters,
-    fileSummaryFacetName
-  );
+  useFileManifest(filters, fileSummaryFacetName);
   const [executionEnvironment, setExecutionEnvironment] =
     useState<ExecutionEnvironment>(BULK_DOWNLOAD_EXECUTION_ENVIRONMENT.BASH);
   const {
     exploreState: { tabValue: entityList },
   } = useExploreState();
-  const { data, isLoading, run } = useFileManifest();
+  const { requestMethod, requestUrl } = useRequestManifest(
+    manifestDownloadFormat,
+    formFacet
+  );
+  const { data, isLoading, run } = useRequestFileLocation(
+    requestUrl,
+    requestMethod
+  );
   const curlCommand = getBulkDownloadCurlCommand(data, executionEnvironment);
   return curlCommand ? (
     <DownloadCurlCommandReady

package/src/components/Export/components/ExportForm/components/ExportManifestDownloadFormatForm/exportManifestDownloadFormatForm.tsx

@@ -1,42 +1,33 @@
 import { FormControlLabel, FormLabel, Radio, RadioGroup } from "@mui/material";
 import React from "react";
-import { useFileManifestState } from "../../../../../../hooks/useFileManifestState";
-import { FileManifestActionKind } from "../../../../../../providers/fileManifestState";
+import { FileManifestFormatState } from "../../../../../../hooks/useFileManifest/useFileManifestFormat";
 import { RadioCheckedIcon } from "../../../../../common/CustomIcon/components/RadioCheckedIcon/radioCheckedIcon";
 import { RadioUncheckedIcon } from "../../../../../common/CustomIcon/components/RadioUncheckedIcon/radioUncheckedIcon";
 import { ManifestDownloadFormat } from "../../../../common/entities";
 import { FormControl } from "../../exportForm.styles";
 
 export interface ExportManifestDownloadFormatFormProps {
-  manifestDownloadFormat?: ManifestDownloadFormat;
+  fileManifestFormatState: FileManifestFormatState;
   manifestDownloadFormats: ManifestDownloadFormat[];
 }
 
 export const ExportManifestDownloadFormatForm = ({
-  manifestDownloadFormat,
+  fileManifestFormatState,
   manifestDownloadFormats,
 }: ExportManifestDownloadFormatFormProps): JSX.Element => {
-  const { fileManifestDispatch } = useFileManifestState();
-
-  // Updates file manifest format state.
-  const onUpdateManifestFormat = (format: ManifestDownloadFormat): void => {
-    fileManifestDispatch({
-      payload: format,
-      type: FileManifestActionKind.UpdateFileManifestFormat,
-    });
-  };
-
   return (
     <FormControl>
       <FormLabel>Download Format</FormLabel>
-      <RadioGroup value={manifestDownloadFormat ?? ""}>
+      <RadioGroup value={fileManifestFormatState.fileManifestFormat ?? ""}>
         {manifestDownloadFormats.map((manifestFormat) => (
           <FormControlLabel
             control={
               <Radio
                 checkedIcon={<RadioCheckedIcon />}
                 icon={<RadioUncheckedIcon />}
-                onChange={(): void => onUpdateManifestFormat(manifestFormat)}
+                onChange={(): void =>
+                  fileManifestFormatState.setFileManifestFormat(manifestFormat)
+                }
                 size="small"
                 value={manifestFormat}
               />