[CMG-698] - Issue with Wordpress Connector. Case #00044506 for Horizontal #757
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2260,19 +2260,22 @@ function limitConcurrency(maxConcurrency: number) { | |||||
| } | ||||||
| const limit = limitConcurrency(5); | ||||||
|
|
||||||
| async function featuredImageMapping(postid: string, post: any, postdata: any, assetsSchemaPath: string) { | ||||||
| try { | ||||||
| // **THE FIX: Use the path argument directly, don't use the global variable** | ||||||
| const fileContent = fs.readFileSync(assetsSchemaPath, 'utf8').trim(); | ||||||
|
|
||||||
| if (!fileContent) { | ||||||
| // File is empty, so no assets have been processed. Nothing to map. | ||||||
| return postdata; | ||||||
| } | ||||||
|
|
||||||
| const assetsId = JSON.parse(fileContent); | ||||||
| if (!post["wp:postmeta"] || !assetsId) { | ||||||
| return postdata; | ||||||
| } | ||||||
|
|
||||||
| const postmetaArray = Array.isArray(post["wp:postmeta"]) ? post["wp:postmeta"] : [post["wp:postmeta"]]; | ||||||
|
|
||||||
| const assetsDetails = postmetaArray | ||||||
| .filter((meta) => meta["wp:meta_key"] === "_thumbnail_id") | ||||||
|
|
||||||
|
|
@@ -2283,14 +2286,17 @@ async function featuredImageMapping(postid: string, post: any, postdata: any) { | |||||
| (asset: any) => asset.uid === attachmentid | ||||||
| ); | ||||||
| }) | ||||||
| .filter(Boolean); | ||||||
|
Contributor
There was a problem hiding this comment. const assetsDetails = postmetaArray |
||||||
|
|
||||||
| if (assetsDetails.length > 0 && postdata[postid]) { | ||||||
|
Contributor
There was a problem hiding this comment. assetsDetails?.length > 0 && postdata?.[postid] |
||||||
| // Assign the found asset object to the 'featured_image' field | ||||||
| postdata[postid]["featured_image"] = assetsDetails[0]; | ||||||
| } | ||||||
| return postdata; | ||||||
| } catch (error) { | ||||||
| console.error("Error during featured image mapping:", error); | ||||||
| // Return the original postdata if an error occurs to avoid losing the entry | ||||||
| return postdata; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -2383,96 +2389,67 @@ async function processChunkData( | |||||
| isLastChunk: boolean, | ||||||
| contenttype: any, | ||||||
| authorsFilePath: string, | ||||||
| referencesFilePath: string, | ||||||
| assetsSchemaPath: string | ||||||
| ) { | ||||||
| let postdataCombined: Record<string, any> = {}; | ||||||
|
|
||||||
| try { | ||||||
| // This filter is good, it correctly selects only post-like items. | ||||||
| const filteredChunk = chunkData?.filter((item: any) => | ||||||
| item["wp:post_type"] !== "page" && | ||||||
|
|
||||||
| item["wp:post_type"] !== "attachment" && | ||||||
| ["publish", "inherit", "draft"]?.includes(item["wp:status"]) | ||||||
| ); | ||||||
|
|
||||||
| // The main loop processes one item at a time. | ||||||
| for (const data of filteredChunk) { | ||||||
| const customId = idCorrector(`posts_${data["wp:post_id"]}`); | ||||||
|
|
||||||
|
|
||||||
| // Step 1: Resolve all references for the CURRENT post | ||||||
| const { postCategories, postTags, postTerms } = extractPostCategories(data["category"], referencesFilePath); | ||||||
|
Contributor
There was a problem hiding this comment. data?.["category"] or for global use if(data) |
||||||
| const postAuthor = extractPostAuthor(data["dc:creator"], authorsFilePath); | ||||||
| const jsonValue = htmlToJson(new JSDOM(data["content:encoded"].replace("//g", "").replace(/<!--?\s+\/?wp:.*?-->/g, "")).window.document.querySelector("body")); | ||||||
|
There was a problem hiding this comment. The regex pattern
Suggested change
|
||||||
| let postDate = null; | ||||||
| if (data["wp:post_date_gmt"] && !data["wp:post_date_gmt"].startsWith("0000")) { | ||||||
| postDate = new Date(data["wp:post_date_gmt"]).toISOString(); | ||||||
| } | ||||||
|
|
||||||
| // Step 2: Create a temporary object with all raw data for the CURRENT post | ||||||
| const rawPostData = { | ||||||
| title: data["title"] || `Posts - ${data["wp:post_id"]}`, | ||||||
| uid: customId, | ||||||
| url: data["link"]?.split(blog_base_url?.split("/").filter(Boolean).pop())[1], | ||||||
| date: postDate, | ||||||
| full_description: jsonValue, | ||||||
| excerpt: (data["excerpt:encoded"] || "").replace("//g", "").replace(/<!--?\s+\/?wp:.*?-->/g, ""), | ||||||
|
There was a problem hiding this comment. The regex pattern
Suggested change
|
||||||
| author: postAuthor, | ||||||
| category: postCategories, | ||||||
| terms: postTerms, | ||||||
| tag: postTags, | ||||||
| featured_image: '', | ||||||
| publish_details: [], | ||||||
| }; | ||||||
|
|
||||||
| // Step 3: Create the final, formatted post object using mapContentTypeToEntry | ||||||
| let formattedPost = { | ||||||
| uid: customId, | ||||||
| ...(await mapContentTypeToEntry(contenttype, rawPostData)), | ||||||
| publish_details: [], | ||||||
| }; | ||||||
|
|
||||||
| // Step 4: Map the featured image for ONLY the CURRENT post | ||||||
| const formattedPostWithImage = await featuredImageMapping( | ||||||
| customId, // Use the corrected ID | ||||||
| data, | ||||||
| { [customId]: formattedPost }, // Pass an object with only the current post | ||||||
| assetsSchemaPath | ||||||
| ); | ||||||
|
|
||||||
| // Step 5: Add the final, complete post to the combined results | ||||||
| if (formattedPostWithImage && formattedPostWithImage[customId]) { | ||||||
|
Contributor
There was a problem hiding this comment. formattedPostWithImage?.[customId] |
||||||
| postdataCombined[customId] = formattedPostWithImage[customId]; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return postdataCombined; | ||||||
|
|
@@ -2498,6 +2475,9 @@ async function extractPosts( packagePath: string, destinationStackId: string, pr | |||||
| referencesFolder = path.join(MIGRATION_DATA_CONFIG.DATA, destinationStackId, MIGRATION_DATA_CONFIG.REFERENCES_DIR_NAME); | ||||||
| const referencesFilePath = path.join(referencesFolder, MIGRATION_DATA_CONFIG.REFERENCES_FILE_NAME); | ||||||
|
|
||||||
| assetsSave = path.join(MIGRATION_DATA_CONFIG.DATA, destinationStackId, MIGRATION_DATA_CONFIG.ASSETS_DIR_NAME); | ||||||
| const assetsSchemaPath = path.join(assetsSave, MIGRATION_DATA_CONFIG.ASSETS_SCHEMA_FILE); | ||||||
|
|
||||||
| const alldata: any = await fs.promises.readFile(packagePath, "utf8"); | ||||||
| const alldataParsed = JSON.parse(alldata); | ||||||
| blog_base_url = | ||||||
|
|
@@ -2515,7 +2495,7 @@ async function extractPosts( packagePath: string, destinationStackId: string, pr | |||||
| const chunkData = JSON.parse(data); | ||||||
| const isLastChunk = filename === lastChunk; | ||||||
|
|
||||||
| const chunkPostData = await processChunkData(chunkData, filename, isLastChunk, contenttype, authorsFilePath, referencesFilePath, assetsSchemaPath); | ||||||
| postdataCombined = { ...postdataCombined, ...chunkPostData }; | ||||||
|
|
||||||
| const seenTitles = new Map(); | ||||||
|
|
@@ -2656,7 +2636,8 @@ const extractPageParent = (parentId?: string): any[] => { | |||||
| async function handlePagesChunkData( | ||||||
| items: any[], | ||||||
| contenttype: any, | ||||||
| authorsFilePath: string, | ||||||
| assetsSchemaPath: string | ||||||
| ): Promise<Record<string, any>> { | ||||||
| const pageDataCombined: Record<string, any> = {}; | ||||||
|
|
||||||
|
|
@@ -2666,18 +2647,16 @@ async function handlePagesChunkData( | |||||
|
|
||||||
| for (const item of items) { | ||||||
| if (!allowedPageTypes.includes(item['wp:post_type']) || !allowedStatuses.includes(item['wp:status'])) { | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| const uid = `pages_${item['wp:post_id']}`; | ||||||
| const customId = idCorrector(uid); | ||||||
|
|
||||||
| const authorRef = extractPageAuthor(item['dc:creator'], authorsFilePath); | ||||||
| const parentRef = extractPageParent(item['wp:post_parent']); | ||||||
| const body = htmlToJson(new JSDOM(item["content:encoded"].replace("//g", "").replace(/<!--?\s+\/?wp:.*?-->/g, "")).window.document.querySelector('body')); | ||||||
|
There was a problem hiding this comment. The regex pattern
Suggested change
|
||||||
|
|
||||||
| const rawPageData = { | ||||||
| uid: customId, | ||||||
| title: item['title'] || 'Untitled', | ||||||
|
|
@@ -2701,9 +2680,10 @@ async function handlePagesChunkData( | |||||
|
|
||||||
|
|
||||||
| const formattedPageWithImage = await featuredImageMapping( | ||||||
| customId, | ||||||
| item, | ||||||
| { [customId]: formattedPage }, | ||||||
| assetsSchemaPath | ||||||
| ); | ||||||
|
|
||||||
|
|
||||||
|
|
@@ -2743,6 +2723,8 @@ async function extractPages( | |||||
| await startingDirPages(ct, master_locale, project?.locales); | ||||||
| const authorsCtName = keyMapper?.["authors"] || MIGRATION_DATA_CONFIG.AUTHORS_DIR_NAME; | ||||||
| const authorsFilePath = path.join(entrySave, authorsCtName, master_locale, `${master_locale}.json`); | ||||||
| assetsSave = path.join(MIGRATION_DATA_CONFIG.DATA, destinationStackId, MIGRATION_DATA_CONFIG.ASSETS_DIR_NAME); | ||||||
| const assetsSchemaPath = path.join(assetsSave, MIGRATION_DATA_CONFIG.ASSETS_SCHEMA_FILE); | ||||||
| const alldata: any = await fs.promises.readFile(packagePath, "utf8"); | ||||||
| const alldataParsed = JSON.parse(alldata); | ||||||
| blog_base_url = | ||||||
|
|
@@ -2765,7 +2747,7 @@ async function extractPages( | |||||
|
|
||||||
| const isLastChunk = filename === lastChunk; | ||||||
|
|
||||||
| const chunkPages = await handlePagesChunkData(chunkData, contenttype, authorsFilePath, assetsSchemaPath); | ||||||
|
|
||||||
| console.info( | ||||||
| `${filename} → Mapped entries: ${Object.keys(chunkPages).length}` | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,5 +86,8 @@ | |
| .log-message { | ||
| flex-grow: 1; | ||
| padding: 0 $px-16; | ||
| &.generic-log-message { | ||
| padding: $px-16; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
meta?.["wp:meta_key"]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Array.isArray(post?.["wp:postmeta"])
? post["wp:postmeta"]
: (post?.["wp:postmeta"] ? [post["wp:postmeta"]] : [])