Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DCJ-482: Safely navigate daa dac associations #2616

Merged
merged 1 commit into from
Jul 3, 2024
Merged

DCJ-482: Safely navigate daa dac associations #2616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pages/dar_application/RequiredDAAs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function RequiredDAAs(props) {
if (!datasetDacId) {
return <div key={dataset.id}></div>;
}
const daa = daas.find((daa) => daa.dacs.some((d) => d.dacId === datasetDacId));
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)) {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/signing_official_console/DAACell.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function DAACell(props) {
const card = libraryCards?.find(card => card.institutionId === institutionId);
const daaIds = researcher && card?.daaIds;
const filteredDaas = daaIds && daas?.filter(daa => daaIds.includes(daa.daaId));
const hasDacId = filteredDaas && filteredDaas.some(daa => daa.dacs.some(dac => dac.dacId === rowDac.dacId));
const hasDacId = filteredDaas && filteredDaas.some(daa => daa.dacs?.some(dac => dac.dacId === rowDac.dacId));

const createDaaLcLink = async (daaId, researcher, dacName) => {
try {
Expand All @@ -33,7 +33,7 @@ export default function DAACell(props) {
};

const handleClick = async (daas, specificDac, researcher) => {
const daaId = daas.find(daa => daa.dacs.some(dac => dac.dacId === specificDac.dacId))?.daaId;
const daaId = daas.find(daa => daa.dacs?.some(dac => dac.dacId === specificDac.dacId))?.daaId;
if (!hasDacId) {
createDaaLcLink(daaId, researcher, specificDac.name);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/signing_official_console/ManageResearcherDAAsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default function ManageResearcherDAAsTable(props) {
columnHeaderFormat = {
...columnHeaderFormat,
...dacs.reduce((acc, dac) => {
const daa = daas.find(daa => daa.dacs.some(d => d.dacId === dac.dacId));
const daa = daas.find(daa => daa.dacs?.some(d => d.dacId === dac.dacId));
const id = daa.daaId;
const fileName = daa.file.fileName;
acc[dac.name] = { label: dac.name, cellStyle: { width: `${dacColumnWidth}%` }, data: <ManageDaasDropdown actionsTitle={`${dac.name} Actions`} download={{id: id, fileName: fileName}} moreData={{id: id, name: dac.name}} researchers={props.researchers} refreshResearchers={refreshResearchers} setResearchers={setResearchers}/>};
Expand Down
Loading