Skip to content

Commit 8b04405

Browse files
committed
fix(rdi): standardize loader behavior in pipeline and analytics pages
References: #RI-7839
1 parent e3df2cb commit 8b04405

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

redisinsight/ui/src/pages/rdi/instance/components/header/components/buttons/deploy-pipeline-button/DeployPipelineButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { Modal } from 'uiSrc/components/base/display/modal'
2323
import { UploadWarningBanner } from 'uiSrc/components/upload-warning/styles'
2424

2525
export interface Props {
26-
loading: boolean
26+
loading?: boolean
2727
disabled: boolean
2828
onReset: () => void
2929
}

redisinsight/ui/src/pages/rdi/instance/components/header/components/pipeline-actions/PipelineActions.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, { useCallback, useEffect } from 'react'
22
import { useDispatch, useSelector } from 'react-redux'
33
import { useParams } from 'react-router-dom'
44

5+
import styled from 'styled-components'
56
import {
67
getPipelineStatusAction,
78
rdiPipelineActionSelector,
@@ -23,13 +24,12 @@ import {
2324
} from 'uiSrc/slices/interfaces'
2425

2526
import { FlexItem, Row } from 'uiSrc/components/base/layout/flex'
27+
import { Theme } from 'uiSrc/components/base/theme/types'
2628
import DeployPipelineButton from '../buttons/deploy-pipeline-button'
2729
import ResetPipelineButton from '../buttons/reset-pipeline-button'
2830
import RdiConfigFileActionMenu from '../rdi-config-file-action-menu'
2931
import StopPipelineButton from '../buttons/stop-pipeline-button'
3032
import StartPipelineButton from '../buttons/start-pipeline-button/StartPipelineButton'
31-
import styled from 'styled-components'
32-
import { Theme } from 'uiSrc/components/base/theme/types'
3333

3434
const VerticalDelimiter = styled(FlexItem)`
3535
border: ${({ theme }: { theme: Theme }) => theme.components.appBar.separator};
@@ -183,11 +183,7 @@ const PipelineActions = ({ collectorStatus, pipelineStatus }: Props) => {
183183
) : null}
184184
</FlexItem>
185185
<FlexItem>
186-
<DeployPipelineButton
187-
loading={deployLoading}
188-
disabled={disabled}
189-
onReset={resetPipeline}
190-
/>
186+
<DeployPipelineButton disabled={disabled} onReset={resetPipeline} />
191187
</FlexItem>
192188
<FlexItem>
193189
<RdiConfigFileActionMenu />

redisinsight/ui/src/pages/rdi/pipeline-management/components/navigation/Navigation.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { useHistory, useLocation, useParams } from 'react-router-dom'
55
import { Nullable } from 'uiSrc/utils'
66
import { PageNames, Pages } from 'uiSrc/constants'
77
import { Title } from 'uiSrc/components/base/text'
8-
import { Loader } from 'uiSrc/components/base/display'
98
import { Col } from 'uiSrc/components/base/layout/flex'
9+
import { LoadingContent } from 'uiSrc/components/base'
1010
import { RdiPipelineTabs } from 'uiSrc/slices/interfaces/rdi'
1111
import { rdiPipelineSelector } from 'uiSrc/slices/rdi/pipeline'
1212

@@ -55,7 +55,7 @@ const Navigation = () => {
5555
Pipeline management
5656
</Title>
5757

58-
{loading && <Loader size="xl" />}
58+
{loading && <LoadingContent lines={4} />}
5959

6060
{!loading && (
6161
<>

redisinsight/ui/src/pages/rdi/pipeline-management/pages/config/Config.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ const Config = () => {
202202
<Row grow={false} justify="end">
203203
<PrimaryButton
204204
onClick={testConnections}
205-
loading={testingConnections || pipelineLoading}
205+
loading={testingConnections}
206+
disabled={pipelineLoading}
206207
aria-labelledby="test target connections"
207208
data-testid="rdi-test-connection-btn"
208209
>

redisinsight/ui/src/pages/rdi/statistics/styles.module.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@
1515
top: 0;
1616
left: 0;
1717
z-index: 2;
18-
opacity: 0.8;
19-
background-color: var(--euiColorLightestShade);
2018
}

0 commit comments

Comments
 (0)