From 8f603e2049af49830c42395d1f223fdc60808ff2 Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Fri, 1 Apr 2022 20:08:20 +0900
Subject: [PATCH] [WebUI] Added IMEI in View (#1464)

---
 webui/server/models/profile.js          |  1 +
 webui/server/models/subscriber.js       |  1 +
 webui/src/components/Profile/View.js    | 13 ++++++++++---
 webui/src/components/Subscriber/View.js | 13 ++++++++++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/webui/server/models/profile.js b/webui/server/models/profile.js
index 93750da83d..32134886c4 100644
--- a/webui/server/models/profile.js
+++ b/webui/server/models/profile.js
@@ -12,6 +12,7 @@ const Profile = new Schema({
   title: { $type: String, required: true },
 
   msisdn: [ String ],
+  imei: [ String ],
 
   security: {
     k: String,
diff --git a/webui/server/models/subscriber.js b/webui/server/models/subscriber.js
index 347349d787..dfe3bb41dd 100644
--- a/webui/server/models/subscriber.js
+++ b/webui/server/models/subscriber.js
@@ -12,6 +12,7 @@ const Subscriber = new Schema({
   imsi: { $type: String, unique: true, required: true },
 
   msisdn: [ String ],
+  imei: [ String ],
 
   security: {
     k: String,
diff --git a/webui/src/components/Profile/View.js b/webui/src/components/Profile/View.js
index feb80ab95e..26c6beda6f 100644
--- a/webui/src/components/Profile/View.js
+++ b/webui/src/components/Profile/View.js
@@ -163,6 +163,7 @@ const View = ({ visible, disableOnClickOutside, profile, onEdit, onDelete, onHid
   const _id = (profile || {})._id;
   const title = (profile || {}).title;
   const msisdn_list = ((profile || {}).msisdn || []);
+  const imei = (profile || {}).imei;
   const security = ((profile || {}).security || {});
   const ambr = ((profile || {}).ambr || {});
   const slice_list = ((profile || {}).slice || []);
@@ -193,7 +194,7 @@ const View = ({ visible, disableOnClickOutside, profile, onEdit, onDelete, onHid
               <div className="header">
                 Profile Configuration
               </div>
-              {msisdn_list.length !== 0 &&
+              {(msisdn_list.length !== 0 || (imei && imei.length !== 0)) &&
                 <div className="body">
                   <div className="left">
                     <PhoneIcon/>
@@ -201,10 +202,16 @@ const View = ({ visible, disableOnClickOutside, profile, onEdit, onDelete, onHid
                   <div className="right">
                     {msisdn_list.map((msisdn, index) =>
                       <div key={index} className="data">
-                          {msisdn}
-                          <span style={{color:oc.gray[5]}}><KeyboardControlIcon/>MSISDN</span>
+                        {msisdn}
+                        <span style={{color:oc.gray[5]}}><KeyboardControlIcon/>MSISDN</span>
                       </div>
                     )}
+                    {imei && imei.length !== 0 &&
+                      <div className="data">
+                        {imei}
+                        <span style={{color:oc.gray[5]}}><KeyboardControlIcon/>IMEI</span>
+                      </div>
+                    }
                   </div>
                 </div>
               }
diff --git a/webui/src/components/Subscriber/View.js b/webui/src/components/Subscriber/View.js
index de1d61e49c..afac2f3eff 100644
--- a/webui/src/components/Subscriber/View.js
+++ b/webui/src/components/Subscriber/View.js
@@ -162,6 +162,7 @@ const Pdn = styled.div`
 const View = ({ visible, disableOnClickOutside, subscriber, onEdit, onDelete, onHide }) => {
   const imsi = (subscriber || {}).imsi;
   const msisdn_list = ((subscriber || {}).msisdn || []);
+  const imei = (subscriber || {}).imei;
   const security = ((subscriber || {}).security || {});
   const ambr = ((subscriber || {}).ambr || {});
   const slice_list = ((subscriber || {}).slice || []);
@@ -192,7 +193,7 @@ const View = ({ visible, disableOnClickOutside, subscriber, onEdit, onDelete, on
               <div className="header">
                 Subscriber Configuration
               </div>
-              {msisdn_list.length !== 0 &&
+              {(msisdn_list.length !== 0 || (imei && imei.length !== 0)) &&
                 <div className="body">
                   <div className="left">
                     <PhoneIcon/>
@@ -200,10 +201,16 @@ const View = ({ visible, disableOnClickOutside, subscriber, onEdit, onDelete, on
                   <div className="right">
                     {msisdn_list.map((msisdn, index) =>
                       <div key={index} className="data">
-                          {msisdn}
-                          <span style={{color:oc.gray[5]}}><KeyboardControlIcon/>MSISDN</span>
+                        {msisdn}
+                        <span style={{color:oc.gray[5]}}><KeyboardControlIcon/>MSISDN</span>
                       </div>
                     )}
+                    {imei && imei.length !== 0 &&
+                      <div className="data">
+                        {imei}
+                        <span style={{color:oc.gray[5]}}><KeyboardControlIcon/>IMEI</span>
+                      </div>
+                    }
                   </div>
                 </div>
               }