spacetelescope
diff --git a/‎CHANGES.rst‎
Lines changed: 7 additions & 0 deletions b/‎CHANGES.rst‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎jdaviz/components/plugin_select.vue‎
Lines changed: 90 additions & 36 deletions b/‎jdaviz/components/plugin_select.vue‎
Lines changed: 90 additions & 36 deletions
diff --git a/‎jdaviz/configs/specviz/helper.py‎
Lines changed: 5 additions & 1 deletion b/‎jdaviz/configs/specviz/helper.py‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎jdaviz/configs/specviz/plugins/unit_conversion/unit_conversion.py‎
Lines changed: 5 additions & 15 deletions b/‎jdaviz/configs/specviz/plugins/unit_conversion/unit_conversion.py‎
Lines changed: 5 additions & 15 deletions
diff --git a/‎jdaviz/configs/specviz/tests/test_helper.py‎
Lines changed: 26 additions & 18 deletions b/‎jdaviz/configs/specviz/tests/test_helper.py‎
Lines changed: 26 additions & 18 deletions
@@ -7,6 +7,9 @@ New Features
 - The Model Fitting plugin now allows the user to select a fitter from a dropdown menu, with the default being the
   ``astropy.modeling.fitting.TRFLSQFitter``. [#3720]
 
+- Dropdown menus generated by ``plugin_select.vue`` now have the ability to be searched when
+  enabled. [#3729]
+
 Cubeviz
 ^^^^^^^
 
@@ -19,6 +22,8 @@ Mosviz
 Specviz
 ^^^^^^^
 
+- Added support for WFSS Level 3 data. [#3729]
+
 Specviz2d
 ^^^^^^^^^
 
@@ -61,6 +66,8 @@ Specviz2d
 Other Changes and Additions
 ---------------------------
 
+- When importing a 2D spectrum file into a SpectrumList, surface brightness units are automatically converted to flux units. [#3729]
+
 4.3.1 (unreleased)
 ==================
 
 
@@ -3,7 +3,7 @@
     <v-select
       :menu-props="{ left: true }"
       attach
-      :items="items"
+      :items="filtered_items"
       v-model="selected"
       @change="$emit('update:selected', $event)"
       :label="api_hints_enabled && api_hint ? api_hint : label"
@@ -18,48 +18,56 @@
       item-value="label"
       persistent-hint
       style="width: 100%"
+      :search-input="search_enabled ? search_query : undefined"
+      @update:search-input="on_search_input"
     >
-      <template v-slot:selection="{ item, index }">
+      <template #prepend-item>
+        <div v-if="search_enabled">
+          <v-text-field
+            v-model="search_query"
+            prepend-inner-icon="mdi-magnify"
+            label="Search"
+            single-line
+            hide-details
+            autofocus
+            style="margin: 8px;"
+          />
+          <v-divider class="mt-2"></v-divider>
+        </div>
+        <div v-if="multiselect">
+          <v-list-item
+            ripple
+            @mousedown.prevent
+            @click="toggle_select_all"
+          >
+            <v-list-item-action>
+              <v-icon>
+                {{ selected.length === items.length ? 'mdi-close-box' : selected.length ? 'mdi-minus-box' : 'mdi-checkbox-blank-outline' }}
+              </v-icon>
+            </v-list-item-action>
+            <v-list-item-content>
+              <v-list-item-title>
+                {{ selected.length < items.length ? 'Select All' : 'Clear All' }}
+              </v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+          <v-divider class="mt-2"></v-divider>
+        </div>
+      </template>
+      <template #selection="{ item, index }">
         <div class="single-line" style="width: 100%">
-          <span v-if="api_hints_enabled" class="api-hint" :style="index > 0 ? 'display: none' : null">
-            {{ multiselect ?
-              selected
-              :
-              '\'' + selected + '\''
-            }}
+          <span v-if="api_hints_enabled && index === 0" class="api-hint">
+            {{ multiselect ? selected : `'${selected}'` }}
           </span>
           <v-chip v-else-if="multiselect" style="width: calc(100% - 10px)">
-            <span>
-              {{ item }}
-            </span>
+            <span>{{ item }}</span>
           </v-chip>
-          <span v-else>
-            {{ item }}
-          </span>
+          <span v-else>{{ item }}</span>
         </div>
       </template>
-      <template v-slot:prepend-item v-if="multiselect">
-        <v-list-item
-        ripple
-        @mousedown.prevent
-        @click="() => {if (selected.length < items.length) { $emit('update:selected', items.map((item) => {return item.label || item.text || item}))} else {$emit('update:selected', [])}}"
-        >
-        <v-list-item-action>
-          <v-icon>
-            {{ selected.length == items.length ? 'mdi-close-box' : selected.length ? 'mdi-minus-box' : 'mdi-checkbox-blank-outline' }}
-          </v-icon>
-        </v-list-item-action>
-        <v-list-item-content>
-          <v-list-item-title>
-            {{ selected.length < items.length ? "Select All" : "Clear All" }}
-          </v-list-item-title>
-        </v-list-item-content>
-        </v-list-item>
-        <v-divider class="mt-2"></v-divider>
-      </template>
-      <template v-slot:item="{ item }">
+      <template #item="{ item }">
         <span style="margin-top: 8px; margin-bottom: 0px">
-          {{ item }}
+          {{ typeof item === 'string' ? item : (item.label || item.text) }}
         </span>
       </template>
     </v-select>
@@ -70,7 +78,53 @@
 <script>
 module.exports = {
   props: ['items', 'selected', 'label', 'hint', 'rules', 'show_if_single_entry', 'multiselect',
-          'api_hint', 'api_hints_enabled', 'dense', 'disabled']
+          'api_hint', 'api_hints_enabled', 'dense', 'disabled', 'search'],
+  data() {
+    return {
+      search_query: '',
+    }
+  },
+  computed: {
+    search_enabled() {
+      return !!this.search;
+    },
+    filtered_items() {
+      if (!this.search_enabled || !this.search_query) {
+        return this.items;
+      }
+      const query = this.search_query.toLowerCase();
+      // Get selected items (as objects or strings)
+      const selected_set = new Set(
+        Array.isArray(this.selected) ? this.selected.map(sel => (typeof sel === 'string' ? sel : sel.label || sel.text || sel)) : [this.selected]
+      );
+      // Filter items by search
+      const filtered = this.items.filter(item => {
+        const label = (typeof item === 'string') ? item : (item.label || item.text || '');
+        return label.toLowerCase().includes(query);
+      });
+      // Add back any selected items not in filtered
+      const all_labels = new Set(filtered.map(item => (typeof item === 'string' ? item : item.label || item.text || '')));
+      this.items.forEach(item => {
+        const label = (typeof item === 'string') ? item : (item.label || item.text || '');
+        if (selected_set.has(label) && !all_labels.has(label)) {
+          filtered.push(item);
+        }
+      });
+      return filtered;
+    },
+  },
+  methods: {
+    on_search_input(value) {
+      this.search_query = value;
+    },
+    toggle_select_all() {
+      if (this.selected.length < this.items.length) {
+        this.$emit('update:selected', this.items.map(item => item.label || item.text || item));
+      } else {
+        this.$emit('update:selected', []);
+      }
+    },
+  },
 };
 </script>
 
 
@@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs):
     @deprecated(since="4.3", alternative="load")
     def load_data(self, data, data_label=None, format=None, show_in_viewer=True,
                   concat_by_file=False, cache=None, local_path=None, timeout=None,
-                  load_as_list=False):
+                  load_as_list=False, exposures=None, sources=None, load_all=False):
         """
         Load data into Specviz.
 
@@ -90,6 +90,10 @@ def load_data(self, data, data_label=None, format=None, show_in_viewer=True,
             load_kwargs['timeout'] = timeout
         if local_path is not None:
             load_kwargs['local_path'] = local_path
+        if sources is not None:
+            load_kwargs['sources'] = sources
+        if exposures is not None:
+            load_kwargs['exposures'] = exposures
 
         if isinstance(data, (SpectrumList, SpectrumCollection)) and isinstance(data_label, list):
             if len(data_label) != len(data):
 
@@ -20,7 +20,7 @@
                                                create_equivalent_flux_units_list,
                                                check_if_unit_is_per_solid_angle,
                                                create_equivalent_angle_units_list,
-                                               supported_sq_angle_units)
+                                               flux_to_sb_unit)
 
 __all__ = ['UnitConversion']
 
@@ -43,16 +43,6 @@ def _valid_glue_display_unit(unit_str, viewer, axis='x'):
     return choices_str[ind]
 
 
-def _flux_to_sb_unit(flux_unit, angle_unit):
-    if angle_unit not in supported_sq_angle_units(as_strings=True):
-        sb_unit = flux_unit
-    else:
-        # str > unit > str to remove formatting inconsistencies with
-        # parentheses/order of units/etc
-        sb_unit = (u.Unit(flux_unit) / u.Unit(angle_unit)).to_string()
-    return sb_unit
-
-
 @tray_registry('g-unit-conversion', label="Unit Conversion",
                category="core", sidebar="settings", subtab=1)
 class UnitConversion(PluginTemplateMixin):
@@ -395,17 +385,17 @@ def _on_unit_selected(self, msg):
                 # which in turn will call _handle_attribute_display_unit,
                 # _handle_spectral_y_unit (if spectral_y_type_selected == 'Surface Brightness'),
                 #  and send a second GlobalDisplayUnitChanged message for sb
-                self.sb_unit_selected = _flux_to_sb_unit(self.flux_unit.selected,
-                                                         self.angle_unit.selected)
+                self.sb_unit_selected = flux_to_sb_unit(self.flux_unit.selected,
+                                                        self.angle_unit.selected)
 
         elif axis == 'angle':
             if len(self.flux_unit_selected):
                 # NOTE: setting sb_unit_selected will call this method again with axis=='sb',
                 # which in turn will call _handle_attribute_display_unit,
                 # _handle_spectral_y_unit (if spectral_y_type_selected == 'Surface Brightness'),
                 #  and send a second GlobalDisplayUnitChanged message for sb
-                self.sb_unit_selected = _flux_to_sb_unit(self.flux_unit.selected,
-                                                         self.angle_unit.selected)
+                self.sb_unit_selected = flux_to_sb_unit(self.flux_unit.selected,
+                                                        self.angle_unit.selected)
 
         elif axis == 'sb':
             # handle spectral y-unit first since that is a more apparent change to the user
 
@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+import re
 from astropy import units as u
 from astropy.io import fits
 from astropy.tests.helper import assert_quantity_allclose
@@ -55,24 +56,30 @@ def test_load_hdulist(self):
         # HDUList should load as Spectrum
         assert isinstance(data, Spectrum)
 
-    def test_load_spectrum_list_no_labels(self):
-        # now load three more spectra from a SpectrumList, without labels
-        self.spec_app.load_data(self.spec_list)
-        assert len(self.spec_app.app.data_collection) == 4
-        for i in (1, 2, 3):
-            assert "1D Spectrum" in self.spec_app.app.data_collection[i].label
-
-    def test_load_spectrum_list_with_labels(self):
-        # NOTE: will be removed after load_data deprecation is removed
-        # now load three more spectra from a SpectrumList, with labels:
-        labels = ["List test 1", "List test 2", "List test 3"]
-        self.spec_app.load_data(self.spec_list, data_label=labels)
+    @pytest.mark.parametrize(
+        'kwargs',
+        ({'data_label': [f"List test {i}" for i in (1, 2, 3)]},
+         {'sources': [f"1D Spectrum at index: {i}" for i in (0, 1, 2)]},
+         {'sources': '*'}))
+    def test_load_spectrum_list_with_kwargs(self, kwargs):
+        error_msg = "No sources selected."
+        with pytest.raises(
+                ValueError,
+                match=re.escape(error_msg)):
+            self.spec_app.load_data(self.spec_list)
+
+        # When loading via the ``data_label`` argument, the length of the
+        # list must match the number of sources in the SpectrumList.
+        self.spec_app.load_data(self.spec_list, **kwargs)
         assert len(self.spec_app.app.data_collection) == 4
+        if 'load' in list(kwargs.keys())[0]:
+            for i in (1, 2, 3):
+                assert "1D Spectrum" in self.spec_app.app.data_collection[i].label
 
     def test_load_multi_order_spectrum_list(self):
         assert len(self.spec_app.app.data_collection) == 1
         # now load ten spectral orders from a SpectrumList:
-        self.spec_app.load_data(self.multi_order_spectrum_list)
+        self.spec_app.load_data(self.multi_order_spectrum_list, sources='*')
         assert len(self.spec_app.app.data_collection) == 11
 
     def test_mismatched_label_length(self):
@@ -417,20 +424,21 @@ def test_load_2d_flux(specviz_helper):
     # 1D Spectrum objects to load in Specviz.
     spec = Spectrum(spectral_axis=np.linspace(4000, 6000, 10)*u.Angstrom,
                     flux=np.ones((4, 10))*u.Unit("1e-17 erg / (Angstrom cm2 s)"))
-    specviz_helper.load_data(spec, data_label="test")
+
+    specviz_helper.load_data(spec, data_label="test", sources='*')
 
     assert len(specviz_helper.app.data_collection) == 4
-    assert specviz_helper.app.data_collection[0].label == "test_0"
+    assert specviz_helper.app.data_collection[0].label == "test_index-0"
 
     spec2 = Spectrum(spectral_axis=np.linspace(4000, 6000, 10)*u.Angstrom,
                      flux=np.ones((2, 10))*u.Unit("1e-17 erg / (Angstrom cm2 s)"))
 
     # Make sure 2D spectra in a SpectrumList also get split properly.
     spec_list = SpectrumList([spec, spec2])
-    specviz_helper.load_data(spec_list, data_label="second test")
+    specviz_helper.load_data(spec_list, data_label="second test", sources='*')
 
-    assert len(specviz_helper.app.data_collection) == 10
-    assert specviz_helper.app.data_collection[-1].label == "second test_5"
+    assert len(specviz_helper.app.data_collection) == 6
+    assert specviz_helper.app.data_collection[-1].label == "second test_index-1"
 
 
 def test_plot_uncertainties(specviz_helper, spectrum1d):