Skip to content

Feature/dropdown field choices #631

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
sayalijoshi27 merged 6 commits into from
Apr 23, 2025
Merged

Feature/dropdown field choices #631

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f2d302
fix:removed mapping for custom and modular block for existing stack case
AishDani Apr 23, 2025
7135818
fix:added await in reset function and removed type for app and extens…
AishDani Apr 23, 2025
4a3764c
Added icon for marketplace app and updated icons with v2 in schema modal
sayalijoshi27 Apr 23, 2025
9aa6d79
Conflict resolved
sayalijoshi27 Apr 23, 2025
2c80886
fix:refactored the key for disabling the Advanced properties for titl…
AishDani Apr 23, 2025
54627ed
Tag line height corrected and axios version update
sayalijoshi27 Apr 23, 2025
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
2 changes: 1 addition & 1 deletion api/src/services/contentMapper.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ const updateContentMapper = async (req: Request) => {
)) as number;

try {
ProjectModelLowdb.update((data: any) => {
await ProjectModelLowdb.update((data: any) => {
data.projects[projectIndex].mapperKeys = content_mapper;
data.projects[projectIndex].updated_at = new Date().toISOString();
});
Expand Down
10 changes: 5 additions & 5 deletions ui/src/components/ContentMapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const Fields: MappingFields = {
options: {
'Reference':'reference'
},
type: 'reference',
type: '',
},
'dropdown': {
label:'Dropdown',
Expand Down Expand Up @@ -205,12 +205,12 @@ const Fields: MappingFields = {
'app':{
label: 'Marketplace app',
options: {'Marketplace app':'app'},
type:'app'
type:''
},
'extension':{
label: 'Extension',
options: {'Extension':'extension'},
type:'extension'
type:''
}

}
Expand Down Expand Up @@ -1240,7 +1240,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R

//utility function to map the source cms field type to content type field type
function checkConditions(fieldTypeToMatch: string | string[], value: ContentTypesSchema, data: FieldMapType) {
const fieldTypes = new Set(['number', 'isodate', 'file', 'reference', 'boolean', 'group', 'link','global_field']);
const fieldTypes = new Set(['number', 'isodate', 'file', 'reference', 'boolean', 'group', 'link','global_field','json','blocks']);
switch (fieldTypeToMatch) {
case 'text':
return (
Expand All @@ -1266,7 +1266,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
case 'isodate':
return value?.data_type === 'isodate';
case 'json':
return value?.data_type === 'json';
return value?.data_type === 'json' && value?.field_metadata?.allow_json_rte;
// case 'enum':
// return 'enum' in value;
case 'radio':
Expand Down