[full-ci] Resharing for ocis #7086

fschade · 2022-06-02T12:55:09Z

enhance web to be able to re-share resources when using an ownCloud infinite scale backend. It now works for project and personal spaces as well as the sharing jail.

Besides that roles, space-ref and path send as separate values to the sharing api which simplifies the usage of it.

update-docs · 2022-06-02T12:55:12Z

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

ownclouders · 2022-06-02T13:18:27Z

Results for oCISSharingPublic2 https://drone.owncloud.com/owncloud/web/26681/69/1

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

webUISharingPublicManagement-publicLinkIndicator_feature-L110.png

ScharfViktor · 2022-06-20T12:00:33Z

just so we don't forget:
we cannot share space with "manager" role via web so we changed roles when we did re-sharing. will this be fixed in this PR?

fschade · 2022-06-27T11:20:51Z

@ScharfViktor not sure if i understand you correct, can you explain more detailed?

.drone.star

changelog/unreleased/enhancement-ocis-resharing

...es/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue

packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue

ScharfViktor · 2022-06-27T11:42:55Z

@ScharfViktor not sure if i understand you correct, can you explain more detailed?

admin creates space
admin tries to add Maria as manager member of the space. Web sends request with the body: shareType=7&shareWith=richard&space_ref=spaceId&permissions=31

Actual: inpossible to add manager user: <ocs><meta><status>error</status><statuscode>400</statuscode><message>invalid role for space member</message></meta></ocs>

and case with changing role: #7163

fschade · 2022-06-27T11:48:53Z

@ScharfViktor, thanks. Unfortunately this is not part of this pr :(

pascalwengerter

Looking good code-wise, will test locally now

tests/acceptance/stepDefinitions/debugContext.js

.drone.star

pascalwengerter · 2022-06-29T10:40:02Z

@fschade I run into SHARESTREE console errors when resharing from the shares jail (moss shared folder "foo" with einstein, einstein logs in and navigates into "foo" and shares subfolder "bar" with Richard). The shareIndicators also behave weirdly, resharing one resources with another user updates all resources with a "people share icon" but that doesn't persist page reloads 🤔

ScharfViktor · 2022-07-01T08:19:21Z

test falls all time in the same place only in oc10. I can reproduce it localy
Steps:

alice creates folder
alice click to the folder (go inside of the folder)
alice tries to go to startUrl:

Actual: index.php/apps/web/index.html#/files/spaces/personal/alice?items-per-page=100 doesn't load. Reload page or go to startUrl again or run test with SLOW_MO helps

JammingBen · 2022-07-01T12:43:46Z

I removed outdated acceptance tests in 70f1317.

I also noticed the share indicators for received shares behave a little weird. Current behavior is that a received share always shows a share indicator. In oC10 that makes sense IMO, as received shares are being displayed in the personal files table. In oCIS however those are beding displayed in the share jail. That means, all resources in the share jail have the sharing indicator.

What's the preferred solution here? We could also differ between those two scenarios, although it would require some engineering.

kulmann · 2022-07-01T13:22:30Z

@JammingBen I agree with your oc10 related argument, so I think for the share jail we only want to show share indicators for outgoing shares, i.e. for reshared resources. fine by me to use the spaces.share_jail capability for that differentiation. 🤔

kulmann

See comments. One thing that irritates me a bit is that the usage of the storage id is not consistent throughout your touched files. There are a lot of cases where we still determine the currentStorageId in different way. Could you please doublecheck and strive for consistency here? To me it's not clear when to use the file id and when to use the storage id in a different way now.

changelog/unreleased/enhancement-resharing

changelog/unreleased/enhancement-ocis-resharing

.drone.env

packages/web-app-files/src/components/SideBar/Details/FileDetails.vue

kulmann · 2022-07-06T08:11:33Z

packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue

-
- return userShares?.length ? userShares[0] : undefined
+ // the root share has an empty key in the shares tree. That's the reason why we retrieve the share by an empty key here
+ return this.sharesTree['']?.find((s) => s.incoming)


But that's only true if we are in the share jail, right? For oc10 the old behaviour should be correct...

i just checked it again, it's the same behavior for classic too

Still have questions:

What if you have a group share and a user share (both incoming shares) for the same folder? Picking any incoming shares is not sufficient then, right?

Still don't get why it would be sufficient in any case to check the incoming shares of the root node. What if the share is mounted in a deeply nested folder? E.g. you have Shares/the-world as default mount path for shares in oc10. Or you move a mounted share to another mount point.

packages/web-app-files/src/services/folder/spaces/loaderPersonal.ts

packages/web-app-files/src/services/folder/spaces/loaderProject.ts

packages/web-app-files/src/services/folder/spaces/loaderShare.ts

tests/acceptance/stepDefinitions/debugContext.js

kulmann · 2022-07-06T08:33:13Z

tests/e2e/support/objects/app-files/resource/actions.ts

+
+ // toDo: remove me
+ // @jannik: please have a look here what we can wait for to be sure that it's there
+ await new Promise((resolve) => setTimeout(resolve, 250))


Remove? ;-)

