From 899265b5eda567fd67449aaac1da4883a60d1a71 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Thu, 26 Oct 2023 16:46:16 +0800
Subject: [PATCH] Update organization combo

---
 .../UserInformationCard_Organization.js              | 12 +++++++-----
 src/utils/Combo.js                                   |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
index cf308b8..443f80d 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
@@ -307,17 +307,19 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                         );
                                         return displayOptions;
                                     },
-                                    getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? item["brNo"] + "-" + item["enCompanyName"]: "") : "",
+                                    getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? 
+                                        <div>BR No.: {item["brNo"]}<div>Org. Name(Eng): {item["enCompanyName"] === null ? "N/A" : item["enCompanyName"]}</div><div>Org. Name(CH): {item["chCompanyName"] === null ? "N/A" : item["chCompanyName"]}</div></div>: "") 
+                                        : "",
                                     isOptionEqualToValue: (option, newValue, setValue, setInputValue) => {
-                                        if (option.id == newValue) {
+                                        if (option.id == newValue || option.id == newValue.id) {
                                             setValue(option);
-                                            setInputValue(option["brNo"] + "-" + option["enCompanyName"]);
+                                            setInputValue(option["brNo"]);
                                             return true;
                                         }
-                                        return option == newValue;
+                                        return option == newValue || option.id == newValue.id;
                                     },
                                     onInputChange: (event, newValue, setInputValue) => {
-                                        if (newValue != null) {
+                                        if (newValue !== "[object Object]" ) {
                                             setInputValue(newValue);
                                         }
                                     },
diff --git a/src/utils/Combo.js b/src/utils/Combo.js
index 75f5393..6c06b83 100644
--- a/src/utils/Combo.js
+++ b/src/utils/Combo.js
@@ -25,9 +25,10 @@ export default function Combo ({valueName, disabled, form, dataList, filterOptio
                     isOptionEqualToValue(option,newValue, setValue,setInputValue )
             }}
             onInputChange={(event, newValue) => {
-                setInputValue(newValue);
                 if(onInputChange){
                     onInputChange(event,newValue, setInputValue)
+                } else {
+                    setInputValue(newValue);
                 }
             }}
             onChange={(event, newValue) => {