Merge pull request #11269 from ihorsokhanexoft/fix/ENG-8742

[ENG-8742] include ignored components when create a view-only link

Author: Johnetordoff

api/nodes/serializers.py

@@ -1697,12 +1697,15 @@ def create(self, validated_data):
         user = get_user_auth(self.context['request']).user
         anonymous = validated_data.pop('anonymous')
         node = self.context['view'].get_node()
+        children = self.context['request'].data.pop('target_type', [])
+        if children:
+            children = [AbstractNode.load(id) for id in children if id != 'nodes']
 
         try:
             view_only_link = new_private_link(
                 name=name,
                 user=user,
-                nodes=[node],
+                nodes=[node, *children],
                 anonymous=anonymous,
             )
         except ValidationError:

api_tests/nodes/views/test_node_view_only_links_list.py

@@ -5,7 +5,8 @@
 from osf_tests.factories import (
     ProjectFactory,
     AuthUserFactory,
-    PrivateLinkFactory
+    PrivateLinkFactory,
+    NodeRelationFactory
 )
 
 
@@ -54,6 +55,11 @@ def view_only_link(public_project):
     return view_only_link
 
 
+@pytest.fixture()
+def components_factory():
+    return ProjectFactory
+
+
 @pytest.mark.django_db
 class TestViewOnlyLinksList:
 
@@ -227,3 +233,77 @@ def test_cannot_create_vol(
         }
         res = app.post_json_api(url, {'data': payload}, expect_errors=True)
         assert res.status_code == 401
+
+    def test_create_vol_with_components(
+            self, app, user, url, public_project, view_only_link, components_factory):
+        component1 = components_factory(creator=user)
+        component2 = components_factory(creator=user)
+        component3 = components_factory(creator=user)
+        NodeRelationFactory(parent=public_project, child=component1)
+        NodeRelationFactory(parent=public_project, child=component2)
+        NodeRelationFactory(parent=public_project, child=component3)
+
+        url = f'{url}?embed=creator&embed=nodes'
+        payload = {
+            'attributes': {
+                'name': 'testmultiplenodes',
+                'anonymous': False,
+            },
+            'relationships': {
+                'nodes': {
+                    'data': [
+                        {
+                            'id': component1._id,
+                            'type': 'nodes'
+                        },
+                        {
+                            'id': component2._id,
+                            'type': 'nodes'
+                        },
+                        {
+                            'id': component3._id,
+                            'type': 'nodes'
+                        }
+                    ]
+                }
+            }
+        }
+        res = app.post_json_api(url, {'data': payload}, auth=user.auth)
+        assert res.status_code == 201
+        data = res.json['data']
+        assert len(data['embeds']['nodes']['data']) == 4
+
+    def test_create_vol_no_duplicated_components(
+            self, app, user, url, public_project, view_only_link, components_factory):
+        component1 = components_factory(creator=user)
+        NodeRelationFactory(parent=public_project, child=component1)
+
+        url = f'{url}?embed=creator&embed=nodes'
+        payload = {
+            'attributes': {
+                'name': 'testmultiplenodes',
+                'anonymous': False,
+            },
+            'relationships': {
+                'nodes': {
+                    'data': [
+                        {
+                            'id': component1._id,
+                            'type': 'nodes'
+                        },
+                        {
+                            'id': component1._id,
+                            'type': 'nodes'
+                        },
+                        {
+                            'id': component1._id,
+                            'type': 'nodes'
+                        },
+                    ]
+                }
+            }
+        }
+        res = app.post_json_api(url, {'data': payload}, auth=user.auth)
+        assert res.status_code == 201
+        data = res.json['data']
+        assert len(data['embeds']['nodes']['data']) == 2

api_tests/registrations/views/test_registration_view_only_links_list.py

@@ -58,6 +58,11 @@ def view_only_link(public_project):
     return view_only_link
 
 
+@pytest.fixture
+def components_factory():
+    return RegistrationFactory
+
+
 class TestRegistrationViewOnlyLinksList(TestViewOnlyLinksList):
     pass