Skip to content

use a multi line approach to display share autocomplete#35486

Merged
micbar merged 8 commits intomasterfrom
port-35397
Jun 14, 2019
Merged

use a multi line approach to display share autocomplete#35486
micbar merged 8 commits intomasterfrom
port-35397

Conversation

@karakayasemi
Copy link
Copy Markdown
Contributor

Description

Port of #35397
Enhance sharing dialog UI to prevent overflow.

Related Issue

How Has This Been Tested?

Screenshots (if appropriate):

Federated or Guest

Screenshot from 2019-05-31 17-26-25

Group

Screenshot from 2019-05-31 17-26-00

With additional user information

Screenshot from 2019-05-31 17-25-46

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@karakayasemi karakayasemi added this to the development milestone Jun 11, 2019
@karakayasemi karakayasemi requested a review from phil-davis June 11, 2019 13:16
@karakayasemi karakayasemi self-assigned this Jun 11, 2019
@karakayasemi karakayasemi requested a review from pmaier1 June 11, 2019 13:16
Copy link
Copy Markdown
Contributor

@pmaier1 pmaier1 left a comment

Choose a reason for hiding this comment

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

❤️
(not a technical review!)

@phil-davis
Copy link
Copy Markdown
Contributor

Strange acceptance test fail:

Feature: disable sharing
  As an admin
  I want to be able to disable the sharing function
  So that users cannot share files

  Background:                                                                              # /drone/src/tests/acceptance/features/webUIRestrictSharing/disableSharing.feature:7
    Given user "user1" has been created with default attributes and without skeleton files # FeatureContext::userHasBeenCreatedWithDefaultAttributesAndWithoutSkeletonFiles()

  @TestAlsoOnExternalUserBackend @smokeTest
  Scenario: Users tries to share via WebUI when Sharing is disabled                              # /drone/src/tests/acceptance/features/webUIRestrictSharing/disableSharing.feature:12
    Given user "user1" has created folder "simple-folder"                                        # FeatureContext::userCreatesFolder()
    And the setting "Allow apps to use the Share API" in the section "Sharing" has been disabled # WebUIGeneralContext::settingInSectionHasBeen()
    When user "user1" logs in using the webUI                                                    # WebUILoginContext::theUserLogsInUsingTheWebUI()
INFORMATION: timed out waiting for ajax calls to start
INFORMATION: timed out waiting for ajax calls to start
    Then it should not be possible to share folder "simple-folder" using the webUI               # WebUISharingContext::itShouldNotBePossibleToShareFileFolderUsingTheWebUI()
      │ INFORMATION: timed out waiting for ajax calls to startINFORMATION: timed out waiting for ajax calls to start
      Exception: exception message has to contain "could not find share-with-field", "could not find sharing button in fileRow" or "could not share with '...'"but was: "Page\FilesPageElement\SharingDialog::shareWithUserOrGroup could not share with ' Group'" in /drone/src/tests/acceptance/features/bootstrap/WebUISharingContext.php:1276

https://drone.owncloud.com/owncloud/core/18209/742

I can reproduce it locally when running with this branch.
It does not happen in the stable10 based code https://github.com/owncloud/core/pull/35397/files
Looking...

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 11, 2019

Codecov Report

Merging #35486 into master will decrease coverage by <.01%.
The diff coverage is 57.14%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #35486      +/-   ##
============================================
- Coverage     65.68%   65.68%   -0.01%     
  Complexity    18735    18735              
============================================
  Files          1221     1221              
  Lines         70793    70796       +3     
  Branches       1288     1289       +1     
============================================
+ Hits          46503    46504       +1     
- Misses        23913    23914       +1     
- Partials        377      378       +1
Flag Coverage Δ Complexity Δ
#javascript 53.68% <57.14%> (-0.01%) 0 <0> (ø)
#phpunit 67.06% <ø> (ø) 18735 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
core/js/sharedialogview.js 78.1% <57.14%> (-0.68%) 0 <0> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ec3550d...a95e0dd. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 11, 2019

Codecov Report

Merging #35486 into master will increase coverage by <.01%.
The diff coverage is 57.14%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #35486      +/-   ##
============================================
+ Coverage     65.68%   65.68%   +<.01%     
  Complexity    18735    18735              
============================================
  Files          1221     1221              
  Lines         70793    70796       +3     
  Branches       1288     1289       +1     
============================================
+ Hits          46503    46505       +2     
  Misses        23913    23913              
- Partials        377      378       +1
Flag Coverage Δ Complexity Δ
#javascript 53.7% <57.14%> (ø) 0 <0> (ø) ⬇️
#phpunit 67.06% <ø> (ø) 18735 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
core/js/sharedialogview.js 78.6% <57.14%> (-0.19%) 0 <0> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dac7daa...03472c1. Read the comment docs.

@phil-davis
Copy link
Copy Markdown
Contributor

I added an extra commit. In master sharing webUI behaves a bit differently when sharing is disabled. See issue #35490
The existing acceptance test code did not really handle nicely this case when sharing is disabled but the sharing panel does actually open. The tests passed, but actually they were opening the sharing panel then typing nothing in the "share with" box. The sharing with nothing does fail, of course. But really it should have been trying to share with something and getting all the way to the "Share API is disabled" message.
I will sort that existing messy test code out separately to this PR.

@phil-davis
Copy link
Copy Markdown
Contributor

@micbar @DeepDiver1975 someone needs to decide if it is OK to override the codecov fail here, or if more unit tests have to be made.
codecov fails in a similar way in the stable10 PR #35397

@phil-davis
Copy link
Copy Markdown
Contributor

I rebased again, hoping to get codecov status reported.

@phil-davis
Copy link
Copy Markdown
Contributor

@micbar @DeepDiver1975 this PR seems to be one of those where codecov never comes. It has had a couple of rebases with no joy.
The stable10 version of this in PR #35397 gets a "minor" codecov fail on the patch coverage.

Everything else about these PRs is ready.

Are you happy to override and merge?

@micbar micbar merged commit 13ef7f9 into master Jun 14, 2019
@delete-merged-branch delete-merged-branch bot deleted the port-35397 branch June 14, 2019 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10.2 RC1 Share with "federation" text is cut off

5 participants