Bugfix/cmg 616 #673

AishDani · 2025-05-29T08:59:41Z

No description provided.

…project creation

…hen for existing case it is getting mapped to title of existing content type

…elds [CMG-640]

…ate uid issues

…r into bugfix/beta-release

…r into bugFix/beta-release

…or migration

…r into bugfix/cmg-616

Copilot

Pull Request Overview

This PR implements project creation navigation flow, enhances locale-mapping validation logic, and refines various utility and mapping functions for migration.

Add createProjectCall in Projects page to dispatch default migration data and navigate to migration steps.
Tighten locale mapping checks by using Object.entries and update interface to Record<string, string>.
Fix field-attacher to include contentTypeId, improve merging logic in content-type creation, and dedupe WordPress post titles.

Reviewed Changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
ui/src/pages/Projects/index.tsx	Added `createProjectCall`, `useNavigate`, dispatch default migration data, and corrected blocking logic
ui/src/components/Modal/modal.interface.ts	Updated `ProjectModalProps` to accept `createProject` callback
api/src/utils/field-attacher.utils.ts	Included `contentTypeId` in `.find` query
api/src/utils/content-type-creator.utils.ts	Refactored `mergeArrays`, `mergeFields`, and `mergeTwoCts`; added `keyMapper`
ui/src/components/ContentMapper/index.scss	Added active filter styling

Comments suppressed due to low confidence (2)

ui/src/pages/Projects/index.tsx:138

The expression isModalOpen || true always evaluates to true, so navigation is permanently blocked. Remove the || true to only block when the modal is actually open.

useBlockNavigation(isModalOpen || true);

api/src/utils/field-attacher.utils.ts:25

The variable contentId is not defined in this scope. It should likely be contentTypeId to match the function parameter.

.find({ id: fieldUid, projectId: projectId , contentTypeId: contentId})

Copilot · 2025-05-30T11:50:18Z

ui/src/components/Modal/modal.interface.ts

  selectedOrg: IDropDown;
  closeModal: () => void;
  isOpen: (flag: boolean) => void;
+  createProject: (values : FormData)=> void


The createProject prop is declared to return void, but the implementation returns a Promise with a result. Update the interface to something like Promise<any> (or a more specific type) to match its actual return value.

Copilot · 2025-05-30T11:50:18Z

ui/src/components/ContentMapper/index.scss

  font-size: $size-font-large;
  font-weight: $font-weight-semi-bold;
 }
