From f0dca41838a191cc8fa6af928292303739095c9b Mon Sep 17 00:00:00 2001 From: Dijana Antovska Date: Fri, 21 Nov 2025 10:48:26 +0200 Subject: [PATCH 1/5] update text on actions modal --- .../SourcePipelineModal.spec.tsx | 44 +++++++++---------- .../SourcePipelineModal.tsx | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx index e8bcf2d340..8196243adb 100644 --- a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx +++ b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx @@ -72,12 +72,12 @@ beforeEach(() => { cleanup() store = createMockedStore() store.clearActions() - ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ - ...initialStateDefault.rdi.pipeline, - }) - ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ - ...initialStateDefault.app.context.pipelineManagement, - }) + ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ + ...initialStateDefault.rdi.pipeline, + }) + ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ + ...initialStateDefault.app.context.pipelineManagement, + }) }) const renderSourcePipelineDialog = () => @@ -95,7 +95,7 @@ describe('SourcePipelineDialog', () => { }) it('should show dialog when isOpenDialog flag is true', () => { - ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ + ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ ...initialStateDefault.app.context.pipelineManagement, isOpenDialog: true, }) @@ -108,7 +108,7 @@ describe('SourcePipelineDialog', () => { }) it('should not show dialog when there is deployed pipeline on a server', () => { - ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ + ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ ...initialStateDefault.rdi.pipeline, loading: false, data: { config: 'some config' }, @@ -120,7 +120,7 @@ describe('SourcePipelineDialog', () => { }) it('should not show dialog when config is fetching', () => { - ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ + ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ ...initialStateDefault.rdi.pipeline, loading: true, data: null, @@ -132,7 +132,7 @@ describe('SourcePipelineDialog', () => { }) it('should show dialog when there is no pipeline on a server', () => { - ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ + ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ ...initialStateDefault.rdi.pipeline, loading: false, data: { config: '' }, @@ -147,13 +147,13 @@ describe('SourcePipelineDialog', () => { const sendEventTelemetryMock = jest.fn() beforeEach(() => { - ;(sendEventTelemetry as jest.Mock).mockImplementation( + ; (sendEventTelemetry as jest.Mock).mockImplementation( () => sendEventTelemetryMock, ) - ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ - ...initialStateDefault.app.context.pipelineManagement, - isOpenDialog: true, - }) + ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ + ...initialStateDefault.app.context.pipelineManagement, + isOpenDialog: true, + }) }) it('should call proper actions after select empty pipeline option', () => { @@ -178,13 +178,13 @@ describe('SourcePipelineDialog', () => { it('should call proper telemetry event after select empty pipeline option', () => { const sendEventTelemetryMock = jest.fn() - ;(sendEventTelemetry as jest.Mock).mockImplementation( - () => sendEventTelemetryMock, - ) - ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ - ...initialStateDefault.app.context.pipelineManagement, - isOpenDialog: true, - }) + ; (sendEventTelemetry as jest.Mock).mockImplementation( + () => sendEventTelemetryMock, + ) + ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ + ...initialStateDefault.app.context.pipelineManagement, + isOpenDialog: true, + }) renderSourcePipelineDialog() diff --git a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.tsx b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.tsx index 6e26a2cc59..2543b176e7 100644 --- a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.tsx +++ b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.tsx @@ -125,7 +125,7 @@ const SourcePipelineDialog = () => { > - Upload from file + Import pipeline from ZIP file Date: Fri, 21 Nov 2025 10:48:39 +0200 Subject: [PATCH 2/5] update text on rdi menu options --- .../rdi-config-file-action-menu/RdiConfigFileActionMenu.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redisinsight/ui/src/pages/rdi/instance/components/header/components/rdi-config-file-action-menu/RdiConfigFileActionMenu.tsx b/redisinsight/ui/src/pages/rdi/instance/components/header/components/rdi-config-file-action-menu/RdiConfigFileActionMenu.tsx index 12a67ce649..fe28ff8e95 100644 --- a/redisinsight/ui/src/pages/rdi/instance/components/header/components/rdi-config-file-action-menu/RdiConfigFileActionMenu.tsx +++ b/redisinsight/ui/src/pages/rdi/instance/components/header/components/rdi-config-file-action-menu/RdiConfigFileActionMenu.tsx @@ -34,7 +34,7 @@ const RdiConfigFileActionMenu = () => { onClose={closeMenu} trigger={ e.preventDefault()} aria-labelledby="Upload pipeline button" @@ -46,7 +46,7 @@ const RdiConfigFileActionMenu = () => { onClose={closeMenu} trigger={ e.preventDefault()} aria-labelledby="Upload file button" @@ -57,7 +57,7 @@ const RdiConfigFileActionMenu = () => { Date: Fri, 21 Nov 2025 11:09:04 +0200 Subject: [PATCH 3/5] update download from server modal text --- .../download-from-server-modal/DownloadFromServerModal.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redisinsight/ui/src/pages/rdi/pipeline-management/components/download-from-server-modal/DownloadFromServerModal.tsx b/redisinsight/ui/src/pages/rdi/pipeline-management/components/download-from-server-modal/DownloadFromServerModal.tsx index 176ac42696..e47e3cb0f6 100644 --- a/redisinsight/ui/src/pages/rdi/pipeline-management/components/download-from-server-modal/DownloadFromServerModal.tsx +++ b/redisinsight/ui/src/pages/rdi/pipeline-management/components/download-from-server-modal/DownloadFromServerModal.tsx @@ -72,8 +72,8 @@ const DownloadFromServerModal = (props: Props) => { - When downloading a new pipeline from the server, it will overwrite the - existing one displayed in Redis Insight. + When downloading the pipeline configuration from the server, it will + overwrite the existing one displayed in Redis Insight. Date: Fri, 21 Nov 2025 11:14:42 +0200 Subject: [PATCH 4/5] reverse unneeded formatting to the pipeline modal tests --- .../SourcePipelineModal.spec.tsx | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx index 8196243adb..e8bcf2d340 100644 --- a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx +++ b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx @@ -72,12 +72,12 @@ beforeEach(() => { cleanup() store = createMockedStore() store.clearActions() - ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ - ...initialStateDefault.rdi.pipeline, - }) - ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ - ...initialStateDefault.app.context.pipelineManagement, - }) + ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ + ...initialStateDefault.rdi.pipeline, + }) + ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ + ...initialStateDefault.app.context.pipelineManagement, + }) }) const renderSourcePipelineDialog = () => @@ -95,7 +95,7 @@ describe('SourcePipelineDialog', () => { }) it('should show dialog when isOpenDialog flag is true', () => { - ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ + ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ ...initialStateDefault.app.context.pipelineManagement, isOpenDialog: true, }) @@ -108,7 +108,7 @@ describe('SourcePipelineDialog', () => { }) it('should not show dialog when there is deployed pipeline on a server', () => { - ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ + ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ ...initialStateDefault.rdi.pipeline, loading: false, data: { config: 'some config' }, @@ -120,7 +120,7 @@ describe('SourcePipelineDialog', () => { }) it('should not show dialog when config is fetching', () => { - ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ + ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ ...initialStateDefault.rdi.pipeline, loading: true, data: null, @@ -132,7 +132,7 @@ describe('SourcePipelineDialog', () => { }) it('should show dialog when there is no pipeline on a server', () => { - ; (rdiPipelineSelector as jest.Mock).mockReturnValue({ + ;(rdiPipelineSelector as jest.Mock).mockReturnValue({ ...initialStateDefault.rdi.pipeline, loading: false, data: { config: '' }, @@ -147,13 +147,13 @@ describe('SourcePipelineDialog', () => { const sendEventTelemetryMock = jest.fn() beforeEach(() => { - ; (sendEventTelemetry as jest.Mock).mockImplementation( + ;(sendEventTelemetry as jest.Mock).mockImplementation( () => sendEventTelemetryMock, ) - ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ - ...initialStateDefault.app.context.pipelineManagement, - isOpenDialog: true, - }) + ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ + ...initialStateDefault.app.context.pipelineManagement, + isOpenDialog: true, + }) }) it('should call proper actions after select empty pipeline option', () => { @@ -178,13 +178,13 @@ describe('SourcePipelineDialog', () => { it('should call proper telemetry event after select empty pipeline option', () => { const sendEventTelemetryMock = jest.fn() - ; (sendEventTelemetry as jest.Mock).mockImplementation( - () => sendEventTelemetryMock, - ) - ; (appContextPipelineManagement as jest.Mock).mockReturnValue({ - ...initialStateDefault.app.context.pipelineManagement, - isOpenDialog: true, - }) + ;(sendEventTelemetry as jest.Mock).mockImplementation( + () => sendEventTelemetryMock, + ) + ;(appContextPipelineManagement as jest.Mock).mockReturnValue({ + ...initialStateDefault.app.context.pipelineManagement, + isOpenDialog: true, + }) renderSourcePipelineDialog() From 8e776001771b8960c2dddd34869561271813561f Mon Sep 17 00:00:00 2001 From: Dijana Antovska Date: Fri, 21 Nov 2025 11:23:50 +0200 Subject: [PATCH 5/5] remove unused imports in tests --- .../source-pipeline-dialog/SourcePipelineModal.spec.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx index e8bcf2d340..0a1a895675 100644 --- a/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx +++ b/redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx @@ -1,5 +1,4 @@ import React from 'react' -import { cloneDeep } from 'lodash' import { cleanup, mockedStore, @@ -10,7 +9,6 @@ import { createMockedStore, } from 'uiSrc/utils/test-utils' import { - getPipeline, rdiPipelineSelector, setChangedFile, } from 'uiSrc/slices/rdi/pipeline'