Skip to content

[CMG-726] - The “Overlapping” and “Advanced Settings” buttons are not responding on multiple clicks. #810

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 30 commits into from
Nov 5, 2025
Merged

[CMG-726] - The “Overlapping” and “Advanced Settings” buttons are not responding on multiple clicks. #810

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
c1e4598
sitecore nested zip issue resolved
sauravraw Sep 22, 2025
b767523
remove hardcode value from config
sauravraw Sep 22, 2025
2537325
Merge branch 'feature/new-logo-update' of https://github.com/contents…
sauravraw Sep 25, 2025
e6f12b1
fixed sitecore issues
sauravraw Sep 25, 2025
5a4de41
Update contenttypes.js
sauravraw Sep 26, 2025
54c45d8
added prefix support
sauravraw Sep 26, 2025
fa5bd36
[CMG-726]
sayalijoshi27 Oct 10, 2025
1dab9fa
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Oct 10, 2025
0f4eb92
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Oct 10, 2025
585e624
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Oct 15, 2025
2799cba
Disabled mandatory toggle for Modular blocks
sayalijoshi27 Oct 15, 2025
a91eb7b
Refactor project service and UI components for improved readability a…
sauravraw Oct 29, 2025
ac72604
Merge branch 'dev' of https://github.com/contentstack/migration-v2 in…
sauravraw Oct 31, 2025
1bfde71
chore: update package-lock.json to mark several dependencies as dev d…
sauravraw Oct 31, 2025
cdcedf4
refactor: enhance error handling and validation in project service me…
sauravraw Nov 3, 2025
5f1eeff
fix: correct comment typo in contentTypeMapper for dropdown advanced …
sauravraw Nov 3, 2025
3eb1eb0
chore: update @contentstack/cli and related dependencies in package.j…
sauravraw Nov 3, 2025
8e01696
refactor: simplify nested zip file validation logic in sitecoreValida…
sauravraw Nov 3, 2025
aa8e183
bugfix: added initial key to enable advance field reset
yashin4112 Nov 3, 2025
860ee72
Merge pull request #821 from contentstack/bugfix/sitecore-zip-issue
sayalijoshi27 Nov 3, 2025
f8ac7db
Merge pull request #822 from contentstack/bugfix/aem-752
sayalijoshi27 Nov 3, 2025
b3fa09a
refactor: add isNumber field to SearchComponent and TeaserComponent f…
shobhitupadhyayy Nov 4, 2025
087d330
[CMG-736] - Multiple clicks on buttons or links that return results s…
sayalijoshi27 Nov 4, 2025
a6d356e
[CMG-736] - Multiple clicks on buttons or links that return results s…
sayalijoshi27 Nov 4, 2025
d6c63ee
conflict resolved
sayalijoshi27 Nov 4, 2025
b46532a
Replaced Master word with default
sayalijoshi27 Nov 4, 2025
595e9f4
refactor: improve state management and formatting in AdvancePropertis…
shobhitupadhyayy Nov 4, 2025
fd4d592
Merge pull request #823 from contentstack/feat/custom-app
umeshmore45 Nov 4, 2025
c46761f
conflict resolved
sayalijoshi27 Nov 4, 2025
d12b956
copilot suggestions added
sayalijoshi27 Nov 4, 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
9 changes: 6 additions & 3 deletions ui/src/components/AdvancePropertise/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,6 @@ const AdvancePropertise = (props: SchemaProps) => {
});
};



