fix(charts): Table chart shows an error on row limit

superset-frontend/packages/superset-ui-core/src/utils/index.ts

@@ -25,6 +25,7 @@ export { default as isEqualArray } from './isEqualArray';
 export { default as makeSingleton } from './makeSingleton';
 export { default as promiseTimeout } from './promiseTimeout';
 export { default as removeDuplicates } from './removeDuplicates';
+export { default as withLabel } from './withLabel';
 export { lruCache } from './lruCache';
 export { getSelectedText } from './getSelectedText';
 export * from './featureFlags';

superset-frontend/packages/superset-ui-core/src/utils/withLabel.ts

@@ -0,0 +1,41 @@
+/**
+ * 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.
+ */
+
+/**
+ * Wraps a validator function to prepend a label to its error message.
+ *
+ * @param validator - The validator function to wrap
+ * @param label - The label to prepend to error messages
+ * @returns A new validator function that includes the label in error messages
+ *
+ * @example
+ * validators: [
+ *   withLabel(validateInteger, t('Row limit')),
+ * ]
+ * // Returns: "Row limit is expected to be an integer"
+ */
+export default function withLabel(
+  validator: (v: unknown, state?: any) => string | false,
+  label: string,
+) {
+  return (v: unknown, state?: any) => {
+    const error = validator(v, state);
+    return error ? `${label} ${error}` : false;
+  };
+}

superset-frontend/packages/superset-ui-core/src/validator/validateNumber.ts

@@ -19,7 +19,7 @@
 
 import { t } from '@apache-superset/core';
 
-export default function validateInteger(v: any) {
+export default function validateNumber(v: any) {
   if (
     (typeof v === 'string' &&
       v.trim().length > 0 &&

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

@@ -20,13 +20,13 @@
 import { validateMaxValue } from '@superset-ui/core';
 import './setup';
 
-test('validateInteger returns the warning message if invalid', () => {
+test('validateMaxValue returns the warning message if invalid', () => {
   expect(validateMaxValue(10.1, 10)).toBeTruthy();
   expect(validateMaxValue(1, 0)).toBeTruthy();
   expect(validateMaxValue('2', 1)).toBeTruthy();
 });
 
-test('validateInteger returns false if the input is valid', () => {
+test('validateMaxValue returns false if the input is valid', () => {
   expect(validateMaxValue(0, 1)).toBeFalsy();
   expect(validateMaxValue(10, 10)).toBeFalsy();
   expect(validateMaxValue(undefined, 1)).toBeFalsy();

superset-frontend/plugins/plugin-chart-ag-grid-table/src/controlPanel.tsx

@@ -51,6 +51,7 @@ import {
   SMART_DATE_ID,
   validateMaxValue,
   validateServerPagination,
+  withLabel,
 } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/api/core';
 import { isEmpty, last } from 'lodash';
@@ -384,7 +385,7 @@ const config: ControlPanelConfig = {
               description: t('Rows per page, 0 means no pagination'),
               visibility: ({ controls }: ControlPanelsContainerProps) =>
                 Boolean(controls?.server_pagination?.value),
-              validators: [validateInteger],
+              validators: [withLabel(validateInteger, t('Server Page Length'))],
             },
           },
         ],
@@ -403,7 +404,7 @@ const config: ControlPanelConfig = {
                   state?.common?.conf?.SQL_MAX_ROW,
               }),
               validators: [
-                validateInteger,
+                withLabel(validateInteger, t('Row limit')),
                 (v, state) =>
                   validateMaxValue(
                     v,

superset-frontend/plugins/plugin-chart-echarts/src/Histogram/controlPanel.tsx

@@ -17,7 +17,11 @@
  * under the License.
  */
 import { t } from '@apache-superset/core';
-import { validateInteger, validateNonEmpty } from '@superset-ui/core';
+import {
+  validateInteger,
+  validateNonEmpty,
+  withLabel,
+} from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/api/core';
 import {
   ControlPanelConfig,
@@ -66,7 +70,7 @@ const config: ControlPanelConfig = {
               default: 5,
               choices: formatSelectOptionsForRange(5, 20, 5),
               description: t('The number of bins for the histogram'),
-              validators: [validateInteger],
+              validators: [withLabel(validateInteger, t('Bins'))],
             },
           },
         ],

superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx

@@ -52,6 +52,7 @@ import {
   SMART_DATE_ID,
   validateMaxValue,
   validateServerPagination,
+  withLabel,
 } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/api/core';
 import { isEmpty, last } from 'lodash';
@@ -407,7 +408,7 @@ const config: ControlPanelConfig = {
               description: t('Rows per page, 0 means no pagination'),
               visibility: ({ controls }: ControlPanelsContainerProps) =>
                 Boolean(controls?.server_pagination?.value),
-              validators: [validateInteger],
+              validators: [withLabel(validateInteger, t('Server Page Length'))],
             },
           },
         ],
@@ -419,14 +420,15 @@ const config: ControlPanelConfig = {
               freeForm: true,
               label: t('Row limit'),
               clearable: false,
-              mapStateToProps: state => ({
+              mapStateToProps: (state, controlState) => ({
+                value: controlState?.value ?? 10000,
                 maxValue: state?.common?.conf?.TABLE_VIZ_MAX_ROW_SERVER,
                 server_pagination: state?.form_data?.server_pagination,
                 maxValueWithoutServerPagination:
                   state?.common?.conf?.SQL_MAX_ROW,
               }),
               validators: [
-                validateInteger,
+                withLabel(validateInteger, t('Row limit')),
                 (v, state) =>
                   validateMaxValue(
                     v,