diff --git a/redisinsight/ui/src/pages/browser/BrowserPage.spec.tsx b/redisinsight/ui/src/pages/browser/BrowserPage.spec.tsx index b627a3da67..908d2c14a2 100644 --- a/redisinsight/ui/src/pages/browser/BrowserPage.spec.tsx +++ b/redisinsight/ui/src/pages/browser/BrowserPage.spec.tsx @@ -142,6 +142,6 @@ describe('BrowserPage', () => { fireEvent.click(screen.getByTestId('onCloseKey-btn')) - expect(store.getActions()).toEqual([...afterRenderActions, resetKeyInfo(), toggleBrowserFullScreen(true)]) + expect(store.getActions()).toEqual([...afterRenderActions, toggleBrowserFullScreen(true)]) }) }) diff --git a/redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx b/redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx index 874d354f8f..47c8bcff8c 100644 --- a/redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx +++ b/redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx @@ -113,10 +113,12 @@ const KeyList = forwardRef((props: Props, ref) => { isNotRendered.current = false dispatch(setBrowserIsNotRendered(isNotRendered.current)) if (itemsRef.current.length === 0) { + setFirstDataLoaded(true) rerender({}) return } + cancelAllMetadataRequests() controller.current = new AbortController() const { startIndex, lastIndex } = renderedRowsIndexesRef.current diff --git a/redisinsight/ui/src/pages/browser/components/redisearch-key-list/styles.module.scss b/redisinsight/ui/src/pages/browser/components/redisearch-key-list/styles.module.scss index 1b94808475..7f99c62fc0 100644 --- a/redisinsight/ui/src/pages/browser/components/redisearch-key-list/styles.module.scss +++ b/redisinsight/ui/src/pages/browser/components/redisearch-key-list/styles.module.scss @@ -14,7 +14,7 @@ box-shadow: none !important; border: 1px solid var(--separatorColor) !important; border-radius: 4px; - padding: 0 20px 0 10px !important; + padding: 0 25px 0 10px !important; overflow: hidden; white-space: nowrap; @@ -49,7 +49,12 @@ } .euiFormControlLayoutIcons { z-index: 6; - :global(.euiIcon) { + + .euiLoadingSpinner { + margin-right: -22px; + } + + .euiIcon { width: 16px; height: 12px; } @@ -114,15 +119,17 @@ height: 36px !important; top: 0; left: 0; - transform: none !important; :global { .euiButtonContent.euiButtonEmpty__content { padding-left: 16px !important; + padding-right: 30px; justify-content: left; .euiButtonEmpty__text { + padding-right: 10px; + text-overflow: initial !important; color: var(--inputPlaceholderColor) !important; } } diff --git a/redisinsight/ui/src/pages/browser/components/search-key-list/styles.module.scss b/redisinsight/ui/src/pages/browser/components/search-key-list/styles.module.scss index 4621f1142c..2546da7084 100644 --- a/redisinsight/ui/src/pages/browser/components/search-key-list/styles.module.scss +++ b/redisinsight/ui/src/pages/browser/components/search-key-list/styles.module.scss @@ -6,6 +6,10 @@ &.redisearchMode { margin-left: 8px; + + > div > div { + border-radius: 4px 0 0 4px; + } } :global(.euiFormControlLayout) { diff --git a/redisinsight/ui/src/slices/browser/keys.ts b/redisinsight/ui/src/slices/browser/keys.ts index 20ca6c5264..d474f19f56 100644 --- a/redisinsight/ui/src/slices/browser/keys.ts +++ b/redisinsight/ui/src/slices/browser/keys.ts @@ -896,9 +896,12 @@ export function fetchKeysMetadata( ) onSuccessAction?.(data) - } catch (error) { - onFailAction?.() - console.error(error) + } catch (_err) { + if (!axios.isCancel(_err)) { + const error = _err as AxiosError + onFailAction?.() + console.error(error) + } } } }