Skip to content

Commit 27dbbb3

Browse files
Merge pull request #815 from contentstack/bugfix/aem-741
bugfix: CMG-741, CMG-749
2 parents ea3ae33 + f08184d commit 27dbbb3

File tree

3 files changed

+36
-14
lines changed

3 files changed

+36
-14
lines changed

ui/src/components/ContentMapper/index.scss

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
}
152152
.Table {
153153
border-left: 0 none;
154-
min-height: inherit;
154+
// min-height: inherit;
155155
.Table__body__row {
156156
// height: auto!important;
157157
// min-height: 80px;
@@ -405,4 +405,14 @@ div .table-row {
405405
max-width: 230px;
406406
display: inline-flex;
407407
line-height: 1.2!important;
408-
}
408+
}
409+
410+
.custom-empty-state {
411+
.Icon--original {
412+
width: 207px !important;
413+
height: auto !important;
414+
max-width: 100%;
415+
display: block;
416+
margin: 0 auto;
417+
}
418+
}

ui/src/components/ContentMapper/index.tsx

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2583,13 +2583,14 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
25832583
<InfiniteScrollTable
25842584
loading={loading}
25852585
canSearch={true}
2586-
data={tableData?.length ? [...tableData] : []}
2586+
totalCounts={Math.max(0, tableData?.length)}
2587+
// data={tableData?.length > 0 ? [...tableData] : []}
2588+
data={[...tableData]}
25872589
columns={columns}
25882590
uniqueKey={'id'}
25892591
isRowSelect
25902592
// fullRowSelect
25912593
itemStatusMap={itemStatusMap}
2592-
totalCounts={totalCounts}
25932594
searchPlaceholder={tableSearchPlaceholder}
25942595
fetchTableData={fetchData}
25952596
loadMoreItems={loadMoreItems}
@@ -2599,6 +2600,20 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
25992600
initialRowSelectedData={initialRowSelectedData}
26002601
initialSelectedRowIds={rowIds}
26012602
itemSize={80}
2603+
v2Features={{
2604+
isNewEmptyState: true
2605+
}}
2606+
customEmptyState={
2607+
<EmptyState
2608+
forPage="list"
2609+
heading={<div className="empty_search_heading">No Fields available</div>}
2610+
moduleIcon="NoSearchResult"
2611+
description="Try changing the search query to find what you are looking for."
2612+
version="v2"
2613+
testId="no-results-found-page"
2614+
className="custom-empty-state"
2615+
/>
2616+
}
26022617
withExportCta={{
26032618
component: (
26042619
<div className='d-flex align-items-center'>
@@ -2669,7 +2684,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
26692684
className="mapper-emptystate"
26702685
img={NoDataFound}
26712686
actions={
2672-
<>
26732687
<Button buttonType="secondary" size="small" version="v2"
26742688
onClick={() => {
26752689
const newMigrationDataObj: INewMigration = {
@@ -2683,14 +2697,12 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
26832697
}
26842698
}
26852699
}
2686-
26872700
dispatch(updateNewMigrationData(newMigrationDataObj));
26882701
handleStepChange(0);
26892702
const url = `/projects/${projectId}/migration/steps/1`;
26902703
navigate(url, { replace: true });
26912704
}}
26922705
className='ml-10'>Go to Legacy CMS</Button>
2693-
</>
26942706
}
26952707
version="v2"
26962708
testId="no-results-found-page"

ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
align-items: center;
2323
justify-content: center;
2424
position: relative;
25-
flex: 0.6;
25+
flex: 0.9;
2626
margin: 0;
2727
}
2828

@@ -82,14 +82,14 @@
8282
}
8383

8484
.connector {
85-
height: 4px;
85+
height: 4px;
8686
background-color: $color-brand-primary-base;
8787
flex-grow: 1;
8888
margin: 0;
8989
margin-bottom: 30px;
9090
border-radius: 4px;
91-
margin-left: -40px;
92-
margin-right: -40px;
91+
margin-left: -80px;
92+
margin-right: -80px;
9393
}
9494

9595
.circle-title-wrapper {
@@ -104,12 +104,12 @@
104104
.disabled-connector {
105105
background-color: $color-base-gray-40;
106106
flex-grow: 1;
107-
margin: 0;
107+
margin: 0;
108108
margin-bottom: 30px;
109109
border-radius: 4px;
110110
height: 4px;
111-
margin-left: -40px;
112-
margin-right: -40px;
111+
margin-left: -80px;
112+
margin-right: -80px;
113113
}
114114

115115
/******************* Custom Classes *******************/

0 commit comments

Comments
 (0)