Merge branch 'ACP2E-3392' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-11-14-2024

Author: chittima

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All rights reserved.
  */
 -->
 <form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
@@ -293,7 +293,7 @@
                         <scopeLabel>[GLOBAL]</scopeLabel>
                         <validation>
                             <rule name="validate-number" xsi:type="boolean">true</rule>
-                            <rule name="validate-greater-than-zero" xsi:type="boolean">true</rule>
+                            <rule name="validate-nonempty-number-greater-than-zero" xsi:type="boolean">true</rule>
                         </validation>
                         <label translate="true">Maximum Qty Allowed in Shopping Cart</label>
                         <dataScope>max_sale_qty</dataScope>

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -2,7 +2,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+/* eslint-disable no-useless-escape */
+// jscs:disable no-useless-escape
 /**
  * @api
  */
@@ -626,6 +627,13 @@ define([
             },
             $.mage.__('Please enter a number greater than 0, without comma in this field.')
         ],
+        'validate-nonempty-number-greater-than-zero': [
+            function (value) {
+                return !isNaN(utils.parseNumber(value))
+                    && value > 0 && (/^\s*-?\d+([,.]\d+)*\s*%?\s*$/).test(value);
+            },
+            $.mage.__('Please enter a number greater than 0, without comma in this field.')
+        ],
         'validate-css-length': [
             function (value) {
                 if (value !== '') {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js

@@ -94,6 +94,31 @@ define([
                 expect(rules['validate-number'].handler(value)).toBe(false);
             });
         });
+        describe('"validate-nonempty-number-greater-than-zero" method', function () {
+            it('Check on empty value', function () {
+                var value = '';
+
+                expect(rules['validate-nonempty-number-greater-than-zero'].handler(value)).toBe(false);
+            });
+
+            it('Check on integer', function () {
+                var value = '125';
+
+                expect(rules['validate-nonempty-number-greater-than-zero'].handler(value)).toBe(true);
+            });
+
+            it('Check on zero', function () {
+                var value = '0';
+
+                expect(rules['validate-nonempty-number-greater-than-zero'].handler(value)).toBe(false);
+            });
+
+            it('Check on not a number', function () {
+                var value = 'string';
+
+                expect(rules['validate-nonempty-number-greater-than-zero'].handler(value)).toBe(false);
+            });
+        });
     });
 
     describe('validate-color', function () {