Skip to content

DirectEditing: Set session user for DirectSession editing - #3356

Merged
max-nextcloud merged 2 commits into
masterfrom
fix/no-user-in-file-put-event
Nov 7, 2022
Merged

DirectEditing: Set session user for DirectSession editing#3356
max-nextcloud merged 2 commits into
masterfrom
fix/no-user-in-file-put-event

Conversation

@marcelklehr

@marcelklehrmarcelklehr commented Nov 4, 2022

Copy link
Copy Markdown
Member

fixesnextcloud/android#10237
fixes#2821

Summary

Set session user for DirectSession editing to have it available for the file put activities event

@marcelklehr
marcelklehr requested review from a team, juliusknorr and max-nextcloud and removed request for a teamNovember 4, 2022 08:43
@marcelklehr

marcelklehr commented Nov 4, 2022

Copy link
Copy Markdown
MemberAuthor

Not sure if this is the best approach. Advice is welcome :)

@marcelklehr
DirectEditing: Set session user for DirectSession editing
468f4e3
to have it available for the file put activities event
fixesnextcloud/android#10237fixes#2821
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
marcelklehrforce-pushed the fix/no-user-in-file-put-event branch from c566b6f to 468f4e3CompareNovember 4, 2022 08:44
@marcelklehr
Fix lint errors
ed4e4fd
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
juliusknorr
juliusknorr approved these changes Nov 4, 2022
View reviewed changes

@juliusknorrjuliusknorr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a good approach 👍

@juliusknorrjuliusknorr added bug Something isn't working 3. to review labels Nov 4, 2022
@max-nextcloud

max-nextcloud commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

The failing cypress test was about fetching a preview for a nextcloud.com link. May have been caused by the network being flaky or nextcloud.com being down for a bit. I triggered a rerun.

@max-nextcloud

max-nextcloud commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

Since this was reported with NC 22 i think it will require backports. I'll try and trigger them.

@max-nextcloud

max-nextcloud commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

/backport to stable25

@max-nextcloud

max-nextcloud commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

/backport to stable24

@max-nextcloud

max-nextcloud commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

/backport to stable23

max-nextcloud
max-nextcloud approved these changes Nov 7, 2022
View reviewed changes

@max-nextcloudmax-nextcloud left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good. Did not test it though.

@cypress

cypressBot commented Nov 7, 2022

Copy link
Copy Markdown


Test summary

101 • 1 • 0 • 0 • Flakiness1

Run details

ProjectText
StatusFailed
Commita94bea1ℹ️
StartedNov 7, 2022 10:52 AM
EndedNov 7, 2022 11:10 AM
Duration18:20 💡
OSLinux Ubuntu - 20.04
BrowserElectron 106

View run in Cypress Dashboard ➡️

Failures

cypress/e2e/links.spec.js 1 Failed
1 test link marks > link preview > shows a link preview

Flakiness

cypress/e2e/sections.spec.js 1 Flakiness
1 Content Sections > Heading anchors > Anchor scrolls into view

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@max-nextcloud

max-nextcloud commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

Same test failed again - but this really does not look like a related issue. Will merge anyway.

@max-nextcloud
max-nextcloud merged commit b6d1ec4 into masterNov 7, 2022
@delete-merged-branch
delete-merged-branchBot deleted the fix/no-user-in-file-put-event branch November 7, 2022 11:13
This was referenced Nov 7, 2022
Merged
Merged
Merged
@max-nextcloud

max-nextcloud commented Nov 7, 2022•
edited
Loading

Copy link
Copy Markdown
Collaborator

/backport 8b3a4d2468f4e3ed4e4fd to stable24

update: okay - i guess one cannot include commits that were not in the original PR.

@marcelklehrmarcelklehr mentioned this pull request Nov 8, 2022
Merged
@blizzzblizzz mentioned this pull request Feb 9, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliusknorrjuliusknorrjuliusknorr approved these changes
@max-nextcloudmax-nextcloudmax-nextcloud approved these changes

Assignees

No one assigned

Labels

3. to reviewbugSomething isn't working

Projects

None yet

Milestone

No milestone

3 participants

@marcelklehr@max-nextcloud@juliusknorr