iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Revert "fix(Charts): Set max row limit + removed the option to use an empty row limit value" (#25753)

This commit is contained in:
Geido 2023-10-25 15:39:49 +03:00 committed by GitHub
parent 27a06f57e1
commit e2fe967788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
View File

@ -47,8 +47,6 @@ import {
isDefined,
hasGenericChartAxes,
NO_TIME_RANGE,
validateNonEmpty,
validateMaxValue,
} from '@superset-ui/core';
import {
@ -245,12 +243,7 @@ const row_limit: SharedControlConfig<'SelectControl'> = {
type: 'SelectControl',
freeForm: true,
label: t('Row limit'),
clearable: false,
validators: [
validateNonEmpty,
legacyValidateInteger,
v => validateMaxValue(v, 100000),
],
validators: [legacyValidateInteger],
default: 10000,
choices: formatSelectOptions(ROW_LIMIT_OPTIONS),
description: t(

1
superset-frontend/packages/superset-ui-core/src/validator/index.ts
View File

@ -22,4 +22,3 @@ export { default as legacyValidateNumber } from './legacyValidateNumber';
export { default as validateInteger } from './validateInteger';
export { default as validateNumber } from './validateNumber';
export { default as validateNonEmpty } from './validateNonEmpty';
export { default as validateMaxValue } from './validateMaxValue';

8
superset-frontend/packages/superset-ui-core/src/validator/validateMaxValue.ts
View File

@ -1,8 +0,0 @@
import { t } from '../translation';
export default function validateMaxValue(v: unknown, max: Number) {
if (Number(v) > +max) {
return t('Value cannot exceed %s', max);
}
return false;
}

38
superset-frontend/packages/superset-ui-core/test/validator/validateMaxValue.test.ts
View File

@ -1,38 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import { validateMaxValue } from '@superset-ui/core';
import './setup';
describe('validateInteger()', () => {
it('returns the warning message if invalid', () => {
expect(validateMaxValue(10.1, 10)).toBeTruthy();
expect(validateMaxValue(1, 0)).toBeTruthy();
expect(validateMaxValue('2', 1)).toBeTruthy();
});
it('returns false if the input is valid', () => {
expect(validateMaxValue(0, 1)).toBeFalsy();
expect(validateMaxValue(10, 10)).toBeFalsy();
expect(validateMaxValue(undefined, 1)).toBeFalsy();
expect(validateMaxValue(NaN, NaN)).toBeFalsy();
expect(validateMaxValue(null, 1)).toBeFalsy();
expect(validateMaxValue('1', 1)).toBeFalsy();
expect(validateMaxValue('a', 1)).toBeFalsy();
});
});