fschade · 2022-07-06T11:31:09Z

admin creates space

@ScharfViktor, the manager fix is now part of this pr, should be fixed 😽

fschade · 2022-07-06T11:32:43Z

test falls all time in the same place only in oc10. I can reproduce it localy Steps:

alice creates folder

alice click to the folder (go inside of the folder)

alice tries to go to startUrl:

Actual: index.php/apps/web/index.html#/files/spaces/personal/alice?items-per-page=100 doesn't load. Reload page or go to startUrl again or run test with SLOW_MO helps

fixed via, temporary workaround in the e2e tests, i start working on it now and try to fix it long term.

kulmann

Just gave it a spin, re-sharing an incoming share from the shared with me page, then navigating into the share, doesn't show any share indicators in the file list and doesn't show the sharees in the right sidebar of any of the files.

ScharfViktor · 2022-07-06T12:19:35Z

ready for testing yet? If so, I can add my findings here

use roles whenever possible use fileId for public link sharing fix indirect sharing-indicators behavior fix retrieving of shares from shares tree fix reshare permissions on share roots fix sharesTree errors for links, take parent permissions into account add ocis resharing env var to docker compose config load indicators in share jail when resharing is enabled make use of resharing composable refactor share loading out of link and share panel component into parent component to load the data only once cleanup expected failures & acceptance tests add gherkin debug helpers bump sdk bump ocis

fschade · 2022-07-06T14:39:14Z

@ScharfViktor, yes. But if you find minor thinks please create a separate issue, i want to close this pr asap.

fschade · 2022-07-06T14:44:00Z

@kulmann, created a separate pr for that Bug, #7220

kulmann

Discussed some followups. Good to merge 💪

sonarcloud · 2022-07-06T14:46:04Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

44.4% Coverage
0.0% Duplication

ScharfViktor · 2022-07-06T15:44:08Z

admin creates space

admin tries to add Maria as manager member of the space. Web sends request with the body: shareType=7&shareWith=richard&space_ref=spaceId&permissions=31

Actual: inpossible to add manager user: <ocs><meta><status>error</status><statuscode>400</statuscode><message>invalid role for space member</message></meta></ocs>

and case with changing role: #7163

fixed. Thanks))

pascalwengerter · 2022-07-15T19:10:47Z

packages/web-app-files/src/store/actions.js

@@ -243,11 +243,6 @@ export default {
 context.commit('CURRENT_FILE_OUTGOING_SHARES_ERROR', null)
 context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)

