Skip to content

Commit b8c5964

Browse files
committed
fix PR comments
1 parent 664f095 commit b8c5964

5 files changed

Lines changed: 19 additions & 14 deletions

File tree

src/legacy/ui/public/vis/editors/default/controls/components/number_list/__snapshots__/number_list.test.tsx.snap

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import React, { useCallback } from 'react';
2121

2222
import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiButtonIcon } from '@elastic/eui';
2323
import { i18n } from '@kbn/i18n';
24-
import { Range } from './range';
24+
import { NumberListRange } from './range';
2525

2626
export interface NumberRowProps {
2727
autoFocus: boolean;
2828
disableDelete: boolean;
2929
isInvalid: boolean;
3030
labelledbyId: string;
3131
model: NumberRowModel;
32-
range: Range;
32+
range: NumberListRange;
3333
onBlur(): void;
3434
onChange({ id, value }: { id: string; value: string }): void;
3535
onDelete(index: string): void;

src/legacy/ui/public/vis/editors/default/controls/components/number_list/range.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const RANGE_RE = new RegExp(
4646
'^\\s*([\\[|\\(])\\s*' + _RE_NUMBER + '\\s*,\\s*' + _RE_NUMBER + '\\s*([\\]|\\)])\\s*$'
4747
);
4848

49-
export class Range {
49+
export class NumberListRange {
5050
constructor(
5151
public minInclusive: boolean,
5252
public min: number,
@@ -62,7 +62,7 @@ export class Range {
6262
}
6363
}
6464

65-
export function parseRange(input: string): Range {
65+
export function parseRange(input: string): NumberListRange {
6666
const match = String(input).match(RANGE_RE);
6767
if (!match) {
6868
throw new TypeError('expected input to be in interval notation e.g., (100, 200]');
@@ -76,5 +76,10 @@ export function parseRange(input: string): Range {
7676

7777
const [minInclusive, min, max, maxInclusive] = args;
7878

79-
return new Range(minInclusive as boolean, min as number, max as number, maxInclusive as boolean);
79+
return new NumberListRange(
80+
minInclusive as boolean,
81+
min as number,
82+
max as number,
83+
maxInclusive as boolean
84+
);
8085
}

src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import {
2727
getNextModel,
2828
getRange,
2929
} from './utils';
30-
import { Range } from './range';
30+
import { NumberListRange } from './range';
3131
import { NumberRowModel } from './number_row';
3232

3333
describe('NumberList utils', () => {
3434
let modelList: NumberRowModel[];
35-
let range: Range;
35+
let range: NumberListRange;
3636

3737
beforeEach(() => {
3838
modelList = [

src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { last } from 'lodash';
2121
import { i18n } from '@kbn/i18n';
2222
import { htmlIdGenerator } from '@elastic/eui';
2323

24-
import { parseRange, Range } from './range';
24+
import { parseRange, NumberListRange } from './range';
2525
import { NumberRowModel } from './number_row';
2626

2727
const EMPTY_STRING = '';
@@ -34,15 +34,15 @@ function parse(value: string) {
3434
return isNaN(parsedValue) ? EMPTY_STRING : parsedValue;
3535
}
3636

37-
function getRange(range?: string): Range {
37+
function getRange(range?: string): NumberListRange {
3838
try {
3939
return range ? parseRange(range) : defaultRange;
4040
} catch (e) {
4141
throw new TypeError('Unable to parse range: ' + e.message);
4242
}
4343
}
4444

45-
function validateValue(value: number | '', numberRange: Range) {
45+
function validateValue(value: number | '', numberRange: NumberListRange) {
4646
const result: { isInvalid: boolean; error?: string } = {
4747
isInvalid: false,
4848
};
@@ -76,7 +76,7 @@ function validateOrder(list: Array<number | undefined>) {
7676
return result;
7777
}
7878

79-
function getNextModel(list: NumberRowModel[], range: Range): NumberRowModel {
79+
function getNextModel(list: NumberRowModel[], range: NumberListRange): NumberRowModel {
8080
const lastValue = last(list).value;
8181
let next = Number(lastValue) ? Number(lastValue) + 1 : 1;
8282

@@ -104,7 +104,7 @@ function getInitModelList(list: Array<number | undefined>): NumberRowModel[] {
104104
function getUpdatedModels(
105105
numberList: Array<number | undefined>,
106106
modelList: NumberRowModel[],
107-
numberRange: Range,
107+
numberRange: NumberListRange,
108108
invalidOrderModelIndex?: number
109109
): NumberRowModel[] {
110110
if (!numberList.length) {

0 commit comments

Comments
 (0)