Skip to content
Merged

Dev #144

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
62e92a4
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jun 6, 2024
4cf5d93
refactor:code according to new design
AishDani Jun 9, 2024
28432fa
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jun 9, 2024
b4844ec
refactor:legacy cms step
AishDani Jun 10, 2024
c08e522
refactor:changed steps name of legacy cms
AishDani Jun 10, 2024
3748649
refactor:changed the condition to show file details on failed
AishDani Jun 10, 2024
70434bb
refactor:resolved PR comment
AishDani Jun 10, 2024
e6a890d
Merge pull request #137 from contentstack/feature/legacy-cms
sreeneshkini Jun 10, 2024
84a2918
added destination stack changes
snehalsankhe Jun 10, 2024
9828395
refactor:added notification and error message for mismatch file format
AishDani Jun 11, 2024
fe425ad
Merge pull request #138 from contentstack/feature/legacy-cms
sreeneshkini Jun 11, 2024
f96e34d
Content mapper new UI
sayalijoshi27 Jun 11, 2024
0e4bf20
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Jun 11, 2024
096b396
add file path, is_fileValid and aws details in file-format api
shristi-sinha Jun 11, 2024
ff57020
Merge pull request #139 from contentstack/feature/save-validatefile
sreeneshkini Jun 11, 2024
355c95c
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Jun 12, 2024
196209e
Content mapper UI design changes
sayalijoshi27 Jun 14, 2024
d1d5673
Code refactor
sayalijoshi27 Jun 17, 2024
9944606
Merge pull request #140 from contentstack/feature/CMG-57
sreeneshkini Jun 17, 2024
046ce65
feat:added progressbar for validation process
AishDani Jun 17, 2024
62d059e
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jun 17, 2024
c9671a6
added destination stack code
snehalsankhe Jun 17, 2024
2d9e4bb
solved conflicts
snehalsankhe Jun 17, 2024
d6a6f75
added styling
snehalsankhe Jun 17, 2024
518c6d9
added styling
snehalsankhe Jun 17, 2024
9bbbe4e
added styling
snehalsankhe Jun 17, 2024
a109770
Merge pull request #141 from contentstack/feature/legacy-cms
sreeneshkini Jun 18, 2024
4a7783e
added master language
snehalsankhe Jun 18, 2024
f0eab80
merge dev
snehalsankhe Jun 18, 2024
c7217e8
merge dev
snehalsankhe Jun 18, 2024
09da730
refactor:added hyperlink for restricted keyword link
AishDani Jun 18, 2024
6682055
Merge pull request #142 from contentstack/layout-changes
sreeneshkini Jun 18, 2024
061d61f
Merge pull request #143 from contentstack/feature/legacy-cms
sreeneshkini Jun 18, 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
164 changes: 136 additions & 28 deletions ui/src/cmsData/legacyCms.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"title": "https://www.contentstack.com/",
"href": "https://www.contentstack.com/"
},
"parent": "",
"parent": "Contentstack",
"isactive": true,
"allowed_file_formats": [
{
Expand Down Expand Up @@ -50,7 +50,7 @@
"title": "https://www.contentful.com/",
"href": "https://www.contentful.com/"
},
"parent": "",
"parent": "Contentful",
"isactive": true,
"allowed_file_formats": [
{
Expand All @@ -77,15 +77,15 @@
"title": "https://wordpress.com/",
"href": "https://wordpress.com/"
},
"parent": "",
"parent": "Wordpress",
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "xml",
"_metadata": {
"uid": "csacaafbc5e52ee0ef"
},
"title": "XML",
"title": "Xml",
"description": "",
"group_name": "xml",
"isactive": true
Expand All @@ -108,17 +108,71 @@
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "sql",
"fileformat_id": "zip",
"_metadata": {
"uid": "cs5d9c8914dc21ea80"
},
"title": "SQL",
"title": "Zip",
"description": "",
"group_name": "sql",
"group_name": "zip",
"isactive": true
}
]
},
{
"cms_id": "drupal v7",
"title": "Drupal v7",
"description": "",
"group_name": "lightning",
"doc_url": {
"title": "https://www.drupal.org/",
"href": "https://www.drupal.org/"
},
"parent": "Drupal",
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "sql",
"title": "Sql",
"description": "",
"group_name": "sql",
"isactive": true,
"_metadata": {
"uid": "csceba83e388748bf1"
}
}
],
"_metadata": {
"uid": "cs88cc83ef30625782"
}
},
{
"cms_id": "drupal v8+",
"title": "Drupal v8+",
"description": "",
"group_name": "lightning",
"doc_url": {
"title": "https://www.drupal.org/",
"href": "https://www.drupal.org/"
},
"parent": "Drupal",
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "sql",
"title": "Sql",
"description": "",
"group_name": "sql",
"isactive": true,
"_metadata": {
"uid": "csce12ba4b8be62108"
}
}
],
"_metadata": {
"uid": "cs65a0fe53fc587481"
}
},
{
"cms_id": "aem",
"_metadata": {
Expand All @@ -135,23 +189,47 @@
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "json",
"fileformat_id": "zip",
"_metadata": {
"uid": "cs08dadd206cfa53b4"
},
"title": "JSON",
"title": "Zip",
"description": "",
"group_name": "json",
"group_name": "zip",
"isactive": true
}
]
},
{
"cms_id": "sitecore",
"_metadata": {
"uid": "cs1c20c0a62eaf4b89"
"cms_id": "sitecore v8",
"title": "Sitecore v8",
"description": "",
"group_name": "lightning",
"doc_url": {
"title": "https://www.sitecore.com/",
"href": "https://www.sitecore.com/"
},
"title": "Sitecore",
"parent": "Sitecore",
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "zip",
"title": "Zip",
"description": "",
"group_name": "zip",
"isactive": true,
"_metadata": {
"uid": "cs7b44e4f248dbdc92"
}
}
],
"_metadata": {
"uid": "csef3e4691c7e23a2d"
}
},
{
"cms_id": "sitecore v9",
"title": "Sitecore v9",
"description": "",
"group_name": "lightning",
"doc_url": {
Expand All @@ -163,15 +241,45 @@
"allowed_file_formats": [
{
"fileformat_id": "zip",
"title": "Zip",
"description": "",
"group_name": "zip",
"isactive": true,
"_metadata": {
"uid": "csd2c76964ab6c1fdb"
},
"uid": "cs47d2095581add21f"
}
}
],
"_metadata": {
"uid": "cse88f8602ab676db3"
}
},
{
"cms_id": "sitecore v10",
"title": "Sitecore v10",
"description": "",
"group_name": "lightning",
"doc_url": {
"title": "https://www.sitecore.com/",
"href": "https://www.sitecore.com/"
},
"parent": "Sitecore",
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "zip",
"title": "Zip",
"description": "",
"group_name": "zip",
"isactive": true
"isactive": true,
"_metadata": {
"uid": "cs882b321665f69cfd"
}
}
]
],
"_metadata": {
"uid": "cs67770c22aae86b7b"
}
},
{
"cms_id": "othercms",
Expand All @@ -189,13 +297,13 @@
"isactive": true,
"allowed_file_formats": [
{
"fileformat_id": "json",
"fileformat_id": "zip",
"_metadata": {
"uid": "cs751db98402e685fe"
},
"title": "JSON",
"title": "Zip",
"description": "",
"group_name": "json",
"group_name": "zip",
"isactive": true
}
]
Expand All @@ -205,10 +313,10 @@
"locale": "en-us",
"uid": "blt1f83a8b93dd822ae",
"created_by": "blt7710245564fbf52b",
"updated_by": "blt7710245564fbf52b",
"updated_by": "blt74f496d523384141",
"created_at": "2024-01-23T09:41:52.061Z",
"updated_at": "2024-02-22T11:28:29.742Z",
"_version": 24,
"updated_at": "2024-06-07T09:23:01.470Z",
"_version": 25,
"_in_progress": false,
"cta": "Proceed to Destination Stack",
"all_steps": [
Expand All @@ -217,7 +325,7 @@
"_metadata": {
"uid": "cs752bfd62296e4791"
},
"title": "Select CMS",
"title": "CMS",
"description": "Select your current Content Management System from available options.",
"step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration.",
"lock": false,
Expand All @@ -241,7 +349,7 @@
"_metadata": {
"uid": "cs7c935e15de9ea7c8"
},
"title": "Select CMS File Format",
"title": "File Format",
"description": "Click to read the document and subsequently continue with migration process.",
"step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration.",
"lock": false,
Expand All @@ -253,7 +361,7 @@
"_metadata": {
"uid": "cs0279f1f0ce13e83e"
},
"title": "Upload File",
"title": "Imported File",
"description": "Select File to upload CMS Data.",
"step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration.",
"lock": false,
Expand All @@ -269,4 +377,4 @@
"restricted_keyword_checkbox_text": "Please acknowledge that you have referred to the Contentstack restricted keywords",
"affix_cta": "Continue",
"file_format_cta": "Continue"
}
}
10 changes: 9 additions & 1 deletion ui/src/components/Common/Card/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
display: flex;
flex-wrap: wrap;
gap: $px-12;
margin-left: 10px !important;
margin-bottom: 10px;
}

