Allowing in-here search with empty query (#10092)

owncloud · Dec 13, 2023 · d3c869c · d3c869c
1 parent 2230644
commit d3c869c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/changelog/unreleased/bugfix-in-here-search b/changelog/unreleased/bugfix-in-here-search
@@ -0,0 +1,6 @@
+Bugfix: Allow empty search query in "in-here" search
+
+Allowing empty search queries in the "in-here" search instead of fallback to search "everywhere".
+
+https://github.com/owncloud/web/pull/10092
+https://github.com/owncloud/web/issues/9970
diff --git a/packages/web-app-files/src/components/Search/List.vue b/packages/web-app-files/src/components/Search/List.vue
@@ -397,7 +397,6 @@ export default defineComponent({
         query['mediatype'] = mediaTypeParams.split('+').map((t) => `"${t}"`)
         updateFilter(mediaTypeFilter)
       }
-
       return (
         // By definition (KQL spec) OR, AND or (GROUP) is implicit for simple cases where
         // different or identical keys are part of the query.
@@ -420,6 +419,7 @@ export default defineComponent({
 
             return acc
           }, [])
+          .sort((a, b) => a.startsWith('scope:') - b.startsWith('scope:'))
           .join(' AND ')
       )
     }

diff --git a/packages/web-app-search/src/portals/SearchBar.vue b/packages/web-app-search/src/portals/SearchBar.vue
@@ -220,7 +220,6 @@ export default defineComponent({
           scope = unref(scopeQueryValue)
         }
         const useScope =
-          unref(term) &&
           unref(currentFolderAvailable) &&
           unref(locationFilterId) === SearchLocationFilterConstants.inHere
         router.push(