@gen3/frontend 0.10.89 → 0.10.91

package/dist/cjs/index.js

@@ -682,7 +682,6 @@ const workspaceShutdownAlertLimit = 30000; // 5 minutes: 5 * 60 * 1000 TODO Figu
     const dispatch = core.useCoreDispatch();
     React.useEffect(()=>{
         if (isWorkspaceStatusError) {
-            console.error('Workspace model error: ', workspaceStatusError.toString());
             dispatch(core.setActiveWorkspaceStatus(core.WorkspaceStatus.StatusError));
             setPollingInterval(0); // stop polling
             setPaymentPollingInterval(0);
@@ -885,6 +884,7 @@ const UPDATE_SESSION_LIMIT = MinutesToMilliseconds(5);
  */ const SessionProvider = ({ children, updateSessionTime = 5, inactiveTimeLimit = 20, workspaceInactivityTimeLimit = 0, logoutInactiveUsers = true, monitorWorkspace = true })=>{
     const router$1 = router.useRouter();
     const coreDispatch = core.useCoreDispatch();
+    core.useGetCSRFQuery();
     useWorkspaceResourceMonitor(monitorWorkspace); // monitor workspaces if any are running or configured
     const [getUserDetails] = core.useLazyFetchUserDetailsQuery(); // Fetch user details
     const userStatus = core.useCoreSelector((state)=>core.selectUserAuthStatus(state));
@@ -3747,6 +3747,23 @@ const NavPageLayout = ({ headerProps, footerProps, mainProps, headerData, childr
 
 var classes = {"tableRow":"DiscoveryTable-module_tableRow__yFUJZ"};
 
+const isSearchKV = (obj)=>{
+    return obj && obj.key && obj.value;
+};
+const isSearchKVArray = (obj)=>{
+    return obj && Array.isArray(obj) && obj.every(isSearchKV);
+};
+const accessibleFieldName = '__accessible';
+var AccessLevel = /*#__PURE__*/ function(AccessLevel) {
+    AccessLevel[AccessLevel["ACCESSIBLE"] = 1] = "ACCESSIBLE";
+    AccessLevel[AccessLevel["UNACCESSIBLE"] = 2] = "UNACCESSIBLE";
+    AccessLevel[AccessLevel["WAITING"] = 3] = "WAITING";
+    AccessLevel[AccessLevel["NOT_AVAILABLE"] = 4] = "NOT_AVAILABLE";
+    AccessLevel[AccessLevel["OTHER"] = 5] = "OTHER";
+    AccessLevel[AccessLevel["MIXED"] = 6] = "MIXED";
+    return AccessLevel;
+}({});
+
 const jsonPathAccessor$1 = (path)=>(row)=>{
         // TODO: add logging if path is not found
         return jsonpathPlus.JSONPath({
@@ -3755,7 +3772,14 @@ const jsonPathAccessor$1 = (path)=>(row)=>{
         });
     };
 const getTagInfo = (tagData, tagsConfig)=>{
-    const categoryConfig = tagsConfig.tagCategories.find((category)=>category.name === tagData.category);
+    if (tagData.category === undefined) {
+        return {
+            color: 'darkgray',
+            display: tagsConfig?.showUnknownTags ?? false,
+            label: tagData.name
+        };
+    }
+    const categoryConfig = tagsConfig?.tagCategories.find((category)=>category.name === tagData.category);
     if (categoryConfig === undefined) return {
         color: 'gray',
         display: tagsConfig?.showUnknownTags ?? false,
@@ -3772,6 +3796,29 @@ const getManualSortingAndPagination = (config)=>{
     const sortingAndPagination = config?.features?.dataLoader?.sortingAndPagination ?? defaultFeature;
     return sortingAndPagination === 'server';
 };
+/**
+ * Converts a numeric value to its equivalent AccessLevel enum value
+ * @param value - The numeric value to convert (1-6)
+ * @returns The corresponding AccessLevel enum value or undefined if not found
+ */ const getAccessLevelFromNumber = (value)=>{
+    if (value === undefined) return undefined;
+    switch(value){
+        case AccessLevel.ACCESSIBLE:
+            return AccessLevel.ACCESSIBLE;
+        case AccessLevel.UNACCESSIBLE:
+            return AccessLevel.UNACCESSIBLE;
+        case AccessLevel.WAITING:
+            return AccessLevel.WAITING;
+        case AccessLevel.NOT_AVAILABLE:
+            return AccessLevel.NOT_AVAILABLE;
+        case AccessLevel.OTHER:
+            return AccessLevel.OTHER;
+        case AccessLevel.MIXED:
+            return AccessLevel.MIXED;
+        default:
+            return undefined;
+    }
+};
 
 const defaultCellRenderer = (value, params)=>{
     if (value === undefined || value === null || lodash.toString(value) === '') {
@@ -3782,11 +3829,8 @@ const defaultCellRenderer = (value, params)=>{
             ]
         });
     }
-    return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Text, {
-        children: [
-            lodash.toString(value),
-            "dfdsfdsf"
-        ]
+    return /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
+        children: lodash.toString(value)
     });
 };
 class DiscoveryCellRendererFactory {
@@ -3931,45 +3975,94 @@ const DiscoveryProvider = ({ children, discoveryIndexConfig })=>{
     });
 };
 
-const isSearchKV = (obj)=>{
-    return obj && obj.key && obj.value;
-};
-const isSearchKVArray = (obj)=>{
-    return obj && Array.isArray(obj) && obj.every(isSearchKV);
+const buildTooltip = (mainMessage, secondaryMessage)=>{
+    return /*#__PURE__*/ jsxRuntime.jsxs("div", {
+        className: "flex flex-col",
+        children: [
+            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Text, {
+                size: "sm",
+                children: [
+                    " ",
+                    mainMessage,
+                    " "
+                ]
+            }),
+            secondaryMessage ? /*#__PURE__*/ jsxRuntime.jsxs("div", {
+                className: "flex flex-col items-start my-1",
+                children: [
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Divider, {}),
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
+                        size: "xs",
+                        children: secondaryMessage
+                    })
+                ]
+            }) : null
+        ]
+    });
 };
-const accessibleFieldName = '__accessible';
-var AccessLevel = /*#__PURE__*/ function(AccessLevel) {
-    AccessLevel[AccessLevel["ACCESSIBLE"] = 1] = "ACCESSIBLE";
-    AccessLevel[AccessLevel["UNACCESSIBLE"] = 2] = "UNACCESSIBLE";
-    AccessLevel[AccessLevel["PENDING"] = 3] = "PENDING";
-    AccessLevel[AccessLevel["NOT_AVAILABLE"] = 4] = "NOT_AVAILABLE";
-    AccessLevel[AccessLevel["OTHER"] = 5] = "OTHER";
-    return AccessLevel;
-}({});
-
-const DataAccessCellRenderer = ({ value })=>{
-    if (value === AccessLevel.PENDING) {
-        return /*#__PURE__*/ jsxRuntime.jsx(lu.LuClock, {
-            color: "yellow",
-            children: "Your access to this study is pending."
+const DataAccessCellRenderer = ({ cell, row }, params)=>{
+    const authzField = params?.authzField || 'authz';
+    let value = cell?.getValue();
+    const authorization = row?.original?.[authzField] || undefined;
+    if (lodash.isArray(value)) value = value[0];
+    const accessLevel = getAccessLevelFromNumber(value);
+    if (!accessLevel) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+            label: buildTooltip('Unable to determine access level'),
+            children: /*#__PURE__*/ jsxRuntime.jsx(lu.LuCircleSlash, {
+                className: "text-utility-error"
+            })
         });
     }
-    if (value === AccessLevel.NOT_AVAILABLE) {
-        return /*#__PURE__*/ jsxRuntime.jsx(lu.LuCircleSlash, {
-            color: "red",
-            children: "Cannot determine access to this study. Please contact the study owner."
+    if (accessLevel === AccessLevel.WAITING) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+            label: buildTooltip('Data are not yet available'),
+            children: /*#__PURE__*/ jsxRuntime.jsx(lu.LuClock, {
+                className: "text-utility-warning"
+            })
         });
     }
-    if (value === AccessLevel.ACCESSIBLE) {
-        return /*#__PURE__*/ jsxRuntime.jsx(lu.LuUnlock, {
-            color: "green",
-            children: "You have access to this study."
+    if (accessLevel === AccessLevel.MIXED) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+            label: buildTooltip('You have mixed acccess'),
+            children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Group, {
+                children: [
+                    /*#__PURE__*/ jsxRuntime.jsx(lu.LuLock, {
+                        className: "text-utility-warning"
+                    }),
+                    /*#__PURE__*/ jsxRuntime.jsx(lu.LuUnlock, {
+                        className: "text-utility-warning"
+                    })
+                ]
+            })
         });
     }
-    if (value === AccessLevel.UNACCESSIBLE) {
-        return /*#__PURE__*/ jsxRuntime.jsx(lu.LuLock, {
-            color: "red",
-            children: "You do not have access to this study."
+    if (accessLevel === AccessLevel.NOT_AVAILABLE) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+            label: buildTooltip('No data is shared'),
+            children: /*#__PURE__*/ jsxRuntime.jsx(lu.LuCircleSlash, {
+                className: "text-utility-error"
+            })
+        });
+    }
+    if (accessLevel === AccessLevel.ACCESSIBLE) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+            label: buildTooltip('You have access to this study', `read access to ${authorization}`),
+            children: /*#__PURE__*/ jsxRuntime.jsx("div", {
+                children: /*#__PURE__*/ jsxRuntime.jsx(lu.LuUnlock, {
+                    className: "text-utility-success"
+                })
+            })
+        });
+    }
+    if (accessLevel === AccessLevel.UNACCESSIBLE) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+            label: buildTooltip('You currently do not have access to this study', `you need read access to ${authorization}`),
+            children: /*#__PURE__*/ jsxRuntime.jsx("div", {
+                children: /*#__PURE__*/ jsxRuntime.jsx(lu.LuLock, {
+                    className: "text-utility-error"
+                })
+            })
         });
     }
     return /*#__PURE__*/ jsxRuntime.jsx(React.Fragment, {});
