Skip to content

Feature/rohit contentful #671

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 4 commits into from
May 22, 2025
Merged

Feature/rohit contentful #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34d2627
Merge pull request #669 from contentstack/dev
AishDani May 20, 2025
84fae44
contentfull affix issue fixed
RohitKini May 21, 2025
fe86ea6
contentfull affix issue fixed
RohitKini May 21, 2025
bce1563
contentfull affix issue fixed
RohitKini May 21, 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 upload-api/migration-contentful/libs/contentTypeMapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const appDetails = require('../utils/apps/appDetails.json')
*/
const uidCorrector = (uid, affix) => {
let newId = uid;
if (restrictedUid?.includes?.(uid)) {
if (restrictedUid?.includes?.(uid) || uid?.startsWith?.('_ids') || uid?.endsWith?.('_ids')) {
newId = uid?.replace?.(uid, `${affix}_${uid}`);
newId = newId?.replace?.(/[^a-zA-Z0-9]+/g, '_');
}
Expand Down
6 changes: 3 additions & 3 deletions upload-api/migration-contentful/libs/createInitialMapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const idArray = require('../utils/restrictedKeyWords');
*/
const uidCorrector = (uid, prefix) => {
let newId = uid;
if (idArray.includes(uid)) {
if (idArray.includes(uid) || uid.startsWith('_ids') || uid.endsWith('_ids')) {
newId = uid.replace(uid, `${prefix}_${uid}`);
newId = newId.replace(/[^a-zA-Z0-9]+/g, '_');
}
Expand All @@ -62,7 +62,7 @@ const uidCorrector = (uid, prefix) => {
*
* // Outputs: an array of content type objects, each containing metadata and field mappings.
*/
const createInitialMapper = async () => {
const createInitialMapper = async (affix="") => {
try {
const initialMapper = [];
const files = await fs.readdir(
Expand All @@ -82,7 +82,7 @@ const createInitialMapper = async () => {
otherCmsTitle: title,
otherCmsUid: data[0]?.contentfulID,
contentstackTitle: title.charAt(0).toUpperCase() + title.slice(1),
contentstackUid: uidCorrector(data[0]?.contentUid),
contentstackUid: uidCorrector(data[0]?.contentUid,affix),
type: 'content_type',
fieldMapping: []
};
Expand Down
2 changes: 1 addition & 1 deletion upload-api/src/services/contentful/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const createContentfulMapper = async (
const fetchedLocales: [] = await extractLocale(cleanLocalPath);

await extractContentTypes(cleanLocalPath, affix);
const initialMapper = await createInitialMapper();
const initialMapper = await createInitialMapper(affix);
const req = {
method: 'post',
maxBodyLength: Infinity,
Expand Down