- let spaceRef
- if (storageId) {
- spaceRef = `${storageId}${path}`


@fschade @kulmann could #7268 have been introduced here?

fschade changed the title ~~[WIP] use ocis storageId whenever possible~~ [WIP] Resharing Jun 2, 2022

fschade force-pushed the resharing branch from 1e7e047 to 339c6cf Compare June 2, 2022 12:59

fschade changed the title ~~[WIP] Resharing~~ [full-ci][WIP] Resharing Jun 2, 2022

fschade force-pushed the resharing branch 5 times, most recently from 5075675 to 8c23df7 Compare June 9, 2022 13:45

fschade force-pushed the resharing branch 4 times, most recently from 034da3e to 728e296 Compare June 13, 2022 09:39

ScharfViktor mentioned this pull request Jun 22, 2022

Changing role in space to manager is not possible #7163

Closed

kulmann mentioned this pull request Jun 24, 2022

[OCIS] wrong path is send when reshaing a share with user #7179

Closed

fschade force-pushed the resharing branch from 728e296 to a8d1771 Compare June 24, 2022 08:42

grgprarup mentioned this pull request Jun 24, 2022

Viewer cannot share a shared resource owncloud/ocis#2260

Closed

fschade force-pushed the resharing branch 2 times, most recently from 1a9d7cf to 2fd0f04 Compare June 27, 2022 11:18

fschade changed the title ~~[full-ci][WIP] Resharing~~ [full-ci] Resharing Jun 27, 2022

fschade changed the title ~~[full-ci] Resharing~~ [full-ci] Resharing for ocis Jun 27, 2022

fschade force-pushed the resharing branch from 2fd0f04 to 3063fc2 Compare June 27, 2022 11:19

fschade marked this pull request as ready for review June 27, 2022 11:20

fschade requested a review from pascalwengerter as a code owner June 27, 2022 11:20

pascalwengerter reviewed Jun 27, 2022

View reviewed changes

pascalwengerter reviewed Jun 29, 2022

View reviewed changes

tests/acceptance/stepDefinitions/debugContext.js Show resolved Hide resolved

.drone.star Show resolved Hide resolved

JammingBen force-pushed the resharing branch from 4ee8b26 to 8e35267 Compare June 30, 2022 11:32

SwikritiT mentioned this pull request Jul 4, 2022

[QA] Bump commit id [Jul 04 - Jul 15] owncloud/QA#748

Closed

16 tasks

kulmann mentioned this pull request Jul 6, 2022

[full-ci] Rework auth handling #7072

Merged

32 tasks

kulmann requested changes Jul 6, 2022

View reviewed changes

kulmann assigned fschade Jul 6, 2022

kulmann added the Category:Enhancement Add new functionality label Jul 6, 2022

fschade force-pushed the resharing branch from b01d439 to 1797050 Compare July 6, 2022 11:27

kulmann requested changes Jul 6, 2022

View reviewed changes

fschade force-pushed the resharing branch from 1797050 to 28dabe3 Compare July 6, 2022 14:38

fschade mentioned this pull request Jul 6, 2022

No share info / indicators from within received shares #7220

Closed

kulmann approved these changes Jul 6, 2022

View reviewed changes

fschade merged commit b2af0b2 into master Jul 6, 2022

delete-merged-branch bot deleted the resharing branch July 6, 2022 15:19

pascalwengerter mentioned this pull request Jul 7, 2022

Archiver (directory) download fails on macOS #7213

Closed

pascalwengerter reviewed Jul 15, 2022

View reviewed changes

micbar mentioned this pull request Jul 19, 2022

Release 2.0.0-beta.5 owncloud/ocis#4181

Closed

36 tasks

JammingBen mentioned this pull request Jul 22, 2022

Prevent share permissions from being exceeded #7317

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[full-ci] Resharing for ocis #7086

[full-ci] Resharing for ocis #7086

fschade commented Jun 2, 2022 •

edited

Loading

update-docs bot commented Jun 2, 2022

ownclouders commented Jun 2, 2022 •

edited

Loading

webUISharingPublicManagement-publicLinkIndicator_feature-L110.png

ScharfViktor commented Jun 20, 2022

fschade commented Jun 27, 2022

ScharfViktor commented Jun 27, 2022

fschade commented Jun 27, 2022

pascalwengerter left a comment

pascalwengerter commented Jun 29, 2022

ScharfViktor commented Jul 1, 2022 •

edited

Loading

JammingBen commented Jul 1, 2022

kulmann commented Jul 1, 2022

kulmann left a comment

kulmann Jul 6, 2022

fschade Jul 6, 2022

kulmann Jul 6, 2022

kulmann Jul 6, 2022

fschade Jul 6, 2022

fschade commented Jul 6, 2022

fschade commented Jul 6, 2022

kulmann left a comment

ScharfViktor commented Jul 6, 2022

fschade commented Jul 6, 2022

fschade commented Jul 6, 2022

kulmann left a comment

sonarcloud bot commented Jul 6, 2022

ScharfViktor commented Jul 6, 2022

pascalwengerter Jul 15, 2022

[full-ci] Resharing for ocis #7086

[full-ci] Resharing for ocis #7086

Conversation

fschade commented Jun 2, 2022 • edited Loading

update-docs bot commented Jun 2, 2022

ownclouders commented Jun 2, 2022 • edited Loading

webUISharingPublicManagement-publicLinkIndicator_feature-L110.png

ScharfViktor commented Jun 20, 2022

fschade commented Jun 27, 2022

ScharfViktor commented Jun 27, 2022

fschade commented Jun 27, 2022

pascalwengerter left a comment

Choose a reason for hiding this comment

pascalwengerter commented Jun 29, 2022

ScharfViktor commented Jul 1, 2022 • edited Loading

JammingBen commented Jul 1, 2022

kulmann commented Jul 1, 2022

kulmann left a comment

Choose a reason for hiding this comment

kulmann Jul 6, 2022

Choose a reason for hiding this comment

fschade Jul 6, 2022

Choose a reason for hiding this comment

kulmann Jul 6, 2022

Choose a reason for hiding this comment

kulmann Jul 6, 2022

Choose a reason for hiding this comment

fschade Jul 6, 2022

Choose a reason for hiding this comment

fschade commented Jul 6, 2022

fschade commented Jul 6, 2022

kulmann left a comment

Choose a reason for hiding this comment

ScharfViktor commented Jul 6, 2022

fschade commented Jul 6, 2022

fschade commented Jul 6, 2022

kulmann left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Jul 6, 2022

ScharfViktor commented Jul 6, 2022

pascalwengerter Jul 15, 2022

Choose a reason for hiding this comment

fschade commented Jun 2, 2022 •

edited

Loading

ownclouders commented Jun 2, 2022 •

edited

Loading

ScharfViktor commented Jul 1, 2022 •

edited

Loading