@@ -4147,13 +4240,10 @@ const RenderLinkWithURL = ({ value, cell }, params)=>{
         onClick: (ev)=>ev.stopPropagation(),
         target: "_blank",
         rel: "noreferrer",
-        children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Text, {
+        children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
             c: "utility.0",
             tt: ttValue,
-            children: [
-                content,
-                " fgh"
-            ]
+            children: content
         })
     });
 };
@@ -4827,14 +4917,20 @@ const DownloadLinksPanel = ({ studyData, downloadLinks, downloadLinkFields = {
                             }
                             const id = entry[downloadLinkFields.idField];
                             return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Group, {
+                                justify: "space-between",
                                 gap: "md",
                                 children: [
                                     /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
                                         children: entry['titleField'] || ''
                                     }),
                                     /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                                        component: "a",
+                                        href: `${core.GEN3_FENCE_API}/data/${id}?expires_in=900&redirect`,
+                                        target: "_blank",
+                                        rel: "noreferrer",
+                                        type: "text",
                                         leftSection: /*#__PURE__*/ jsxRuntime.jsx(fi.FiDownload, {}),
-                                        disabled: !id,
+                                        "data-disabled": !id,
                                         children: "Download File"
                                     })
                                 ]
@@ -5013,14 +5109,16 @@ const TableIcons = {
         })
 };
 
