Merge pull request #69 from openimis/release/24.04

MERGING release/24.04 into main
openimis · Jun 26, 2024 · 135b8e5 · 135b8e5
2 parents a96ffbd + 0e69145
commit 135b8e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/components/ContractHeadPanel.js b/src/components/ContractHeadPanel.js
@@ -174,8 +174,7 @@ class ContractHeadPanel extends FormPanel {
             <PublishedComponent
               pubRef="policyHolder.PolicyHolderPicker"
               module="contract"
-              withNull
-              nullLabel={formatMessage(intl, "contract", "emptyLabel")}
+              withNull={false}
               value={!!edited && !!edited.policyHolder && edited.policyHolder}
               onChange={(v) => this.updateAttribute("policyHolder", v)}
               readOnly={
@@ -281,10 +280,13 @@ class ContractHeadPanel extends FormPanel {
               module="contract"
               label="dateValidFrom"
               required
-              maxDate={!!edited && !!edited.dateValidTo && edited.dateValidTo}
               value={!!edited && !!edited.dateValidFrom && edited.dateValidFrom}
               onChange={(v) => this.updateAttribute("dateValidFrom", v)}
               readOnly={readOnlyFields.includes("dateValidFrom") || isAmendment}
+              // NOTE: maxDate cannot be passed if dateValidTo does not exist.
+              // Passing any other falsy value will block months manipulation.
+              // eslint-disable-next-line react/jsx-props-no-spreading
+              {...(edited.dateValidTo ? { maxDate: edited.dateValidTo } : null)}
             />
           </Grid>
           <Grid item xs={2} className={classes.item}>
@@ -293,12 +295,13 @@ class ContractHeadPanel extends FormPanel {
               module="contract"
               label="dateValidTo"
               required
-              minDate={
-                !!edited && !!edited.dateValidFrom && edited.dateValidFrom
-              }
               value={!!edited && !!edited.dateValidTo && edited.dateValidTo}
               onChange={(v) => this.updateAttribute("dateValidTo", v)}
               readOnly={readOnlyFields.includes("dateValidTo")}
+              // NOTE: minDate cannot be passed if dateValidFrom does not exist.
+              // Passing any other falsy value will block months manipulation.
+              // eslint-disable-next-line react/jsx-props-no-spreading
+              {...(edited.dateValidFrom ? { minDate: edited.dateValidFrom } : null)}
             />
           </Grid>
         </Grid>

diff --git a/src/dialogs/CreateContractDetailsDialog.js b/src/dialogs/CreateContractDetailsDialog.js
@@ -139,7 +139,7 @@ class CreateContractDetailsDialog extends Component {
                                 <PublishedComponent
                                     pubRef="policyHolder.PolicyHolderInsureePicker"
                                     required
-                                    withNull
+                                    withNull={false}
                                     policyHolderId={contract?.policyHolder?.id}
                                     value={!!contractDetails.insuree && contractDetails.insuree}
                                     onChange={v => this.updateAttribute('insuree', v)}
@@ -148,7 +148,7 @@ class CreateContractDetailsDialog extends Component {
                             <Grid item className={classes.item}>
                                 <PublishedComponent
                                     pubRef="policyHolder.PolicyHolderContributionPlanBundlePicker"
-                                    withNull
+                                    withNull={false}
                                     nullLabel={formatMessage(intl, "contract", "emptyLabel")}
                                     policyHolderId={contract?.policyHolder?.id}
                                     value={!!contractDetails.contributionPlanBundle && contractDetails.contributionPlanBundle}

diff --git a/src/dialogs/UpdateContractDetailsDialog.js b/src/dialogs/UpdateContractDetailsDialog.js
@@ -149,7 +149,7 @@ class CreateContractDetailsDialog extends Component {
                                 <PublishedComponent
                                     pubRef="policyHolder.PolicyHolderInsureePicker"
                                     required
-                                    withNull
+                                    withNull={false}
                                     policyHolderId={contract?.policyHolder?.id}
                                     value={!!contractDetails.insuree && contractDetails.insuree}
                                     readOnly
@@ -158,7 +158,7 @@ class CreateContractDetailsDialog extends Component {
                             <Grid item className={classes.item}>
                                 <PublishedComponent
                                     pubRef="policyHolder.PolicyHolderContributionPlanBundlePicker"
-                                    withNull
+                                    withNull={false}
                                     nullLabel={formatMessage(intl, "contract", "emptyLabel")}
                                     policyHolderId={contract?.policyHolder?.id}
                                     value={!!contractDetails.contributionPlanBundle && contractDetails.contributionPlanBundle}