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

Dashboard frontend enhancements #21598

Merged
merged 28 commits into from
Aug 6, 2020
Merged

Dashboard frontend enhancements #21598

merged 28 commits into from
Aug 6, 2020

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Jun 26, 2020

Follow up PR to #21346

  • Implement dynamic sorting and adding/removing panels
  • Only show name if display name is set.
  • Make dashboard the default app
  • Check if we can make the default app dynamic depending on a user setting
  • UI needs polishing
  • Integrate status feature
  • Rename API to use the term Widget instead of Panel
  • App store category for apps supporting dashboard Add dashboard category appstore#737
  • Link to the new app store category

@@ -24,5 +24,6 @@
return [
'routes' => [
['name' => 'dashboard#index', 'url' => '/', 'verb' => 'GET'],
['name' => 'dashboard#updateLayout', 'url' => '/layout', 'verb' => 'POST'],
Copy link
Member

Choose a reason for hiding this comment

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

to be more compliant to what REST is about I would suggest to restructure this to be a resource, like simply /dashboard/layout and POST the data there

Copy link
Member Author

Choose a reason for hiding this comment

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

I'd look into this in a separate pr since my first attempt for that didn't work out as expected.

@juliushaertl juliushaertl force-pushed the enh/20930/dashboard branch 2 times, most recently from ea46d1a to 2ae0c7a Compare July 10, 2020 08:04
@rullzer rullzer mentioned this pull request Jul 10, 2020
@juliushaertl juliushaertl force-pushed the enh/20930/dashboard branch 4 times, most recently from 1026be8 to 6b2bb32 Compare July 15, 2020 08:54
Base automatically changed from enh/20930/dashboard to master July 15, 2020 09:10
@jancborchardt
Copy link
Member

@juliushaertl needs a rebase. :)

Also:

Decide if this should be the default app and how the order of apps should be in the app menu

I would say we make this the default app in master so we can properly dogfood it. We can still decide later before the RCs or so to keep Files the default. Ok @karlitschek @rullzer?

@karlitschek
Copy link
Member

@jancborchardt agreed

@nextcloud nextcloud deleted a comment from faily-bot bot Jul 22, 2020
@juliushaertl juliushaertl force-pushed the enh/20930/dashboard-drag branch 2 times, most recently from dbef1e2 to 10295d8 Compare July 24, 2020 05:33
@jancborchardt jancborchardt added this to the Nextcloud 20 milestone Aug 3, 2020
@juliushaertl juliushaertl force-pushed the enh/20930/dashboard-drag branch 2 times, most recently from 60041fb to bdf7257 Compare August 5, 2020 08:34
@juliushaertl juliushaertl changed the title Allow userdefined dashboard order Dashboard frontend enhancements Aug 5, 2020
@juliushaertl juliushaertl marked this pull request as ready for review August 5, 2020 10:41
@juliushaertl juliushaertl removed the 2. developing Work in progress label Aug 5, 2020
juliushaertl and others added 20 commits August 5, 2020 17:01
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member

I reverted the URL change in the acceptance tests. The dashboard app should be disabled in those anyways. So this should fix those failing tests.

@MorrisJobke MorrisJobke 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
@faily-bot
Copy link

faily-bot bot commented Aug 5, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31436: failure

jsunit

Show full log
PhantomJS 2.1.1 (Linux 0.0.0) LOG: 'JQMIGRATE: Migrate is installed, version 1.4.1'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'jQuery is deprecated: The global jQuery is deprecated. It will be updated to v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: '$ is deprecated: The global jQuery is deprecated. It will be updated to v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'Handlebars is deprecated: please ship your own, this will be removed in Nextcloud 20'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Files.Settings initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Files.Sidebar initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Sharing.ShareSearch initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Sharing.ExternalLinkActions initialized'
PhantomJS 2.1.1 (Linux 0.0.0): Executed 847 of 850 (skipped 3) SUCCESS (10.756 secs / 10.188 secs)

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()

@skjnldsv
Copy link
Member

skjnldsv commented Aug 6, 2020

Tests failures unrelated

@skjnldsv skjnldsv merged commit 5b6246f into master Aug 6, 2020
@skjnldsv skjnldsv deleted the enh/20930/dashboard-drag branch August 6, 2020 06:17
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 enhancement feature: dashboard integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants