kui-crm 0.0.170 → 0.0.172

package/cjs/index.js

@@ -2693,15 +2693,39 @@ var StyledWrapper$7 = styled__default["default"](kuiBasic.Grid)(templateObject_1
 var templateObject_1$v;
 
 var meterFeaturesFieldsSchema = {
-    tariff: yup__namespace.object({
-        name: yup__namespace.string().required("This field is required"),
-    }),
+    noTariff: yup__namespace.boolean(),
+    tariff: yup__namespace
+        .object({
+        name: yup__namespace.string().nullable(),
+    })
+        .when("noTariff", {
+        is: function (value) { return !value; },
+        then: function (rule) {
+            return rule.shape({
+                name: yup__namespace.string().required(defaultRequiredMessage),
+            });
+        },
+    })
+        .nullable(),
     number: yup__namespace.string().required("This field is required"),
+    startDate: yup__namespace
+        .mixed()
+        .when("replaceableCounter", {
+        is: function (value) { return value; },
+        then: function (rule) { return rule.required("This field is required"); },
+    })
+        .when("startDate", {
+        is: function (value) { return value; },
+        then: function (rule) {
+            return rule.test("check-start-date", "Select a date in the past", function (value) { return Number(value === null || value === void 0 ? void 0 : value.diffNow("days").days) <= 0; });
+        },
+    })
+        .nullable(),
 };
 var getMeterFeaturesFieldsSchema = function (valuesFields, isReplacementRequired) {
     var valuesSchema = valuesFields.map(function (field) {
         var _a;
-        return (__assign(__assign((_a = {}, _a[field] = yup__namespace
+        return (__assign((_a = {}, _a[field] = yup__namespace
             .number()
             .min(0)
             .required("This field is required")
@@ -2710,34 +2734,7 @@ var getMeterFeaturesFieldsSchema = function (valuesFields, isReplacementRequired
                 .number()
                 .required("The maximum number of counters has been created in this object, select the one to replace")
                 .transform(function (value) { return (Number.isNaN(value) ? undefined : value); }),
-        })), { startDate: yup__namespace
-                .mixed()
-                .when("replaceableCounter", {
-                is: function (value) { return value; },
-                then: function (rule) { return rule.required("This field is required"); },
-            })
-                .when("startDate", {
-                is: function (value) { return value; },
-                then: function (rule) {
-                    return rule.test("check-start-date", "Select a date in the past", function (value) { return Number(value === null || value === void 0 ? void 0 : value.diffNow("days").days) <= 0; });
-                },
-            })
-                .nullable(), noTariff: yup__namespace.boolean(), tariff: yup__namespace
-                .object({
-                name: yup__namespace.string().nullable(),
-            })
-                .when("noTariff", {
-                is: function (value) {
-                    console.log("noTariff", value);
-                    return !value;
-                },
-                then: function (rule) {
-                    return rule.shape({
-                        name: yup__namespace.string().required(defaultRequiredMessage),
-                    });
-                },
-            })
-                .nullable() }));
+        })));
     });
     return yup__namespace.object().shape(__assign(__assign({}, meterFeaturesFieldsSchema), Object.assign.apply(Object, __spreadArray([{}], valuesSchema, false))), [["startDate", "startDate"]]);
 };