-const extractCellValue = (func)=>({ cell })=>func({
+const extractCellValue = (func)=>({ cell, row })=>func({
             value: cell.getValue(),
-            cell
+            cell,
+            row
         });
-const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPagination, pagination, sorting })=>{
+const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPagination, setSelection, pagination, sorting })=>{
     const { discoveryConfig: config, setStudyDetails } = useDiscoveryContext();
     const { isLoading, isError, isFetching } = dataRequestStatus;
     const manualSortingAndPagination = getManualSortingAndPagination(config);
+    const [rowSelection, setRowSelection] = React.useState({}); //ts type available
     const cols = useDeepCompare.useDeepCompareMemo(()=>{
         const studyColumns = config.studyColumns ?? [];
         return studyColumns.map((columnDef, idx)=>{
@@ -5060,6 +5158,7 @@ const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPaginati
         enableColumnActions: false,
         enableStickyHeader: true,
         enableStickyFooter: true,
+        getRowId: (originalRow)=>config?.minimalFieldMapping?.uid && config.minimalFieldMapping.uid in originalRow ? originalRow[config.minimalFieldMapping.uid] : originalRow?.id ?? undefined,
         // TODO: keep this to explore later
         // mantineTableContainerProps: ({ table }) => {
         //   return {
@@ -5069,7 +5168,9 @@ const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPaginati
         //   };
         // },
         renderDetailPanel: config.studyPreviewField ? DiscoveryTableRowRenderer(config.studyPreviewField) : undefined,
+        onRowSelectionChange: setRowSelection,
         state: {
+            rowSelection,
             isLoading,
             ...manualSortingAndPagination ? {
                 pagination,
@@ -5116,6 +5217,13 @@ const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPaginati
             }
         }
     });
+    useDeepCompare.useDeepCompareEffect(()=>{
+        //fetch data based on row selection state or something
+        setSelection(rowSelection ? Object.keys(rowSelection) : []);
+    }, [
+        rowSelection,
+        setSelection
+    ]);
     return /*#__PURE__*/ jsxRuntime.jsxs(React.Fragment, {
         children: [
             /*#__PURE__*/ jsxRuntime.jsx(StudyDetails, {}),
@@ -5411,10 +5519,10 @@ const AdvancedSearchPanel = (props)=>{
     });
 };
 
-const DataLibraryActionButton = /*#__PURE__*/ React.forwardRef(({ label = undefined, icon = undefined, disabled = false, toolTip = undefined, onClick = ()=>null, active = false, showIcon = true, loginRequired = false, ...buttonProps }, ref)=>{
+const DataLibraryActionButton = /*#__PURE__*/ React.forwardRef(({ label = undefined, icon = undefined, disabled = false, tooltip = undefined, onClick = ()=>null, active = false, showIcon = true, loginRequired = false, ...buttonProps }, ref)=>{
     // TODO Test what idp was used to login and restrict actions to that idp or all or none
     const requiresLogin = !core.useIsUserLoggedIn() && loginRequired;
-    const buttonUcon = active ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Loader, {
+    const buttonIcon = active ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Loader, {
         size: "sm",
         className: "p-1"
     }) : /*#__PURE__*/ jsxRuntime.jsx(fi.FiDownload, {
@@ -5422,13 +5530,13 @@ const DataLibraryActionButton = /*#__PURE__*/ React.forwardRef(({ label = undefi
         size: 16
     });
     return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
-        disabled: !toolTip,
-        label: toolTip,
+        disabled: !tooltip,
+        label: tooltip,
         children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
             ref: ref,
             onClick: onClick,
             disabled: disabled || requiresLogin,
-            leftSection: showIcon ? buttonUcon : undefined,
+            leftSection: showIcon ? buttonIcon : undefined,
             ...buttonProps,
             children: label
         })
@@ -5436,21 +5544,297 @@ const DataLibraryActionButton = /*#__PURE__*/ React.forwardRef(({ label = undefi
 });
 DataLibraryActionButton.displayName = 'DataLibraryActionButton';
 
-const ActionBar = ({ config })=>{
-    const { buttons } = config;
+const MANIFEST_FILENAME = 'manifest.json';
+/**
+ * Determines the disabled state and the reason for disabling based on authentication status,
+ * selection count, and requirement for login.
+ *
+ * @param {boolean} isAuthenticated - Indicates whether the user is authenticated.
+ * @param {number} numSelected - The number of items selected for the operation.
+ * @param {boolean} requiresLogin - Specifies whether login is required to perform the operation.
+ * @returns {Object} An object containing the following properties:
+ *   - {boolean} disabled - True if the action should be disabled, false otherwise.
+ *   - {string} [disabledReason] - The reason why the action is disabled (if applicable).
+ */ const getDisabledState = (isAuthenticated, numSelected, requiresLogin)=>{
+    const LOGIN_REQUIRED_MSG = 'You must be logged in to download a manifest';
+    const NO_SELECTION_MSG = 'You must select at least one study to download a manifest';
+    if (requiresLogin && !isAuthenticated) {
+        return {
+            disabled: true,
+            disabledReason: LOGIN_REQUIRED_MSG
+        };
+    }
+    if (numSelected === 0) {
+        return {
+            disabled: true,
+            disabledReason: NO_SELECTION_MSG
+        };
+    }
+    return {
+        disabled: false
+    }; // Default enabled state.
+};
+const handleDownloadManifestClick = ({ exportDataFields, selectedResources })=>{
+    const { dataObjectField } = exportDataFields;
+    if (dataObjectField === undefined) {
+        notifications.notifications.show({
+            title: 'Error notification',
+            message: 'Missing required configuration field `config.features.export.manifestFieldName'
+        });
+        return;
+    }
+    // combine manifests from all selected studies
+    const manifest = [];
+    selectedResources.forEach((study)=>{
+        if (study[dataObjectField]) {
+            const studyDataObject = study[dataObjectField];
+            if ('commons_url' in study && !core.GEN3_DOMAIN?.includes(study.commons_url)) {
+                // PlanX addition to allow hostname based DRS in manifest download clients
+                // like FUSE
+                manifest.push(...studyDataObject.map((x)=>({
+                        ...x,
+                        commons_url: 'commons_url' in x ? x.commons_url : study.commons_url
+                    })));
+            } else {
+                manifest.push(...studyDataObject);
+            }
+        }
+    });
+    // download the manifest
+    if (manifest.length === 0) {
+        notifications.notifications.show({
+            title: 'Export warning',
+            message: 'None of the selected studies have any data objects. Please select a different study or select a different data object field.'
+        });
+        return;
+    }
+    const blob = new Blob([
+        JSON.stringify(manifest, null, 2)
+    ], {
+        type: 'text/json'
+    });
+    FileSaver.saveAs(blob, MANIFEST_FILENAME);
+};
+const DownloadManifestButton = ({ buttonConfig, selectedResources, exportDataFields })=>{
+    const { isAuthenticated } = useIsAuthenticated();
+    const { disabled, disabledReason } = getDisabledState(isAuthenticated, selectedResources.length, buttonConfig?.requiresLogin ?? false);
+    return /*#__PURE__*/ jsxRuntime.jsx(DataLibraryActionButton, {
+        "data-testid": "download-manifest-button",
+        label: buttonConfig?.label ?? 'Download Manifest',
+        icon: /*#__PURE__*/ jsxRuntime.jsx(fi.FiDownload, {}),
+        disabled: disabled,
+        tooltip: disabledReason ?? buttonConfig?.tooltip ?? 'Download Manifest of selected studies',
+        onClick: ()=>{
+            handleDownloadManifestClick({
+                selectedResources: selectedResources,
+                exportDataFields: exportDataFields
+            });
+        }
+    });
+};
+
+const extractIdToLabel = (data)=>!data ? {} : Object.keys(data).reduce((acc, id)=>{
+        acc[id] = data[id].name;
+        return acc;
+    }, {});
+const createTooltipLabel = (error, isLoggedIn, requiresLogin, numSelected, currentListName)=>{
+    if (error) return 'Error saving to data library. Please try again later';
+    if (!isLoggedIn && requiresLogin) return 'Please log in to save to data library';
+    if (numSelected === 0) return 'Please select at least one study to save to data library';
+    if (!currentListName) return 'Please select or create a list';
+    return 'Add selections to list';
+};
+const AddToDataLibrary = ({ buttonConfig, selectedResources, exportDataFields, classNames = {} })=>{
+    const [selectItems, setSelectItems] = React.useState({});
+    const [currentList, setCurrentList] = React.useState(null);
+    const [error, setError] = React.useState(null);
+    const [currentListName, setCurrentListName] = React.useState('');
+    const combobox = core$1.useCombobox({
+        onDropdownClose: ()=>combobox.resetSelectedOption()
+    });
+    const userStatus = core.useCoreSelector((state)=>core.selectUserAuthStatus(state));
+    const isLoggedIn = core.isAuthenticated(userStatus);
+    const isDisabled = error !== null || selectedResources.length === 0 || !currentListName || buttonConfig?.requiresLogin && !isLoggedIn;
+    const tooltipLabel = createTooltipLabel(error, isLoggedIn, buttonConfig.requiresLogin, selectedResources.length, currentListName);
+    const classNamesDefaults = {
+        root: 'w-1/2'
+    };
+    const mergedClassnames = mergeDefaultTailwindClassnames(classNamesDefaults, classNames);
+    const { dataLibrary, updateListInDataLibrary, addListToDataLibrary, isLoading, error: dataLibraryError } = core.useDataLibrary();
+    const saveToList = (listname, listId = undefined)=>{
+        if (selectedResources.length === 0) return;
+        const items = core.buildListItemsGroupedByDataset(core.extractFileDatasetsInRecords(selectedResources, exportDataFields));
+        if (listId) {
+            if (Object.keys(items).length === 0) {
+                notifications.notifications.show({
+                    id: 'update-datalibrary-no-items-to-update-notification',
+                    position: 'top-center',
+                    withCloseButton: true,
+                    autoClose: 5000,
+                    title: 'Save to list',
+                    message: `No data objects selected to save to list ${listname}.`,
+                    loading: false
+                });
+                return;
+            }
+            updateListInDataLibrary({
+                id: listId,
+                name: listname,
+                items: {
+                    ...dataLibrary[listId].items,
+                    ...items
+                }
+            });
+            notifications.notifications.show({
+                id: 'update-datalibrary-list-notification',
+                position: 'top-center',
+                withCloseButton: true,
+                autoClose: 5000,
+                title: 'Save to list',
+                message: `${Object.values(items)} saved to list ${listname} successfully.`,
+                loading: isLoading
+            });
+        } else {
+            addListToDataLibrary(items, listname);
+            notifications.notifications.show({
+                id: 'update-datalibrary-list-notification',
+                position: 'top-center',
+                withCloseButton: true,
+                autoClose: 5000,
+                title: 'Save to list',
+                message: `${Object.values(items)} saved to list ${listname} successfully.`,
+                loading: isLoading
+            });
+        }
+    };
+    const exactOptionMatch = Object.values(selectItems).some((listName)=>listName === currentListName);
+    const filteredOptions = exactOptionMatch ? selectItems : Object.entries(selectItems).reduce((acc, [listId, listName])=>{
+        if (listName.toLowerCase().includes(currentListName.toLowerCase().trim())) {
+            acc[listId] = listName;
+        }
+        return acc;
+    }, {});
+    const options = React.useMemo(()=>Object.entries(filteredOptions).map(([listId, listName])=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Combobox.Option, {
+                value: listId,
+                children: listName
+            }, listId)), [
+        filteredOptions
+    ]);
+    React.useEffect(()=>{
+        if (options.length === 0) setCurrentList(null);
+    }, [
+        options
+    ]);
+    useDeepCompare.useDeepCompareEffect(()=>{
+        if (dataLibrary && !dataLibraryError) {
+            const listItems = extractIdToLabel(dataLibrary);
+            setSelectItems(listItems);
+        }
+        setError(dataLibraryError);
+        if (dataLibraryError) {
+            notifications.notifications.show({
+                id: 'update-datalibrary-error-notification',
+                position: 'top-center',
+                withCloseButton: true,
+                autoClose: 5000,
+                title: 'Error',
+                message: `Error saving to data library. Please try again later.`,
+                loading: false
+            });
+        }
+    }, [
+        dataLibrary,
+        dataLibraryError
+    ]);
+    return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Group, {
+        "data-testid": "add-to-data-library",
+        wrap: "nowrap",
+        classNames: {
+            root: mergedClassnames.root
+        },
+        children: [
+            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Combobox, {
+                onOptionSubmit: (selectedValue)=>{
+                    setCurrentList(selectedValue);
+                    setCurrentListName(selectItems[selectedValue]);
+                    combobox.closeDropdown();
+                },
+                store: combobox,
+                withinPortal: false,
+                children: [
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Combobox.Target, {
+                        children: /*#__PURE__*/ jsxRuntime.jsx(core$1.TextInput, {
+                            placeholder: "Select/Search/Create List",
+                            value: currentListName ?? '',
+                            className: 'w-full',
+                            onChange: (event)=>{
+                                setCurrentListName(event.currentTarget.value);
+                                combobox.openDropdown();
+                                combobox.updateSelectedOptionIndex();
+                            },
+                            onClick: ()=>combobox.openDropdown(),
+                            onFocus: ()=>combobox.openDropdown(),
+                            onBlur: ()=>combobox.closeDropdown()
+                        })
+                    }),
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Combobox.Dropdown, {
+                        children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Combobox.Options, {
+                            children: /*#__PURE__*/ jsxRuntime.jsx(core$1.ScrollArea.Autosize, {
+                                mah: 200,
+                                type: "scroll",
+                                children: options.length === 0 ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Combobox.Empty, {
+                                    children: "Click button to create new list"
+                                }) : options
+                            })
+                        })
+                    })
+                ]
+            }),
+            /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+                label: tooltipLabel,
+                children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                    classNames: {
+                        root: 'w-1/3'
+                    },
+                    loading: isLoading,
+                    disabled: isDisabled,
+                    onClick: ()=>{
+                        if (currentList) {
+                            saveToList(selectItems[currentList], currentList);
+                        } else {
+                            saveToList(currentListName, undefined);
+                        }
+                    },
+                    children: options.length === 0 && currentListName.length > 0 ? 'Save to New List' : buttonConfig?.label ?? 'Save to List'
+                })
+            })
+        ]
+    });
+};
+
+const createActionButton = ({ buttonConfig, selectedResources, exportDataFields })=>{
+    return ({
+        manifest: /*#__PURE__*/ jsxRuntime.jsx(DownloadManifestButton, {
+            buttonConfig: buttonConfig,
+            selectedResources: selectedResources,
+            exportDataFields: exportDataFields
+        }, buttonConfig.type),
+        addToDataLibrary: /*#__PURE__*/ jsxRuntime.jsx(AddToDataLibrary, {
+            buttonConfig: buttonConfig,
+            selectedResources: selectedResources,
+            exportDataFields: exportDataFields
+        }, buttonConfig.type)
+    })[buttonConfig.type];
+};
+const ActionBar = ({ buttons, selectedResources, exportDataFields, verifyExternalLogins })=>{
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
         className: "flex items-center justify-end py-1 px-2 mb-1 w-full gap-x-1.5 ",
-        children: buttons?.map((button, index)=>{
-            return /*#__PURE__*/ jsxRuntime.jsx(DataLibraryActionButton, {
-                label: button.label,
-                icon: /*#__PURE__*/ jsxRuntime.jsx(fi.FiDownload, {}),
-                toolTip: button.tooltip,
-                loginRequired: config?.loginRequireForAllButtons ?? true,
-                onClick: ()=>{
-                    console.log('Download $[button.label]');
-                }
-            }, `action-button-${index}`);
-        // }
+        children: buttons?.map((button)=>{
+            return createActionButton({
+                buttonConfig: button,
+                selectedResources,
+                exportDataFields
+            });
         })
     });
 };
@@ -5704,26 +6088,41 @@ const userHasMethodForServiceOnResource = (method, service, resourcePath, userAu
     return actions !== undefined && actions.some((x)=>(x.service === service || x.service === '*') && (x.method === method || x.method === '*'));
 };
 
+const METADATA_ITEM_AUTHORIZATION_FIELD = '__accessible';
+
 /**
- * Check for non-numeric items in an array and convert them to numbers.
- * Handles strings, numbers, and nested arrays.
- * It will silently convert any non-numeric items to 0 so as not to break the sum.
- * @param fields - array of fields to check
- */ const checkForNonNumericItems = (fields)=>fields.map((item)=>{
-        if (typeof item === 'number') {
-            return item;
-        }
-        // parse any string representation of an integer
-        if (typeof item === 'string') {
-            return parseInt(item, 10) || 0;
-        }
-        // if it's an array, recurse and sum the result
-        if (Array.isArray(item)) {
-            return sum(checkForNonNumericItems(item));
-        }
-        // if it's not a number, return 0 so as not to break the sum
-        return 0;
-    });
+ * Parses a single value into a number
+ * @param item - Value to convert
+ * @returns Numeric representation of the value
+ */ const parseNumericValue = (item)=>{
+    const DEFAULT_VALUE = 0;
+    // Handle undefined values
+    if (item === undefined) {
+        return DEFAULT_VALUE;
+    }
+    // Numbers can be used directly
+    if (typeof item === 'number' && !Number.isNaN(item)) {
+        return item;
+    }
+    // Parse string representations of numbers
+    if (typeof item === 'string') {
+        const parsedValue = parseInt(item, 10);
+        return Number.isNaN(parsedValue) ? DEFAULT_VALUE : parsedValue;
+    }
+    // Recursively handle arrays by summing their numeric values
+    if (Array.isArray(item)) {
+        return convertToNumbers(item).reduce((acc, val)=>acc + val, 0);
+    }
+    // Return default for any other types
+    return DEFAULT_VALUE;
+};
+/**
+ * Converts various types of values to numbers
+ * @param fields - Array of values to convert
+ * @returns Array of numbers, with non-numeric values converted to 0
+ */ const convertToNumbers = (fields)=>{
+    return fields.map(parseNumericValue);
+};
 /**
  * Process a summary statistic using the provided data and summary config
  * @param {JSONObject }data
@@ -5740,7 +6139,7 @@ const userHasMethodForServiceOnResource = (method, service, resourcePath, userAu
         case 'sum':
             {
                 // parse any string representation of an integer
-                fields = checkForNonNumericItems(fields);
+                fields = convertToNumbers(fields);
                 return sum(fields).toLocaleString();
             }
         case 'count':
@@ -5766,21 +6165,45 @@ const processAllSummaries = (data, summaries)=>{
         ];
     }, []);
 };
-const processAuthorizations = (data, config, authMapping)=>{
+const processAuthorizations = (data, config, userAuthMapping)=>{
+    const { enabled } = config.features.authorization;
+    if (!enabled) {
+        return data;
+    }
+    if (!userAuthMapping) {
+        throw new Error('Arborist must be enabled for the Discovery page to work if authorization is enabled in the Discovery page. Set `useArboristUI: true` in the portal config.');
+    }
+    const hostnameWithSubdomain = window.location.hostname; // TODO: replace this with useRouter
+    // mark studies as accessible or inaccessible to user
     const { authzField, dataAvailabilityField } = config.minimalFieldMapping;
-    const { supportedValues } = config.features.authorization;
-    return data.map((study)=>{
-        if (typeof study[authzField] !== 'string') return study;
-        const studyAuthz = study[authzField];
-        let accessible;
-        if (supportedValues?.pending?.enabled && dataAvailabilityField && study[dataAvailabilityField] === 'pending') {
-            accessible = AccessLevel.PENDING;
-        } else if (supportedValues?.notAvailable?.enabled && !study[authzField]) {
+    const { supportedValues, isMesh } = config.features.authorization;
+    const studiesWithAccessibleField = data.map((study)=>{
+        let accessible = AccessLevel.NOT_AVAILABLE;
+        if (supportedValues?.unaccessible?.enabled && dataAvailabilityField && study[dataAvailabilityField] === 'unaccessible') {
+            accessible = AccessLevel.UNACCESSIBLE;
+        } else if (supportedValues?.notAvailable?.enabled && dataAvailabilityField && study[dataAvailabilityField] === 'not_available') {
             accessible = AccessLevel.NOT_AVAILABLE;
+        } else if (supportedValues?.waiting?.enabled && !study[authzField]) {
+            accessible = AccessLevel.WAITING;
         } else {
-            const isAuthorized = userHasMethodForServiceOnResource('read', '*', studyAuthz, authMapping) || userHasMethodForServiceOnResource('read', 'peregrine', studyAuthz, authMapping) || userHasMethodForServiceOnResource('read', 'guppy', studyAuthz, authMapping) || userHasMethodForServiceOnResource('read-storage', 'fence', studyAuthz, authMapping);
+            let authMapping = {};
+            if (isMesh) {
+                let commonsURL = study.commons_url; // TODO: configure this value
+                if (commonsURL && commonsURL.startsWith('http')) {
+                    commonsURL = new URL(commonsURL).hostname;
+                }
+                authMapping = userAuthMapping[commonsURL || hostnameWithSubdomain] || {};
+            } else {
+                authMapping = Object.values(userAuthMapping)[0];
+            }
+            // TODO: This needs to be configurable GFF-294
+            const isAuthorized = userHasMethodForServiceOnResource('read', '*', study[authzField], authMapping) || userHasMethodForServiceOnResource('read', 'peregrine', study[authzField], authMapping) || userHasMethodForServiceOnResource('read', 'guppy', study[authzField], authMapping) || userHasMethodForServiceOnResource('read-storage', 'fence', study[authzField], authMapping);
             if (supportedValues?.accessible?.enabled && isAuthorized) {
-                accessible = AccessLevel.ACCESSIBLE;
+                if (supportedValues?.mixed?.enabled && dataAvailabilityField && study[dataAvailabilityField] === 'mixed_availability') {
+                    accessible = AccessLevel.MIXED;
+                } else {
+                    accessible = AccessLevel.ACCESSIBLE;
+                }
             } else if (supportedValues?.unaccessible?.enabled && !isAuthorized) {
                 accessible = AccessLevel.UNACCESSIBLE;
             } else {
@@ -5789,9 +6212,10 @@ const processAuthorizations = (data, config, authMapping)=>{
         }
         return {
             ...study,
-            __accessible: accessible
+            [METADATA_ITEM_AUTHORIZATION_FIELD]: accessible
         };
     });
+    return studiesWithAccessibleField;
 };
 const processChartData = (data, pathsToProcess)=>{
     // Initialize results object
@@ -5898,7 +6322,9 @@ const useGetMDSData = ({ guidType = 'unregistered_discovery_metadata', maxStudie
                 ] : acc;
             }, []);
             if (discoveryConfig?.features?.authorization.enabled) {
-                setMDSData(processAuthorizations(studyData, discoveryConfig, authMapping));
+                setMDSData(processAuthorizations(studyData, discoveryConfig, {
+                    default: authMapping
+                }));
             } else setMDSData(studyData);
         }
     }, [
@@ -5937,7 +6363,9 @@ const useGetAggMDSData = ({ guidType = 'unregistered_discovery_metadata', maxStu
     React.useEffect(()=>{
         if (data && isSuccess) {
             if (discoveryConfig?.features?.authorization.enabled) {
-                setMDSData(processAuthorizations(data.data, discoveryConfig, authMapping));
+                setMDSData(processAuthorizations(data.data, discoveryConfig, {
+                    default: authMapping
+                }));
             } else setMDSData(data.data);
         }
     }, [
@@ -6718,7 +7146,9 @@ const useGetIndexedMDSData = ({ guidType = 'unregistered_discovery_metadata', ma
         if (data && isSuccess) {
             const studyData = data.data;
             if (discoveryConfig?.features?.authorization.enabled) {
-                setMDSData(processAuthorizations(studyData, discoveryConfig, authMapping));
+                setMDSData(processAuthorizations(studyData, discoveryConfig, {
+                    default: authMapping
+                }));
             } else setMDSData(studyData);
         } else setMDSData([]);
     }, [
@@ -6780,7 +7210,20 @@ const registerDefaultDiscoveryDataLoaders = ()=>{
 };
 registerDefaultDiscoveryDataLoaders();
 
-const DiscoveryIndexPanel = ({ discoveryConfig, indexSelector })=>{
+/**
+ * DiscoveryIndexPanel is a React functional component that renders a discovery panel interface.
+ * It includes features such as search, sorting, filtering, charts, export functionality, and a discovery table.
+ * The component uses hooks for handling state, API data loading, and interface interactions.
+ *
+ * @param {Object} props - The properties object passed to the component.
+ * @param {Object} props.discoveryConfig - Configuration object for setting up the discovery panel.
+ * @param {Object} props.discoveryConfig.features - Defines enabled features (e.g., search, charts, export).
+ * @param {Object} props.discoveryConfig.minimalFieldMapping - Field mapping configuration, such as `uid`.
+ * @param {JSX.Element} props.indexSelector - React component for selecting an index in the discovery panel.
+ *
+ * @return {JSX.Element} A fully featured discovery interface including search functionality, a table, charts, filters, and more.
+ */ const DiscoveryIndexPanel = ({ discoveryConfig, indexSelector })=>{
+    console.log(discoveryConfig);
     const dataHook = React.useMemo(()=>getDiscoveryDataLoader(discoveryConfig?.features?.dataLoader?.dataFetchFunction) ?? useLoadAllMDSData, [
         discoveryConfig?.features?.dataLoader?.dataFetchFunction
     ]);
@@ -6790,6 +7233,7 @@ const DiscoveryIndexPanel = ({ discoveryConfig, indexSelector })=>{
     });
     const parentDivRef = React.useRef(null);
     const [searchBarTerm, setSearchBarTerm] = React.useState([]);
