Skip to content

Bug fixes #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Bug fixes #193

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca14e97
[CMG-244], [CMG-245]
sayalijoshi27 Jul 16, 2024
d2c739d
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Jul 16, 2024
2daecc2
[CMG-233] - Content Mapper | LHS | Icons of Content type and Global f…
sayalijoshi27 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ui/src/components/ContentMapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@ 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',
Date: 'Date',
boolean: 'Boolean',
link: 'Link',
reference: 'Reference',
dropdown: 'Select',
dropdown: 'dropdown',
radio: 'Select',
CheckBox: 'Select',
global_field: 'Global'
Expand Down Expand Up @@ -484,7 +484,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>
Expand Down Expand Up @@ -892,6 +892,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 },
Expand Down Expand Up @@ -1108,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 && (
Expand Down