Merge pull request #4530 from bjester/import-search-clipboard

Properly format node_id+channel_id query parameter

Author: bjester

contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js

@@ -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 }
       )
     )

contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js

@@ -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]],
       });
     });
 
@@ -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]],
       });
     });
   });

contentcuration/contentcuration/frontend/shared/data/resources.js

@@ -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;
     });