Skip to content

Commit 8e3093d

Browse files
committed
RI-6371 clean up connect to instance function, fix loading style
1 parent cb07936 commit 8e3093d

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

redisinsight/ui/src/components/instance-header/components/instances-navigation-popover/components/instances-list/InstancesList.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ const InstancesList = ({
3737
const instances = selectedTab === InstancesTabs.Databases ? filteredDbInstances : filteredRdiInstances
3838

3939
const connectToInstance = (id = '') => {
40-
dispatch(resetKeys())
41-
dispatch(resetRedisearchKeysData())
42-
dispatch(resetCliSettingsAction())
43-
dispatch(resetCliHelperSettings())
44-
dispatch(setAppContextInitialState())
45-
4640
dispatch(setConnectedInstanceId(id))
4741
setLoading(false)
4842
history.push(Pages.browser(id))
@@ -110,7 +104,12 @@ const InstancesList = ({
110104
key={instance.id}
111105
label={(
112106
<EuiText style={{ display: 'flex', alignItems: 'center' }}>
113-
{loading && instance?.id === selected && <EuiLoadingSpinner size="s" style={{ marginRight: '8px' }} />}
107+
{loading && instance?.id === selected && (
108+
<EuiLoadingSpinner
109+
size="s"
110+
className={styles.loading}
111+
/>
112+
)}
114113
{instance.name}
115114
{' '}
116115
{getDbIndex(instance.db)}

redisinsight/ui/src/components/instance-header/components/instances-navigation-popover/styles.module.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@
7070
line-height: 16.8px !important;
7171
color: var(--euiTextSubduedColor) !important;
7272
}
73+
74+
.loading {
75+
margin-right: 8px;
76+
border-color: var(--separatorDropdownColor) !important;
77+
78+
border-top-color: var(--euiColorGhost) !important;
79+
}
7380
}
7481

7582
.listContainer :global(.euiListGroupItem-isActive), :global(.euiListGroupItem:hover) {

redisinsight/ui/src/pages/home/components/database-list-component/DatabasesListWrapper.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,6 @@ const DatabasesListWrapper = (props: Props) => {
135135
}
136136

137137
const connectToInstance = (id = '') => {
138-
// reset rdi context
139-
dispatch(resetRdiContext())
140-
141-
if (contextInstanceId && contextInstanceId !== id) {
142-
dispatch(resetKeys())
143-
dispatch(resetRedisearchKeysData())
144-
dispatch(resetCliSettingsAction())
145-
dispatch(resetCliHelperSettings())
146-
dispatch(setAppContextInitialState())
147-
}
148138
dispatch(setConnectedInstanceId(id))
149139

150140
history.push(Pages.browser(id))

0 commit comments

Comments
 (0)