Skip to content

Commit 4f0eb62

Browse files
#RI-5829 - resolve comments
1 parent 5ac1d5f commit 4f0eb62

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { upperFirst } from 'lodash'
2+
import React from 'react'
3+
4+
export const rdiErrorMessages = {
5+
invalidStructure: (name = 'Value', msg = 'Failed to convert YAML to JSON structure') => (
6+
<>
7+
{`${upperFirst(name)} has an invalid structure.`}
8+
<br />
9+
{msg}
10+
</>
11+
),
12+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './errors'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import {
2222
setPipelineInitialState,
2323
} from 'uiSrc/slices/rdi/pipeline'
2424
import { IPipeline } from 'uiSrc/slices/interfaces'
25-
import { createAxiosError, Nullable, pipelineToJson, rdiErrorMessages } from 'uiSrc/utils'
25+
import { createAxiosError, Nullable, pipelineToJson } from 'uiSrc/utils'
26+
import { rdiErrorMessages } from 'uiSrc/pages/rdi/constants'
2627
import { addErrorNotification } from 'uiSrc/slices/app/notifications'
2728

2829
import InstancePageRouter from './InstancePageRouter'

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
@@ -14,9 +14,10 @@ import { FileChangeType, IPipeline, RdiPipelineTabs } from 'uiSrc/slices/interfa
1414
import MonacoYaml from 'uiSrc/components/monaco-editor/components/monaco-yaml'
1515
import TestConnectionsPanel from 'uiSrc/pages/rdi/pipeline-management/components/test-connections-panel'
1616
import TemplatePopover from 'uiSrc/pages/rdi/pipeline-management/components/template-popover'
17+
import { rdiErrorMessages } from 'uiSrc/pages/rdi/constants'
1718
import { testConnectionsAction, rdiTestConnectionsSelector, testConnectionsController } from 'uiSrc/slices/rdi/testConnections'
1819
import { appContextPipelineManagement } from 'uiSrc/slices/app/context'
19-
import { createAxiosError, isEqualPipelineFile, rdiErrorMessages, yamlToJson } from 'uiSrc/utils'
20+
import { createAxiosError, isEqualPipelineFile, yamlToJson } from 'uiSrc/utils'
2021

2122
import { addErrorNotification } from 'uiSrc/slices/app/notifications'
2223
import styles from './styles.module.scss'

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/Job.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ import { deleteChangedFile, rdiPipelineSelector, setChangedFile } from 'uiSrc/sl
1212
import { FileChangeType, IPipeline, RdiPipelineTabs } from 'uiSrc/slices/interfaces'
1313
import MonacoYaml from 'uiSrc/components/monaco-editor/components/monaco-yaml'
1414
import DryRunJobPanel from 'uiSrc/pages/rdi/pipeline-management/components/jobs-panel'
15+
import { rdiErrorMessages } from 'uiSrc/pages/rdi/constants'
1516
import { DSL, KEYBOARD_SHORTCUTS } from 'uiSrc/constants'
1617
import TemplatePopover from 'uiSrc/pages/rdi/pipeline-management/components/template-popover'
17-
import { createAxiosError, isEqualPipelineFile, Maybe, rdiErrorMessages, yamlToJson } from 'uiSrc/utils'
18+
import { createAxiosError, isEqualPipelineFile, Maybe, yamlToJson } from 'uiSrc/utils'
1819
import { getUtmExternalLink } from 'uiSrc/utils/links'
1920
import { KeyboardShortcut } from 'uiSrc/components'
2021

redisinsight/ui/src/utils/errors.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AxiosError } from 'axios'
2-
import { capitalize, isEmpty, isString, isArray, set, isNumber, upperFirst } from 'lodash'
2+
import { capitalize, isEmpty, isString, isArray, set, isNumber } from 'lodash'
33
import React from 'react'
44
import { EuiSpacer } from '@elastic/eui'
55
import { CustomErrorCodes } from 'uiSrc/constants'
@@ -202,13 +202,3 @@ export const parseCustomError = (err: CustomError | string = DEFAULT_ERROR_MESSA
202202

203203
return set(error, 'response.data', parsedError) as AxiosError
204204
}
205-
206-
export const rdiErrorMessages = {
207-
invalidStructure: (name = 'Value', msg = 'Failed to convert YAML to JSON structure') => (
208-
<>
209-
{`${upperFirst(name)} has an invalid structure.`}
210-
<br />
211-
{msg}
212-
</>
213-
),
214-
}

0 commit comments

Comments
 (0)