merge activity settings for calendars, events and todos

[icewind1991]

Signed-off-by: Robin Appelman robin@icewind.nl

[MorrisJobke]

Fine with me

[jancborchardt]

Please review @nextcloud/calendar @nextcloud/tasks :)

[georgehrke]

What is the intention here? Is there any related Github issue?

[rullzer]

To have cleaner notifiation settings

[MorrisJobke]

Before:

After:

[rullzer]

Before:

After:

I think you switched before and after ;)

[georgehrke]

Code-wise the change is fine.

Not really happy about it though.

[tcitworld]

Yeah, don't really like it either, pretty sure people won't be happy not having separate settings anymore. For instance, the deletion of a (shared) calendar is a pretty much important event that people may want to subscribe to without knowing of every event or task updates.

Why not use #22117 to create a proper dav group if the issue is too many checkboxes?

[rullzer]

cc: @jancborchardt ^^^

[jancborchardt]

To have the settings cleaner but also useful, we should not have the Calendar and Tasks settings in "Other activities" but rather a specific section "Calendar and Tasks" – I assume that’s what you meant @tcitworld, right?

In there we can then have entries for:

• A calendar was modified
• A calendar was deleted
• A calendar event was modified
• A calendar event was deleted
• A task was modified
• A task was deleted

Would that work @georgehrke @tcitworld?

[tcitworld]

Right now we don't differentiate between calendar/event/tasks modifications or deletions, but yeah, that seems about right.

[nickvergessen]

Merging the settings fine by me, but the filter is really useful I think, as when you use fully interact with todos, the calendar changes are hard to find if they are all in one filter.

[nickvergessen]

I think the list could be simplified, but this is the minimum:

• A calendar was modified (created, deleted, shared, ...)
• A calendar event was modified (created, deleted, updated same as files)
• A task was modified (created, deleted, updated same as files)

[jancborchardt]

I think the list could be simplified, but this is the minimum:

• A calendar was modified (created, deleted, shared, ...)
• A calendar event was modified (created, deleted, updated same as files)
• A task was modified (created, deleted, updated same as files)

Then let’s do that and put it in a section "Calendar and tasks" so it’s not just in "Other". @icewind1991 can you do that?

[nickvergessen]

No, he is on vacation

[icewind1991]

Changed:

[faily-bot]

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32341: failure

acceptance-app-files

• tests/acceptance/features/app-files.feature:262

Show full log

  Scenario: unmarking a file as favorite causes the file list to be sorted again                          # /drone/src/tests/acceptance/features/app-files.feature:262
    Given I am logged in                                                                                  # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "A name alphabetically lower than welcome.txt"                        # FileListContext::iCreateANewFolderNamed()
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    And I close the details view                                                                          # FilesAppContext::iCloseTheDetailsView()
    And I see that the details view is closed                                                             # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
    And I mark "welcome.txt" as favorite                                                                  # FileListContext::iMarkAsFavorite()
    And I see that "welcome.txt" is marked as favorite                                                    # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    When I unmark "welcome.txt" as favorite                                                               # FileListContext::iUnmarkAsFavorite()
    Then I see that "welcome.txt" is not marked as favorite                                               # FileListContext::iSeeThatIsNotMarkedAsFavorite()
      Not favorited state icon for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()