Remove hard coded 'Subset' string checks

jdaviz/app.py

@@ -1899,13 +1899,14 @@ def vue_data_item_remove(self, event):
         # the reference data (which would leave 0 external_links).
         if len(self.data_collection) > 1 and len(self.data_collection.external_links) == 0:
             if self.config == "imviz" and imviz_refdata:
+                subset_labels = [sg.label for sg in self.data_collection.subset_groups]
                 link_type = self._jdaviz_helper.plugins["Links Control"].link_type.selected.lower()
                 self._jdaviz_helper.link_data(link_type=link_type, error_on_fail=True)
                 # Hack to restore responsiveness to imviz layers
                 for viewer_ref in self.get_viewer_reference_names():
                     viewer = self.get_viewer(viewer_ref)
                     loaded_layers = [layer.layer.label for layer in viewer.layers if
-                                     "Subset" not in layer.layer.label]
+                                     layer.layer.label not in subset_labels]
                     if len(loaded_layers):
                         self.remove_data_from_viewer(viewer_ref, loaded_layers[-1])
                         self.add_data_to_viewer(viewer_ref, loaded_layers[-1])

jdaviz/core/helpers.py

@@ -865,7 +865,8 @@ def get_interactive_regions(self):
 
             # TODO: Remove this when Jdaviz support round-tripping, see
             # https://github.com/spacetelescope/jdaviz/pull/721
-            if not subset_label.startswith('Subset'):
+
+            if subset_label not in [sg.label for sg in self.app.data_collection.subset_groups]:
                 continue
 
             try:

jdaviz/core/template_mixin.py

@@ -1669,7 +1669,8 @@
         if subset.label not in self.labels:
             # NOTE: this logic will need to be revisited if generic renaming of subsets is added
             # see https://github.com/spacetelescope/jdaviz/pull/1175#discussion_r829372470
-            if subset.label.startswith('Subset') and self._is_valid_item(subset):
+            dc_subset_labels = [sg.label for sg in self.app.data_collection.subset_groups]
+            if subset.label in dc_subset_labels and self._is_valid_item(subset):
                 # NOTE: += will not trigger traitlet update
                 self.items = self.items + [self._subset_to_dict(subset)]  # noqa
         else:
@@ -2047,27 +2048,27 @@
 
     def _get_continuum(self, dataset, spatial_subset, spectral_subset, update_marks=False):
         if dataset.selected == '':
             self._update_continuum_marks()
             return None, None, None
 
         if spatial_subset == 'per-pixel':
             if self.app.config != 'cubeviz':
                 raise ValueError("per-pixel only supported for cubeviz")
             full_spectrum = self.dataset.selected_obj
         else:
             full_spectrum = dataset.selected_spectrum_for_spatial_subset(spatial_subset.selected if spatial_subset is not None else None,  # noqa
                                                                          use_display_units=True)
 
         if full_spectrum is None or self.continuum_width == "":
             self._update_continuum_marks()
             return None, None, None
 
         spectral_axis = full_spectrum.spectral_axis
         if spectral_axis.unit == u.pix:
             # plugin should be disabled so not get this far, but can still get here
             # before the disabled message is set
             self._update_continuum_marks()
             return None, None, None
 
         if self.continuum_subset_selected == spectral_subset.selected:
             # already raised a validation error in the UI
@@ -2144,7 +2145,7 @@
             spectral_axis_nanmasked = spectral_axis.value.copy()
             spectral_axis_nanmasked[~continuum_mask] = np.nan
             if not update_marks:
                 pass
             elif spectral_subset.selected == "Entire Spectrum":
                 mark_x = {'left': spectral_axis_nanmasked,
                           'center': spectral_axis.value,