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.

Sign up for GitHub

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

Jump to bottom

Fix OCM provider public API and handling to allow apps to register #40885

Merged
merged 4 commits into from Oct 13, 2023
Merged

Fix OCM provider public API and handling to allow apps to register #40885

merged 4 commits into from Oct 13, 2023

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Oct 12, 2023 •
edited

Follow up to #39574

TODO

  • Make the public API only rely on OCP
  • Make the OCM provider stateful so apps can add resources
  • Allow apps to register OCM resources

Checklist

@nickvergessen nickvergessen added this to the Nextcloud 28 milestone Oct 12, 2023
@nickvergessen nickvergessen self-assigned this Oct 12, 2023
@nickvergessen
Copy link
Member Author

Since #39574 was backported, I guess we should also backport:

  • fix(OCM): Make the public API only rely on OCP
  • fix(OCM): Move JsonSerializable to the interface because consumers rely on the function

The other commits are more a feature addition for talks federation in nextcloud/spreed#5723 so having them in 28+ only is okay for me

@nickvergessen nickvergessen force-pushed the bugfix/noid/fix-OCM-provider branch 2 times, most recently from f841b31 to 6433a71 Compare October 12, 2023 13:18
come-nc
come-nc approved these changes Oct 12, 2023
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

Fine apart from nitpick

lib/private/OCM/Model/OCMProvider.php Outdated Show resolved Hide resolved
lib/public/OCM/Events/BeforeResourceTypesGetEvent.php Outdated Show resolved Hide resolved
@nickvergessen nickvergessen mentioned this pull request Oct 12, 2023
Merged
4 tasks
@nickvergessen
fix(OCM): Make the public API only rely on OCP
4dbe067 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(OCM): Make the OCM provider stateful so apps can add resources
b246d51 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
feat(OCM): Add a way for apps to create a new IOCMResource
fc445a2 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
feat(OCM): Dispatch an event so apps can register resources
21e7a82 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen merged commit 160a2b7 into master Oct 13, 2023
38 of 39 checks passed
@nickvergessen nickvergessen deleted the bugfix/noid/fix-OCM-provider branch October 13, 2023 08:53
@nickvergessen
Copy link
Member Author

/backport 4dbe067 to stable27

@nickvergessen
Copy link
Member Author

/backport 4dbe067 to stable26

@solracsf
Copy link
Member

Needs manual backport it seems.

@nickvergessen
Copy link
Member Author

Since stable branches are currently frozen (in RC stage), will have to wait until after Thursday

This was referenced Oct 27, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@come-nc come-nc come-nc approved these changes

@ArtificialOwl ArtificialOwl ArtificialOwl approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@mejo- mejo- Awaiting requested review from mejo- mejo- is a code owner

@Altahrim Altahrim Awaiting requested review from Altahrim

Assignees

@nickvergessen nickvergessen

Labels
3. to review Waiting for reviews bug feature: federation
Projects
None yet
Milestone
Nextcloud 28
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nickvergessen @solracsf @ArtificialOwl @ChristophWurst @come-nc