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

[Vue Rewrite] Upmerge Release 22 into Vue Rewrite Branch #2305

Merged
merged 4 commits into from
Aug 9, 2023

Conversation

devlinjunker
Copy link
Contributor

@devlinjunker devlinjunker commented Aug 7, 2023

Related to #748

Follows #2024

Summary

I'm back to help with the migration to Vue!

This upmerge was needed so I could run on the latest NC versions, so I've brought all of the recent changes to this branch and fixed some failing Github Actions and they all pass on this branch now.

  • commit dfdff06 : upmerge
  • commit 12189db : small fixes related to vue-rewrite changes

NOTE: Please review this one specifically! The fixes here are sort of hacky to get the builds to pass and may not be approved by all...

  • commit 4eea7f3 : related to persistent GH Action failure due to deprecated method calls allowEvalScript and getTime
    • Removed allowEvalScript because we do not need eval() for the Vue Rewrite
    • Used TimeFactory->now()->getTimestamp() instead of TimeFactory->getTime()
    • Hack in FolderServiceTest.php to mock the missing methods and allow PHP Unit Tests to pass with NC25, NC26 and NC27 (should we just run the tests against Nextcloud 27 though instead? and the vue rewrite will require NC27+ ?)

I tested these changes on my localhost for working on the vue-rewrite and tested that the actions are passing on my local repo: devlinjunker#127

Screenshot 2023-08-07 at 12 09 48 PM

Checklist

Up Next

  • Add Feed Component (Will have another PR to follow this one soon preview here)
  • Look into Three Panel Layout for displaying Feeds + Items (Bookmarks App seems like Good Example...)
  • Sidebar Actions

Signed-off-by: Devlin Junker <[email protected]>
Signed-off-by: Devlin Junker <[email protected]>
@devlinjunker
Copy link
Contributor Author

Note: In #2024 I mentioned Template Testing.... (WIP)

This was tricky, and I looked at other nextcloud repos and did not see this in-depth of testing so I decided to skip that for now and keep moving on feature development.

@SMillerDev
Copy link
Contributor

should we just run the tests against Nextcloud 27 though instead? and the vue rewrite will require NC27+ ?

Sounds good to me.

@Grotax
Copy link
Member

Grotax commented Aug 8, 2023

NC27 only is fine for me too.

@devlinjunker
Copy link
Contributor Author

Okay, I will look into removing the hack I added and just running the tests against NC27

@devlinjunker
Copy link
Contributor Author

devlinjunker commented Aug 8, 2023

I have attempted to restrict the vue-rewrite to NC27 (can someone review this to make sure I didn't miss anything?) and tested all of the builds here: devlinjunker#128

Once this is reviewed and it builds successfully, can we merge it so we can move forward with these changes to create the Add Feed Component?

then I can get to the fun of displaying the feed items!

@Grotax
Copy link
Member

Grotax commented Aug 9, 2023

Ah the unit tests still need to be adjusted. We also need to change that code on master though.
I think it's okay if these tests fail for now. Either the code will be changed in master first and therefore also the tests fixed or it will be fixed later on the rewrite branch and merged into master.

Fine for me like this.

@Grotax Grotax merged commit 9a047cb into nextcloud:vue-rewrite Aug 9, 2023
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants