From d7509c71ed512f15f4e8f5f9c909e8f9e59215c5 Mon Sep 17 00:00:00 2001
From: Duy Nguyen <duytnguyendtn.open@gmail.com>
Date: Tue, 1 Nov 2022 16:23:51 -0400
Subject: [PATCH] Make mosviz visibility fallback more robust

---
 CHANGES.rst                              | 2 +-
 jdaviz/components/viewer_data_select.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 180b829f87..9942dc778c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -86,7 +86,7 @@ Imviz
 Mosviz
 ^^^^^^
 
-- Data unassigned a row is hidden under the subdropdown in the data dropdown. [#1798]
+- Data unassigned a row is hidden under the subdropdown in the data dropdown. [#1798, #1808]
 
 Specviz
 ^^^^^^^
diff --git a/jdaviz/components/viewer_data_select.vue b/jdaviz/components/viewer_data_select.vue
index 4177f27466..3d103f5a19 100644
--- a/jdaviz/components/viewer_data_select.vue
+++ b/jdaviz/components/viewer_data_select.vue
@@ -142,10 +142,9 @@ module.exports = {
           return false
         } else if (this.$props.viewer.reference === 'image-viewer' && item.type !== 'image') {
           return false
-        } else if ((item.meta.mosviz_row !== undefined) && (item.meta.mosviz_row !== null)) {
+        } else {
           return this.dataItemInViewer(item, returnExtraItems)
         }
-        return !returnExtraItems
       } else if (this.$props.viewer.config === 'cubeviz') {
         if (this.$props.viewer.reference === 'spectrum-viewer') {
           if (item.meta.Plugin === undefined) {