Parenting now relies on parent data in viewers

* Child data will be added to all viewers in which parents reside.
* Still need to add filter to viewer selection in UI for child data

Author: MatthewPortman

jdaviz/configs/default/plugins/data_menu/data_menu.py

@@ -693,12 +693,6 @@ def add_data(self, *data_labels):
         """
         available = self.dataset.choices
 
-        # TODO: Remove this if we decide to prevent users from removing child data from viewers
-        for label in data_labels:
-            # Check if incoming labels are children of parent data
-            parent_label = self.app._get_assoc_data_parent(label)
-            available += self.app._get_assoc_data_children(parent_label)
-
         unavailable = [data_label for data_label in data_labels
                        if data_label not in available]
         if len(unavailable):

jdaviz/core/loaders/importers/importer.py

@@ -417,6 +417,10 @@ def add_to_data_collection(self, data, data_label=None, data_hash=None,
 
         # Determine which viewer(s) to add the data to.
         viewer_select = viewer_select if viewer_select is not None else self.viewer
+        if parent is not None:
+            viewer_select.selected = [viewer for viewer, viewer_api in
+                                      self._app._jdaviz_helper.viewers.items()
+                                      if parent in viewer_api.data_menu.data_labels_loaded]
 
         if viewer_select is False:
             # return without adding to viewers or broadcasting snackbar message that
@@ -463,7 +467,10 @@ def add_to_data_collection(self, data, data_label=None, data_hash=None,
             for viewer_label in viewer_select.selected:
                 viewer = self._app._jdaviz_helper.viewers.get(viewer_label)
                 try:
-                    viewer.data_menu.add_data(data_label)
+                    if parent is not None:
+                        self._app.add_data_to_viewer(viewer_label, data_label)
+                    else:
+                        viewer.data_menu.add_data(data_label)
                 except Exception as e:
                     failed_viewers.append(viewer_label)
                     exceptions.append(str(e))

jdaviz/core/loaders/tests/test_loaders.py

@@ -873,15 +873,35 @@ def test_load_image_auto_parent_existing_in_dc(self, rename):
         assert dcf_helper._app._get_assoc_data_parent('Image[ERR,2]') == primary_label
         assert dcf_helper._app._get_assoc_data_children(primary_label) == ['Image[ERR,2]']
 
-        # This should raise 'Data labels {unavailable} not able to be loaded...'
-        # if parent child association doesn't work correctly (i.e. the previous behavior)
-        # TODO: Remove this if we decide to prevent users from removing child data from viewers
-        dcf_helper.viewers['Image'].data_menu.add_data('Image[ERR,2]')
+    def test_multi_viewer_parent_data(self):
+        dcf_helper = self.dcf_helper
+        ldr = self.ldr
+
+        # Default parent selection is 'auto'
+        ldr.importer.extension = 'SCI,1'
+        ldr.load()
+
+        # Load a second viewer with the same data - Image (1)
+        vc = dcf_helper.new_viewers['Image']
+        vc.dataset = 'Image[SCI,1]'
+        vc()
+
+        assert len(dcf_helper.viewers['Image'].data_menu.data_labels_loaded) == 1
+        assert len(dcf_helper.viewers['Image (1)'].data_menu.data_labels_loaded) == 1
+
+        # Parent should be 'Auto'
+        ldr.importer.extension = 'ERR,1'
+        ldr.load()
 
-    # TODO: Remove skip once this behavior is fixed
+        assert dcf_helper._app._get_assoc_data_parent('Image[ERR,1]') == 'Image[SCI,1]'
+        assert dcf_helper._app._get_assoc_data_children('Image[SCI,1]') == ['Image[ERR,1]']
+
+        assert len(dcf_helper.viewers['Image'].data_menu.data_labels_loaded) == 2
+        assert len(dcf_helper.viewers['Image (1)'].data_menu.data_labels_loaded) == 2
+
+        # TODO: Remove skip once this behavior is fixed
     @pytest.mark.skip
-    @pytest.mark.parametrize('remove_from', ('viewer', 'app'))
-    def test_load_unload_parenting_behavior(self, remove_from):
+    def test_load_unload_parenting_behavior(self):
         ldr = self.ldr
         dcf_helper = self.dcf_helper
 
@@ -895,17 +915,9 @@ def test_load_unload_parenting_behavior(self, remove_from):
 
         dm = dcf_helper.viewers['Image'].data_menu
         dm.layer = ['Image[ERR,1]']
-
-        if remove_from == 'viewer':
-            # Remove from viewer and use data_menu.add_data
-            # TODO: remove this and the parametrization if we decide to
-            #  prevent users from removing child data from viewers (keep remove_from_app though)
-            dm.remove_from_viewer()
-            dm.add_data('Image[ERR,1]')
-        else:
-            # Remove from app and load again
-            dm.remove_from_app()
-            ldr.load()
+        # Remove from app and load again
+        dm.remove_from_app()
+        ldr.load()
 
         assert dcf_helper._app._get_assoc_data_parent('Image[ERR,1]') is None
         assert dcf_helper._app._get_assoc_data_children('Image[SCI,1]') == []