You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by di...@apache.org on 2023/10/25 11:21:05 UTC
[superset] 01/01: Revert "fix(Charts): Set max row limit + removed the option to use an empty row limit value (#25579)"
This is an automated email from the ASF dual-hosted git repository.
diegopucci pushed a commit to branch revert-25579-chart/row-limit
in repository https://gitbox.apache.org/repos/asf/superset.git
commit dc2dcd6a4515df6603804e91e05f1309b447e4cb
Author: Geido <60...@users.noreply.github.com>
AuthorDate: Wed Oct 25 14:20:59 2023 +0300
Revert "fix(Charts): Set max row limit + removed the option to use an empty row limit value (#25579)"
This reverts commit f556ef53f3177746ec2526b4b963da4ef00c2d58.
---
.../src/shared-controls/sharedControls.tsx | 9 +----
.../superset-ui-core/src/validator/index.ts | 1 -
.../src/validator/validateMaxValue.ts | 8 -----
.../test/validator/validateMaxValue.test.ts | 38 ----------------------
4 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
index 80469e17a4..57419b4918 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
@@ -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(
diff --git a/superset-frontend/packages/superset-ui-core/src/validator/index.ts b/superset-frontend/packages/superset-ui-core/src/validator/index.ts
index fb37328c02..532efcc959 100644
--- a/superset-frontend/packages/superset-ui-core/src/validator/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/validator/index.ts
@@ -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';
diff --git a/superset-frontend/packages/superset-ui-core/src/validator/validateMaxValue.ts b/superset-frontend/packages/superset-ui-core/src/validator/validateMaxValue.ts
deleted file mode 100644
index 24c1da1c79..0000000000
--- a/superset-frontend/packages/superset-ui-core/src/validator/validateMaxValue.ts
+++ /dev/null
@@ -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;
-}
diff --git a/superset-frontend/packages/superset-ui-core/test/validator/validateMaxValue.test.ts b/superset-frontend/packages/superset-ui-core/test/validator/validateMaxValue.test.ts
deleted file mode 100644
index 70f3d332c5..0000000000
--- a/superset-frontend/packages/superset-ui-core/test/validator/validateMaxValue.test.ts
+++ /dev/null
@@ -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();
- });
-});