Skip to content
Merged

Dev #144

Show file tree
Hide file tree
Changes from all 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
7 changes: 7 additions & 0 deletions api/src/models/project-lowdb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ interface LegacyCMS {
type: string;
path: string;
};
awsDetails: {
awsRegion: string;
bucketName: string;
buketKey: string;
}
file_path: string;
is_fileValid: boolean;
}

interface ExecutionLog {
Expand Down
19 changes: 14 additions & 5 deletions api/src/services/projects.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ const createProject = async (req: Request) => {
destination_stack_id: "",
test_stacks: [],
current_test_stack_id: "",
legacy_cms: {},
legacy_cms: {
"is_fileValid":false,
awsDetails: {
awsRegion: "",
bucketName: "",
buketKey: ""
} },
content_mapper: [],
execution_log: [],
created_by: user_id,
Expand Down Expand Up @@ -346,10 +352,8 @@ const affixConfirmation = async (req: Request) => {

const updateFileFormat = async (req: Request) => {
const { orgId, projectId } = req.params;
const { token_payload, file_format } = req.body;
const { token_payload, file_format,file_path,is_fileValid,awsDetails } = req.body;
const srcFunc = "updateFileFormat";

await ProjectModelLowdb.read();
const projectIndex = (await getProjectUtil(
projectId,
{
Expand Down Expand Up @@ -390,11 +394,16 @@ const updateFileFormat = async (req: Request) => {
}

try {
ProjectModelLowdb.update((data: any) => {
ProjectModelLowdb.update((data: any) => {
data.projects[projectIndex].legacy_cms.file_format = file_format;
data.projects[projectIndex].legacy_cms.file_path = file_path;
data.projects[projectIndex].legacy_cms.is_fileValid = is_fileValid;
data.projects[projectIndex].current_step = STEPPER_STEPS.LEGACY_CMS;
data.projects[projectIndex].status = NEW_PROJECT_STATUS[0];
data.projects[projectIndex].updated_at = new Date().toISOString();
data.projects[projectIndex].legacy_cms.awsDetails.awsRegion = awsDetails.awsRegion;
data.projects[projectIndex].legacy_cms.awsDetails.bucketName = awsDetails.bucketName;
data.projects[projectIndex].legacy_cms.awsDetails.buketKey = awsDetails.buketKey;
});

logger.info(
Expand Down
4 changes: 2 additions & 2 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@contentstack/json-rte-serializer": "^2.0.5",
"@contentstack/venus-components": "1.5.1",
"@contentstack/venus-components": "^2.2.4",
"@reduxjs/toolkit": "^2.2.5",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
Expand Down Expand Up @@ -65,4 +65,4 @@
"last 1 safari version"
]
}
}
}
3 changes: 2 additions & 1 deletion ui/src/cmsData/content_mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@
],
"_version": 3
},
"search_placeholder": "Search",
"table_search_placeholder": "Search in Fields...",
"search_placeholder": "Search for content types...",
"tags": [],
"title": "Content Mapping",
"updated_at": "2024-01-25T12:13:32.967Z",
Expand Down
16 changes: 8 additions & 8 deletions ui/src/cmsData/destinationStack.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"title": "Destination Stack",
"title": "Destination Stack Details",
"cta": "Continue To Content Mapping",
"description":"To proceed with your data migration, please select the appropriate stack from the designated organization.",
"new_stack": {
"save_stack_cta": "Save",
"new_stack_input": "Enter Stack Details Below",
Expand All @@ -10,19 +11,18 @@
{
"step_id": "Step1",
"_metadata": { "uid": "cs45d60445c89ed302" },
"title": "Select Organisation",
"description": "Select your organisation maintained on Contentstack.",
"step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration.",
"lock": true,
"title": "Organization",
"ifReadonly": true,
"description": "",
"lock": false,
"active": true,
"empty_step_placeholder": "No Organisation selected..."
},
{
"step_id": "Step2",
"_metadata": { "uid": "cs1979790a8619e118" },
"title": "Select Stack",
"description": "Select the corresponding stack for data migrations.",
"step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration.",
"title": "Stack",
"description": "",
"lock": false,
"active": true,
"empty_step_placeholder": "No Stack selected..."
Expand Down
Loading