+    const [selections, setSelections] = React.useState([]); // table selections
     const [advancedSearchTerms, setAdvancedSearchTerms] = React.useState({
         operation: SearchCombination.and,
         filters: {}
@@ -6815,6 +7259,15 @@ const DiscoveryIndexPanel = ({ discoveryConfig, indexSelector })=>{
         searchTerms: searchParam,
         discoveryConfig
     });
+    const selectedRecords = React.useMemo(()=>{
+        const uidField = discoveryConfig?.minimalFieldMapping?.uid ?? 'guid';
+        const filterSelectedMembers = (data)=>data.filter((member)=>uidField in member && selections.includes(member[uidField]));
+        return filterSelectedMembers(data);
+    }, [
+        data,
+        discoveryConfig?.minimalFieldMapping?.uid,
+        selections
+    ]);
     const [sorting, setSorting] = React.useState([]);
     const [showAdvancedSearch, { toggle: toggleAdvancedSearch }] = hooks.useDisclosure(false);
     if (dataRequestStatus.isLoading) {
@@ -6888,8 +7341,11 @@ const DiscoveryIndexPanel = ({ discoveryConfig, indexSelector })=>{
                                 color: "accent",
                                 children: "Filters"
                             }) : false,
-                            discoveryConfig?.features?.exportToDataLibrary?.enabled ? /*#__PURE__*/ jsxRuntime.jsx(ActionBar, {
-                                config: discoveryConfig.features.exportToDataLibrary
+                            discoveryConfig?.features?.exportFromDiscovery?.enabled ? /*#__PURE__*/ jsxRuntime.jsx(ActionBar, {
+                                buttons: discoveryConfig.features.exportFromDiscovery.buttons,
+                                exportDataFields: discoveryConfig.features.exportFromDiscovery.exportDataFields,
+                                selectedResources: selectedRecords,
+                                verifyExternalLogins: discoveryConfig.features.exportFromDiscovery.verifyExternalLogins
                             }) : null
                         ]
                     }),
