feat(4336): sharing hierarchy conflict UX (ADR-0005)#256
Open
Gerry-Cern wants to merge 6 commits into
Open
Conversation
- Added `useSharingHierarchyConflictConfirm` to manage user confirmation for sharing conflicts. - Introduced `SharingHierarchyConflictCancelledError` for error handling. - Updated share-related components to utilize the new conflict confirmation logic. - Enhanced `useSharesStore` to retry share operations with a force header upon user confirmation of conflicts. - Added tests for conflict handling in share operations.
Match Jesse Geens hierarchy conflict contract (error_type, can_force, conflicting_shares, Force header) and batch deferred 409 confirmations when inviting multiple collaborators.
Show an inform modal when the server returns can_force false, suppress error toasts when the user cancels a force confirmation, filter indirect shares from invite autocomplete, and parse richer conflicting_shares fields.
Replace plain-text hierarchy conflict dialogs with a grouped scrollable modal aligned to the ticket mockup. Revert stale role dropdown state on failed updates and offer to remove redundant direct shares on parent_conflict.
collaboratorShares filtering in the invite autocomplete was matching direct and indirect shares alike, so any user with an inherited (parent) share vanished from search entirely. Since roles only ever increase going down the tree (read < write < deny), a user with just an indirect share must still be searchable to receive a stronger direct share on the current resource. Only an existing direct share should hide the user, since that case is edited via the share list instead.
- Drop the raw server "message" shown below the intro text; the curated, translatable intro already explains the conflict, so showing the untranslated API error text underneath was redundant. - Stop forcing a trailing slash onto every conflicting-share path. It broke file shares (e.g. "myfile.txt/") since the fallback applied unconditionally regardless of whether the entry was a file or folder. - Restore bullet points on the conflicting-share list (was disabled via list-style: none) and render each entry as a bare <li> instead of wrapping it in a <span>, since OcModal's warning-variation styles color every descendant <span>, which is what turned the entries yellow. - Simplify the permission-label fallback: drop the heuristic that matched a Reva permission_type against role display-name substrings (e.g. "view"/"edit"/"deny"), which could mislabel custom role names. The role-id lookup path already mirrors how ListItem.vue resolves a share's role name (graphRoles[id].displayName via $gettext); the permission_type-only fallback now goes straight to the generic translated label instead of guessing at a matching role.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Implements the ownCloud Web side of ADR-0005 hierarchical sharing conflicts for collaborator share mutations via Graph.
When Reva rejects a create/update share with HTTP 409 and a structured JSON body, the UI:
parent_conflict,can_force: false)child_conflict,can_force: true)Force: trueheader after the user confirmsBackend contract: targets Jesse Geens' Reva branch
feat/share-consistency. Deploy web and Reva together.Behaviour
InviteCollaboratorFormchild_conflict409s during parallel invites, show one combined modal, then re-issue failed invites withForce: trueListItem(role/expiry)Force: trueFileShares,SpaceMembersReva JSON contract (409)
{ "error_type": "parent_conflict | child_conflict", "message": "...", "can_force": true, "conflicting_shares": [{ "id", "resource_id", "path", "permission_type" }] }