mirror of
https://github.com/bitwarden/browser
synced 2025-12-10 21:33:27 +00:00
fix bulk menu (#14079)
This commit is contained in:
@@ -52,10 +52,12 @@
|
||||
{{ "permission" | i18n }}
|
||||
</th>
|
||||
<th bitCell class="tw-w-12 tw-text-right">
|
||||
@let featureFlaggedDisable =
|
||||
(limitItemDeletion$ | async) ? (disableMenu$ | async) : disableMenu;
|
||||
<button
|
||||
[disabled]="disabled || isEmpty || disableMenu"
|
||||
[disabled]="disabled || isEmpty || featureFlaggedDisable"
|
||||
[bitMenuTriggerFor]="headerMenu"
|
||||
[attr.title]="disableMenu ? ('missingPermissions' | i18n) : ''"
|
||||
[attr.title]="featureFlaggedDisable ? ('missingPermissions' | i18n) : ''"
|
||||
bitIconButton="bwi-ellipsis-v"
|
||||
size="small"
|
||||
type="button"
|
||||
|
||||
@@ -85,6 +85,7 @@ export class VaultItemsComponent {
|
||||
protected selection = new SelectionModel<VaultItem>(true, [], true);
|
||||
protected canDeleteSelected$: Observable<boolean>;
|
||||
protected canRestoreSelected$: Observable<boolean>;
|
||||
protected disableMenu$: Observable<boolean>;
|
||||
|
||||
constructor(
|
||||
protected cipherAuthorizationService: CipherAuthorizationService,
|
||||
@@ -140,6 +141,20 @@ export class VaultItemsComponent {
|
||||
}),
|
||||
map((canRestore) => canRestore && this.showBulkTrashOptions),
|
||||
);
|
||||
|
||||
this.disableMenu$ = combineLatest([this.limitItemDeletion$, this.canDeleteSelected$]).pipe(
|
||||
map(([enabled, canDelete]) => {
|
||||
if (enabled) {
|
||||
return (
|
||||
!this.bulkMoveAllowed &&
|
||||
!this.showAssignToCollections() &&
|
||||
!canDelete &&
|
||||
!this.showBulkEditCollectionAccess
|
||||
);
|
||||
}
|
||||
return false;
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
get showExtraColumn() {
|
||||
|
||||
Reference in New Issue
Block a user