From 9b8eb24aa12d2ab10fb468f275cb7e94953972fc Mon Sep 17 00:00:00 2001 From: Sayali Joshi Date: Tue, 25 Jun 2024 00:15:20 +0530 Subject: [PATCH 1/8] Login module fixes --- ui/src/components/Card/card.scss | 1 + ui/src/components/ContentMapper/index.scss | 3 ++- ui/src/components/ContentMapper/index.tsx | 10 ++++------ ui/src/pages/Home/index.tsx | 2 +- ui/src/pages/RegionalLogin/index.scss | 5 ++++- ui/src/scss/App.scss | 6 +++++- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ui/src/components/Card/card.scss b/ui/src/components/Card/card.scss index fa090c38a..98d188128 100644 --- a/ui/src/components/Card/card.scss +++ b/ui/src/components/Card/card.scss @@ -4,6 +4,7 @@ background: $color-brand-white-base; border-radius: 0.6rem; border: 1px solid $color-brand-secondary-lightest; + margin: 0 20px 20px; transition: box-shadow 0.3s ease; width: 20rem; } diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss index 3249fe800..e3593fe95 100644 --- a/ui/src/components/ContentMapper/index.scss +++ b/ui/src/components/ContentMapper/index.scss @@ -66,7 +66,8 @@ } .dropdown-align { .Dropdown__menu--primary { - right: 0.25rem; + right: 0; + top: 1.5rem; } } .content-type-list { diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx index f3f3def51..331d68d0b 100644 --- a/ui/src/components/ContentMapper/index.tsx +++ b/ui/src/components/ContentMapper/index.tsx @@ -1007,7 +1007,6 @@ const ContentMapper = () => { {active == index && ( - { } ]} type="click" - isEllipse + withIcon dropDownPosition="left" className='dropdown-align' > - + - {/* + /* handleOnClick(content?.otherCmsTitle)} /> - */} - + */ )} ))} diff --git a/ui/src/pages/Home/index.tsx b/ui/src/pages/Home/index.tsx index 03a7d1e0b..2436eaf71 100644 --- a/ui/src/pages/Home/index.tsx +++ b/ui/src/pages/Home/index.tsx @@ -36,7 +36,7 @@ const Home = () => {
{heading &&

{heading}

} - {description && parse(description)} + {description &&
{parse(description)}
} {cta?.title && ( diff --git a/ui/src/pages/RegionalLogin/index.scss b/ui/src/pages/RegionalLogin/index.scss index 548c6e717..2e8ad1f31 100644 --- a/ui/src/pages/RegionalLogin/index.scss +++ b/ui/src/pages/RegionalLogin/index.scss @@ -60,9 +60,12 @@ background-color: rgba(0, 0, 0, 0); border-top: 0 solid rgba(34, 34, 34, 0.125); padding: 0.625rem 1.25rem; + .stretched-link { + line-height: $line-height-default; + } [class*='link-arrow'] { &:after { - top: 8px; + top: 6px; } } } diff --git a/ui/src/scss/App.scss b/ui/src/scss/App.scss index 5a960be43..3fd7c1f09 100644 --- a/ui/src/scss/App.scss +++ b/ui/src/scss/App.scss @@ -315,9 +315,13 @@ h1 { h2 { color: $color-base-black-base; font-size: $size-font-5-xl; - font-weight: $font-weight-bold; line-height: 1.5; } +.welcome-para { + p { + color: $color-font-black; + } +} .pb-32 { padding-bottom: $px-32; } From d99e1c4218c44357caabba897fa9ba3596976307 Mon Sep 17 00:00:00 2001 From: snehalsankhe Date: Tue, 25 Jun 2024 11:55:31 +0530 Subject: [PATCH 2/8] Solved issues --- .../DestinationStack/Actions/LoadStacks.tsx | 17 ++++------ .../DestinationStack/DestinationStack.scss | 8 +++-- ui/src/components/DestinationStack/index.tsx | 5 --- ui/src/components/MainHeader/index.scss | 32 +++++++++---------- ui/src/pages/Migration/index.tsx | 5 ++- 5 files changed, 30 insertions(+), 37 deletions(-) diff --git a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx index 183fb08ed..4bc2c2792 100644 --- a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx +++ b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx @@ -46,7 +46,7 @@ const LoadStacks = (props: LoadFileFormatProps) => { const { projectId = '' }: Params = useParams(); useEffect(()=>{ - if(! isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value)){ + if(!isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value)){ setSelectedStack(newMigrationData?.destination_stack?.selectedStack); } },[newMigrationData?.destination_stack?.selectedStack]) @@ -110,11 +110,9 @@ const LoadStacks = (props: LoadFileFormatProps) => { }; /**** ALL METHODS HERE ****/ - const [placeholder, setPlaceholder] = useState('Select a stack'); //Handle Legacy cms selection const handleDropdownChange = (name: string) => (data: IDropDown) => { - const stackChanged = selectedStack?.value !== data?.value; const stackCleared = data?.value === '' || data?.value === null || data === null; if (data?.value == '+ Create a new Stack') { handleCreateNewStack() @@ -135,7 +133,6 @@ const LoadStacks = (props: LoadFileFormatProps) => { } }; - dispatch(updateNewMigrationData((newMigrationDataObj))); if (!stackCleared) { if (props?.handleStepChange) { @@ -161,7 +158,6 @@ const LoadStacks = (props: LoadFileFormatProps) => { created_at: stack?.created_at })) : []; - stackArray.sort( (a: IDropDown, b: IDropDown) => new Date(b?.created_at)?.getTime() - new Date(a?.created_at)?.getTime() @@ -218,12 +214,8 @@ const LoadStacks = (props: LoadFileFormatProps) => { const loadMoreOptions: any = async ({ search, - skip, - limit }: { search: string; - skip: number; - limit: number; }) => { const stackData = await getAllStacksInOrg( selectedOrganisation?.value, search @@ -282,6 +274,9 @@ const LoadStacks = (props: LoadFileFormatProps) => { return { options: stackArray }; }; + + const emptyStackValue = selectedStack?.value === undefined || selectedStack?.value === '' || selectedStack?.value === null + const onBlurDropdown = () => { if (!isEmptyString(selectedStack?.value)) { if (props?.handleStepChange) { @@ -303,15 +298,17 @@ const LoadStacks = (props: LoadFileFormatProps) => { onBlur={onBlurDropdown} canEditOption={true} value={selectedStack} - isClearable={true} isSearchable={true} + isClearable={!emptyStackValue ? true : false } width="600px" isDisabled={props?.stepComponentProps?.isSummary || false} placeholder={placeholder} limit={10} updateOption={()=> undefined} + error={emptyStackValue ? true : false} />
+ {emptyStackValue &&
Please select a stack
}
diff --git a/ui/src/components/DestinationStack/DestinationStack.scss b/ui/src/components/DestinationStack/DestinationStack.scss index 726a0d15b..e56582dd1 100644 --- a/ui/src/components/DestinationStack/DestinationStack.scss +++ b/ui/src/components/DestinationStack/DestinationStack.scss @@ -27,8 +27,8 @@ } .Dropdown-wrapper { .css-b8ldur-Input { - // border: 1px solid red; - cursor: not-allowed; + margin: 0; + padding: 0; } } .stackselect { @@ -107,6 +107,10 @@ padding: 0 !important; } } + .errorMessage { + color: $color-brand-warning-medium; + font-size: $size-font-small; + } } diff --git a/ui/src/components/DestinationStack/index.tsx b/ui/src/components/DestinationStack/index.tsx index 76cd29810..f6ee5591b 100644 --- a/ui/src/components/DestinationStack/index.tsx +++ b/ui/src/components/DestinationStack/index.tsx @@ -2,7 +2,6 @@ import { useEffect, useRef, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import AutoVerticalStepper from '../Stepper/VerticalStepper/AutoVerticalStepper'; import { getDestinationStackSteps } from './StepperSteps'; -import { useNavigate, useParams } from 'react-router-dom'; import { CircularLoader } from '@contentstack/venus-components'; import { CS_ENTRIES } from '../../utilities/constants'; import { @@ -15,10 +14,6 @@ import './DestinationStack.scss'; import { isEmptyString, validateArray } from '../../utilities/functions'; import { getAllStacksInOrg } from '../../services/api/stacks.service'; import { MigrationResponse, StackResponse } from '../../services/api/service.interface'; -// import { -// updateCurrentStepData, -// updateDestinationStack -// } from '../../services/api/migration.service'; import { getCMSDataFromFile } from '../../cmsData/cmsSelector'; import { RootState } from '../../store'; import { updateMigrationData, updateNewMigrationData } from '../../store/slice/migrationDataSlice'; diff --git a/ui/src/components/MainHeader/index.scss b/ui/src/components/MainHeader/index.scss index fad380d74..fa7155642 100644 --- a/ui/src/components/MainHeader/index.scss +++ b/ui/src/components/MainHeader/index.scss @@ -2,7 +2,6 @@ .mainheader { background-color: $color-brand-white-base; - // border-bottom: 1px solid $color-brand-secondary-lightest; height: 3.5rem; justify-content: space-between; position: fixed; @@ -34,40 +33,39 @@ .organisationWrapper { margin-left: 1.063rem; &:focus { - box-shadow: 0 0 1px $color-brand-primary-base, 0 0 0 4px #bbb4f4; + box-shadow: none; } } + .Dropdown { + &:focus { + box-shadow: none; + } + } .Dropdown-wrapper { padding: 0 18px; } - .Dropdown__header__value { - overflow: visible; - line-height: 1.2; - } - .Dropdown__header__label { - margin-bottom: 0; - } .Dropdown.Dropdown--hover .Dropdown__menu--primary { top: 2.5rem; } .organisationWrapper { + &:focus { + box-shadow: none; + } .Dropdown__header__value { color: #475161; max-width: 11.1875rem; width: auto; - // overflow: hidden; + color: $color-black-222 !important; + line-height: $line-height-reset; } .Dropdown__menu--primary .Dropdown__menu__list__item, .Dropdown__menu--secondary .Dropdown__menu__list__item, .Dropdown__menu--tertiary .Dropdown__menu__list__item { max-width: 14.5rem; } + .Dropdown__header__label { + line-height: $line-height-reset; + margin-bottom: 8px; + } } } -.Dropdown__header__label { - line-height: $line-height-reset; -} -.Dropdown__header__value { - color: $color-black-222 !important; - line-height: $line-height-reset; -} diff --git a/ui/src/pages/Migration/index.tsx b/ui/src/pages/Migration/index.tsx index 5c0ebb747..67d4cafb1 100644 --- a/ui/src/pages/Migration/index.tsx +++ b/ui/src/pages/Migration/index.tsx @@ -141,7 +141,6 @@ const Migration = () => { ] return steps; } - const handleClick = () => { // Call handleStepChange function @@ -197,7 +196,7 @@ const Migration = () => { const handleOnClickDestinationStack = async (event: MouseEvent) => { setIsLoading(true); - if(isCompleted){ + if(isCompleted && !isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value)){ event?.preventDefault(); //Update Data in backend await updateDestinationStack(selectedOrganisation?.value, projectId, { @@ -207,11 +206,11 @@ const Migration = () => { const res = await updateCurrentStepData(selectedOrganisation?.value, projectId); if (res) { setIsLoading(false); - const url = `/projects/${projectId}/migration/steps/3`; navigate(url, { replace: true }); } } else{ + setIsLoading(false); Notification({ notificationContent: { text: 'Please complete all steps' }, type: 'warning' From 2fd16a4add722aa46f3a2d1cd18ccae7d5112634 Mon Sep 17 00:00:00 2001 From: snehalsankhe Date: Tue, 25 Jun 2024 12:55:13 +0530 Subject: [PATCH 3/8] solved bugs --- ui/src/components/Card/card.scss | 1 - ui/src/components/Card/index.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/src/components/Card/card.scss b/ui/src/components/Card/card.scss index 98d188128..fa090c38a 100644 --- a/ui/src/components/Card/card.scss +++ b/ui/src/components/Card/card.scss @@ -4,7 +4,6 @@ background: $color-brand-white-base; border-radius: 0.6rem; border: 1px solid $color-brand-secondary-lightest; - margin: 0 20px 20px; transition: box-shadow 0.3s ease; width: 20rem; } diff --git a/ui/src/components/Card/index.tsx b/ui/src/components/Card/index.tsx index 32c6c3fd9..230857fa9 100644 --- a/ui/src/components/Card/index.tsx +++ b/ui/src/components/Card/index.tsx @@ -58,7 +58,7 @@ const CardList = ({ project }: ProjectType) => { }, [selectedOrganisation?.value, project?.id]); return ( -
+
onClickProject(project?.id || '')}>
From b56b3eb7d6aeffcbb76c6eaefab708662064a582 Mon Sep 17 00:00:00 2001 From: AishDani Date: Tue, 25 Jun 2024 14:19:02 +0530 Subject: [PATCH 4/8] refactor:css bugs in legacy cms --- ui/src/cmsData/legacyCms.json | 4 ++-- ui/src/components/Common/Card/card.tsx | 4 ++-- ui/src/components/DestinationStack/index.tsx | 1 + .../LegacyCms/Actions/LoadFileFormat.tsx | 2 +- .../LegacyCms/Actions/LoadSelectCms.tsx | 2 +- ui/src/components/LegacyCms/index.tsx | 1 + ui/src/components/LegacyCms/legacyCms.scss | 7 ++++--- .../HorizontalStepper/HorizontalStepper.scss | 5 +++-- .../VerticalStepper/AutoVerticalStepper.scss | 16 +++++++++++++--- .../VerticalStepper/AutoVerticalStepper.tsx | 14 +++++++++----- 10 files changed, 37 insertions(+), 19 deletions(-) diff --git a/ui/src/cmsData/legacyCms.json b/ui/src/cmsData/legacyCms.json index f3359ecc9..08ef2bfd7 100644 --- a/ui/src/cmsData/legacyCms.json +++ b/ui/src/cmsData/legacyCms.json @@ -350,7 +350,7 @@ "uid": "cs7c935e15de9ea7c8" }, "title": "File Format", - "description": "Click to read the document and subsequently continue with migration process.", + "description": "The file format compatible with the above cms is as follows.", "step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration.", "lock": false, "active": true, @@ -362,7 +362,7 @@ "uid": "cs0279f1f0ce13e83e" }, "title": "Imported File", - "description": "Select File to upload CMS Data.", + "description": "The uploaded file is as follows.", "step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration.", "lock": false, "active": true, diff --git a/ui/src/components/Common/Card/card.tsx b/ui/src/components/Common/Card/card.tsx index 178e68d20..fc0a9b7e1 100644 --- a/ui/src/components/Common/Card/card.tsx +++ b/ui/src/components/Common/Card/card.tsx @@ -1,4 +1,4 @@ -import { Icon, Radio, Tooltip } from '@contentstack/venus-components'; +import { Icon, Paragraph, Radio, Tooltip } from '@contentstack/venus-components'; import { MouseEvent, useState } from 'react'; import WordWrapper from '../WordWrapper/WordWrapper'; import { addDomainInPath } from '../../../utilities/functions'; @@ -72,7 +72,7 @@ const Card = ({ data, selectedCard, onCardClick, cardType, idField = 'id' }: Car
- +
); diff --git a/ui/src/components/DestinationStack/index.tsx b/ui/src/components/DestinationStack/index.tsx index 76cd29810..f2e5b0283 100644 --- a/ui/src/components/DestinationStack/index.tsx +++ b/ui/src/components/DestinationStack/index.tsx @@ -220,6 +220,7 @@ const DestinationStackComponent = ({ description={migrationData?.destinationStackData?.description} ref={autoVerticalStepperComponent} isEdit={!isMigrationLocked} + isRequired={false} handleOnAllStepsComplete={handleAllStepsComplete} />
diff --git a/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx b/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx index 4843f6680..4838fc988 100644 --- a/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx +++ b/ui/src/components/LegacyCms/Actions/LoadFileFormat.tsx @@ -101,7 +101,7 @@ const LoadFileFormat = (props: LoadFileFormatProps) => { return (
-
+
{validateArray(allowed_file_formats) ? ( allowed_file_formats?.map((data: ICardType, index: number) => (
diff --git a/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx b/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx index e35afc5f0..906eb3c88 100644 --- a/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx +++ b/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx @@ -204,7 +204,7 @@ const LoadSelectCms = (props: LoadSelectCmsProps) => { : ( cmsData && validateArray(cmsData) && ( -
+
{cmsData?.map((data: ICMSType) => ( void; }; @@ -76,7 +76,7 @@ const AutoVerticalStepper = React.forwardRef< } }; - const StepperStepTitleCreator: (data: any) => JSX.Element = (data: any) => { + const StepperStepTitleCreator: (data: any,isRequired:boolean) => JSX.Element = (data: any, isRequired:boolean) => { const showSpan = data?.title == 'Orgnization' ? (read only) : '' return ( <> @@ -84,6 +84,8 @@ const AutoVerticalStepper = React.forwardRef<
+ {isRequired && } + {data?.ifReadonly && (read only)}
{data.titleNote ? data.titleNote : ''} @@ -96,6 +98,7 @@ const AutoVerticalStepper = React.forwardRef< ) : null} */}
+ {/* */} {data.description &&
{data.description}
} ); @@ -153,7 +156,8 @@ const AutoVerticalStepper = React.forwardRef< const getStepStatus = (idx: number) => { return stepStatus[idx]; }; - + console.log("steps :::::", steps); + return (
{props?.description &&
{props?.description}
} @@ -173,7 +177,7 @@ const AutoVerticalStepper = React.forwardRef< style={{ paddingBottom: '10px' }} >
- {StepperStepTitleCreator(step)} + {StepperStepTitleCreator(step, props?.isRequired)}
From c008fd302705c131b6cd160c69f87014ef28c703 Mon Sep 17 00:00:00 2001 From: AishDani Date: Tue, 25 Jun 2024 14:23:46 +0530 Subject: [PATCH 5/8] refactor:removed console --- .../components/Stepper/VerticalStepper/AutoVerticalStepper.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx index 4bf9f1b03..96907ae37 100644 --- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx +++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx @@ -98,7 +98,6 @@ const AutoVerticalStepper = React.forwardRef< ) : null} */}
- {/* */} {data.description &&
{data.description}
} ); @@ -156,8 +155,6 @@ const AutoVerticalStepper = React.forwardRef< const getStepStatus = (idx: number) => { return stepStatus[idx]; }; - console.log("steps :::::", steps); - return (
{props?.description &&
{props?.description}
} From f3b88b87cd90b9291d99b4e00043516c2712cff7 Mon Sep 17 00:00:00 2001 From: Sayali Joshi Date: Tue, 25 Jun 2024 15:03:28 +0530 Subject: [PATCH 6/8] [CMG-127] - Empty Project dashboard | Search field should not be displayed --- ui/src/components/ProjectsHeader/index.tsx | 52 ++++++++-------------- ui/src/pages/Projects/index.scss | 6 ++- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/ui/src/components/ProjectsHeader/index.tsx b/ui/src/components/ProjectsHeader/index.tsx index 493867fc6..808f6a035 100644 --- a/ui/src/components/ProjectsHeader/index.tsx +++ b/ui/src/components/ProjectsHeader/index.tsx @@ -24,39 +24,25 @@ const ProjectsHeader = ({ const SearchProject = ( <> - {allProject && allProject?.length > 0 ? ( -
- - search.replace(/\s/g, '').length - ? setSearchText(search?.trim()) - : setSearchText(search) - } - width="large" - onClear={true} - onClick={setFocus} - value={searchText} - debounceSearch={true} - id="search-project-input" - /> -
- ) : ( - searchText?.length > 0 && ( -
- setSearchText(search)} - onClear={true} - onClick={setFocus} - value={searchText} - debounceSearch={true} - id="search-project-input" - /> -
- ) - )} +
+ + search.replace(/\s/g, '').length + ? setSearchText(search?.trim()) + : setSearchText(search) + } + width="large" + onClear={true} + onClick={setFocus} + value={searchText} + debounceSearch={true} + id="search-project-input" + version="v2" + disabled={allProject && allProject?.length <= 0} + /> +
); diff --git a/ui/src/pages/Projects/index.scss b/ui/src/pages/Projects/index.scss index 926d50365..8ca4b3d61 100644 --- a/ui/src/pages/Projects/index.scss +++ b/ui/src/pages/Projects/index.scss @@ -1,8 +1,10 @@ @import '../../scss/variables'; .project-search-wrapper { - margin-top: 2px; - margin-left: 8px; + margin-left: $px-12; + .Search { + height: 2.5rem; + } .Search__input { border: 1px solid $color-base-gray-40; } From 3d5695be323799482608702698c4f2e7c2bcc97b Mon Sep 17 00:00:00 2001 From: Sayali Joshi Date: Tue, 25 Jun 2024 17:02:03 +0530 Subject: [PATCH 7/8] [CMG-146] - Search | When enter space multiple times and then search for existing Project name, it doesnt show result --- ui/src/components/ProjectsHeader/index.tsx | 40 +++++++++++++++++++--- ui/src/pages/Projects/index.scss | 4 +-- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/ui/src/components/ProjectsHeader/index.tsx b/ui/src/components/ProjectsHeader/index.tsx index 808f6a035..e52a4a05c 100644 --- a/ui/src/components/ProjectsHeader/index.tsx +++ b/ui/src/components/ProjectsHeader/index.tsx @@ -10,7 +10,6 @@ const ProjectsHeader = ({ setSearchText, searchPlaceholder, cta, - restore_cta: restoreCta, allProject, handleModal }: ProjectsHeaderType) => { @@ -29,9 +28,7 @@ const ProjectsHeader = ({ placeholder={searchPlaceholder} type="secondary" onChange={(search: string) => - search.replace(/\s/g, '').length - ? setSearchText(search?.trim()) - : setSearchText(search) + setSearchText(search?.trim()) } width="large" onClear={true} @@ -40,9 +37,42 @@ const ProjectsHeader = ({ debounceSearch={true} id="search-project-input" version="v2" - disabled={allProject && allProject?.length <= 0} + disabled={allProject && allProject?.length <= 0 && searchText?.length <= 0} />
+ {/* {allProject && allProject?.length > 0 ? ( +
+ + search.replace(/\s/g, '').length + ? setSearchText(search?.trim()) + : setSearchText(search) + } + width="large" + onClear={true} + onClick={setFocus} + value={searchText} + debounceSearch={true} + id="search-project-input" + /> +
+ ) : ( + searchText?.length > 0 && ( +
+ setSearchText(search)} + onClear={true} + onClick={setFocus} + value={searchText} + debounceSearch={true} + id="search-project-input" + /> +
+ ) + )} */} ); diff --git a/ui/src/pages/Projects/index.scss b/ui/src/pages/Projects/index.scss index 8ca4b3d61..7e135b6b5 100644 --- a/ui/src/pages/Projects/index.scss +++ b/ui/src/pages/Projects/index.scss @@ -3,11 +3,9 @@ .project-search-wrapper { margin-left: $px-12; .Search { + background-color: $color-brand-white-base; height: 2.5rem; } - .Search__input { - border: 1px solid $color-base-gray-40; - } ::placeholder { font-size: $px-16; color: $color-stepper-title !important; From 9c72ef928388d108546c07a9ac171c4413a08ada Mon Sep 17 00:00:00 2001 From: Sayali Joshi Date: Wed, 26 Jun 2024 13:30:18 +0530 Subject: [PATCH 8/8] Content type mapping save API fixes --- ui/src/components/ContentMapper/index.tsx | 79 +---------------------- 1 file changed, 3 insertions(+), 76 deletions(-) diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx index 331d68d0b..a941fe24d 100644 --- a/ui/src/components/ContentMapper/index.tsx +++ b/ui/src/components/ContentMapper/index.tsx @@ -18,8 +18,6 @@ import { ModalFooter, Dropdown } from '@contentstack/venus-components'; -import { jsonToHtml } from '@contentstack/json-rte-serializer'; -import HTMLReactParser from 'html-react-parser'; // Services import { getCMSDataFromFile } from '../../cmsData/cmsSelector'; @@ -29,7 +27,6 @@ import { getExistingContentTypes, updateContentType, resetToInitialMapping, - createTestStack, fetchExistingContentType } from '../../services/api/migration.service'; import { getStackStatus } from '../../services/api/stacks.service'; @@ -512,6 +509,7 @@ const ContentMapper = () => { return row; }); setTableData(updatedRows); + setSelectedEntries(updatedRows); }; const handleDropDownChange = (value: FieldTypes) => { @@ -630,6 +628,7 @@ const ContentMapper = () => { }); setTableData(updatedRows as FieldMapType[]); + setSelectedEntries(updatedRows as FieldMapType[]); }; const SelectAccessorOfColumn = (data: FieldMapType) => { @@ -1104,7 +1103,7 @@ const ContentMapper = () => {
- - - - {/* {actionCta && validateArray(actionCta) && ( - -
-
- {currentIndex > 0 && ( - - - {prevButtonLabel} - - )} -
-
-
- - -
-
- {currentIndex < contentTypes.length - 1 && ( - - {nextButtonLabel} - - - )} -
-
-
- - )} */}
- - {/* {cta?.title && ( -
- -
- )} */}
); };