Skip to content

Reset isForkingSandbox on error #1859

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
merged 2 commits into from
May 11, 2019
Merged

Reset isForkingSandbox on error #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efcb99c
Reset isForkingSandbox on error
ValentinH May 7, 2019
5c13369
Use path for success/error
ValentinH May 8, 2019
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
5 changes: 3 additions & 2 deletions packages/app/src/app/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,16 @@ export function getGitChanges({ api, state }) {
.then(gitChanges => ({ gitChanges }));
}

export function forkSandbox({ state, props, api }) {
export function forkSandbox({ state, props, api, path }) {
const sandboxId = props.sandboxId || state.get('editor.currentId');
const url = sandboxId.includes('/')
? `/sandboxes/fork/${sandboxId}`
: `/sandboxes/${sandboxId}/fork`;

return api
.post(url, props.body || {})
.then(data => ({ forkedSandbox: data }));
.then(data => path.success({ forkedSandbox: data }))
.catch(error => path.error({ error }));
}

export function moveModuleContent({ props, state }) {
Expand Down
19 changes: 12 additions & 7 deletions packages/app/src/app/store/sequences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,18 @@ export const forkSandbox = sequence('forkSandbox', [
factories.track('Fork Sandbox', {}),
set(state`editor.isForkingSandbox`, true),
actions.forkSandbox,
actions.moveModuleContent,
setSandboxData,
set(state`editor.currentId`, props`sandbox.id`),
factories.addNotification('Forked sandbox!', 'success'),
factories.updateSandboxUrl(props`sandbox`),
ensurePackageJSON,
set(state`editor.isForkingSandbox`, false),
{
success: [
actions.moveModuleContent,
setSandboxData,
set(state`editor.currentId`, props`sandbox.id`),
factories.addNotification('Forked sandbox!', 'success'),
factories.updateSandboxUrl(props`sandbox`),
ensurePackageJSON,
set(state`editor.isForkingSandbox`, false),
],
error: set(state`editor.isForkingSandbox`, false),
},
],
false: [
factories.track('Show Server Fork Sign In Modal', {}),
Expand Down