@@ -6910,6 +7366,7 @@ const DiscoveryIndexPanel = ({ discoveryConfig, indexSelector })=>{
                                     dataRequestStatus: dataRequestStatus,
                                     setPagination: setPagination,
                                     setSorting: setSorting,
+                                    setSelection: setSelections,
                                     pagination: pagination,
                                     sorting: sorting
                                 })
@@ -11012,7 +11469,7 @@ const TabsLayoutToComponentProp = (tabsLayout)=>{
     }
 };
 const CohortBuilder = ({ explorerConfig, sharedFiltersMap = null, tabsLayout = 'left' })=>{
-    const { isFetching } = core.useGetCSRFQuery();
+    core.useGetCSRFQuery();
     const dispatch = core.useCoreDispatch();
     dispatch(core.setSharedFilters(sharedFiltersMap ?? {}));
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
@@ -12322,7 +12779,7 @@ class FilesystemContent {
         try {
             return await JSON.parse(fs.readFileSync(path.join(this.rootPath, filepath)).toString('utf8'));
         } catch (err) {
-            throw new Error(`Cannot process ${filepath} `);
+            throw new Error(`Cannot process ${path.join(this.rootPath, filepath)} `);
         }
     }
     async getAll(filepath, filter) {
@@ -12839,8 +13296,8 @@ const IndexPanel = ({ dataConfig, tabs, tabTitle })=>{
 
 const persistor = reduxPersist.persistStore(AppStore);
 const CohortDiscovery = (config)=>{
-    const { isLoading } = core.useGetCSRFQuery(); // need for Guppy
-    if (isLoading) {
+    const { isFetching } = core.useGetCSRFQuery(); // needed for Guppy
+    if (isFetching) {
         return /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
             maw: 400,
             h: 100,
@@ -15174,24 +15631,25 @@ const createMantineTheme = (fonts, colors)=>{
             Pagination: core$1.Pagination.extend({
                 defaultProps: {
                     getControlProps: (control)=>{
+                        //Add 508 localization to Pagination, not needed if using react table
                         if (control === 'first') {
                             return {
-                                "aria-label": "First"
+                                'aria-label': 'First'
                             };
                         }
                         if (control === 'last') {
                             return {
-                                "aria-label": "Last"
+                                'aria-label': 'Last'
                             };
                         }
                         if (control === 'next') {
                             return {
-                                "aria-label": "Next"
+                                'aria-label': 'Next'
                             };
                         }
                         if (control === 'previous') {
                             return {
-                                "aria-label": "Previous"
+                                'aria-label': 'Previous'
                             };
                         }
                         return {};
@@ -15606,7 +16064,7 @@ const GetSharedFieldMapping = async (cohortBuilderConfiguration)=>{
             // create shared filter from Gen3 graphql mapping
             const indices = cohortBuilderConfiguration?.explorerConfig.map((tab)=>tab.guppyConfig.dataType);
             try {
-                const data = await core.fetchJSONDataFromURL(`${core.GEN3_GUPPY_API}/graphql`, true, 'POST', {
+                const data = await core.fetchJSONDataFromURL(`${core.GEN3_GUPPY_API}/graphql`, true, core.HttpMethod.POST, {
                     query: `{ _mapping { ${indices.join(' ')} }}`,
                     variables: {}
                 });
@@ -16080,7 +16538,7 @@ const getStatus = (expiration, now)=>{
  * with the ability to delete a given credential using useRemoveCredentialMutation() hook
  * @returns {JSX.Element} The JSX element representing the credentials table.
  */ const CredentialsTable = ()=>{
-    const { data: csrfToken } = core.useGetCSRFQuery();
+    const { data: csrfToken, isFetching: isCSRFFetching } = core.useGetCSRFQuery();
     const { data: credentials } = core.useGetCredentialsQuery();
     const [removeCredential] = core.useRemoveCredentialMutation();
     const columns = React.useMemo(()=>{
@@ -16142,7 +16600,10 @@ const getStatus = (expiration, now)=>{
         mantineSearchTextInputProps: {
             placeholder: 'Search API Keys'
         },
-        icons: TableIcons
+        icons: TableIcons,
+        state: {
+            isLoading: isCSRFFetching
+        }
     });
     return /*#__PURE__*/ jsxRuntime.jsx(mantineReactTable.MantineReactTable, {
         table: table
@@ -16752,7 +17213,7 @@ const AuthzContext = /*#__PURE__*/ React.createContext({
     },
     dispatch: ()=>null
 });
-const AuthzProvider = ({ children, authz = {
+const AuthzAdminProvider = ({ children, authz = {
     users: [],
     groups: [],
     roles: [],
@@ -17332,7 +17793,7 @@ const Gen3Authz = ({ authz })=>{
             /*#__PURE__*/ jsxRuntime.jsx("h1", {
                 children: "Gen3 Authz"
             }),
-            /*#__PURE__*/ jsxRuntime.jsx(AuthzProvider, {
+            /*#__PURE__*/ jsxRuntime.jsx(AuthzAdminProvider, {
                 authz: authz,
                 children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Tabs, {
                     orientation: "vertical",
@@ -18616,12 +19077,12 @@ const getDataLibraryItem = (dataLibrary, listId, dataId, fileId)=>{
         };
     } else {
         if (!fileId) return undefined;
-        if (!(fileId in datasetOrCohort.items)) return undefined;
-        if (core.isFileItem(datasetOrCohort.items[fileId])) {
+        if (!(fileId in datasetOrCohort.members)) return undefined;
+        if (core.isFileItem(datasetOrCohort.members[fileId])) {
             return {
                 datasetName: name,
                 datasetId: dataId,
-                ...datasetOrCohort.items[fileId]
+                ...datasetOrCohort.members[fileId]
             };
         }
         return undefined;
@@ -18828,7 +19289,7 @@ const getNumberOfSelectedItemsInList = (selections, listId)=>{
 };
 const isListInSelection = (listId, selections)=>listId in selections;
 
-const SearchAndActions = ({ createList, gatherData, size = 'sm' })=>{
+const SearchAndActions = ({ createList, gatherData, size = 'sm', enableCreateNewList = false, enableDownloadManifest = false })=>{
     const { selections, clearSelections } = useDataLibrarySelection();
     const retrieveDisabled = Object.keys(selections).length === 0;
     const iconSize = IconSize[size] || IconSize['sm'];
@@ -18868,6 +19329,38 @@ const SearchAndActions = ({ createList, gatherData, size = 'sm' })=>{
                             height: iconSize
                         })
                     })
+                }),
+                enableCreateNewList && /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+                    label: "Create a new empty list",
+                    children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                        hidden: true,
+                        size: "compact-md",
+                        variant: "outline",
+                        onClick: ()=>createList({}),
+                        "aria-label": "create a new list",
+                        classNames: {
+                            root: 'bg-base-max hover:bg-base-light'
+                        },
+                        children: /*#__PURE__*/ jsxRuntime.jsx(md.MdAdd, {
+                            size: "1.5em"
+                        })
+                    })
+                }),
+                enableCreateNewList && /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+                    label: "Download Manifest of selected items",
+                    children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                        size: "compact-md",
+                        variant: "outline",
+                        "aria-label": "Download Manifest of Selected Items",
+                        classNames: {
+                            root: 'bg-base-max hover:bg-base-light'
+                        },
+                        children: /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
+                            icon: "gen3:download-alt",
+                            height: 24,
+                            width: 24
+                        })
+                    })
                 })
             ]
         })
@@ -19275,7 +19768,7 @@ const sendExistingPFBToURL = async (validatedSelections, params, done = ()=>null
                 withCloseButton: true,
                 autoClose: 5000,
                 title: 'Action Error',
-                message: error.status in HTTPUserFriendlyErrorMessages ? HTTPUserFriendlyErrorMessages[error.status] : 'An error has occured to prevent exporting PFB',
+                message: error.status in HTTPUserFriendlyErrorMessages ? HTTPUserFriendlyErrorMessages[error.status] : 'An error has occurred to prevent exporting PFB',
                 color: 'red',
                 loading: false
             });
@@ -19544,7 +20037,7 @@ const SelectedItemsModal = (props)=>{
  * it iterates through the dataset items and sets the keys of file items
  * to true in the returned object.
  *
- * @param {RegisteredDataListEntry | CohortItem} dataSetOrCohort - The dataset or cohort item to process.
+ * @param {DataLibraryDataset | CohortItem} dataSetOrCohort - The dataset or cohort item to process.
  * @returns {SelectedMembers} An object representing the selected members.
  */ const getDatasetMembers = (dataSetOrCohort)=>{
     if (core.isCohortItem(dataSetOrCohort)) {
@@ -19552,7 +20045,7 @@ const SelectedItemsModal = (props)=>{
             [dataSetOrCohort.id]: true
         };
     }
-    return Object.entries(dataSetOrCohort.items).reduce((acc, [key, item])=>{
+    return Object.entries(dataSetOrCohort.members).reduce((acc, [key, item])=>{
         if (core.isFileItem(item)) acc[key] = true;
         return acc;
     }, {});
@@ -19752,7 +20245,7 @@ const DatasetAccordionControl = ({ listName, numberOfItems, updatedTime, created
                         ]
                     }),
                     /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
-                        label: `Delete ${listName}. Will not delete dataset`,
+                        label: `Delete list ${listName}. Will not delete the actual dataset`,
                         children: /*#__PURE__*/ jsxRuntime.jsx(core$1.ActionIcon, {
                             color: "accent.4",
                             variant: "transparent",
@@ -19969,12 +20462,18 @@ const LabeledText = ({ label, text })=>{
         ]
     });
 };
-const QueryDetails = ({ name, schemaVersion, index, data, id })=>{
+const QueryDetails = ({ name, schemaVersion, data, id })=>{
     if (!data) {
         return /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
             message: "No cohort query"
         });
     }
+    const index = core.extractIndexFromDataLibraryCohort(data);
+    if (!index) {
+        return /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
+            message: "Not able to extract index from cohort query"
+        });
+    }
     return /*#__PURE__*/ jsxRuntime.jsxs("div", {
         className: "flex flex-col",
         children: [
@@ -20139,11 +20638,12 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
                 } : {}
             };
         },
-        renderRowActions: ({ row })=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
-                label: row.original.isCohort ? 'Remove cohort from list' : 'Remove dataset from list',
+        renderRowActions: ({ row })=>{
+            return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+                label: row.original.isCohort === 'True' ? 'Remove cohort from list' : 'Remove dataset from list',
                 children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Button, {
                     variant: "transparent",
-                    "aria-label": `remove ${row.original.isCohort ? 'cohort' : 'dataset'}  ${row.original.name} from list`,
+                    "aria-label": `remove ${row.original.isCohort === 'True' ? 'cohort' : 'dataset'}  ${row.original.name} from list`,
                     onClick: ()=>{
                         removeList(row.id);
                     },
@@ -20154,7 +20654,8 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
                         row.original.itemType
                     ]
                 })
-            }),
+            });
+        },
         mantineDetailPanelProps: {
             style: {
                 padding: '0px',
@@ -20200,11 +20701,9 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
  *
  * @param {Object} dataListAccordionItemParams - Parameters for the DataListAccordionItem.
  * @param {Object} dataListAccordionItemParams.dataList - The data list to be displayed in the accordion item.
- * @param {Function} dataListAccordionItemParams.updateListInDataLibrary - Function to update the list in the data library.
- * @param {Function} dataListAccordionItemParams.deleteListFromDataLibrary - Function to delete the list from the data library.
  *
  * @return {JSX.Element} A rendered accordion item component with controls for data list updates and deletions.
- */ const DatalistAccordionItem = ({ dataList, updateListInDataLibrary, deleteListFromDataLibrary, size = 'sm' })=>{
+ */ const DatalistAccordionItem = ({ dataList, updateListInDataLibrary, deleteListFromDataLibrary, isUpdating, size = 'sm' })=>{
     const [selectedState, setSelectedState] = React.useState('unchecked');
     const { id: listId, name: listName } = dataList;
     const numberOfItemsInList = React.useMemo(()=>{
@@ -20214,10 +20713,13 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
     ]);
     const { selections, updateSelections, removeListMember, removeList } = useDataLibrarySelection();
     const updateList = async (update)=>{
-        await updateListInDataLibrary(listId, {
-            ...dataList,
+        await updateListInDataLibrary({
+            ...{
+                name: listName,
+                items: dataList.items
+            },
             ...update,
-            updatedTime: core.getTimestamp()
+            id: listId
         });
     };
     const tableRowData = React.useMemo(()=>Object.entries(dataList.items).reduce((acc, [datasetId, dataItem])=>{
@@ -20235,7 +20737,7 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
                 });
             } else {
                 // handle RegisteredDataListEntry
-                Object.entries(dataItem.items).forEach(([itemId, item])=>{
+                Object.entries(dataItem.members).forEach(([itemId, item])=>{
                     if (core.isFileItem(item)) {
                         files.push({
                             ...item,
@@ -20287,10 +20789,10 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
     const removeItemFromList = async (itemId)=>{
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { [itemId]: _removedKey, ...newObject } = dataList.items;
-        await updateListInDataLibrary(listId, {
-            ...dataList,
-            items: newObject,
-            updatedTime: core.getTimestamp()
+        await updateListInDataLibrary({
+            id: listId,
+            name: dataList.name,
+            items: newObject
         });
         // update selections
         removeListMember(listId, itemId);
@@ -20306,12 +20808,16 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
     return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Accordion.Item, {
         value: listName,
         className: "group",
+        pos: "relative",
         children: [
+            /*#__PURE__*/ jsxRuntime.jsx(core$1.LoadingOverlay, {
+                visible: isUpdating === listId
+            }),
             /*#__PURE__*/ jsxRuntime.jsx(DatasetAccordionControl, {
                 listName: listName,
                 numberOfItems: numberOfItemsInList,
-                updatedTime: dataList.updatedTime,
-                createdTime: dataList.createdTime,
+                updatedTime: dataList.updated_time,
+                createdTime: dataList.created_time,
                 updateHandler: updateList,
                 deleteListHandler: ()=>deleteListFromDataLibrary(listId),
                 selectListHandler: handleSelectList,
@@ -20330,34 +20836,41 @@ const DataSetContentsTable = ({ listId, data, removeList, size = 'sm' })=>{
     }, listName);
 };
 
-const DataLibraryLists = ({ useAPI, actions, size })=>{
-    const { dataLibrary, isError, isLoading, error: dataLibraryError, addListToDataLibrary, updateListInDataLibrary, deleteListFromDataLibrary } = core.useDataLibrary(useAPI);
+const DataLibraryLists = ({ requiresLogin = true, actions, size })=>{
+    const { dataLibrary, isLoading, isUpdating, error: dataLibraryError, addListToDataLibrary, updateListInDataLibrary, deleteListFromDataLibrary } = core.useDataLibrary();
+    const { isAuthenticated } = useIsAuthenticated();
     const [selectedItemsOpen, { open, close }] = hooks.useDisclosure(false);
     const { gatherSelectedItems } = useDataLibrarySelection();
     const gatherData = ()=>{
         gatherSelectedItems(dataLibrary);
         open();
     };
-    if (isError) {
-        let message = 'There was a error getting the library';
-        if (dataLibraryError && 'data' in dataLibraryError && dataLibraryError?.status in HTTPUserFriendlyErrorMessages) {
-            message = HTTPUserFriendlyErrorMessages[dataLibraryError?.status];
-        }
-        return /*#__PURE__*/ jsxRuntime.jsx("div", {
-            className: "flex flex-col w-full ml-2",
-            children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
-                children: /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
-                    message: message
+    if (dataLibraryError?.isError) {
+        if (dataLibraryError?.status === 401) {
+            let message = 'You are not authorized to access the library.';
+            if (requiresLogin) {
+                if (!isAuthenticated) message = 'Data Library requires login. Please log in to continue.';
+                else message = 'You are not authorized to access the library. Please contact your site administrator.';
+            }
+            return /*#__PURE__*/ jsxRuntime.jsx("div", {
+                className: "flex flex-col w-full ml-2",
+                children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
+                    children: /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
+                        message: message
+                    })
                 })
-            })
+            });
+        } else notifications.notifications.show({
+            position: 'top-center',
+            color: 'red',
+            title: 'Data Library Error',
+            message: dataLibraryError?.message,
+            autoClose: 2000
         });
     }
     return /*#__PURE__*/ jsxRuntime.jsxs("div", {
         className: "flex flex-col w-full ml-2",
         children: [
-            /*#__PURE__*/ jsxRuntime.jsx(core$1.LoadingOverlay, {
-                visible: isLoading
-            }),
             /*#__PURE__*/ jsxRuntime.jsx(SelectedItemsModal, {
                 opened: selectedItemsOpen,
                 onClose: close,
@@ -20368,23 +20881,29 @@ const DataLibraryLists = ({ useAPI, actions, size })=>{
                 createList: addListToDataLibrary,
                 gatherData: gatherData
             }),
-            /*#__PURE__*/ jsxRuntime.jsx("div", {
+            /*#__PURE__*/ jsxRuntime.jsxs("div", {
                 className: "flex items-center",
-                children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Accordion, {
-                    chevronPosition: "left",
-                    classNames: {
-                        root: 'w-full',
-                        control: 'data-active:bg-secondary-lightest'
-                    },
-                    children: dataLibrary && Object.values(dataLibrary).map((datalist)=>{
-                        return /*#__PURE__*/ jsxRuntime.jsx(DatalistAccordionItem, {
-                            dataList: datalist,
-                            size: size,
-                            updateListInDataLibrary: updateListInDataLibrary,
-                            deleteListFromDataLibrary: deleteListFromDataLibrary
-                        }, datalist.id);
+                children: [
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.LoadingOverlay, {
+                        visible: isLoading
+                    }),
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Accordion, {
+                        chevronPosition: "left",
+                        classNames: {
+                            root: 'w-full',
+                            control: 'data-active:bg-secondary-lightest'
+                        },
+                        children: dataLibrary && Object.values(dataLibrary).map((datalist)=>{
+                            return /*#__PURE__*/ jsxRuntime.jsx(DatalistAccordionItem, {
+                                dataList: datalist,
+                                size: size,
+                                isUpdating: isUpdating,
+                                updateListInDataLibrary: updateListInDataLibrary,
+                                deleteListFromDataLibrary: deleteListFromDataLibrary
+                            }, datalist.id);
+                        })
                     })
-                })
+                ]
             })
         ]
     });
@@ -21046,6 +21565,7 @@ async function credentialsLogout(req, res) {
 }
 
 exports.AISearchPageGetServerSideProps = AISearchPageGetServerSideProps;
+exports.ActionBar = ActionBar;
 exports.ActionButton = ActionButton;
 exports.AdminAuthZPageGetServerSideProps = AdminAuthZPageGetServerSideProps;
 exports.AiSearch = AiSearch;