Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-22 16:29:09 +01:00
Code Issues Projects Releases Wiki Activity

Fix build error (#9150)

Browse Source
This commit is contained in:
Thomas Rittson 2024-05-14 00:22:01 +10:00 committed by GitHub
parent 9c839a62d7
commit a852493211
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
View File

@ -35,6 +35,7 @@ export class VaultCollectionRowComponent {
@Input() groups: GroupView[]; @Input() groups: GroupView[];
@Input() showPermissionsColumn: boolean; @Input() showPermissionsColumn: boolean;
@Input() flexibleCollectionsV1Enabled: boolean; @Input() flexibleCollectionsV1Enabled: boolean;
@Input() restrictProviderAccess: boolean;
@Output() onEvent = new EventEmitter<VaultItemEvent>(); @Output() onEvent = new EventEmitter<VaultItemEvent>();
@ -56,7 +57,10 @@ export class VaultCollectionRowComponent {
} }
get permissionText() { get permissionText() {
if (this.collection.id == Unassigned && this.organization?.canEditUnassignedCiphers()) { if (
this.collection.id == Unassigned &&
this.organization?.canEditUnassignedCiphers(this.restrictProviderAccess)
) {
return this.i18nService.t("canEdit"); return this.i18nService.t("canEdit");
} }
if ((this.collection as CollectionAdminView).assigned) { if ((this.collection as CollectionAdminView).assigned) {

1
apps/web/src/app/vault/components/vault-items/vault-items.component.html
View File

@ -97,6 +97,7 @@
[canEditCollection]="canEditCollection(item.collection)" [canEditCollection]="canEditCollection(item.collection)"
[canViewCollectionInfo]="canViewCollectionInfo(item.collection)" [canViewCollectionInfo]="canViewCollectionInfo(item.collection)"
[flexibleCollectionsV1Enabled]="flexibleCollectionsV1Enabled" [flexibleCollectionsV1Enabled]="flexibleCollectionsV1Enabled"
[restrictProviderAccess]="restrictProviderAccess"
[checked]="selection.isSelected(item)" [checked]="selection.isSelected(item)"
(checkedToggled)="selection.toggle(item)" (checkedToggled)="selection.toggle(item)"
(onEvent)="event($event)" (onEvent)="event($event)"

1
apps/web/src/app/vault/components/vault-items/vault-items.component.ts
View File

@ -48,6 +48,7 @@ export class VaultItemsComponent {
@Input({ required: true }) flexibleCollectionsV1Enabled = false; @Input({ required: true }) flexibleCollectionsV1Enabled = false;
@Input() addAccessStatus: number; @Input() addAccessStatus: number;
@Input() addAccessToggle: boolean; @Input() addAccessToggle: boolean;
@Input() restrictProviderAccess: boolean;
private _ciphers?: CipherView[] = []; private _ciphers?: CipherView[] = [];
@Input() get ciphers(): CipherView[] { @Input() get ciphers(): CipherView[] {

1
apps/web/src/app/vault/org-vault/vault.component.html
View File

@ -71,6 +71,7 @@
[flexibleCollectionsV1Enabled]="flexibleCollectionsV1Enabled" [flexibleCollectionsV1Enabled]="flexibleCollectionsV1Enabled"
[addAccessStatus]="addAccessStatus$ | async" [addAccessStatus]="addAccessStatus$ | async"
[addAccessToggle]="showAddAccessToggle" [addAccessToggle]="showAddAccessToggle"
[restrictProviderAccess]="restrictProviderAccessEnabled"
> >
</app-vault-items> </app-vault-items>
<ng-container *ngIf="!flexibleCollectionsV1Enabled"> <ng-container *ngIf="!flexibleCollectionsV1Enabled">