Fixed validation error message for min/max (#1058)

* Fixed validation error message for min/max * . * fix ci * test? * no build?
ukrbublik · Jun 7, 2024 · 4b7e4ea · 4b7e4ea
1 parent 52ac610
commit 4b7e4ea
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 12 deletions.
diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
@@ -15,5 +15,5 @@
     "/packages/sandbox_next"
   ],
   "node": "18",
-  "buildCommand": "build-libs"
+  "buildCommand": false
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Changelog
 - 6.6.0
+  - Optimizations for rendering and export utils (PR #1054) (issue #342)
   - Add JsonLogic Export for SwitchCase (PR #1013)
   - Add support of `tooltip` for operator config (PR #1011) (issue #261)
-  - Optimizations (PR #1054) (issue #342)
   - Removed `optimizeRenderWithInternals` from `settings` (PR #1054)
   - Fixed `TreeStore` - 2nd arg `action` can be undefined (PR #1054) (issue #1056)
   - Fixed import of negative number in SpEL (PR #1054) (issue #1055)
+  - Fixed validation error message for min/max (PR #1058) (issue #1057)
 - 6.5.2
   - Updated dependencies. `@babel/runtime` is now dep for core package (PR #1051) (issue #964)
 - 6.5.1

diff --git a/packages/antd/scripts/build-npm.sh b/packages/antd/scripts/build-npm.sh
@@ -1,7 +1,6 @@
 rm -rf ./lib # old name
 rm -rf ./cjs
 rm -rf ./esm
-rm -rf ./css
 
 babel --extensions ".tsx,.jsx,.ts,.js" -d ./cjs ./modules
 #find ./cjs -name "*.js" -exec sed -i.bak "s+antd/es/+antd/lib/+g" {} +
@@ -11,5 +10,6 @@ ESM=1 babel --extensions ".tsx,.jsx,.ts,.js" -d ./esm ./modules
 cp ./modules/index.d.ts ./cjs/index.d.ts
 cp ./modules/index.d.ts ./esm/index.d.ts
 
+rm -rf ./css
 sass -I node_modules -I ../../node_modules styles/:css/ --no-source-map --style=expanded
 cp ./styles/* ./css
diff --git a/packages/bootstrap/scripts/build-npm.sh b/packages/bootstrap/scripts/build-npm.sh
@@ -1,12 +1,12 @@
 rm -rf ./lib # old name
 rm -rf ./cjs
 rm -rf ./esm
-rm -rf ./css
 
 babel -d ./cjs ./modules
 ESM=1 babel -d ./esm ./modules
 cp ./modules/index.d.ts ./cjs/index.d.ts
 cp ./modules/index.d.ts ./esm/index.d.ts
 
+rm -rf ./css
 sass -I node_modules -I ../../node_modules styles/:css/ --no-source-map --style=expanded
 cp ./styles/* ./css
diff --git a/packages/core/modules/i18n/validation/constains.js b/packages/core/modules/i18n/validation/constains.js
@@ -37,3 +37,4 @@ export const ITEM_POSITION_ROOT = "ITEM_POSITION_ROOT";
 export const ITEM_POSITION_WITH_INDEX_PATH = "ITEM_POSITION_WITH_INDEX_PATH";
 export const ITEM_POSITION_IN_CASE = "ITEM_POSITION_IN_CASE";
 
+export const _CONTEXT_MIN_MAX = "range";
diff --git a/packages/core/modules/i18n/validation/translations.js b/packages/core/modules/i18n/validation/translations.js
@@ -23,8 +23,10 @@ export const translations = {
   [constants.INCORRECT_VALUE_TYPE]: "Value should have type {{wType}}, but got value of type {{valueType}}",
   [constants.INCORRECT_VALUE_JS_TYPE]: "Value should have JS type {{jsType}}, but got value of type {{valueTypeof}}",
   [constants.VALUE_LENGTH_CONSTRAINT_FAIL]: "Value {{value}} should have max length {{fieldSettings.maxLength}} but got {{length}}",
-  [constants.VALUE_MIN_CONSTRAINT_FAIL]: "Value {{value}} should be from {{fieldSettings.min}} to {{fieldSettings.max}}",
-  [constants.VALUE_MAX_CONSTRAINT_FAIL]: "Value {{value}} should be from {{fieldSettings.min}} to {{fieldSettings.max}}",
+  [constants.VALUE_MIN_CONSTRAINT_FAIL]: "Value {{value}} should be greater than or equal to {{fieldSettings.min}}",
+  [constants.VALUE_MIN_CONSTRAINT_FAIL+"_"+constants._CONTEXT_MIN_MAX]: "Value {{value}} should be from {{fieldSettings.min}} to {{fieldSettings.max}}",
+  [constants.VALUE_MAX_CONSTRAINT_FAIL]: "Value {{value}} should be less than or equal to {{fieldSettings.max}}",
+  [constants.VALUE_MAX_CONSTRAINT_FAIL+"_"+constants._CONTEXT_MIN_MAX]: "Value {{value}} should be from {{fieldSettings.min}} to {{fieldSettings.max}}",
   [constants.NO_CONFIG_FOR_FIELD_VALUE]: "No config for field {{field}}",
   [constants.CANT_COMPARE_FIELD_WITH_ITSELF]: "Can't compare field {{field}} with itself",
   [constants.CANT_COMPARE_FIELD_WITH_FIELD]: "Can't compare field {{leftField}} with {{rightField}}",

diff --git a/packages/core/modules/utils/validation.js b/packages/core/modules/utils/validation.js
@@ -879,11 +879,12 @@ const validateNormalValue = (field, value, valueSrc, valueType, asyncListValues,
         });
       }
       // validate min/max
+      const minMaxContext = fieldSettings.min != undefined && fieldSettings.max != undefined ? constants._CONTEXT_MIN_MAX : undefined;
       if (fieldSettings.min != null && value < fieldSettings.min) {
         fixedValue = canFix ? fieldSettings.min : value;
         allErrors.push({
           key: constants.VALUE_MIN_CONSTRAINT_FAIL,
-          args: { value, fieldSettings },
+          args: { value, fieldSettings, context: minMaxContext },
           fixed: canFix,
           fixedFrom: canFix ? value : undefined,
           fixedTo: canFix ? fixedValue : undefined,
@@ -893,7 +894,7 @@ const validateNormalValue = (field, value, valueSrc, valueType, asyncListValues,
         fixedValue = canFix ? fieldSettings.max : value;
         allErrors.push({
           key: constants.VALUE_MAX_CONSTRAINT_FAIL,
-          args: { value, fieldSettings },
+          args: { value, fieldSettings, context: minMaxContext },
           fixed: canFix,
           fixedFrom: canFix ? value : undefined,
           fixedTo: canFix ? fixedValue : undefined,

diff --git a/packages/fluent/scripts/build-npm.sh b/packages/fluent/scripts/build-npm.sh
@@ -1,12 +1,12 @@
 rm -rf ./lib # old name
 rm -rf ./cjs
 rm -rf ./esm
-rm -rf ./css
 
 babel -d ./cjs ./modules
 ESM=1 babel -d ./esm ./modules
 cp ./modules/index.d.ts ./cjs/index.d.ts
 cp ./modules/index.d.ts ./esm/index.d.ts
 
+rm -rf ./css
 sass -I node_modules -I ../../node_modules styles/:css/ --no-source-map --style=expanded
 cp ./styles/* ./css
diff --git a/packages/material/scripts/build-npm.sh b/packages/material/scripts/build-npm.sh
@@ -1,12 +1,12 @@
 rm -rf ./lib # old name
 rm -rf ./cjs
 rm -rf ./esm
-rm -rf ./css
 
 babel -d ./cjs ./modules
 ESM=1 babel -d ./esm ./modules
 cp ./modules/index.d.ts ./cjs/index.d.ts
 cp ./modules/index.d.ts ./esm/index.d.ts
 
+rm -rf ./css
 sass -I node_modules -I ../../node_modules styles/:css/ --no-source-map --style=expanded
 cp ./styles/* ./css
diff --git a/packages/mui/scripts/build-npm.sh b/packages/mui/scripts/build-npm.sh
@@ -1,12 +1,12 @@
 rm -rf ./lib # old name
 rm -rf ./cjs
 rm -rf ./esm
-rm -rf ./css
 
 babel -d ./cjs ./modules
 ESM=1 babel -d ./esm ./modules
 cp ./modules/index.d.ts ./cjs/index.d.ts
 cp ./modules/index.d.ts ./esm/index.d.ts
 
+rm -rf ./css
 sass -I node_modules -I ../../node_modules styles/:css/ --no-source-map --style=expanded
 cp ./styles/* ./css
diff --git a/packages/ui/scripts/build-npm.sh b/packages/ui/scripts/build-npm.sh
@@ -1,12 +1,12 @@
 rm -rf ./lib # old name
 rm -rf ./cjs
 rm -rf ./esm
-rm -rf ./css
 
 babel -d ./cjs ./modules
 ESM=1 babel -d ./esm ./modules
 cp ./modules/index.d.ts ./cjs/index.d.ts
 cp ./modules/index.d.ts ./esm/index.d.ts
 
+rm -rf ./css
 sass styles/:css/ --no-source-map --style=expanded
 cp ./styles/* ./css