Skip to content

Conversation

@SebastianKrupinski
Copy link
Contributor

Resolves: #6767
Requires: nextcloud/server#51081

@codecov
Copy link

codecov bot commented Feb 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 22.89%. Comparing base (2798772) to head (82316d5).
Report is 8 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6770      +/-   ##
============================================
+ Coverage     22.88%   22.89%   +0.01%     
- Complexity      476      478       +2     
============================================
  Files           252      252              
  Lines         12307    12309       +2     
  Branches       2383     2382       -1     
============================================
+ Hits           2816     2818       +2     
  Misses         9143     9143              
  Partials        348      348              
Flag Coverage Δ
javascript 14.53% <ø> (ø)
php 59.37% <ø> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@SebastianKrupinski SebastianKrupinski added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 27, 2025
@SebastianKrupinski
Copy link
Contributor Author

The failed tests are due to the missing class on server the required PR needs to be merged

@ChristophWurst
Copy link
Member

This app works with Nextcloud 30. CI for 30 and 31 will still fail even when the server PR is in. Just FYI.

@SebastianKrupinski
Copy link
Contributor Author

This app works with Nextcloud 30. CI for 30 and 31 will still fail even when the server PR is in. Just FYI.

Yes, the idea was to back port the server side to 30 and 31

@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-6767-do-not-show-hidden branch from 4b0ba0a to b12d8db Compare May 8, 2025 23:45
@SebastianKrupinski
Copy link
Contributor Author

@st3iny Do you mid giving this a final review?

@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-6767-do-not-show-hidden branch 2 times, most recently from 77852f4 to e1ff31e Compare May 11, 2025 21:58
@kesselb kesselb force-pushed the fix/issue-6767-do-not-show-hidden branch 2 times, most recently from 1687935 to 1cb92f9 Compare May 14, 2025 15:07
@kesselb
Copy link
Contributor

kesselb commented May 14, 2025

Pushed a commit to update the psalm-baseline:

  • suppress isEnabled
  • remove stale entries

Psalm has issues missing interfaces, does not handle interface_exists properly. Adding it to the baseline is therefore okay. The alternative is to safeguard the call with another method_exists check.

@kesselb kesselb force-pushed the fix/issue-6767-do-not-show-hidden branch from 1cb92f9 to 0ef6dbc Compare May 14, 2025 15:12
@kesselb
Copy link
Contributor

kesselb commented May 14, 2025

Appended the previous commit to add psalm-baseline.xml to REUSE.toml. It's apparently not ideal to have the copyright in the baseline itself because that file is generated. Weird anyway to have a "copyright" for that, I mean it's generated after all 😕

@SebastianKrupinski
Copy link
Contributor Author

Pushed a commit to update the psalm-baseline:

* suppress isEnabled

* remove stale entries

Psalm has issues missing interfaces, does not handle interface_exists properly. Adding it to the baseline is therefore okay. The alternative is to safeguard the call with another method_exists check.

I can change it to method_exists.

Copy link
Contributor

@kesselb kesselb left a comment

Choose a reason for hiding this comment

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

Tested and works.

I believe it's still okay for me to approve this, as I only made changes related to CI and did not modify any code.

@kesselb
Copy link
Contributor

kesselb commented May 14, 2025

I can change it to method_exists.

Sure! Feel free to drop my commit, I can take care of updating the baseline/moving spdx to resuse.toml later.

There is now more psalm errors, but in unrelated code 🤣

@kesselb kesselb force-pushed the fix/issue-6767-do-not-show-hidden branch from 0ef6dbc to 7230873 Compare May 14, 2025 15:23
@kesselb
Copy link
Contributor

kesselb commented May 14, 2025

There is now more psalm errors, but in unrelated code 🤣

That happend because I had nextcloud/ocp:dev-stable31 installed for updating the baseline and that dropped the entries for ServerVersion which is new in 31, but not available in 30.

