Skip to content

Bugfix/legacy cms #245

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 5 commits into from
Aug 22, 2024
Merged

Bugfix/legacy cms #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc03546
refactor:uncaught error on file validation
AishDani Aug 21, 2024
e85f278
refactor:nesdted group field mapping:[CMG-289]
AishDani Aug 21, 2024
8c2195a
dev merged
AishDani Aug 21, 2024
b2322e2
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Aug 21, 2024
4737e37
refactor:[cmg-289]
AishDani Aug 21, 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
1 change: 0 additions & 1 deletion ui/src/components/ContentMapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,6 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re

if (checkConditions(fieldTypeToMatch, key, item)) {
OptionsForRow.push(getMatchingOption(key, true, `${updatedDisplayName} > ${key.display_name}` || ''));
break;
}

// Recursively process nested groups
Expand Down
19 changes: 6 additions & 13 deletions ui/src/services/api/upload.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ export const getCall = async (url: string, options?: any) => {
try {
const response = await axios.get(url, { ...options });
return response;
} catch (error) {
if (error instanceof Error) {
throw new Error(`${error.message}`);
} else {
throw new Error('Unknown error in userSession');
}
} catch (err: any) {
return err.response;
}
};

Expand Down Expand Up @@ -44,7 +40,7 @@ export const uploadFilePath = () => {
return `${UPLOAD_FILE_RELATIVE_URL}upload`;
};

export const fileValidation = (projectId: string) => {
export const fileValidation = async(projectId: string) => {
try {
const options = {
headers: {
Expand All @@ -53,16 +49,13 @@ export const fileValidation = (projectId: string) => {
},

};
return getCall(`${UPLOAD_FILE_RELATIVE_URL}validator`, options);
return await getCall(`${UPLOAD_FILE_RELATIVE_URL}validator`, options);
} catch (error) {
if (error instanceof Error) {
throw new Error(`${error.message}`);
} else {
throw new Error('Unknown error');
}
return error;
}
};


export const getConfig = async() => {
try {
return await getCall(`${UPLOAD_FILE_RELATIVE_URL}config`);
Expand Down
4 changes: 2 additions & 2 deletions uplaode-api/src/services/fileProcessing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const handleFileProcessing = async (fileExt: string, zipBuffer: any, cmsType: st
if (fileExt === 'zip') {
const zip = new JSZip();
await zip.loadAsync(zipBuffer);
if (validator({ data: zip, type: cmsType, extension: fileExt })) {
if (await validator({ data: zip, type: cmsType, extension: fileExt })) {
const isSaved = await saveZip(zip);
if (isSaved) {
logger.info('Validation success:', {
Expand Down Expand Up @@ -38,7 +38,7 @@ const handleFileProcessing = async (fileExt: string, zipBuffer: any, cmsType: st
// if file is not zip
// Convert the buffer to a string assuming it's UTF-8 encoded
const jsonString = Buffer?.from?.(zipBuffer)?.toString?.('utf8');
if (validator({ data: jsonString, type: cmsType, extension: fileExt })) {
if (await validator({ data: jsonString, type: cmsType, extension: fileExt })) {
logger.info('Validation success:', {
status: HTTP_CODES?.OK,
message: HTTP_TEXTS?.VALIDATION_SUCCESSFULL,
Expand Down