+.filtetButton-color{


[nitpick] The class name filtetButton-color appears to have a typo. Consider renaming it to filterButton-color for clearer intent.

Suggested change

.filtetButton-color{

.filterButton-color{

Copilot · 2025-05-30T11:50:18Z

ui/src/components/DestinationStack/index.tsx

  },[newMigrationData?.isprojectMapped]);

+    useEffect(()=>{
+     if(! isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value ) 


This effect references newMigrationData.destination_stack.selectedStack.value but only lists newMigrationData in its dependency array. Consider adding the specific nested property to the array to prevent stale reads or unintended re-renders.

Copilot

Pull Request Overview

This PR fixes issues related to project migration and updates various components to use newly introduced APIs and updated field identifiers for consistency. Key changes include the addition of a createProjectCall in the Projects page, enhanced locale mapping validation in the Migration page, and widespread modifications in ContentMapper and AdvancePropertise to use backupFieldUid for improved field matching.

Reviewed Changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
ui/src/pages/Projects/index.tsx	Adds createProjectCall and integrates navigation and redux update for migration flow.
ui/src/pages/Migration/index.tsx	Updates localeMapping validation using Object.entries and fallback object.
ui/src/context/app/app.interface.ts	Refines localeMapping type to a Record<string, string>.
ui/src/components/Modal/*	Updates Modal interface/implementation to use createProject prop for project creation.
ui/src/components/ContentMapper/*	Updates various usages from uid to backupFieldUid to ensure field consistency.
ui/src/components/AdvancePropertise/*	Passes contentstackFieldUid through to updateFieldSettings calls.
api/src/utils/* & api/src/services/*	Minor modifications to API utilities and services addressing field attacher and migration logging.
.talismanrc	Adds a new checksum entry for ContentMapper file.

Comments suppressed due to low confidence (1)

api/src/services/wordpress.service.ts:2334

[nitpick] Using a Map to track seen titles is effective; however, if the number of posts is extremely large, consider benchmarking this approach to ensure it scales efficiently.

const seenTitles = new Map();

Copilot · 2025-06-02T07:35:33Z

ui/src/pages/Projects/index.tsx

+          return res?.error;
+        }
+        if (res?.status === 201) {
+          const projectId = res?.data?.project?.id;
+          dispatch(updateNewMigrationData(DEFAULT_NEW_MIGRATION))
+          navigate(`/projects/${projectId}/migration/steps/1`);
+
+        }
+        return res;
+


The function returns res.error when an error is encountered, which may not conform to the CreateProjectResponse type. Consider standardizing the return value for error cases for consistency in response handling.

Suggested change

return res?.error;

}

if (res?.status === 201) {

const projectId = res?.data?.project?.id;

dispatch(updateNewMigrationData(DEFAULT_NEW_MIGRATION))

navigate(`/projects/${projectId}/migration/steps/1`);

}

return res;

return {

status: res?.status || 500,

error: res?.error,

data: null

} as CreateProjectResponse;

}

if (res?.status === 201) {

const projectId = res?.data?.project?.id;

dispatch(updateNewMigrationData(DEFAULT_NEW_MIGRATION))

navigate(`/projects/${projectId}/migration/steps/1`);

}

return res;

Copilot · 2025-06-02T07:35:34Z

ui/src/pages/Migration/index.tsx

    setIsLoading(true);

    const hasNonEmptyMapping =
      newMigrationData?.destination_stack?.localeMapping &&


[nitpick] The updated localeMapping validation uses a fallback empty object and Object.entries, which improves robustness but may benefit from a brief inline comment describing the intent. Adding such documentation can help future maintainers understand the check.

Suggested change

newMigrationData?.destination_stack?.localeMapping &&

newMigrationData?.destination_stack?.localeMapping &&

// Use a fallback empty object to ensure Object.entries does not throw an error if localeMapping is null or undefined.

// Validate that each entry in localeMapping has a non-empty label and a defined, non-empty value.

umeshmore45 · 2025-06-02T07:37:37Z

api/src/services/wordpress.service.ts

      postdataCombined = { ...postdataCombined, ...chunkPostData };
+
+      const seenTitles = new Map();
+      Object?.entries(postdataCombined)?.forEach(([uid, item]:any) => {


Object?.entries?.(postdataCombined)?.forEach?.(([uid, item]:any)

umeshmore45 · 2025-06-02T07:38:08Z

api/src/services/wordpress.service.ts

+      Object?.entries(postdataCombined)?.forEach(([uid, item]:any) => {
+        const originalTitle = item?.title;
+
+        if (seenTitles.has(originalTitle)) {


umeshmore45 · 2025-06-02T07:39:23Z

api/src/utils/content-type-creator.utils.ts

    if (item?.contentstackFieldType === 'group') {
      const groupSchema: any = { ...item, schema: [] }
+      if (item?.contentstackFieldUid?.includes('.')) {
+        const parts = item?.contentstackFieldUid?.split('.');


why we are making changes in this file @AishDani

If any group from the source CMS is mapped to a nested group present in Contentstack, then we are modifying its Contentstack UID with all nested groups by adding a dot in between. In this function we are arranging schema of group so keeping only nested group uid to source group which will help to find match in Contentstack schema.

umeshmore45 · 2025-06-02T07:39:45Z

api/src/utils/content-type-creator.utils.ts

        if (et?.contentstackFieldUid?.includes(`${item?.contentstackFieldUid}.`) ||
          (newStack === false && et?.uid?.includes(`${item?.uid}.`))) {
+            const target = groupSchema?.contentstackFieldUid;
+            const index = et?.contentstackFieldUid?.indexOf(target);


et?.contentstackFieldUid?.indexOf?.(target)

umeshmore45 · 2025-06-02T07:54:03Z

ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx

+    // const validLabels = cmsLocaleOptions?.map((item)=> item?.label);

-    const existingMasterKey = Object?.keys(selectedMappings || {})?.find((key) =>
+    const existingMasterID = Object?.keys(selectedMappings || {})?.find((key) =>


Object?.keys?.

sayalijoshi27 · 2025-06-02T08:22:25Z

ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx

+      const existingLabel = existingMasterID;
+      const expectedLabel = `${locale?.label}-master_locale`;
+
+      const isLabelMismatch = existingLabel && existingLabel.localeCompare(expectedLabel) !== 0;


existingLabel?.localeCompare

sayalijoshi27 · 2025-06-02T08:23:09Z

ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx

  ) => {
    const selectedLocaleKey = selectedValue?.value;

+    let existingLabel = existingField[index];


existingField?.[index]

Bugfix/cmg 616

AishDani added 10 commits May 8, 2025 12:42

fix:resolved the bug [CMG-634]

7b723d2

fix:[CMG-633]:prefiled values of affic and validation message on new …

016c940

…project creation

fix:resolved the bug [CMG-622] mapping of nested group in content mapper

be67715

fix:refactored the bug [CMG-639] When uid of the field is title and t…

67f11c8

…hen for existing case it is getting mapped to title of existing content type

fix:resolved selection and deselection for duplicate title and uid fi…

7cd5c9c

…elds [CMG-640]

refactor:changed uid key to backupFieldUid in mapping to avoid duplic…

cec94e4

…ate uid issues

Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…

baaefd1

…r into bugfix/beta-release

Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…

3c39511

…r into bugFix/beta-release

Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…

e574dbd

…r into bugFix/beta-release

fix:resolved language mapper bugs and added custom starting message f…

24a34ed

…or migration

AishDani requested a review from a team as a code owner May 29, 2025 08:59

AishDani added 4 commits May 30, 2025 15:27

refactor:resolved talisman errors

43f1c94

Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…

a10cb5d

…r into bugfix/cmg-616

fix:added uid in duplicate title entry in wordpress

a3012ad

refactor:added optional chaining

58f3f14

AishDani requested review from RohitKini, umeshmore45 and v1shalpatel May 30, 2025 11:38

umeshmore45 requested a review from Copilot May 30, 2025 11:48

Copilot AI reviewed May 30, 2025

View reviewed changes

refactor:resolved copilots error

7a0b218

umeshmore45 requested a review from Copilot June 2, 2025 07:34

Copilot AI reviewed Jun 2, 2025

View reviewed changes

umeshmore45 requested changes Jun 2, 2025

View reviewed changes

sayalijoshi27 approved these changes Jun 2, 2025

View reviewed changes

refactor:resolved PR comments

06947c7

AishDani requested review from sayalijoshi27 and umeshmore45 June 2, 2025 09:07

Update .talismanrc

5ed10b2

sayalijoshi27 merged commit c5acfac into dev Jun 2, 2025
7 checks passed

umeshmore45 pushed a commit that referenced this pull request Jun 10, 2025

Merge pull request #673 from contentstack/bugfix/cmg-616

b91adfd

Bugfix/cmg 616

umeshmore45 pushed a commit that referenced this pull request Jun 11, 2025

Merge pull request #673 from contentstack/bugfix/cmg-616

8d72387

Bugfix/cmg 616

umeshmore45 pushed a commit that referenced this pull request Jun 11, 2025

Merge pull request #673 from contentstack/bugfix/cmg-616

30dc4aa

Bugfix/cmg 616

Bugfix/cmg 616 #673

Bugfix/cmg 616 #673

Uh oh!

Conversation

AishDani commented May 29, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jun 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 2, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants