[full-ci] Batch actions for accepting and declining shares #5374

kulmann · 2021-06-25T11:49:20Z

Description

Continuing #5211 for a centralized implementation of the triggerShareAction business logic. Moved it to a helper and made individual mixins for acceptShare and declineShare available, which can be used in the actions accordion in the right sidebar.

This PR removes the delete actions (batch and individual) from shares on the shared with me page, as the decline action is the right thing to choose in such a situation.

Related Issue

Motivation and Context

Improve UX and refactor code

How Has This Been Tested?

unit tests for the triggerShareAction helper (existed before, now moved to a dedicated spec file for the new helper)

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Technical debt
Tests

Checklist:

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

Open tasks:

Since we have an action for the right sidebar for accepting a share now, we could change the right sidebar behaviour to display actions (at the moment it displays a message that the share has to be accepted first). This requires solving other issues so I will not do that in this PR.
changelog item

…t-decline

packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue

pascalwengerter · 2021-06-25T12:06:35Z

packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue

+        return
+      }
+
+      console.log(errors)


Dev leftover or on purpose?

Intentional, because I don't want to swallow errors. Eventually we should come up with a proper logging solution.

ownclouders · 2021-06-25T12:12:56Z

Results for oC10SharingAccept https://drone.owncloud.com/owncloud/web/16862/9/1

💥 The acceptance tests failed. Please find the screenshots inside ...

webUISharingAcceptSharesToRoot-acceptShares-feature-110.png

💥 The acceptance tests pipeline failed. The build has been cancelled.

ownclouders · 2021-06-25T13:14:30Z

Results for oCISSharingInternalUsers2 https://drone.owncloud.com/owncloud/web/16866/53/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

ownclouders · 2021-06-25T14:31:54Z

Results for oCISSharingInternalUsers2 https://drone.owncloud.com/owncloud/web/16868/53/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

ownclouders · 2021-06-30T15:19:31Z

Results for oCISSharingBasic https://drone.owncloud.com/owncloud/web/16971/47/1
The following scenarios passed on retry:

webUIRestrictSharing/restrictSharing.feature:49

ownclouders · 2021-06-30T15:21:14Z

Results for oC10IntegrationApp2 https://drone.owncloud.com/owncloud/web/16971/63/1

💥 The acceptance tests failed. Please find the screenshots inside ...

webUITrashbinRestore-trashbinRestore-feature-14.png

ownclouders · 2021-06-30T15:22:16Z

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/16971/34/1

💥 The acceptance tests failed. Please find the screenshots inside ...

webUITrashbinDelete-trashbinDelete-feature-112.png

webUITrashbinDelete-trashbinDelete-feature-41.png

webUITrashbinRestore-trashbinRestore-feature-138.png

webUITrashbinRestore-trashbinRestore-feature-14.png

webUITrashbinRestore-trashbinRestore-feature-181.png

webUITrashbinRestore-trashbinRestore-feature-222.png

webUITrashbinRestore-trashbinRestore-feature-241.png

webUITrashbinRestore-trashbinRestore-feature-260.png

webUITrashbinRestore-trashbinRestore-feature-30.png

ownclouders · 2021-06-30T15:24:22Z

Results for oC10Files2 https://drone.owncloud.com/owncloud/web/16971/11/1

💥 The acceptance tests failed. Please find the screenshots inside ...

webUIFilesDetails-fileDetails-feature-116.png

webUIFilesDetails-fileDetails-feature-66.png

webUIFilesDetails-fileDetails-feature-82.png

webUIFilesDetails-fileDetails-feature-99.png

webUIFilesSearch-search-feature-175.png

…t-decline

ownclouders · 2021-06-30T15:56:36Z

Results for oCISSharingBasic https://drone.owncloud.com/owncloud/web/16973/47/1
The following scenarios passed on retry:

webUIRestrictSharing/restrictSharing.feature:49

ownclouders · 2021-06-30T15:57:18Z

Results for oC10Files2 https://drone.owncloud.com/owncloud/web/16973/11/1

💥 The acceptance tests failed. Please find the screenshots inside ...

webUIFilesDetails-fileDetails-feature-116.png

webUIFilesDetails-fileDetails-feature-66.png

