Skip to content

Save draft before publishing and reflect loading state in ui #727

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

Open
jeroenrinzema wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

Save draft before publishing and reflect loading state in ui #727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 24 additions & 15 deletions apps/ui/src/views/journey/JourneyEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function JourneyStepNode({
project,
journey,
value: data,
onChange: () => {},
onChange: () => { },
})
}
{
Expand Down Expand Up @@ -451,6 +451,7 @@ export default function JourneyEditor() {
void loadSteps()
}, [loadSteps])

const [publishing, setPublishing] = useState(false)
const [saving, setSaving] = useState(false)
const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false)
const [viewUsersStep, setViewUsersStep] = useState<null | { stepId: number, stepType: string }>(null)
Expand All @@ -473,19 +474,21 @@ export default function JourneyEditor() {
setNodes(nodes)
}

const saveSteps = useCallback(async () => {
async function saveDraft() {
const stepMap = await api.journeys.steps.set(project.id, journey.id, nodesToSteps(nodes, edges))

setSaving(true)
try {
const stepMap = await api.journeys.steps.set(project.id, journey.id, nodesToSteps(nodes, edges))

const refreshed = stepsToNodes(stepMap, {
setViewUsersStep,
})
const refreshed = stepsToNodes(stepMap, {
setViewUsersStep,
})

setNodes(refreshed.nodes)
setEdges(refreshed.edges)
setNodes(refreshed.nodes)
setEdges(refreshed.edges)
}

const saveSteps = useCallback(async () => {
setSaving(true)
try {
await saveDraft()
toast.success(t('journey_saved'))
} catch (error: any) {
toast.error(`Unable to save: ${error}`)
Expand All @@ -512,13 +515,19 @@ export default function JourneyEditor() {

const publishJourney = async () => {
if (!confirm(t('journey_publish_confirmation'))) return
setSaving(true)

// NOTE: we have to save the draft before publishing
if (hasUnsavedChanges) {
await saveDraft()
}

setPublishing(true)
try {
await api.journeys.publish(project.id, journey.id)
window.location.href = `/projects/${project.id}/journeys/${journey.parent_id ?? journey.id}`
toast.success(t('journey_published'))
} finally {
setSaving(false)
setPublishing(false)
}
}

Expand Down Expand Up @@ -712,7 +721,7 @@ export default function JourneyEditor() {
{checkProjectRole('publisher', project.role) && (
<Button
onClick={publishJourney}
isLoading={saving}
isLoading={publishing}
variant="secondary"
>
{t('publish')}
Expand Down Expand Up @@ -741,7 +750,7 @@ export default function JourneyEditor() {
{draftId
? <Button
onClick={() => editDraft(draftId)}
isLoading={saving}
isLoading={publishing}
variant="primary"
>
{t('journey_draft_edit')}
Expand Down