Add upload editor in files sidebar mode #4535
Conversation
danxuliu
added
3. to review
bug
regression
feature: talk-sidebar ⬅️
|
/backport to stable20 |
|
Mmmm, this needs more work (I tested this in stable20, but master should be the same).
The modal will be shown again. |
|
oh, so this was always missing ? otherwise we just hide the upload button for now |
danxuliu
force-pushed
the
add-upload-editor-in-files-sidebar-mode
branch
from
d738451 to
2c96454
Compare
It seems so :-)
The latest pushed commits should fix the described issue (and do a small cleanup). But my development machine is doing funny things so I could not properly test it :-( |
|
but if #4291 is not merged first, then this PR here won't be testable ? |
Mmm, no, it does not fix the described issue. It changes it, but there is still an issue :-P (the chat tab is empty for the second file). |
nickvergessen
modified the milestones:
11.0.0-alpha.1,
💚 Next Major (21),
11.0.0-alpha.2,
💚 Next Alpha (21)
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
The upload editor is shown based on both "showUploadEditor" (set in the store) and "modalDismissed" (set in the component). As "modalDismissed" is initially false and "showUploadEditor" was not cleared after an upload started or was discarded this caused the upload editor to be immediately shown if mounted again (for example, when joining a conversation in the Files app sidebar) if a previous upload was initialised. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
As "showUploadEditor" is now properly updated in the store when an upload starts or discarded the "modalDismissed" property of the component is redundant and can be removed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
As "showUploadEditor" is true only when "currentUploadId" is set and false otherwise there is no need to use a separate variable. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
|
rebased |
PVince81
force-pushed
the
add-upload-editor-in-files-sidebar-mode
branch
from
2c96454 to
1c70320
Compare
here after rebase not happening any more, it was likely the bug we already fixed (somehow I can't find the PR any more) however the upload dialog doesn't appear after selecting files in the file picker |
|
I've re-tried this and the upload dialog seems to work now. Maybe I had some caching issues. |
|
/backport to stable21 |
|
/backport to stable20.1 |
Follow up to #3988
Extracted from #4291 for tidiness and easier backporting.