mirror of
https://github.com/bitwarden/browser
synced 2025-12-19 01:33:33 +00:00
[AC-2086] Limit admin access - Collection Modal (#8335)
* feat: add view collection string, update button text, refs AC-2086 * feat: remove canEdit from Restricted Collection Access component, refs AC-2086 * feat: add view collection clicked flow, refs AC-2086 * fix: revert accidental svg icon changes, refs AC-2086 * feat: add input for access selector to hide multi select, refs AC-2086 * feat: apply readonly/disabled changes to access dialog, refs AC-2086 * fix: messages file conflict, refs AC-2086 * feat: apply disabled state to access selector, refs AC-2086 * fix: formatting, refs AC-2086 * fix: permission mode read only relocate, refs AC-2086 * fix: conform readonly casing, refs AC-2086
This commit is contained in:
@@ -65,17 +65,22 @@
|
||||
</bit-tab>
|
||||
<bit-tab label="{{ 'access' | i18n }}">
|
||||
<div class="tw-mb-3" *ngIf="organization.flexibleCollections">
|
||||
<span *ngIf="organization.useGroups">{{ "grantCollectionAccess" | i18n }}</span>
|
||||
<span *ngIf="!organization.useGroups">{{
|
||||
"grantCollectionAccessMembersOnly" | i18n
|
||||
}}</span>
|
||||
<span
|
||||
*ngIf="
|
||||
(flexibleCollectionsV1Enabled$ | async) &&
|
||||
organization.allowAdminAccessToAllCollectionItems
|
||||
"
|
||||
>{{ " " + ("adminCollectionAccess" | i18n) }}</span
|
||||
>
|
||||
<ng-container *ngIf="dialogReadonly">
|
||||
<span>{{ "readOnlyCollectionAccess" | i18n }}</span>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!dialogReadonly">
|
||||
<span *ngIf="organization.useGroups">{{ "grantCollectionAccess" | i18n }}</span>
|
||||
<span *ngIf="!organization.useGroups">{{
|
||||
"grantCollectionAccessMembersOnly" | i18n
|
||||
}}</span>
|
||||
<span
|
||||
*ngIf="
|
||||
(flexibleCollectionsV1Enabled$ | async) &&
|
||||
organization.allowAdminAccessToAllCollectionItems
|
||||
"
|
||||
>{{ " " + ("adminCollectionAccess" | i18n) }}</span
|
||||
>
|
||||
</ng-container>
|
||||
</div>
|
||||
<div
|
||||
class="tw-mb-3 tw-text-danger"
|
||||
@@ -85,7 +90,7 @@
|
||||
</div>
|
||||
<bit-access-selector
|
||||
*ngIf="organization.useGroups"
|
||||
[permissionMode]="PermissionMode.Edit"
|
||||
[permissionMode]="dialogReadonly ? PermissionMode.Readonly : PermissionMode.Edit"
|
||||
formControlName="access"
|
||||
[items]="accessItems"
|
||||
[columnHeader]="'groupSlashMemberColumnHeader' | i18n"
|
||||
@@ -96,7 +101,7 @@
|
||||
></bit-access-selector>
|
||||
<bit-access-selector
|
||||
*ngIf="!organization.useGroups"
|
||||
[permissionMode]="PermissionMode.Edit"
|
||||
[permissionMode]="dialogReadonly ? PermissionMode.Readonly : PermissionMode.Edit"
|
||||
formControlName="access"
|
||||
[items]="accessItems"
|
||||
[columnHeader]="'memberColumnHeader' | i18n"
|
||||
@@ -108,7 +113,13 @@
|
||||
</bit-tab-group>
|
||||
</div>
|
||||
<ng-container bitDialogFooter>
|
||||
<button type="submit" bitButton bitFormButton buttonType="primary" [disabled]="loading">
|
||||
<button
|
||||
type="submit"
|
||||
bitButton
|
||||
bitFormButton
|
||||
buttonType="primary"
|
||||
[disabled]="loading || dialogReadonly"
|
||||
>
|
||||
{{ "save" | i18n }}
|
||||
</button>
|
||||
<button
|
||||
|
||||
Reference in New Issue
Block a user