search

nextcloud / text

📑 Collaborative document editing using Markdown
GNU Affero General Public License v3.0
552 stars 91 forks source link

Conflict dialog needs some redesign on mobile #3984

Open juliusknorr opened 1 year ago

juliusknorr commented 1 year ago

We need to figure out a better way to let users decide about a hard conflict with the file content.

Currently this is kind of squashed and not really usable on smaller screens:

Screenshot 2023-03-23 at 15 38 31

With rich workspace it is even worse:

Screenshot 2023-03-23 at 15 38 38

@jancborchardt @nimishavijay Do you have any good suggestion for that?

This is happening if users are currently editing a text file (or if it has unsaved changes) and the file is updated externally e.g. by uploading a new version through the web interface or clients. I was also thinking about just always applying the latest content and getting rid of the conflict dialog but this might also confuse users as the content would change unexpectedly on the text editor.

nimishavijay commented 1 year ago

Totally agree! Whenever this screen has come up for me, 9 out of 10 times I can't tell what has changed anyway and click on "Use current version" while being a bit unsure about what that is doing. If this screen comes up while we are writing, we cannot continue unless we click on one of the options. That's not great user experience and hence I would agree with you that we should just use the latest version.

Many times I have noticed that when I click on "Use current version" or "Use saved version" it reloads the entire document for a several seconds, and sometimes I have to close the document and open it again. If the content is being updated automatically it should be as smooth as possible.

this might also confuse users as the content would change unexpectedly on the text editor.

Also agree! How about we show a notification that the document was updated with a "more info" button which could take you to a modal where the 2 versions are compared side by side as it is right now. That way there is no major change in the layout suddenly and also there is an option to investigate more in case the change is content is actually jarring. What do you think?

Any other approaches @jancborchardt ?

juliusknorr commented 1 year ago

Many times I have noticed that when I click on "Use current version" or "Use saved version" it reloads the entire document for a several seconds, and sometimes I have to close the document and open it again. If the content is being updated automatically it should be as smooth as possible.

This should be addressed with #3972

Also agree! How about we show a notification that the document was updated with a "more info" button which could take you to a modal where the 2 versions are compared side by side as it is right now. That way there is no major change in the layout suddenly and also there is an option to investigate more in case the change is content is actually jarring. What do you think?

Would make sense to me. Note that this approach would have the changes from the collaborative editing session not being written to the file then until the conflict is manually resolved.

jancborchardt commented 1 year ago

@juliushaertl so your first screenshot/example I’d say does not look so bad layout-wise for what we need to accomplish. The main issue here is that it is not visible what actually changed.

Can we mark the specifically added and removed parts like a diff, with slight/light red and green background for example?

The second example of rich workspaces: Any way we can also show that in full width & height just like as if you opened it in text? Cause resolving that error is quite important here?