Skip to content

Commit 458c13b

Browse files
committed
* #RI-3848 - Button is displayed with incorrect scanned parameters
* removed panelState from BrowserLeftPanel
1 parent e0c6b03 commit 458c13b

File tree

5 files changed

+9
-23
lines changed

5 files changed

+9
-23
lines changed

redisinsight/ui/src/pages/browser/BrowserPage.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,9 @@ const BrowserPage = () => {
186186
>
187187
<BrowserLeftPanel
188188
selectKey={selectKey}
189-
panelsState={{
190-
handleAddKeyPanel,
191-
handleBulkActionsPanel,
192-
handleCreateIndexPanel,
193-
}}
189+
handleAddKeyPanel={handleAddKeyPanel}
190+
handleBulkActionsPanel={handleBulkActionsPanel}
191+
handleCreateIndexPanel={handleCreateIndexPanel}
194192
/>
195193
</EuiResizablePanel>
196194

redisinsight/ui/src/pages/browser/components/browser-left-panel/BrowserLeftPanel.tsx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,18 @@ import styles from './styles.module.scss'
2727

2828
export interface Props {
2929
selectKey: ({ rowData }: { rowData: any }) => void
30-
panelsState: {
31-
handleAddKeyPanel: (value: boolean) => void
32-
handleBulkActionsPanel: (value: boolean) => void
33-
handleCreateIndexPanel: (value: boolean) => void
34-
}
30+
handleAddKeyPanel: (value: boolean) => void
31+
handleBulkActionsPanel: (value: boolean) => void
32+
handleCreateIndexPanel: (value: boolean) => void
3533
}
3634

3735
const BrowserLeftPanel = (props: Props) => {
3836
const {
3937
selectKey,
40-
panelsState,
41-
} = props
42-
43-
const {
4438
handleAddKeyPanel,
4539
handleBulkActionsPanel,
4640
handleCreateIndexPanel,
47-
} = panelsState
41+
} = props
4842

4943
const { instanceId } = useParams<{ instanceId: string }>()
5044
const patternKeysState = useSelector(keysDataSelector)

redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ const KeyList = forwardRef((props: Props, ref) => {
100100

101101
useEffect(() => {
102102
cancelAllMetadataRequests()
103-
104-
return () => {
105-
dispatch(setLastBatchKeys(itemsRef.current?.slice(-SCAN_COUNT_DEFAULT - 1), searchMode))
106-
}
107103
}, [searchMode])
108104

109105
useEffect(() => {
@@ -118,7 +114,6 @@ const KeyList = forwardRef((props: Props, ref) => {
118114
if (itemsRef.current.length === 0) {
119115
cancelAllMetadataRequests()
120116
setFirstDataLoaded(true)
121-
dispatch(resetKeysData(searchMode))
122117
rerender({})
123118
return
124119
}

redisinsight/ui/src/pages/browser/components/key-tree/KeyTree.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ const KeyTree = forwardRef((props: Props, ref) => {
204204
<KeyList
205205
hideHeader
206206
hideFooter
207-
ref={ref}
208207
keysState={keyListState}
209208
loading={loading || constructingTree}
210209
selectKey={selectKey}

redisinsight/ui/src/pages/home/components/DatabasesListComponent/DatabasesListWrapper.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
ConnectionType,
2525
Instance,
2626
} from 'uiSrc/slices/interfaces'
27-
import { resetPatternKeysData } from 'uiSrc/slices/browser/keys'
27+
import { resetKeys } from 'uiSrc/slices/browser/keys'
2828
import { resetRedisearchKeysData } from 'uiSrc/slices/browser/redisearch'
2929
import { PageNames, Pages, Theme } from 'uiSrc/constants'
3030
import { sendEventTelemetry, TelemetryEvent, getRedisModulesSummary } from 'uiSrc/telemetry'
@@ -108,8 +108,8 @@ const DatabasesListWrapper = ({
108108

109109
const connectToInstance = (id = '') => {
110110
if (contextInstanceId && contextInstanceId !== id) {
111+
dispatch(resetKeys())
111112
dispatch(resetRedisearchKeysData())
112-
dispatch(resetPatternKeysData())
113113
dispatch(resetCliSettingsAction())
114114
dispatch(resetCliHelperSettings())
115115
dispatch(setAppContextInitialState())

0 commit comments

Comments
 (0)