const handleDrop = (index: number) => {
if (draggedIndex === null) return;

Expand Down Expand Up @@ -576,7 +574,11 @@ const AdvancePropertise = (props: SchemaProps) => {
);
}}
options={
option}
(Array.isArray(props?.data?.referenceTo) && props?.data?.referenceTo?.length) ? [props.data.referenceTo.map((item: any) => ({
Copy link

Copilot AI Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace any type with a more specific type definition. The item parameter should have an explicit type for better type safety.

Suggested change
(Array.isArray(props?.data?.referenceTo) && props?.data?.referenceTo?.length) ? [props.data.referenceTo.map((item: any) => ({
(Array.isArray(props?.data?.referenceTo) && props?.data?.referenceTo?.length) ? [props.data.referenceTo.map((item: string) => ({

Copilot uses AI. Check for mistakes.
label: item,
value: item
})), ...option]
: option ?? []}
Copy link

Copilot AI Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The mapped referenceTo array is wrapped in an extra array bracket, creating a nested array structure [[{label, value}, ...], ...option] instead of the intended flat array [{label, value}, ..., ...option]. Remove the outer brackets around props.data.referenceTo.map(...) to properly spread the mapped items.

Copilot uses AI. Check for mistakes.
placeholder="Add Content Type(s)"
version="v2"
isSearchable={true}
Expand Down Expand Up @@ -659,6 +661,7 @@ const AdvancePropertise = (props: SchemaProps) => {
true
))
}
disabled={props?.fieldtype === 'Modular Blocks' || props?.fieldtype === 'Block'}
/>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/ContentMapper/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ div .table-row {
display: block;
}
.advanced-setting-button {
padding: 5px;
padding: 5px 10px;
}
.field-count {
font-size: $size-font-large;
Expand Down
12 changes: 6 additions & 6 deletions ui/src/components/ContentMapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,14 +1342,14 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
<Button
buttonType="light"
disabled={newMigrationData?.project_current_step > 4}
onClick={() =>
handleAdvancedSetting(fieldLabel, data?.advanced || {}, data?.uid, data)
}
>
<Icon
version="v2"
icon="Sliders"
size="small"
onClick={() =>
handleAdvancedSetting(fieldLabel, data?.advanced || {}, data?.uid, data)
}
disabled={newMigrationData?.project_current_step > 4}
/>

Expand Down Expand Up @@ -1838,14 +1838,14 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
<Button
buttonType="light"
disabled={(contentTypeSchema && existingField[data?.backupFieldUid]) || newMigrationData?.project_current_step > 4}
onClick={() => {
handleAdvancedSetting(initialOption?.label, data?.advanced || {}, data?.uid, data);
}}
>
<Icon
version={'v2'}
icon="Sliders"
size="small"
onClick={() => {
handleAdvancedSetting(initialOption?.label, data?.advanced || {}, data?.uid, data);
}}
/>
</Button>
</Tooltip>
Expand Down
5 changes: 0 additions & 5 deletions ui/src/components/LogScreen/MigrationLogViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,10 @@ import { updateNewMigrationData } from '../../store/slice/migrationDataSlice';
// Utilities
import { CS_URL } from '../../utilities/constants';

// Service
import { updateCurrentStepData } from '../../services/api/migration.service';

// Interface
import { INewMigration } from '../../context/app/app.interface';
import { ModalObj } from '../Modal/modal.interface';

// Components
import MigrationCompletionModal from '../Common/MigrationCompletionModal';
import useBlockNavigation from '../../hooks/userNavigation';

// CSS
Expand Down
6 changes: 6 additions & 0 deletions ui/src/components/Modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,18 @@ const Modal = (props: ProjectModalProps) => {
if (result) {
Notification({
notificationContent: { text: result?.data?.message },
notificationProps: {
hideProgressBar: true
},
type: 'success'
});
closeModal();
} else {
Notification({
notificationContent: { text: 'Error occurred while creating project.' },
notificationProps: {
hideProgressBar: true
},
type: 'error'
});
closeModal();
Expand Down
13 changes: 4 additions & 9 deletions ui/src/pages/Login/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ const Login: FC<IProps> = () => {
if (res?.status === 200 && res?.data?.notice === TFA_VIA_SMS_MESSAGE) {
Notification({
notificationContent: { text: res?.data?.notice },
type: 'success'
type: 'success',
notificationProps: {
hideProgressBar: true
}
});
}

Expand Down Expand Up @@ -198,14 +201,6 @@ const Login: FC<IProps> = () => {
}
};

// useEffect(()=>{
// if(region && loginStates?.tfa){
// setIsBlock(true);

// }

// },[loginStates]);

// Function for TFA validation
const TFAValidation = (value: string): string | undefined => {
if (value?.length) {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/pages/Migration/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ const Migration = () => {
notificationContent: { text: 'Migration Execution process started' },
notificationProps: {
position: 'bottom-center',
hideProgressBar: false
hideProgressBar: true
},
type: 'message'
});
Expand Down