From d4be690ddafe31cb702e5eac98bd16266c66830f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Massot?= <francois.massot@gmail.com>
Date: Fri, 17 Mar 2023 09:28:45 +0100
Subject: [PATCH] Fix index side bar width and index combobox. (#3043)

---
 quickwit/quickwit-ui/src/components/IndexSideBar.tsx | 3 ++-
 quickwit/quickwit-ui/src/views/SearchView.tsx        | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/quickwit/quickwit-ui/src/components/IndexSideBar.tsx b/quickwit/quickwit-ui/src/components/IndexSideBar.tsx
index 739bb86904d..823ea894a7d 100644
--- a/quickwit/quickwit-ui/src/components/IndexSideBar.tsx
+++ b/quickwit/quickwit-ui/src/components/IndexSideBar.tsx
@@ -29,6 +29,7 @@ const IndexBarWrapper = styled('div')({
   display: 'flex',
   height: '100%',
   flex: '0 0 260px',
+  maxWidth: '260px',
   flexDirection: 'column',
   borderRight: '1px solid rgba(0, 0, 0, 0.12)',
 });
@@ -152,7 +153,7 @@ export function IndexSideBar(props: IndexMetadataProps) {
             {open ? <KeyboardArrowDown /> : <ChevronRight />}
         </IconButton>
         Fields
-        { open && <List dense={true} sx={{paddingTop: '0'}}>
+        { open && <List dense={true} sx={{paddingTop: '0', overflowWrap: 'break-word'}}>
           { fields.map(function(field) {
             return <ListItem
               key={ field.json_path }
diff --git a/quickwit/quickwit-ui/src/views/SearchView.tsx b/quickwit/quickwit-ui/src/views/SearchView.tsx
index 8e8256885f6..289fd140378 100644
--- a/quickwit/quickwit-ui/src/views/SearchView.tsx
+++ b/quickwit/quickwit-ui/src/views/SearchView.tsx
@@ -42,6 +42,9 @@ function updateSearchRequestWithIndex(index: Index | null, searchRequest: Search
     searchRequest.startTimestamp = null;
     searchRequest.endTimestamp = null;
   }
+  if (index?.metadata.index_config.index_id) {
+    searchRequest.indexId = index?.metadata.index_config.index_id;
+  }
 }
 
 function SearchView() {
@@ -66,8 +69,8 @@ function SearchView() {
     setSearchRequest(updatedSearchRequest);
     setQueryRunning(true);
     setSearchError(null);
+    navigate('/search?' + toUrlSearchRequestParams(updatedSearchRequest).toString());
     quickwitClient.search(updatedSearchRequest).then((response) => {
-      navigate('/search?' + toUrlSearchRequestParams(updatedSearchRequest).toString());
       updateLastSearchRequest(updatedSearchRequest);
       setSearchResponse(response);
       setQueryRunning(false);
@@ -80,7 +83,6 @@ function SearchView() {
   const onIndexMetadataUpdate = (indexMetadata: IndexMetadata | null) => {
     setSearchRequest(previousRequest => {
       updateSearchRequestWithIndex(index, previousRequest);
-      setSearchRequest(previousRequest);
       return {...previousRequest, indexId: indexMetadata === null ? null : indexMetadata.index_config.index_id};
     });
   }