Skip to content

Commit a08ad0f

Browse files
Merge pull request #3493 from RedisInsight/fe/bugfix/RI-5211_fix_style
#RI-5211 - fix style and add test id
2 parents f33716c + 2f65d91 commit a08ad0f

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

redisinsight/ui/src/components/main-router/MainRouter.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('MainRouter', () => {
5959

6060
it('should set Database workspace', () => {
6161
(appContextSelector as jest.Mock).mockReturnValueOnce({ workspace: AppWorkspace.RDI })
62-
reactRouterDom.useLocation = jest.fn().mockReturnValue({ pathname: Pages.triggeredFunctions('1') })
62+
reactRouterDom.useLocation = jest.fn().mockReturnValue({ pathname: Pages.analytics('1') })
6363

6464
render(<Router><MainRouter /></Router>)
6565

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,6 @@ describe('DatabasesListWrapper', () => {
275275
RedisTimeSeries: {
276276
loaded: false
277277
},
278-
'Triggers and Functions': {
279-
loaded: false
280-
},
281278
customModules: []
282279
}
283280
});

redisinsight/ui/src/pages/instance/InstancePage.spec.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ describe('InstancePage', () => {
125125
setConnectedInfoInstance(),
126126
getRecommendations(),
127127
...resetContextActions,
128-
clearExpertChatHistory(),
129-
clearExpertChatHistory(),
128+
clearExpertChatHistory(),
130129
setAppContextConnectedInstanceId(INSTANCE_ID_MOCK),
131130
setDbConfig(undefined),
132131
resetRdiConnectedInstance(),

redisinsight/ui/src/pages/rdi/instance/InstancePage.spec.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { setClusterDetailsInitialState } from 'uiSrc/slices/analytics/clusterDet
2121
import { setDatabaseAnalysisInitialState } from 'uiSrc/slices/analytics/dbAnalysis'
2222
import { setInitialAnalyticsSettings } from 'uiSrc/slices/analytics/settings'
2323
import { setInitialRecommendationsState } from 'uiSrc/slices/recommendations/recommendations'
24-
import { setTriggeredFunctionsInitialState } from 'uiSrc/slices/triggeredFunctions/triggeredFunctions'
2524
import {
2625
resetConnectedInstance as resetConnectedDatabaseInstance,
2726
} from 'uiSrc/slices/instances/instances'
@@ -93,7 +92,6 @@ describe('InstancePage', () => {
9392
setInitialAnalyticsSettings(),
9493
setRedisearchInitialState(),
9594
setInitialRecommendationsState(),
96-
setTriggeredFunctionsInitialState(),
9795
clearExpertChatHistory(),
9896
setConnectedInstance(),
9997
]

redisinsight/ui/src/pages/rdi/instance/components/confirm-leave-page-popup/ConfirmLeavePagePopup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const ConfirmLeavePagePopup = (props: Props) => {
4343
</EuiText>
4444
</section>
4545
<div className={styles.footer}>
46-
<Download />
46+
<Download dataTestid="popup-download-pipeline-btn" />
4747
<EuiButton
4848
fill
4949
color="secondary"

redisinsight/ui/src/pages/rdi/instance/components/confirm-leave-page-popup/styles.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
justify-content: space-between;
2424
align-items: center;
2525
padding-top: 40px;
26-
padding-bottom: 1px;
26+
padding-bottom: 6px;
2727
}
2828

2929
.button {
@@ -35,7 +35,7 @@
3535
}
3636

3737
:global {
38-
.euiModal__closeIcon {
38+
.euiButtonIcon.euiModal__closeIcon {
3939
right: 35px;
4040
top: 35px;
4141
}

redisinsight/ui/src/pages/rdi/pipeline-management/components/download/Download.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ import { IPipeline } from 'uiSrc/slices/interfaces'
1010
import { rdiPipelineSelector } from 'uiSrc/slices/rdi/pipeline'
1111
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
1212

13-
const Download = () => {
13+
interface Props {
14+
dataTestid?: string
15+
}
16+
17+
const Download = ({ dataTestid }: Props) => {
1418
const { loading } = useSelector(rdiPipelineSelector)
1519

1620
const { rdiInstanceId } = useParams<{ rdiInstanceId: string }>()
@@ -45,7 +49,7 @@ const Download = () => {
4549
disabled={loading}
4650
onClick={handleDownloadClick}
4751
aria-labelledby="Download pipeline button"
48-
data-testid="download-pipeline-btn"
52+
data-testid={dataTestid || 'download-pipeline-btn'}
4953
>
5054
Download
5155
</EuiButtonEmpty>

0 commit comments

Comments
 (0)