webUIFilesDetails-fileDetails-feature-82.png

webUIFilesDetails-fileDetails-feature-99.png

webUIFilesSearch-search-feature-175.png

ownclouders · 2021-06-30T16:04:16Z

Results for oC10IntegrationApp2 https://drone.owncloud.com/owncloud/web/16973/63/1

💥 The acceptance tests failed. Please find the screenshots inside ...

webUITrashbinRestore-trashbinRestore-feature-14.png

ownclouders · 2021-06-30T16:04:41Z

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/16973/34/1

💥 The acceptance tests failed. Please find the screenshots inside ...

webUITrashbinDelete-trashbinDelete-feature-112.png

webUITrashbinDelete-trashbinDelete-feature-41.png

webUITrashbinRestore-trashbinRestore-feature-138.png

webUITrashbinRestore-trashbinRestore-feature-14.png

webUITrashbinRestore-trashbinRestore-feature-181.png

webUITrashbinRestore-trashbinRestore-feature-222.png

webUITrashbinRestore-trashbinRestore-feature-241.png

webUITrashbinRestore-trashbinRestore-feature-260.png

webUITrashbinRestore-trashbinRestore-feature-30.png

…t-decline

ownclouders · 2021-07-01T15:00:05Z

Results for oCISSharingBasic https://drone.owncloud.com/owncloud/web/17006/47/1
The following scenarios passed on retry:

webUIRestrictSharing/restrictSharing.feature:49

ownclouders · 2021-07-01T15:58:37Z

Results for oCISSharingBasic https://drone.owncloud.com/owncloud/web/17008/47/1
The following scenarios passed on retry:

webUIRestrictSharing/restrictSharing.feature:49

ownclouders · 2021-07-02T08:19:57Z

Results for oCISSharingBasic https://drone.owncloud.com/owncloud/web/17020/47/1
The following scenarios passed on retry:

webUIRestrictSharing/restrictSharing.feature:49

packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue

fschade

just a small finding, expect that it looks good to me 🚀

sonarcloud · 2021-07-02T09:43:08Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

18.7% Coverage
5.1% Duplication

ownclouders · 2021-07-02T09:59:38Z

Results for oCISSharingBasic https://drone.owncloud.com/owncloud/web/17023/47/1
The following scenarios passed on retry:

webUIRestrictSharing/restrictSharing.feature:49

fschade

LGTM 🚀

elizavetaRa and others added 5 commits June 21, 2021 12:24

batch actions for Accept and Decline in Shared with me

2bfbe61

Move share action trigger into helper and create file action mixins

f13eab5

Merge remote-tracking branch 'origin/master' into batch-actions-accep…

0fbd6ed

…t-decline

Remove unnecessary params

da7ecf5

Move unit test from SharedWithMe view to helper

3ff7e9d

kulmann added the Status:Needs-Review Needs review from a maintainer label Jun 25, 2021

kulmann requested review from elizavetaRa, pascalwengerter and fschade June 25, 2021 11:49

kulmann self-assigned this Jun 25, 2021

This comment has been minimized.

Sign in to view

kulmann commented Jun 25, 2021

View reviewed changes

packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue Outdated Show resolved Hide resolved

pascalwengerter reviewed Jun 25, 2021

View reviewed changes

kulmann force-pushed the batch-actions-accept-decline branch from 4471b5e to ff11089 Compare June 25, 2021 14:09

kulmann changed the title ~~Batch actions for accepting and declining shares~~ [full-ci] Batch actions for accepting and declining shares Jun 25, 2021

kulmann force-pushed the batch-actions-accept-decline branch from ff11089 to ec897cd Compare June 25, 2021 14:48

kulmann added 3 commits June 26, 2021 20:53

Fix tests for declining a share

e10c0f2

Changelog item

27a774d

Remove unneeded mutation mappings

dd65fca

kulmann force-pushed the batch-actions-accept-decline branch from ec897cd to dd65fca Compare June 26, 2021 18:53

owncloud deleted a comment from ownclouders Jun 26, 2021

Use delete step in tests where delete button is expected

df7a6ac

Merge remote-tracking branch 'origin/master' into batch-actions-accep…

f352330

…t-decline

kulmann added 4 commits July 1, 2021 16:10

