(fix) Recurring validation (#229)

* If start date is not exist - hide last date input, disable endless checkbox * Recurring: show error if last order date is not exist for non-endless node
bitfinexcom · Sep 6, 2023 · efc901a · efc901a
1 parent ec1549c
commit efc901a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/recurring/meta/get_ui_def.js b/lib/recurring/meta/get_ui_def.js
@@ -108,6 +108,9 @@ const getUIDef = ({ i18n, isEditMode } = {}) => ({
       minDate: null,
       disabled: {
         endless: { eq: true }
+      },
+      visible: {
+        startedAt: { exist: true }
       }
     },
 
@@ -131,7 +134,10 @@ const getUIDef = ({ i18n, isEditMode } = {}) => ({
         ].join(' ')
       ),
       default: true,
-      customClassName: 'vertical-align'
+      customClassName: 'vertical-align',
+      disabled: {
+        startedAt: { exist: false }
+      }
     },
 
     action: {

diff --git a/lib/recurring/meta/validate_params.js b/lib/recurring/meta/validate_params.js
@@ -17,14 +17,18 @@ const { apply: applyI18N } = require('../../util/i18n')
  *   description of which parameter is invalid.
  */
 const validateParams = (args) => {
-  const { amount } = args
+  const { amount, endless, endedAt } = args
   if (!_isFinite(amount) || amount === 0) {
     return applyI18N(
       validationErrObj('amount', 'Invalid amount'),
       'invalidAmount'
     )
   }
 
+  if (!endless && !endedAt) {
+    return applyI18N(validationErrObj('endedAt', 'Last Order Date must be specified'), 'lastOrderDateRequired')
+  }
+
   return null
 }