Skip to content

fix(clone): fixed target branches issue #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
netrajpatel merged 2 commits into from
Jun 15, 2023
Merged

fix(clone): fixed target branches issue #838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ede36
fix(clone): fixed target branches issue
vkalta Jun 14, 2023
a3eac95
Merge branch 'development' into fix/clone_issues
aman19K Jun 14, 2023
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
32 changes: 16 additions & 16 deletions packages/contentstack-clone/src/lib/util/clone-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class CloneHandler {
let spinner;
try {
const stackAPIClient = client.stack({
api_key: config.source_stack,
api_key: config.target_stack ? config.target_stack : config.source_stack,
management_token: config.management_token,
});

Expand Down Expand Up @@ -337,12 +337,17 @@ class CloneHandler {

const orgMsgExistingStack = 'Choose an organization where the destination stack exists: ';
const orgMsgNewStack = 'Choose an organization where you want to create a stack: ';
const org = await cloneCommand.execute(new HandleOrgCommand({
msg: !canCreateStack.stackCreate ? orgMsgExistingStack : orgMsgNewStack
}, this));

let self = this;
if (org) {
let org;
if (!config.target_stack) {
org = await cloneCommand.execute(new HandleOrgCommand({
msg: !canCreateStack.stackCreate ? orgMsgExistingStack : orgMsgNewStack
}, this));
}

const params = { org, canCreateStack };
if (!config.target_stack) {
let self = this;
keyPressHandler = async function (_ch, key) {
if (key.name === 'left' && key.shift) {
if (self.executingCommand === 1) {
Expand All @@ -363,10 +368,9 @@ class CloneHandler {
};
process.stdin.addListener('keypress', keyPressHandler);
this.setBackKeyPressHandler(keyPressHandler);

await this.executeStackDestinationPrompt({ org, canCreateStack });
await this.executeStackDestinationPrompt(params);
} else {
return reject('Org not found.');
await this.executeBranchDestinationPrompt(params);
}

return resolve();
Expand All @@ -381,13 +385,9 @@ class CloneHandler {
this.setExectingCommand(1);
const { org, canCreateStack } = params;
if (!canCreateStack.stackCreate) {
if (!config.target_stack) {
const stackMsg = 'Choose the destination stack:';
await cloneCommand.execute(new HandleDestinationStackCommand({ org, msg: stackMsg, isSource: false }, this));
}
if (config.target_stack) {
this.executeBranchDestinationPrompt(params);
}
const stackMsg = 'Choose the destination stack:';
await cloneCommand.execute(new HandleDestinationStackCommand({ org, msg: stackMsg, isSource: false }, this));
this.executeBranchDestinationPrompt(params);
} else {
const orgUid = orgUidList[org.Organization];
await cloneCommand.execute(new CreateNewStackCommand({ orgUid }, this));
Expand Down