.trigger_list {
Expand All @@ -22,12 +24,15 @@
.connector_list,
.action_list,
.trigger_list {
border: 1px solid $color-base-gray-40;
//border: 1px solid $color-base-gray-40;
border: 1px solid #6C5CE766;
border-radius: $px-6;
flex: 0 10%;
cursor: pointer;
min-width: $px-117;
text-align: center;
height: 128px;
gap: 12px;
}

.connector_list .tippy-box-light #automationConnectorsHelpText {
Expand Down Expand Up @@ -62,3 +67,6 @@
margin-top: 3.5rem;
z-index: 8;
}
.centered-card-title{
margin: 10px;
}
14 changes: 5 additions & 9 deletions ui/src/components/Common/Card/card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,23 @@ const Card = ({ data, selectedCard, onCardClick, cardType, idField = 'id' }: Car
</div>
)}

{/* <span
<span
style={{
position: 'absolute',
right: '-1px',
top: '-5px'
}}
>
{isHovered || selectedCard[idField] === data[idField] ? (
<Radio checked={selectedCard?.id === data.id} />
{isHovered || selectedCard[idField] === data?.[idField] ? (
<Radio checked={selectedCard?.id === data?.id} disabled={!isHovered} />
) : (
<></>
)}
</span> */}
</span>

<div className="service_icon">
<img
src={addDomainInPath(`images/${data?.group_name ?? 'lightning'}.png`)}
style={imgStyle}
/>
</div>
<div className="service_title centered-flex-container">
<div className="centered-card-title">
<WordWrapper tooltipcontent={data.title} text={data.title} maxLength={12} position="top" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/ContentMapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const ContentMapper = () => {
action_cta: actionCta,
cta,
search_placeholder: searchPlaceholder
}
}= {}
} = migrationData;

const parseDescription = HTMLReactParser(jsonToHtml(description ?? {}));
Expand Down
Loading