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

forces sidebarPlugins to unmount and mount during an ActivityTab update #1732

Merged

Conversation

Messj1
Copy link
Contributor

@Messj1 Messj1 commented Jul 16, 2024

sidebarPlugins is initialized as empty array and during next tick reattached so vue force a remount.

Fixes #1731

src/views/ActivityTab.vue Outdated Show resolved Hide resolved
@Messj1 Messj1 force-pushed the bugfix/Keep-ActivitySidebarPlugin-updated branch from 0d61c8f to b7b114b Compare July 18, 2024 01:59
@Messj1
Copy link
Contributor Author

Messj1 commented Jul 22, 2024

@susnux How can I resolve this conflict with the generated file :/

After a merge of master into feature it should not appear as conflict anymore ...

$ git merge-base master bugfix/Keep-ActivitySidebarPlugin-updated 
46653414006d853a93c45464c12d616028bd6e68
$ git log -1 46653414006d853a93c45464c12d616028bd6e68
commit 46653414006d853a93c45464c12d616028bd6e68 (upstream/master, upstream/HEAD, origin/master, master)
Author: Nextcloud bot <[email protected]>
Date:   Mon Jul 22 00:23:26 2024 +0000

    Fix(l10n): Update translations from Transifex
    
    Signed-off-by: Nextcloud bot <[email protected]>

So since the master branch has no changes to himself, there is IMHO no reason for any conflict.

Any Ideas?

@artonge
Copy link
Collaborator

artonge commented Jul 23, 2024

Please don't merge master into this branch. You can rebase your branch with git rebase origin/master.
If the rebase stops due to conflict, it is usually from build files. Those conflict can be resolved with:

npm ci
npm run build
git add .
git rebase --continue

Also, please squash your commits into one :).

src/views/ActivityTab.vue Outdated Show resolved Hide resolved
@Messj1 Messj1 force-pushed the bugfix/Keep-ActivitySidebarPlugin-updated branch from c99c989 to 97e8f00 Compare July 23, 2024 17:10
sidebarPlugins is initialized as empty array and during next reattached so vue force a remount

Signed-off-by: Jan Messer <[email protected]>
@Messj1 Messj1 force-pushed the bugfix/Keep-ActivitySidebarPlugin-updated branch from 97e8f00 to 5e7b446 Compare July 23, 2024 17:33
Copy link

codecov bot commented Jul 24, 2024

Welcome to Codecov 🎉

Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests.

Thanks for integrating Codecov - We've got you covered ☂️

@artonge
Copy link
Collaborator

artonge commented Jul 24, 2024

CI failures are unrelated, merging.

@artonge artonge merged commit 4ea2baf into nextcloud:master Jul 24, 2024
48 of 52 checks passed
@Messj1 Messj1 deleted the bugfix/Keep-ActivitySidebarPlugin-updated branch July 24, 2024 15:55
Copy link
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@susnux
Copy link
Contributor

susnux commented Sep 5, 2024

/backport to stable29

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sidebar Comments Field saves the comment on the origin File not the selected one
3 participants