Skip to content
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.

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

Try and handle conflict on update: it's a plan #5451

Closed
wants to merge 1 commit into from

Conversation

bendem
Copy link

@bendem bendem commented Jan 28, 2025

This is a plan to fix the data loss part of #395. I know absolutely nothing of the codebase and my years of php are far. I already have a functional PoC, but that's not the best user experience and I'm afraid getting it polished is beyond what I'm able to do for now.

Video of it in action:

demo.bookstack.conflict.mp4

@ssddanbrown
Copy link
Member

Thanks for the suggestion and PR @bendem.

I'm not opposed to introducing a higher barrier to saving overlapping changes, but I wouldn't want to outright prevent it like in this implementation, I don't want to be leading users into hard blocks/dead-ends.

We could do something similar to this but:

  • On save compare created dates between actual page latest revision and user draft (if existing).
  • If user draft less created before page latest revision,
    • Save submitted content to user draft.
    • Return to editor with warning about potential conflicts.
    • Require secondary confirmation (save again after being shown warning) before actual save.

@bendem
Copy link
Author

bendem commented Feb 13, 2025

Agreed, this was mostly to illustrate my comment. I'm not in a position to push this further, but I hope it can spark a contribution from someone more familiar with php and the codebase.

@bendem bendem closed this Feb 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants