cleanup date field #556

impactoss · Aug 22, 2024 · b7fca0b · b7fca0b
1 parent acbf5ec
commit b7fca0b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 45 deletions.
diff --git a/app/containers/ActionEdit/index.js b/app/containers/ActionEdit/index.js
@@ -214,10 +214,10 @@ export class ActionEdit extends React.Component { // eslint-disable-line react/p
     ([ // fieldGroups
       { // fieldGroup
         fields: [
-          getDateField(
-            intl.formatMessage,
-            'target_date',
-          ),
+          getDateField({
+            formatMessage: intl.formatMessage,
+            attribute: 'target_date',
+          }),
           getTextareaField(
             intl.formatMessage,
             'target_date_comment',

diff --git a/app/containers/ActionNew/index.js b/app/containers/ActionNew/index.js
@@ -189,7 +189,7 @@ export class ActionNew extends React.PureComponent { // eslint-disable-line reac
     ([ // fieldGroups
       { // fieldGroup
         fields: [
-          getDateField(intl.formatMessage, 'target_date'),
+          getDateField({ formatMessage: intl.formatMessage, attribute: 'target_date' }),
           getTextareaField(intl.formatMessage, 'target_date_comment'),
         ],
       },

diff --git a/app/containers/CategoryEdit/index.js b/app/containers/CategoryEdit/index.js
@@ -241,10 +241,10 @@ export class CategoryEdit extends React.PureComponent { // eslint-disable-line r
     fields.push({
       fields: [
         entity.getIn(['taxonomy', 'attributes', 'has_date'])
-          && getDateField(
-            intl.formatMessage,
-            'date',
-          ),
+        && getDateField({
+          formatMessage: intl.formatMessage,
+          attribute: 'date',
+        }),
         getFormField({
           formatMessage: intl.formatMessage,
           controlType: 'url',

diff --git a/app/containers/IndicatorEdit/index.js b/app/containers/IndicatorEdit/index.js
@@ -210,20 +210,19 @@ export class IndicatorEdit extends React.Component { // eslint-disable-line reac
         label: intl.formatMessage(appMessages.entities.due_dates.schedule),
         icon: 'reminder',
         fields: [
-          getDateField(
-            intl.formatMessage,
-            'start_date',
+          getDateField({
+            formatMessage: intl.formatMessage,
+            attribute: 'start_date',
             repeat,
-            repeat ? 'start_date' : 'start_date_only',
-            false,
-            false,
+            label: repeat ? 'start_date' : 'start_date_only',
+            modifyFieldAttributes: 
             (field, formData) =>
               modifyStartDateField(
                 field,
                 this.props.isRepeat(formData),
                 this.props.intl,
-              )
-          ),
+              ),
+          }),
           getCheckboxField(
             intl.formatMessage,
             'repeat',
@@ -233,19 +232,19 @@ export class IndicatorEdit extends React.Component { // eslint-disable-line reac
             intl.formatMessage,
             (formData) => !this.props.isRepeat(formData)
           ),
-          getDateField(
-            intl.formatMessage,
-            'end_date',
+          getDateField({
+            formatMessage: intl.formatMessage,
+            attribute: 'end_date',
             repeat,
-            'end_date',
-            (value, formData) =>
+            label: 'end_date',
+            dynamicValidators: (value, formData) =>
               this.props.onEndDateChange(
                 value,
                 formData,
                 intl.formatMessage,
               ),
-            (formData) => !this.props.isRepeat(formData),
-          ),
+            isFieldDisabled: (formData) => !this.props.isRepeat(formData),
+          }),
           renderUserControl(
             users,
             intl.formatMessage(appMessages.attributes.manager_id.indicators),

diff --git a/app/containers/IndicatorNew/index.js b/app/containers/IndicatorNew/index.js
@@ -180,20 +180,17 @@ export class IndicatorNew extends React.PureComponent { // eslint-disable-line r
         label: intl.formatMessage(appMessages.entities.due_dates.schedule),
         icon: 'reminder',
         fields: [
-          getDateField(
-            intl.formatMessage,
-            'start_date',
-            false,
-            'start_date',
-            false,
-            false,
-            (field, formData) =>
+          getDateField({
+            formatMessage: intl.formatMessage,
+            attribute: 'start_date',
+            label: 'start_date',
+            modifyFieldAttributes: (field, formData) =>
               modifyStartDateField(
                 field,
                 this.props.isRepeat(formData),
                 this.props.intl,
-              )
-          ),
+              ),
+          }),
           getCheckboxField(
             intl.formatMessage,
             'repeat',
@@ -202,19 +199,18 @@ export class IndicatorNew extends React.PureComponent { // eslint-disable-line r
             intl.formatMessage,
             (formData) => !this.props.isRepeat(formData)
           ),
-          getDateField(
-            intl.formatMessage,
-            'end_date',
-            false,
-            'end_date',
-            (value, formData) =>
+          getDateField({
+            formatMessage: intl.formatMessage,
+            attribute: 'end_date',
+            label: 'end_date',
+            dynamicValidators: (value, formData) =>
               this.props.onEndDateChange(
                 value,
                 formData,
                 intl.formatMessage,
               ),
-            (formData) => !this.props.isRepeat(formData),
-          ),
+            isFieldDisabled: (formData) => !this.props.isRepeat(formData),
+          }),
           renderUserControl(
             users,
             intl.formatMessage(appMessages.attributes.manager_id.indicators),

diff --git a/app/utils/formik.js b/app/utils/formik.js
@@ -548,15 +548,15 @@ export const getTextareaField = (formatMessage, attribute = 'description') => ge
   attribute,
 });
 
-export const getDateField = (
+export const getDateField = ({  
   formatMessage,
   attribute,
   required = false,
   label,
   dynamicValidators,
   isFieldDisabled,
-  modifyFieldAttributes
-) => {
+  modifyFieldAttributes,
+}) => {
   const field = getFormField({
     formatMessage,
     controlType: 'date',