Skip to content

Handle limit offset and sorting in files search - #26198

Merged
MorrisJobke merged 10 commits into
masterfrom
unified-search-node
Mar 22, 2021
Merged

Handle limit offset and sorting in files search#26198
MorrisJobke merged 10 commits into
masterfrom
unified-search-node

Conversation

@icewind1991

@icewind1991icewind1991 commented Mar 18, 2021•
edited
Loading

Copy link
Copy Markdown
Member
  • Use Node search api directly from files' search provider, skipping a few deprecated layers
  • Unify handling of node search methods by transforming all search methods into "new" search queries
  • Handle limit, offset and order in node search api (in a somewhat suboptimal way)

@icewind1991
use "newer" node search api directly in unified search
14a1b50
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
unify handling of Folder::search methods into "new" query objects
f8bca54
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991icewind1991 added the 2. developing Work in progress label Mar 18, 2021
@icewind1991
only require user to be set in a query that handles tags
50e374c
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
handle limit and offset in folder file search
bd229e7
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991icewind1991 changed the title [wip] search[wip] limit and offset in file searchMar 18, 2021
@icewind1991
format
a428f7d
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
cleanup fileinfo creation
de71396
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
folder filtering in sql
feed42d
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
handle ordering in folder search
bfe3712
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
pass order from unified search to file search
a0fb6d2
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
use node search api for legacy file search endpoint
b38618c
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991icewind1991 changed the title [wip] limit and offset in file searchHandle limit offset and sorting in files searchMar 19, 2021
@icewind1991icewind1991 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 19, 2021
@icewind1991icewind1991 added this to the Nextcloud 22 milestone Mar 19, 2021
@icewind1991
icewind1991 requested review from ChristophWurst, MorrisJobke, rullzer and skjnldsv and removed request for ChristophWurstMarch 19, 2021 15:26
@skjnldsv

skjnldsv commented Mar 22, 2021

Copy link
Copy Markdown
Member

Thanks for this @icewind1991 !

MorrisJobke
MorrisJobke approved these changes Mar 22, 2021
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and still works 👍

@MorrisJobke
MorrisJobke merged commit 1c074e7 into masterMar 22, 2021
@MorrisJobke
MorrisJobke deleted the unified-search-node branch March 22, 2021 20:48
@icewind1991

icewind1991 commented Mar 23, 2021

Copy link
Copy Markdown
MemberAuthor

/backport to stable21

@icewind1991

icewind1991 commented Mar 23, 2021

Copy link
Copy Markdown
MemberAuthor

/backport to stable20

@icewind1991

icewind1991 commented Mar 23, 2021

Copy link
Copy Markdown
MemberAuthor

/backport to stable19

@backportbot-nextcloud

backportbot-nextcloudBot commented Mar 23, 2021

Copy link
Copy Markdown

The backport to stable19 failed. Please do this backport manually.

This was referenced Mar 23, 2021
Merged
Merged
@icewind1991icewind1991 mentioned this pull request Mar 23, 2021
Merged
icewind1991 added a commit that referenced this pull request Apr 1, 2021
@icewind1991
remove leftover debug @NoCSRFRequired introduced with#26198
c232a40
Signed-off-by: Robin Appelman <robin@icewind.nl>
rullzer added a commit that referenced this pull request Apr 1, 2021
@rullzer
Merge pull request#26403from nextcloud/fix-26198-csrf
037411b
remove leftover debug @NoCSRFRequired introduced with #26198
backportbot-nextcloudBot pushed a commit that referenced this pull request Apr 1, 2021
@icewind1991@backportbot
remove leftover debug @NoCSRFRequired introduced with#26198
17b64a4
Signed-off-by: Robin Appelman <robin@icewind.nl>
backportbot-nextcloudBot pushed a commit that referenced this pull request Apr 1, 2021
@icewind1991@backportbot
remove leftover debug @NoCSRFRequired introduced with#26198
fb201a5
Signed-off-by: Robin Appelman <robin@icewind.nl>
MorrisJobke added a commit that referenced this pull request Apr 1, 2021
@MorrisJobke
Merge pull request#26404from nextcloud/backport/26403/stable21
9010524
[stable21] remove leftover debug @NoCSRFRequired introduced with #26198
MorrisJobke added a commit that referenced this pull request Apr 1, 2021
@MorrisJobke
Merge pull request#26405from nextcloud/backport/26403/stable20
94c8e96
[stable20] remove leftover debug @NoCSRFRequired introduced with #26198
This was referenced Apr 1, 2021
Merged
Merged
Merged
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@rullzerrullzerAwaiting requested review from rullzer

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsfeature: search

Projects

None yet

Milestone

Nextcloud 22

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991@skjnldsv@MorrisJobke