From ca14e9752da2b86a871b0395b70ff74167daabb0 Mon Sep 17 00:00:00 2001
From: Sayali Joshi <sayali.joshi@contentstack.com>
Date: Tue, 16 Jul 2024 13:08:09 +0530
Subject: [PATCH 1/2] [CMG-244], [CMG-245]

---
 ui/src/components/ContentMapper/index.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 932ed5838..57948926e 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -85,7 +85,7 @@ const Fields: Mapping = {
   'HTML Rich text Editor': 'JSON Rich Text Editor',
   'JSON Rich Text Editor': 'JSON Rich Text Editor',
   // 'Multi line': 
-  json: 'JSON Rich Text Editor',
+  json: ['HTML Rich text Editor', 'JSON Rich Text Editor'],
   URL: 'URL',
   file: 'File',
   number: 'Number',
@@ -93,7 +93,7 @@ const Fields: Mapping = {
   boolean: 'Boolean',
   link: 'Link',
   reference: 'Reference',
-  dropdown: 'Select',
+  dropdown: 'dropdown',
   radio: 'Select',
   CheckBox: 'Select',
   global_field: 'Global'
@@ -403,7 +403,7 @@ const ContentMapper = () => {
       <div>
         <div className="cms-field">{data?.otherCmsField}</div>
         <InstructionText>
-          Other CMS Type: {data?.otherCmsType}
+          Type: {data?.otherCmsType}
           <br />
           UID: {data?.uid}
         </InstructionText>
@@ -796,6 +796,10 @@ const ContentMapper = () => {
         setisDropDownCHanged(false);
         setisContentTypeMapped(true);
         setisContentTypeSaved(true);
+
+        setFilteredContentTypes(filteredContentTypes?.map(ct => 
+          ct?.id === data?.updatedContentType?.id ? { ...ct, status: data?.updatedContentType?.status } : ct
+        ))
       } else {
         Notification({
           notificationContent: { text: data?.error?.message },

From 2daecc239dda04b8c62cf6eca1c0f91ce19f39df Mon Sep 17 00:00:00 2001
From: Sayali Joshi <sayali.joshi@contentstack.com>
Date: Tue, 16 Jul 2024 13:17:24 +0530
Subject: [PATCH 2/2] [CMG-233] - Content Mapper | LHS | Icons of Content type
 and Global fields are missing

---
 ui/src/components/ContentMapper/index.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 89f5e7752..81ef07407 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -1112,17 +1112,14 @@ const ContentMapper = () => {
                     >
                       <div className='cms-title'>
                         <Tooltip content={content?.type} position="bottom">
-                          {content?.type === "Content Type" 
+                          {content?.type === "content_type" 
                             ? <Icon icon={active == index ? "ContentModelsMediumActive" : "ContentModelsMedium"} size="small"  />
-                            : content?.type === "Global Field"
-                              ? <Icon icon={active == index ? "GlobalFieldsMediumActive" : "GlobalFieldsMedium"} size="small" />
-                              : <></>
+                            : <Icon icon={active == index ? "GlobalFieldsMediumActive" : "GlobalFieldsMedium"} size="small" />
                           }
                         </Tooltip>
                         {content?.otherCmsTitle && <span>{content?.otherCmsTitle}</span> }
                       </div>
                       
-                      
                       <div className='d-flex align-items-center ct-options'>
                         <span>
                           {icon && (