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

Add Event and Task Backends for Unified Search #22020

Merged
merged 1 commit into from
Aug 4, 2020

Conversation

georgehrke
Copy link
Member

@georgehrke georgehrke commented Jul 27, 2020

Fixes #20918
Fixes nextcloud/calendar#8

Light Dark
3E00E548-E4F2-49E5-B57B-2F50C0CFA4C7 F6D253C6-D338-4698-9906-E9E861B32306

I'm not super happy about the ellipsis for the Foo 4 event, but we can look into better solutions later.

@georgehrke georgehrke added the 2. developing Work in progress label Jul 27, 2020
@georgehrke georgehrke added this to the Nextcloud 20 milestone Jul 29, 2020
@georgehrke georgehrke force-pushed the feature/20918/calendar_search branch from 7e92ba9 to 13c20bb Compare July 31, 2020 12:06
@skjnldsv skjnldsv mentioned this pull request Aug 3, 2020
23 tasks
@georgehrke georgehrke force-pushed the feature/20918/calendar_search branch 2 times, most recently from 80a1c0e to 12674f7 Compare August 4, 2020 10:47
@georgehrke georgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 4, 2020
@georgehrke georgehrke force-pushed the feature/20918/calendar_search branch 2 times, most recently from 43a276c to 8513c98 Compare August 4, 2020 13:57
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke georgehrke force-pushed the feature/20918/calendar_search branch from 8513c98 to 900617e Compare August 4, 2020 14:02
@georgehrke
Copy link
Member Author

(Clicking an event in the list currently redirects to files. The link itself is correct, it's just an issue in the calendar app)

@faily-bot
Copy link

faily-bot bot commented Aug 4, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31359: failure

sqlite

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\Files\Cache\UpdaterLegacyTest::testWrite
Failed asserting that 1596551011 is equal to 1596551012 or is greater than 1596551012.

/drone/src/tests/lib/Files/Cache/UpdaterLegacyTest.php:118

@skjnldsv
Copy link
Member

skjnldsv commented Aug 4, 2020

Unrelated failures

@jancborchardt
Copy link
Member

I'm not super happy about the ellipsis for the Foo 4 event, but we can look into better solutions later.

To solve that easily (at least I guess it’s easy) we can simply omit the year if it’s the current one. :) Less info clutter, quicker to read as well.


$principalUri = 'principals/users/' . $user->getUID();
$calendarsById = $this->getSortedCalendars($principalUri);
$subscriptionsById = $this->getSortedSubscriptions($principalUri);
Copy link
Member

Choose a reason for hiding this comment

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

We don't show subscriptions in Tasks at the moment. I guess when a VTODO in a subscription is matched, the corresponding route in Tasks won't exist. We could also show subscriptions in the Tasks app of course, but we decided not to for now nextcloud/tasks#910.

Copy link
Member

@raimund-schluessler raimund-schluessler left a comment

Choose a reason for hiding this comment

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

Works fine. Tasks are found as they should.

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 4, 2020
@skjnldsv skjnldsv merged commit 72b45f9 into master Aug 4, 2020
@skjnldsv skjnldsv deleted the feature/20918/calendar_search branch August 4, 2020 18:54
@raimund-schluessler
Copy link
Member

raimund-schluessler commented Aug 4, 2020

What I just noticed:
When you disable e.g. the Tasks app, the tasks-dav search provider is still enabled (it shows in the results of the nextcloud/index.php/search/providers route), but the search does not return any results for Tasks (which makes sense, since the route would not be available).

@georgehrke @skjnldsv Can the *-dav search provider be disabled/unregistered when the corresponding app is not installed?

@skjnldsv
Copy link
Member

skjnldsv commented Aug 4, 2020

No idea! 🤔
cc @nickvergessen

@georgehrke
Copy link
Member Author

We are already aware of that issue: #22092 (comment)

@georgehrke
Copy link
Member Author

@skjnldsv Will you take care of that in #22099? :)

@skjnldsv
Copy link
Member

skjnldsv commented Aug 4, 2020

I have no idea, maybe try to get #22099 in so we can do followups

@jancborchardt
Copy link
Member

To solve that easily (at least I guess it’s easy) we can simply omit the year if it’s the current one. :) Less info clutter, quicker to read as well.

Did you see that btw @georgehrke @skjnldsv – just want to make sure it doesn’t go under, as it significantly reduces the information overload there.

@skjnldsv
Copy link
Member

skjnldsv commented Aug 7, 2020

Mostly for @georgehrke then :p

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: dav feature: search
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unified search for calendar / events, tasks implement a search function [$90]
4 participants