Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 api/src/services/migration.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ const startMigration = async (req: Request): Promise<any> => {
break;
}
case CMS.AEM: {
await aemService.createAssets({ projectId, packagePath, destinationStackId: project?.current_test_stack_id });
await aemService.createAssets({ projectId, packagePath, destinationStackId: project?.destination_stack_id });
await aemService.createEntry({
packagePath,
contentTypes,
Expand Down
43 changes: 43 additions & 0 deletions ui/src/components/ContentMapper/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -425,4 +425,47 @@ div .table-row {
.advanced-setting-button,
.table-row button {
flex-shrink: 0;
}

// Prevent header wrapping
.nowrap-header {
white-space: nowrap;
display: inline-block;
}

// Make sure table and save button stay fully visible
.table-wrapper {
position: relative;
padding-bottom: 70px;
}

// Sticky footer for Save button
.mapper-footer {
position: sticky;
bottom: 0;
background: #fff;
padding: 12px 18px;
border-top: 1px solid #e5e5e5;
display: flex;
justify-content: space-between;
align-items: center;
z-index: 100;
}

// Ensure Save button is never clipped
.saveButton {
min-width: 90px;
}

// Prevent bottom overflow issues with InfiniteScrollTable
.infinite-scroll-table,
.infinite-scroll-table-wrapper {
overflow-y: auto !important;
}

// Safety for small screens
@media (max-height: 800px) {
.mapper-footer {
padding: 10px;
}
}
24 changes: 16 additions & 8 deletions ui/src/components/ContentMapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2381,10 +2381,12 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
const columns = [
{
disableSortBy: true,
Header: `${newMigrationData?.legacy_cms?.selectedCms?.title}: ${otherCmsTitle}`,
Header: (
<span className="nowrap-header">
{`${newMigrationData?.legacy_cms?.selectedCms?.title}: ${otherCmsTitle}`}
</span>
),
accessor: accessorCall,
// accessor: 'otherCmsField',
default: false,
id: 'uuid'
}
];
Expand All @@ -2394,19 +2396,25 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
if (!isNewStack) {
columns?.push({
disableSortBy: true,
Header: `Contentstack: ${isOtherContentType ? otherContentType?.label : otherCmsTitle}`,
Header: (
<span className="nowrap-header">
{`Contentstack: ${isOtherContentType ? otherContentType?.label : otherCmsTitle}`}
</span>
),
// accessor: 'ct_field',
accessor: SelectAccessorOfColumn,
id: 'contentstack_field',
default: false
});
} else {
columns?.push({
disableSortBy: true,
Header: `Contentstack: ${isNewStack ? otherCmsTitle : otherContentType?.label ?? ''}`,
Header: (
<span className="nowrap-header">
{`Contentstack: ${isNewStack ? otherCmsTitle : otherContentType?.label ?? ''}`}
</span>
),
accessor: SelectAccessor,
id: 'contentstack_cms_field',
default: false
});
}

Expand Down Expand Up @@ -2680,7 +2688,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
plural: `${totalCounts === 0 ? 'Count' : ''}`
}}
/>
<div className='d-flex align-items-center justify-content-between my-2 mx-3 px-1 py-1'>
<div className="mapper-footer">
<div>Total Fields: <strong>{totalCounts}</strong></div>
<Button
className="saveButton"
Expand Down