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.

Sign up for GitHub

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

Jump to bottom

App navigation via unified search #22102

Merged
merged 3 commits into from
Aug 5, 2020
Merged

App navigation via unified search #22102

merged 3 commits into from
Aug 5, 2020

Conversation

nickvergessen
Copy link
Member

Bildschirmfoto von 2020-08-04 16-23-12

Branch targets #22099

@nickvergessen nickvergessen added this to the Nextcloud 20 milestone Aug 4, 2020
@nickvergessen nickvergessen added the 3. to review Waiting for reviews label Aug 4, 2020
@skjnldsv

This comment has been minimized.

Sign in to view
@jancborchardt

This comment has been minimized.

Sign in to view
@skjnldsv skjnldsv mentioned this pull request Aug 4, 2020
Merged
1 task
@skjnldsv skjnldsv mentioned this pull request Aug 4, 2020
Closed
23 tasks
@skjnldsv skjnldsv force-pushed the fix/unified-search branch 2 times, most recently from 0af7698 to 71b62c4 Compare August 4, 2020 19:36
Base automatically changed from fix/unified-search to master August 5, 2020 12:17
@nickvergessen nickvergessen force-pushed the feature/noid/app-navigation-via-unified-search branch from 0080616 to 507f395 Compare August 5, 2020 14:41
@nickvergessen
Copy link
Member Author

Rebased with order adjustments

@nickvergessen
App navigation via unified search
fcdd702 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the feature/noid/app-navigation-via-unified-search branch from 507f395 to fcdd702 Compare August 5, 2020 14:42
skjnldsv
skjnldsv reviewed Aug 5, 2020
View reviewed changes
apps/settings/lib/Search/AppSearch.php
Comment on lines +90 to +93
$result[] = new SearchResultEntry(
'',
$entry['name'],
'',
Copy link
Member

Choose a reason for hiding this comment

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

Btw, is there no other way for an API to have empty strings like that? Is that good practices?

@skjnldsv skjnldsv added this to In progress in Unified search via automation Aug 5, 2020
jancborchardt
jancborchardt requested changes Aug 5, 2020
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Looks good! 👍 to @skjnldsv’s feedback, and also I found one entry which doesn’t really make sense – there’s possibly more which we might need to filter?
image

jancborchardt
jancborchardt approved these changes Aug 5, 2020
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

My feedback can also be fixed in a follow-up tho.

@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 5, 2020
@nickvergessen
Hide navigation links which dont lead anywhere (looking at you user s…
5be0494 
…tatus)

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Very top of the tops
99fbaa9 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Copy link
Member Author

there’s possibly more which we might need to filter?

Well user status is registering a navigation link which is highjacked by JS. I'm not aware we have more of this, but now fixed by ignoring empty link items

Fix both issues.

@faily-bot
Copy link

faily-bot bot commented Aug 5, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31430: 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()

MorrisJobke
MorrisJobke approved these changes Aug 5, 2020
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

How nice is this?!? :) I love it already 👍

@MorrisJobke MorrisJobke merged commit 2aa6256 into master Aug 5, 2020
Unified search automation moved this from In progress to Done Aug 5, 2020
@MorrisJobke MorrisJobke deleted the feature/noid/app-navigation-via-unified-search branch August 5, 2020 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@jancborchardt jancborchardt jancborchardt approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: search
Projects
No open projects
Unified search
  
Done
Milestone
Nextcloud 20
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nickvergessen @skjnldsv @jancborchardt @MorrisJobke