Revert share loading when sidebar opens as it's not needed, yet

fee2fb5

Fix loading highlighted file in search mode

e72172f

Merge remote-tracking branch 'origin/master' into batch-actions-accep…

953e6d9

…t-decline

Fix e2e test for batch declining shares

168c78d

kulmann mentioned this pull request Jul 1, 2021

delete pending share option is not available for sharee #5435

Closed

Add expected test failure about declining shares

9caf39c

Add more issue links to changelog

05404eb

fschade reviewed Jul 2, 2021

View reviewed changes

packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue Outdated Show resolved Hide resolved

fschade reviewed Jul 2, 2021

View reviewed changes

Correctly await share action batches with a p-queue

1e72e12

kulmann requested review from pascalwengerter and fschade July 2, 2021 09:40

fschade approved these changes Jul 2, 2021

View reviewed changes

kulmann merged commit 59d2073 into master Jul 2, 2021

delete-merged-branch bot deleted the batch-actions-accept-decline branch July 2, 2021 11:29

[full-ci] Batch actions for accepting and declining shares #5374

[full-ci] Batch actions for accepting and declining shares #5374

Conversation

kulmann commented Jun 25, 2021 • edited Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Open tasks:

This comment has been minimized.

pascalwengerter Jun 25, 2021

Choose a reason for hiding this comment

kulmann Jun 25, 2021

Choose a reason for hiding this comment

fschade Jun 25, 2021

Choose a reason for hiding this comment

ownclouders commented Jun 25, 2021

webUISharingAcceptSharesToRoot-acceptShares-feature-110.png

ownclouders commented Jun 25, 2021

ownclouders commented Jun 25, 2021

ownclouders commented Jun 30, 2021

ownclouders commented Jun 30, 2021

webUITrashbinRestore-trashbinRestore-feature-14.png

ownclouders commented Jun 30, 2021

webUITrashbinDelete-trashbinDelete-feature-112.png

webUITrashbinDelete-trashbinDelete-feature-41.png

webUITrashbinRestore-trashbinRestore-feature-138.png

webUITrashbinRestore-trashbinRestore-feature-14.png

webUITrashbinRestore-trashbinRestore-feature-181.png

webUITrashbinRestore-trashbinRestore-feature-222.png

webUITrashbinRestore-trashbinRestore-feature-241.png

webUITrashbinRestore-trashbinRestore-feature-260.png

webUITrashbinRestore-trashbinRestore-feature-30.png

ownclouders commented Jun 30, 2021

webUIFilesDetails-fileDetails-feature-116.png

webUIFilesDetails-fileDetails-feature-66.png

webUIFilesDetails-fileDetails-feature-82.png

webUIFilesDetails-fileDetails-feature-99.png

webUIFilesSearch-search-feature-175.png

ownclouders commented Jun 30, 2021

ownclouders commented Jun 30, 2021

webUIFilesDetails-fileDetails-feature-116.png

webUIFilesDetails-fileDetails-feature-66.png

webUIFilesDetails-fileDetails-feature-82.png

webUIFilesDetails-fileDetails-feature-99.png

webUIFilesSearch-search-feature-175.png

ownclouders commented Jun 30, 2021

webUITrashbinRestore-trashbinRestore-feature-14.png

ownclouders commented Jun 30, 2021

webUITrashbinDelete-trashbinDelete-feature-112.png

webUITrashbinDelete-trashbinDelete-feature-41.png

webUITrashbinRestore-trashbinRestore-feature-138.png

webUITrashbinRestore-trashbinRestore-feature-14.png

webUITrashbinRestore-trashbinRestore-feature-181.png

webUITrashbinRestore-trashbinRestore-feature-222.png

webUITrashbinRestore-trashbinRestore-feature-241.png

webUITrashbinRestore-trashbinRestore-feature-260.png

webUITrashbinRestore-trashbinRestore-feature-30.png

ownclouders commented Jul 1, 2021

ownclouders commented Jul 1, 2021

ownclouders commented Jul 2, 2021

fschade left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Jul 2, 2021

ownclouders commented Jul 2, 2021

fschade left a comment

Choose a reason for hiding this comment

kulmann commented Jun 25, 2021 •

edited

Loading