Skip to content

Commit c8d3c83

Browse files
author
MargeBot
committed
Merge branch 'IDTEAM-4850-web-the-edit-vault-button-should-be-hidden-for-the-vault-with-editor-access-same-as-in-i-os' into 'main'
Hide the "Edit Vault" button when the user it was shared with is not an admin. See merge request web/clients!25566
2 parents 3146e68 + 99dbe47 commit c8d3c83

2 files changed

Lines changed: 10 additions & 23 deletions

File tree

packages/pass/components/Menu/Vault/VaultMenu.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export const VaultMenu: FC<Props> = ({ render, onAction = noop }) => {
4949
count={vault.count}
5050
label={vault.content.name}
5151
selected={scope === 'share' && selectedShareId === vault.shareId}
52-
canEdit={isShareManageable(vault)}
5352
canMove={isWritableVault(vault) && vault.count > 0}
5453
canDelete={vault.owner}
5554
canInvite={!vault.shared}

packages/pass/components/Menu/Vault/VaultMenuItem.tsx

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import noop from '@proton/utils/noop';
2929

3030
type Props = {
3131
canDelete: boolean;
32-
canEdit: boolean;
3332
canInvite: boolean;
3433
canLeave: boolean;
3534
canManage: boolean;
@@ -55,19 +54,7 @@ const handleClickEvent = (handler?: () => void) => (evt: React.MouseEvent) => {
5554
};
5655

5756
export const VaultMenuItem = memo(
58-
({
59-
canDelete,
60-
canEdit,
61-
canInvite,
62-
canLeave,
63-
canManage,
64-
canMove,
65-
count,
66-
label,
67-
selected,
68-
vault,
69-
onAction = noop,
70-
}: Props) => {
57+
({ canDelete, canInvite, canLeave, canManage, canMove, count, label, selected, vault, onAction = noop }: Props) => {
7158
const vaultActions = useVaultActions();
7259
const inviteActions = useInviteActions();
7360
const { moveMany } = useItemsActions();
@@ -76,7 +63,7 @@ export const VaultMenuItem = memo(
7663
const plan = useSelector(selectPassPlan);
7764
const access = useSelector(selectAccess(vault.shareId));
7865

79-
const withActions = canEdit || canDelete || canInvite || canManage || canLeave || canMove;
66+
const withActions = canDelete || canInvite || canManage || canLeave || canMove;
8067

8168
const onManage = pipe(() => inviteActions.manageVaultAccess(vault.shareId), onAction);
8269
const onEdit = pipe(() => vaultActions.edit(vault), onAction);
@@ -176,13 +163,14 @@ export const VaultMenuItem = memo(
176163
quickActions={
177164
withActions
178165
? [
179-
<DropdownMenuButton
180-
key="vault-edit"
181-
disabled={!onEdit}
182-
label={c('Action').t`Edit vault`}
183-
icon="pen"
184-
onClick={handleClickEvent(onEdit)}
185-
/>,
166+
canManage && (
167+
<DropdownMenuButton
168+
key="vault-edit"
169+
label={c('Action').t`Edit vault`}
170+
icon="pen"
171+
onClick={handleClickEvent(onEdit)}
172+
/>
173+
),
186174

187175
vault.shared && (
188176
<DropdownMenuButton

0 commit comments

Comments
 (0)