Merge pull request #67 from openimis/feature/OP-1725

OP-1725: remove null/empty option from dropdowns
openimis · Jan 15, 2024 · 24c4cf1 · 24c4cf1
2 parents b26a5bc + 13fdd51
commit 24c4cf1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 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={

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}