Skip to content

Commit 7d2bb83

Browse files
RI-2790-remove db index validation (#634)
* RI-2790-remove db index validation
1 parent 571b813 commit 7d2bb83

File tree

8 files changed

+8
-43
lines changed

8 files changed

+8
-43
lines changed

redisinsight/api/src/modules/instances/dto/database-instance.dto.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ export class ConnectionOptionsDto extends EndpointDto {
212212
example: 0,
213213
})
214214
@IsInt()
215-
@Max(15)
216215
@Min(0)
217216
@Type(() => Number)
218217
@IsOptional()
@@ -403,15 +402,13 @@ export class AddDatabaseInstanceDto extends ConnectionOptionsDto {
403402

404403
export class ConnectToRedisDatabaseIndexDto {
405404
@ApiPropertyOptional({
406-
description: 'Databases index. Redis databases are numbered from 0 to 15.',
405+
description: 'Databases index.',
407406
type: Number,
408407
minimum: 0,
409-
maximum: 15,
410408
default: 0,
411409
})
412410
@IsInt()
413411
@Min(0)
414-
@Max(15)
415412
@Type(() => Number)
416413
@IsNotEmpty()
417414
dbNumber?: number;

redisinsight/api/src/modules/instances/dto/redis-sentinel.dto.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ export class AddSentinelMasterDto {
6464
example: 0,
6565
})
6666
@IsInt()
67-
@Max(15)
6867
@Min(0)
6968
@Type(() => Number)
7069
@IsOptional()

redisinsight/ui/src/components/input-field-sentinel/InputFieldSentinel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { omit } from 'lodash'
33
import React, { useState } from 'react'
44
import cx from 'classnames'
55
import { useDebouncedEffect } from 'uiSrc/services'
6-
import { validateDatabaseNumber } from 'uiSrc/utils'
6+
import { validateNumber } from 'uiSrc/utils'
77

88
import styles from './styles.module.scss'
99

@@ -77,7 +77,7 @@ const InputFieldSentinel = (props: Props) => {
7777
compressed
7878
type="text"
7979
value={value}
80-
onChange={(e) => handleChange(validateDatabaseNumber(e.target?.value))}
80+
onChange={(e) => handleChange(validateNumber(e.target?.value))}
8181
data-testid="sentinel-input-number"
8282
/>
8383
)}

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ import { FormikErrors, useFormik } from 'formik'
3333
import cx from 'classnames'
3434
import {
3535
MAX_PORT_NUMBER,
36-
MAX_DATABASE_INDEX_NUMBER,
36+
validateNumber,
3737
validateCertName,
3838
validateField,
3939
validatePortNumber,
40-
validateDatabaseNumber,
4140
} from 'uiSrc/utils/validations'
4241
import {
4342
ConnectionType,
@@ -753,7 +752,7 @@ const AddStandaloneForm = (props: Props) => {
753752
{ [styles.dbInputBig]: !flexItemClassName }
754753
)}
755754
>
756-
<EuiFormRow label="Database Index" helpText="Should not exceed 15.">
755+
<EuiFormRow label="Database Index">
757756
<EuiFieldNumber
758757
name="db"
759758
id="db"
@@ -765,12 +764,11 @@ const AddStandaloneForm = (props: Props) => {
765764
onChange={(e: ChangeEvent<HTMLInputElement>) => {
766765
formik.setFieldValue(
767766
e.target.name,
768-
validateDatabaseNumber(e.target.value.trim())
767+
validateNumber(e.target.value.trim())
769768
)
770769
}}
771770
type="text"
772771
min={0}
773-
max={MAX_DATABASE_INDEX_NUMBER}
774772
/>
775773
</EuiFormRow>
776774
</EuiFlexItem>

redisinsight/ui/src/pages/sentinelDatabases/SentinelDatabasesPage.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { useHistory } from 'react-router-dom'
1111
import { useDispatch, useSelector } from 'react-redux'
1212

1313
import { Pages } from 'uiSrc/constants'
14-
import { MAX_DATABASE_INDEX_NUMBER, setTitle } from 'uiSrc/utils'
14+
import { setTitle } from 'uiSrc/utils'
1515
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
1616
import {
1717
createMastersSentinelAction,
@@ -235,7 +235,6 @@ const SentinelDatabasesPage = () => {
235235
<div role="presentation">
236236
<InputFieldSentinel
237237
min={0}
238-
max={MAX_DATABASE_INDEX_NUMBER}
239238
className={styles.dbInfo}
240239
value={`${db}` || '0'}
241240
name={`db-${id}`}

redisinsight/ui/src/pages/sentinelDatabasesResult/SentinelDatabasesResultPage.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
createMastersSentinelAction,
2626
resetDataSentinel,
2727
} from 'uiSrc/slices/instances/sentinel'
28-
import { MAX_DATABASE_INDEX_NUMBER, removeEmpty, setTitle } from 'uiSrc/utils'
28+
import { removeEmpty, setTitle } from 'uiSrc/utils'
2929
import { ApiStatusCode, Pages } from 'uiSrc/constants'
3030
import { ApiEncryptionErrors } from 'uiSrc/constants/apiErrors'
3131
import { InputFieldSentinel } from 'uiSrc/components'
@@ -299,7 +299,6 @@ const SentinelDatabasesResultPage = () => {
299299
<InputFieldSentinel
300300
min={0}
301301
disabled={loading}
302-
max={MAX_DATABASE_INDEX_NUMBER}
303302
className={styles.dbInfo}
304303
value={`${db}` || '0'}
305304
name={`db-${id}`}

redisinsight/ui/src/utils/tests/validations.spec.ts

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import {
88
validateCountNumber,
99
validateScoreNumber,
1010
validateTTLNumberForAddKey,
11-
MAX_DATABASE_INDEX_NUMBER,
12-
validateDatabaseNumber,
1311
validateCertName,
1412
validateRefreshRateNumber,
1513
MAX_REFRESH_RATE,
@@ -134,28 +132,6 @@ describe('Validations utils', () => {
134132
})
135133
})
136134

137-
describe('validateDatabaseNumber', () => {
138-
it('validateDatabaseNumber should return only numbers between 0 and MAX_DATABASE_INDEX_NUMBER', () => {
139-
const expectedResponse1 = `${MAX_DATABASE_INDEX_NUMBER}`
140-
const expectedResponse2 = `${MAX_DATABASE_INDEX_NUMBER}`
141-
const expectedResponse4 = ''
142-
const expectedResponse5 = ''
143-
const expectedResponse6 = `${MAX_DATABASE_INDEX_NUMBER}`
144-
const expectedResponse7 = `${MAX_DATABASE_INDEX_NUMBER}`
145-
const expectedResponse8 = `${MAX_DATABASE_INDEX_NUMBER}`
146-
const expectedResponse13 = '5'
147-
148-
expect(validateDatabaseNumber(text1)).toEqual(expectedResponse1)
149-
expect(validateDatabaseNumber(text2)).toEqual(expectedResponse2)
150-
expect(validateDatabaseNumber(text4)).toEqual(expectedResponse4)
151-
expect(validateDatabaseNumber(text5)).toEqual(expectedResponse5)
152-
expect(validateDatabaseNumber(text6)).toEqual(expectedResponse6)
153-
expect(validateDatabaseNumber(text7)).toEqual(expectedResponse7)
154-
expect(validateDatabaseNumber(text8)).toEqual(expectedResponse8)
155-
expect(validateDatabaseNumber(text13)).toEqual(expectedResponse13)
156-
})
157-
})
158-
159135
describe('validateEmail', () => {
160136
it('validateEmail should return "true" only for email format text', () => {
161137
expect(validateEmail(text1)).toBeFalsy()

redisinsight/ui/src/utils/validations.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { floor } from 'lodash'
22

33
export const MAX_TTL_NUMBER = 2147483647
44
export const MAX_PORT_NUMBER = 65535
5-
export const MAX_DATABASE_INDEX_NUMBER = 99
65
export const MAX_SCORE_DECIMAL_LENGTH = 15
76
export const MAX_REFRESH_RATE = 999.9
87
export const MIN_REFRESH_RATE = 1.0
@@ -61,8 +60,6 @@ export const validateEmail = (email: string) => {
6160
}
6261

6362
export const validatePortNumber = (initValue: string) => validateNumber(initValue, MAX_PORT_NUMBER)
64-
export const validateDatabaseNumber = (initValue: string) =>
65-
validateNumber(initValue, MAX_DATABASE_INDEX_NUMBER)
6663

6764
export const validateNumber = (initValue: string, maxNumber: number = Infinity, minNumber: number = 0) => {
6865
const positiveNumbers = /[^0-9]+/gi

0 commit comments

Comments
 (0)