-
formatSearchDataset(ds))}
- selectConfig={{
- // return custom html for displaying dataset options
- formatOptionLabel: (opt) => opt.label,
- // return string value of dataset for accessibility / html keys
- getOptionLabel: (opt) => opt.displayText,
- }}
- loadOptions={(query, callback) => searchDatasets(query, callback, datasets)}
- placeholder={'Dataset Name, Sample Collection ID, or PI'}
- onChange={async ({key, value}) => {
- const datasets = value.map((val) => val.dataset);
- const datasetIds = datasets?.map((ds) => ds.dataSetId);
- const fullDatasets = await DataSet.getDatasetsByIds(datasetIds);
- onChange({key, value: datasetIds});
- setDatasets(fullDatasets);
- }}
- />
+ {DAAUtils.isEnabled() ?
+
+
+
Currently selected datasets:
+
+
@@ -610,7 +616,7 @@ const DataAccessRequestApplication = (props) => {
{DAAUtils.isEnabled() ?
setIsAttested(false)}
isAttested={isAttested}
@@ -629,7 +635,13 @@ const DataAccessRequestApplication = (props) => {
{isAttested &&
- setShowDialogSave(true)} isLoading={isLoading} formData={formData} datasets={datasets} dataUseTranslations={dataUseTranslations} />
+ setShowDialogSave(true)}
+ isLoading={isLoading}
+ formData={formData}
+ datasets={DAAUtils.isEnabled() ? selectedDatasets : datasets}
+ dataUseTranslations={dataUseTranslations} />
}
diff --git a/src/pages/dar_application/RequiredDAAs.jsx b/src/pages/dar_application/RequiredDAAs.jsx
index a16e2bf05..df284c4ae 100644
--- a/src/pages/dar_application/RequiredDAAs.jsx
+++ b/src/pages/dar_application/RequiredDAAs.jsx
@@ -3,20 +3,20 @@ import React from 'react';
export default function RequiredDAAs(props) {
const { datasets, daas, daaDownload } = props;
const fileNames = new Set();
- const daaDivs = datasets.map((dataset) => {
+ const daaDivs = datasets.map((dataset, index) => {
const datasetDacId = dataset.dacId;
if (!datasetDacId) {
- return
;
+ return
;
}
const daa = daas.find((daa) => daa.dacs?.some((d) => d.dacId === datasetDacId));
const id = daa.daaId;
const fileName = daa.file.fileName.split('.')[0];
if (fileNames.has(fileName)) {
- return
;
+ return
;
}
fileNames.add(fileName);
return (
-
+
{daaDownload(id, fileName)}
);
diff --git a/src/pages/dar_application/SelectableDatasets.jsx b/src/pages/dar_application/SelectableDatasets.jsx
new file mode 100644
index 000000000..f9095db79
--- /dev/null
+++ b/src/pages/dar_application/SelectableDatasets.jsx
@@ -0,0 +1,98 @@
+import React, {useEffect, useState} from 'react';
+import DeleteIcon from '@mui/icons-material/Delete';
+import ReactTooltip from 'react-tooltip';
+import RestoreFromTrashIcon from '@mui/icons-material/RestoreFromTrash';
+
+export default function SelectableDatasets(props) {
+ const {datasets, setSelectedDatasets, disabled} = props;
+ const [removedIds, setRemovedIds] = useState([]);
+
+ useEffect(() => {
+ // Populate parent state with the current state of datasets to be saved to the DAR
+ const newSelectedDatasets = datasets.filter(ds => !removedIds.includes(ds.dataSetId));
+ setSelectedDatasets(newSelectedDatasets);
+ }, [removedIds, datasets, setSelectedDatasets]);
+
+ const updateLocalState = (ds) => {
+ if (removedIds.includes(ds.dataSetId)) {
+ setRemovedIds(removedIds.toSpliced(removedIds.indexOf(ds.dataSetId), 1));
+ } else {
+ setRemovedIds(removedIds.concat(ds.dataSetId));
+ }
+ };
+
+ const datasetDescriptionDiv = (ds) => {
+ return
+
{ds.datasetIdentifier}
+
|
+
{ds.datasetName}
+
;
+ };
+
+ const deletableStyled = (ds) => {
+ const isDeletable = removedIds.length < datasets.length - 1;
+ const clickable = isDeletable && !disabled;
+ return
updateLocalState(ds)} : {})}>
+ {datasetDescriptionDiv(ds)}
+
+ <>
+ {!disabled && }
+ {!isDeletable &&
+
+ The last dataset can not be deleted
+ }
+
+
+
+
;
+ };
+
+ const unDeletableStyled = (ds) => {
+ const style = disabled ?
+ {backgroundColor: 'lightgray', opacity: .5} :
+ {backgroundColor: 'lightgray', opacity: .5, cursor: 'pointer'};
+ return
updateLocalState(ds)})}>
+ {datasetDescriptionDiv(ds)}
+
+ {!disabled && }
+
+
+
;
+ };
+
+ const datasetList = () => {
+ return datasets.map((ds) => {
+ return removedIds.includes(ds.dataSetId) ?
+ unDeletableStyled(ds) :
+ deletableStyled(ds);
+ });
+
+ };
+
+ return (
+
+ {datasetList()}
+
+ );
+
+}