Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VCST-410: Incorrect validation for decimal fields in settings #2757

Merged
merged 2 commits into from
Feb 6, 2024
Merged

VCST-410: Incorrect validation for decimal fields in settings #2757

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1658ba
VCST-410: Incorrect validation for decimal fields in settings
OlegoO Feb 2, 2024
d5673ea
Merge branch 'dev' into fix/VCST-410-decimal-setting-allow-empty-string
AlexTzykin Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 60 additions & 61 deletions src/VirtoCommerce.Platform.Web/wwwroot/js/common/directives/smartFloat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
'use strict';

angular.module('platformWebApp')
// TODO: Replace with tested localized version (see below)
.directive('smartFloat', ['$filter', '$compile', 'platformWebApp.userProfile', function ($filter, $compile, userProfile) {
var INTEGER_REGEXP = /^\-?\d+$/; //Integer number
var INTEGER_MAX_VALUE = 2147483647;
var INTEGER_MIN_VALUE = -2147483648;
var FLOAT_REGEXP_1 = /^[-+]?\$?\d{1,3}(\.\d{3})+(,\d*)$/; //Numbers like: 1.234,5678
var FLOAT_REGEXP_2 = /^[-+]?\$?\d{1,3}(,\d{3})+(\.\d*)$/; //Numbers like: 1,234.5678
var FLOAT_REGEXP_3 = /^[-+]?\$?\d+(\.\d*)?$/; //Numbers like: 1234.5678
var FLOAT_REGEXP_4 = /^[-+]?\$?\d+(,\d*)?$/; //Numbers like: 1234,5678
// TODO: Replace with tested localized version (see below)
.directive('smartFloat', ['$filter', '$compile', 'platformWebApp.userProfile', function ($filter, $compile, userProfile) {
var INTEGER_REGEXP = /^\-?\d+$/; //Integer number
var INTEGER_MAX_VALUE = 2147483647;
var INTEGER_MIN_VALUE = -2147483648;
var FLOAT_REGEXP_1 = /^[-+]?\$?\d{1,3}(\.\d{3})+(,\d*)$/; //Numbers like: 1.234,5678
var FLOAT_REGEXP_2 = /^[-+]?\$?\d{1,3}(,\d{3})+(\.\d*)$/; //Numbers like: 1,234.5678
var FLOAT_REGEXP_3 = /^[-+]?\$?\d+(\.\d*)?$/; //Numbers like: 1234.5678
var FLOAT_REGEXP_4 = /^[-+]?\$?\d+(,\d*)?$/; //Numbers like: 1234,5678

return {
require: 'ngModel',
link: function (scope, elm, attrs, ctrl) {
return {
require: 'ngModel',
link: function (scope, elm, attrs, ctrl) {
// possible values for fraction are: 0, positive number, negative number, none
// when fraction is a negative number result has maximum length of the fractional part of the value
var fraction = (attrs.fraction || Number(attrs.fraction) === 0) ? attrs.fraction : 2;
if (attrs.numType === "float") {
ctrl.$parsers.unshift(function (viewValue) {
if (FLOAT_REGEXP_1.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue.replace('.', '').replace(',', '.'));
} else if (FLOAT_REGEXP_2.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue.replace(',', ''));
} else if (FLOAT_REGEXP_3.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue);
} else if (FLOAT_REGEXP_4.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue.replace(',', '.'));
} else {
//Allow to use empty values
ctrl.$setValidity('float', !viewValue);
return viewValue;
}
});
var fraction = (attrs.fraction || Number(attrs.fraction) === 0) ? attrs.fraction : 2;
if (attrs.numType === "float") {
ctrl.$parsers.unshift(function (viewValue) {
if (FLOAT_REGEXP_1.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue.replace('.', '').replace(',', '.'));
} else if (FLOAT_REGEXP_2.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue.replace(',', ''));
} else if (FLOAT_REGEXP_3.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue);
} else if (FLOAT_REGEXP_4.test(viewValue)) {
ctrl.$setValidity('float', true);
return parseFloat(viewValue.replace(',', '.'));
} else {
ctrl.$setValidity('float', false);
return viewValue;
}
});

ctrl.$formatters.unshift(
function (modelValue) {
ctrl.$formatters.unshift(
function (modelValue) {
if (modelValue == null) {
return modelValue;
}
Expand All @@ -51,29 +50,29 @@ angular.module('platformWebApp')
return new Intl.NumberFormat(userProfile.language || 'default', { maximumFractionDigits: -fraction }).format(resultValue);
}
// default behavior
return $filter('number')(resultValue, fraction);
}
);
}
else if (attrs.numType === "positiveInteger") {
ctrl.$parsers.unshift(function (viewValue) {
ctrl.$setValidity('positiveInteger', INTEGER_REGEXP.test(viewValue) && viewValue > 0);
return viewValue;
});
}
else {
ctrl.$parsers.unshift(function (viewValue) {
if (INTEGER_REGEXP.test(viewValue) && viewValue >= INTEGER_MIN_VALUE && viewValue <= INTEGER_MAX_VALUE) {
ctrl.$setValidity('integer', true);
return viewValue;
}
else {
//Allow to use empty values
ctrl.$setValidity('integer', !viewValue);
return viewValue;
}
});
}
}
};
}]);
return $filter('number')(resultValue, fraction);
}
);
}
else if (attrs.numType === "positiveInteger") {
ctrl.$parsers.unshift(function (viewValue) {
ctrl.$setValidity('positiveInteger', INTEGER_REGEXP.test(viewValue) && viewValue > 0);
return viewValue;
});
}
else {
ctrl.$parsers.unshift(function (viewValue) {
if (INTEGER_REGEXP.test(viewValue) && viewValue >= INTEGER_MIN_VALUE && viewValue <= INTEGER_MAX_VALUE) {
ctrl.$setValidity('integer', true);
return viewValue;
}
else {
//Allow to use empty values
ctrl.$setValidity('integer', !viewValue);
return viewValue;
}
});
}
}
};
}]);
Loading