Skip to content

Fixes error that appears in the console on drag nested resource to root #4150

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

Merged
bjester merged 4 commits into from
Jul 6, 2023
Merged

Fixes error that appears in the console on drag nested resource to root #4150

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4af8e7d
Fixes error that appears in the console on drag nested resource to to…
akolson Jun 16, 2023
0ac48fd
Fixes error that appears in the console on drag nested resource to to…
akolson Jun 16, 2023
4f9fc43
Fixes css styling
akolson Jun 16, 2023
9b2aff0
Adds defensive check to prevent failing drops
akolson Jun 16, 2023
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
63 changes: 33 additions & 30 deletions contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,44 +538,47 @@
}

// All sources should be from the same region
const sourceRegion = drop.sources[0].region;
const sources = drop.sources || [];
const sourceRegion = sources.length > 0 ? sources[0].region : null;
const payload = {
target: identity.metadata.id,
position,
};

// When the source region is the clipboard, we want to make sure we use
// `excluded_descendants` by accessing the copy trees through the clipboard node ID
if (sourceRegion && sourceRegion.id === DraggableRegions.CLIPBOARD) {
return Promise.all(
data.sources.map(source => {
// Using `getCopyTrees` we can access the `excluded_descendants` for the node, such
// that we make sure to skip copying nodes that aren't intended to be copied
const trees = this.getCopyTrees(source.metadata.clipboardNodeId, true);
if (payload.target) {
Copy link
Copy Markdown
Member

@bjester bjester Jul 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In such scenarios where you have to nest a large block of code in a conditional, it can make more sense to have to shortcut the code early instead, which keeps the code flatter. For example:

if (!payload.target) return;

Copy link
Copy Markdown
Member Author

@akolson akolson Jul 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Blaine! I will most likely refactor this in my next studio PR

// When the source region is the clipboard, we want to make sure we use
// `excluded_descendants` by accessing the copy trees through the clipboard node ID
if (sourceRegion && sourceRegion.id === DraggableRegions.CLIPBOARD) {
return Promise.all(
data.sources.map(source => {
// Using `getCopyTrees` we can access the `excluded_descendants` for the node, such
// that we make sure to skip copying nodes that aren't intended to be copied
const trees = this.getCopyTrees(source.metadata.clipboardNodeId, true);

// Since we're using `ignoreSelection=true` for `getCopyTrees`, it should only
// return one tree at most
if (trees.length === 0) {
return Promise.resolve();
} else if (trees.length > 1) {
throw new Error(
'Multiple copy trees are unexpected for drag and drop copy operation'
);
}
// Since we're using `ignoreSelection=true` for `getCopyTrees`, it should only
// return one tree at most
if (trees.length === 0) {
return Promise.resolve();
} else if (trees.length > 1) {
throw new Error(
'Multiple copy trees are unexpected for drag and drop copy operation'
);
}

return this.copyContentNode({
...payload,
id: source.metadata.id,
excluded_descendants: get(trees, [0, 'extra_fields', 'excluded_descendants'], {}),
});
})
);
}
return this.copyContentNode({
...payload,
id: source.metadata.id,
excluded_descendants: get(trees, [0, 'extra_fields', 'excluded_descendants'], {}),
});
})
);
}

return this.moveContentNodes({
...payload,
id__in: data.sources.map(s => s.metadata.id),
});
return this.moveContentNodes({
...payload,
id__in: data.sources.map(s => s.metadata.id),
});
}
},
insertPosition(mask) {
return mask & DraggableFlags.TOP
Expand Down