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

Jump to bottom

Properly format node_id+channel_id query parameter #4530

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Properly format node_id+channel_id query parameter #4530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef7bf4
Properly format node_id+channel_id query parameter
bjester Apr 22, 2024
19a15f5
Fix linting issue
bjester Apr 22, 2024
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 contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export function addClipboardNodeFromListener(context, obj) {
.then(() =>
context.dispatch(
'contentNode/loadContentNodes',
{ '[node_id+channel_id]__in': [obj.source_node_id, obj.source_channel_id] },
{ '[node_id+channel_id]__in': [[obj.source_node_id, obj.source_channel_id]] },
{ root }
)
)
Expand Down
4 changes: 2 additions & 2 deletions contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ describe('ContentNode methods', () => {
);
expect(table.get).toHaveBeenCalledWith({ '[node_id+channel_id]': [node_id, channel_id] });
expect(fetchCollection).toHaveBeenCalledWith({
_node_id_channel_id_: [node_id, channel_id],
'[node_id+channel_id]__in': [[node_id, channel_id]],
});
});

Expand All @@ -731,7 +731,7 @@ describe('ContentNode methods', () => {
await expect(ContentNode.getByNodeIdChannelId(node_id, channel_id)).resolves.toBeFalsy();
expect(table.get).toHaveBeenCalledWith({ '[node_id+channel_id]': [node_id, channel_id] });
expect(fetchCollection).toHaveBeenCalledWith({
_node_id_channel_id_: [node_id, channel_id],
'[node_id+channel_id]__in': [[node_id, channel_id]],
});
});
});
Expand Down
4 changes: 3 additions & 1 deletion contentcuration/contentcuration/frontend/shared/data/resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,9 @@ export const ContentNode = new TreeResource({
const values = [nodeId, channelId];
return this.table.get({ '[node_id+channel_id]': values }).then(node => {
if (!node) {
return this.fetchCollection({ _node_id_channel_id_: values }).then(nodes => nodes[0]);
return this.fetchCollection({ '[node_id+channel_id]__in': [values] }).then(
nodes => nodes[0]
);
}
return node;
});
Expand Down
Loading