[stable20] Add upload editor in files sidebar mode #5111
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
backportbot-nextcloud
bot
added
bug
feature: talk-sidebar ⬅️
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>
PVince81
force-pushed
the
backport/4535/stable20
branch
from
f023e97 to
df8036f
Compare
|
conflicts solved by backporting from #5111 instead next up: testing |
This was referenced Feb 22, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #4535