composer require nextcloud/ocp:dev-stable30
composer run psalm -- --set-baseline=tests/psalm-baseline.xml
git restore composer.json composer.lock
composer install

@SebastianKrupinski
Copy link
Contributor Author

There is now more psalm errors, but in unrelated code 🤣

That happend because I had nextcloud/ocp:dev-stable31 installed for updating the baseline and that dropped the entries for ServerVersion which is new in 31, but not available in 30.

composer require nextcloud/ocp:dev-stable30
composer run psalm -- --set-baseline=tests/psalm-baseline.xml
git restore composer.json composer.lock
composer install

Okay, I'll take care of the other errors

@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-6767-do-not-show-hidden branch from 7230873 to caac7c7 Compare May 14, 2025 16:11
@SebastianKrupinski
Copy link
Contributor Author

/backport to stable5.2

@backportbot backportbot bot added the backport-request A backport was requested for this pull request label May 14, 2025
@kesselb
Copy link
Contributor

kesselb commented May 14, 2025

This PR seems a bit cursed 🧙‍♂️ 😆

Tests need an update.

The baseline contains an entry that is no longer valid due to the method_exists check. Please drop my commit; I'll take care of updating the baseline and SPDX in a follow-up.

@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-6767-do-not-show-hidden branch from caac7c7 to a763904 Compare May 14, 2025 16:30
@SebastianKrupinski
Copy link
Contributor Author

The baseline contains an entry that is no longer valid due to the method_exists check. Please drop my commit; I'll take care of updating the baseline and SPDX in a follow-up.

Will do

@SebastianKrupinski
Copy link
Contributor Author

@st3iny when you get a min, remove your block please

@SebastianKrupinski
Copy link
Contributor Author

SebastianKrupinski commented May 14, 2025

@kesselb I think the easiest would be to back port the server portion to 30, its a fix for a issue

Test are failing on 30 because the interface is missing, unless they can be skipped for 30, but not sure that is possible since we need to create a dummy interface, for the inheritance issue

Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

As much as I dislike saying that, please remove the unit test again. Unfortunately, we can't mock the intersection of multiple interfaces until we upgrade to PHPUnit 10.

For now, test only with the old interface (ICalendar) and pretend that ICalendarIsEnabled does not exist.

Edit: See my next review.

Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

Hackity hack but should work ...

@SebastianKrupinski
Copy link
Contributor Author

Hackity hack but should work ...

I agree, wacky hacky, the best option is just to back port the server code, its a fix for a bug and 30 is still supported. I'll back port it today, now that the freeze is over.

@SebastianKrupinski
Copy link
Contributor Author

Hackity hack but should work ...

Looks like back porting to 30 was my original idea, the PR was already created was just waiting for the freeze to be over. 😆

Signed-off-by: SebastianKrupinski <[email protected]>
@SebastianKrupinski SebastianKrupinski force-pushed the fix/issue-6767-do-not-show-hidden branch from f1c1287 to 82316d5 Compare June 17, 2025 12:54
@SebastianKrupinski SebastianKrupinski requested review from st3iny and removed request for st3iny June 17, 2025 12:55
@SebastianKrupinski SebastianKrupinski merged commit 179ff85 into main Jun 17, 2025
49 checks passed
@SebastianKrupinski SebastianKrupinski deleted the fix/issue-6767-do-not-show-hidden branch June 17, 2025 13:27
@github-project-automation github-project-automation bot moved this from 🏗️ In progress to ☑️ Done in 💌 📅 👥 Groupware team Jun 17, 2025
@backportbot backportbot bot removed the backport-request A backport was requested for this pull request label Jun 17, 2025
@SebastianKrupinski
Copy link
Contributor Author

/backport to stable5.3

@backportbot backportbot bot added the backport-request A backport was requested for this pull request label Jun 17, 2025
@backportbot backportbot bot removed the backport-request A backport was requested for this pull request label Jun 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

Development

Successfully merging this pull request may close these issues.

Calendar dashboard widget is showing me events of hidden calendars

5 participants