Skip to content
Merged

Dev #168

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a6ec05a
refactor:updated file format to show file format of cms
AishDani Jun 27, 2024
97ac8c7
refactor:legacy cms bugs
AishDani Jun 27, 2024
c43ad23
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jun 27, 2024
44e5b20
added profile card
RohitKini Jul 2, 2024
4d7423d
added profile card
RohitKini Jul 2, 2024
cc89f4a
Merge pull request #163 from contentstack/feature/profile-design
sreeneshkini Jul 2, 2024
f861ca5
Done functionality fixes for existing content type mapping
sayalijoshi27 Jul 2, 2024
2203b2f
Merge pull request #164 from contentstack/feature/CMG-57
v1shalpatel Jul 3, 2024
417515d
Content Type status modified functionality
sayalijoshi27 Jul 3, 2024
ce6b331
Removed code for search fieldsmapping as per content type
sayalijoshi27 Jul 4, 2024
00058d3
refactor:legacy cms bugs
AishDani Jul 4, 2024
9dab0fc
Merge pull request #165 from contentstack/feature/CMG-57
v1shalpatel Jul 4, 2024
a45ee93
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jul 4, 2024
9b64a54
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jul 4, 2024
1867387
refactor:resolved legacy cms bugs
AishDani Jul 4, 2024
9e4653c
refactor:removed search from getAllProject api
AishDani Jul 4, 2024
0765dfc
Merge pull request #166 from contentstack/feature/legacy-cms
v1shalpatel Jul 4, 2024
3bec73b
added destination bugs
snehalsankhe Jul 4, 2024
ec50c84
merged from dev
snehalsankhe Jul 4, 2024
690c223
Merge pull request #167 from contentstack/layout-changes
v1shalpatel Jul 4, 2024
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
1 change: 1 addition & 0 deletions ui/src/components/ContentMapper/contentMapper.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface FieldTypes {
label: string;
value: any;
id?: string;
isDisabled?: boolean;
}
export interface TableTypes {
sortBy: any;
Expand Down
43 changes: 27 additions & 16 deletions ui/src/components/ContentMapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,13 @@ const ContentMapper = () => {

const OptionValue: FieldTypes =
OptionsForRow?.length === 0
? { label: 'No matches found', value: 'No matches found' }
? {
label: data?.ContentstackFieldType,
value: data?.ContentstackFieldType,
isDisabled: data?.ContentstackFieldType === 'group' ||
data?.ContentstackFieldType === 'text' ||
data?.ContentstackFieldType === 'url'
}
: { label: `${selectedOption} matches`, value: `${selectedOption} matches` };

const adjustedOptions = OptionsForRow.map((option: optionsType) => ({
Expand All @@ -713,23 +719,28 @@ const ContentMapper = () => {
maxWidth="290px"
isClearable={false}
options={adjustedOptions}
isDisabled={
OptionValue?.isDisabled
}
/>
</div>
<Icon
version="v2"
icon="Setting"
size="small"
onClick={() => {
// const value = {
// ValidationRegex: data?.advanced?.ValidationRegex,
// Mandatory: data?.advanced?.mandatory,
// Multiple: data?.advanced?.multiple,
// Unique: data?.advanced?.unique,
// NonLocalizable: data?.advanced?.nonLocalizable
// };
handleAdvancedSetting(data?.ContentstackFieldType, advancePropertise, data?.uid, data);
}}
/>
{!OptionValue?.isDisabled && (
<Icon
version="v2"
icon="Setting"
size="small"
onClick={() => {
// const value = {
// ValidationRegex: data?.advanced?.ValidationRegex,
// Mandatory: data?.advanced?.mandatory,
// Multiple: data?.advanced?.multiple,
// Unique: data?.advanced?.unique,
// NonLocalizable: data?.advanced?.nonLocalizable
// };
handleAdvancedSetting(data?.ContentstackFieldType, advancePropertise, data?.uid, data);
}}
/>
)}
</div>
);
};
Expand Down
3 changes: 0 additions & 3 deletions ui/src/components/DestinationStack/Actions/LoadStacks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ const defaultStack = {
};

const LoadStacks = (props: LoadFileFormatProps) => {

console.log("props", props);

/**** ALL HOOKS HERE ****/

const newMigrationData = useSelector((state:RootState)=>state?.migration?.newMigrationData);
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Modal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ const Modal = (props: ProjectModalProps) => {
<Textarea
{...input}
value={input?.value}
onChange={(event: any): any => {
onChange={(event: React.ChangeEvent<HTMLInputElement>): void => {
input.onChange(event);
}}
id="description"
Expand Down