Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-25 12:15:18 +01:00
Code Issues Projects Releases Wiki Activity

Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion (#6409)

Browse Source
This commit is contained in:
Thomas Rittson 2023-09-27 07:37:39 +10:00 committed by GitHub
parent f4ba92b63c
commit a64ae699ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/admin-console/organizations/settings/account.component.html
View File

@ -60,8 +60,8 @@
<h1 bitTypography="h1" class="tw-mt-16 tw-pb-2.5">{{ "collectionManagement" | i18n }}</h1> <h1 bitTypography="h1" class="tw-mt-16 tw-pb-2.5">{{ "collectionManagement" | i18n }}</h1>
<p>{{ "collectionManagementDesc" | i18n }}</p> <p>{{ "collectionManagementDesc" | i18n }}</p>
<bit-form-control> <bit-form-control>
<bit-label>{{ "limitCollectionCdOwnerAdminDesc" | i18n }}</bit-label> <bit-label>{{ "limitCollectionCreationDeletionDesc" | i18n }}</bit-label>
<input type="checkbox" bitCheckbox formControlName="limitCollectionCdOwnerAdmin" /> <input type="checkbox" bitCheckbox formControlName="limitCollectionCreationDeletion" />
</bit-form-control> </bit-form-control>
<button <button
type="submit" type="submit"

6
apps/web/src/app/admin-console/organizations/settings/account.component.ts
View File

@ -60,7 +60,7 @@ export class AccountComponent {
}); });
protected collectionManagementFormGroup = this.formBuilder.group({ protected collectionManagementFormGroup = this.formBuilder.group({
limitCollectionCdOwnerAdmin: [false], limitCollectionCreationDeletion: [false],
}); });
protected organizationId: string; protected organizationId: string;
@ -127,7 +127,7 @@ export class AccountComponent {
businessName: this.org.businessName, businessName: this.org.businessName,
}); });
this.collectionManagementFormGroup.patchValue({ this.collectionManagementFormGroup.patchValue({
limitCollectionCdOwnerAdmin: this.org.limitCollectionCdOwnerAdmin, limitCollectionCreationDeletion: this.org.limitCollectionCreationDeletion,
}); });
this.loading = false; this.loading = false;
@ -166,7 +166,7 @@ export class AccountComponent {
submitCollectionManagement = async () => { submitCollectionManagement = async () => {
const request = new OrganizationCollectionManagementUpdateRequest(); const request = new OrganizationCollectionManagementUpdateRequest();
request.limitCreateDeleteOwnerAdmin = request.limitCreateDeleteOwnerAdmin =
this.collectionManagementFormGroup.value.limitCollectionCdOwnerAdmin; this.collectionManagementFormGroup.value.limitCollectionCreationDeletion;
await this.organizationApiService.updateCollectionManagement(this.organizationId, request); await this.organizationApiService.updateCollectionManagement(this.organizationId, request);

2
apps/web/src/locales/en/messages.json
View File

@ -7132,7 +7132,7 @@
"collectionManagementDesc": { "collectionManagementDesc": {
"message": "Manage the collection behavior for the organization" "message": "Manage the collection behavior for the organization"
}, },
"limitCollectionCdOwnerAdminDesc": { "limitCollectionCreationDeletionDesc": {
"message": "Limit collection creation and deletion to owners and admins" "message": "Limit collection creation and deletion to owners and admins"
}, },
"collectionManagementUpdated": { "collectionManagementUpdated": {

4
libs/common/src/admin-console/models/data/organization.data.ts
View File

@ -49,7 +49,7 @@ export class OrganizationData {
familySponsorshipValidUntil?: Date; familySponsorshipValidUntil?: Date;
familySponsorshipToDelete?: boolean; familySponsorshipToDelete?: boolean;
accessSecretsManager: boolean; accessSecretsManager: boolean;
limitCollectionCdOwnerAdmin: boolean; limitCollectionCreationDeletion: boolean;
constructor( constructor(
response: ProfileOrganizationResponse, response: ProfileOrganizationResponse,
@ -101,7 +101,7 @@ export class OrganizationData {
this.familySponsorshipValidUntil = response.familySponsorshipValidUntil; this.familySponsorshipValidUntil = response.familySponsorshipValidUntil;
this.familySponsorshipToDelete = response.familySponsorshipToDelete; this.familySponsorshipToDelete = response.familySponsorshipToDelete;
this.accessSecretsManager = response.accessSecretsManager; this.accessSecretsManager = response.accessSecretsManager;
this.limitCollectionCdOwnerAdmin = response.limitCollectionCdOwnerAdmin; this.limitCollectionCreationDeletion = response.limitCollectionCreationDeletion;
this.isMember = options.isMember; this.isMember = options.isMember;
this.isProviderUser = options.isProviderUser; this.isProviderUser = options.isProviderUser;

4
libs/common/src/admin-console/models/domain/organization.ts
View File

@ -67,7 +67,7 @@ export class Organization {
/** /**
* Refers to the ability for an organization to limit collection creation and deletion to owners and admins only * Refers to the ability for an organization to limit collection creation and deletion to owners and admins only
*/ */
limitCollectionCdOwnerAdmin: boolean; limitCollectionCreationDeletion: boolean;
constructor(obj?: OrganizationData) { constructor(obj?: OrganizationData) {
if (obj == null) { if (obj == null) {
@ -119,7 +119,7 @@ export class Organization {
this.familySponsorshipValidUntil = obj.familySponsorshipValidUntil; this.familySponsorshipValidUntil = obj.familySponsorshipValidUntil;
this.familySponsorshipToDelete = obj.familySponsorshipToDelete; this.familySponsorshipToDelete = obj.familySponsorshipToDelete;
this.accessSecretsManager = obj.accessSecretsManager; this.accessSecretsManager = obj.accessSecretsManager;
this.limitCollectionCdOwnerAdmin = obj.limitCollectionCdOwnerAdmin; this.limitCollectionCreationDeletion = obj.limitCollectionCreationDeletion;
} }
get canAccess() { get canAccess() {

6
libs/common/src/admin-console/models/response/organization.response.ts
View File

@ -33,7 +33,7 @@ export class OrganizationResponse extends BaseResponse {
smServiceAccounts?: number; smServiceAccounts?: number;
maxAutoscaleSmSeats?: number; maxAutoscaleSmSeats?: number;
maxAutoscaleSmServiceAccounts?: number; maxAutoscaleSmServiceAccounts?: number;
limitCollectionCdOwnerAdmin: boolean; limitCollectionCreationDeletion: boolean;
constructor(response: any) { constructor(response: any) {
super(response); super(response);
@ -73,6 +73,8 @@ export class OrganizationResponse extends BaseResponse {
this.smServiceAccounts = this.getResponseProperty("SmServiceAccounts"); this.smServiceAccounts = this.getResponseProperty("SmServiceAccounts");
this.maxAutoscaleSmSeats = this.getResponseProperty("MaxAutoscaleSmSeats"); this.maxAutoscaleSmSeats = this.getResponseProperty("MaxAutoscaleSmSeats");
this.maxAutoscaleSmServiceAccounts = this.getResponseProperty("MaxAutoscaleSmServiceAccounts"); this.maxAutoscaleSmServiceAccounts = this.getResponseProperty("MaxAutoscaleSmServiceAccounts");
this.limitCollectionCdOwnerAdmin = this.getResponseProperty("LimitCollectionCdOwnerAdmin"); this.limitCollectionCreationDeletion = this.getResponseProperty(
"LimitCollectionCreationDeletion"
);
} }
} }

6
libs/common/src/admin-console/models/response/profile-organization.response.ts
View File

@ -48,7 +48,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
familySponsorshipValidUntil?: Date; familySponsorshipValidUntil?: Date;
familySponsorshipToDelete?: boolean; familySponsorshipToDelete?: boolean;
accessSecretsManager: boolean; accessSecretsManager: boolean;
limitCollectionCdOwnerAdmin: boolean; limitCollectionCreationDeletion: boolean;
constructor(response: any) { constructor(response: any) {
super(response); super(response);
@ -106,6 +106,8 @@ export class ProfileOrganizationResponse extends BaseResponse {
} }
this.familySponsorshipToDelete = this.getResponseProperty("FamilySponsorshipToDelete"); this.familySponsorshipToDelete = this.getResponseProperty("FamilySponsorshipToDelete");
this.accessSecretsManager = this.getResponseProperty("AccessSecretsManager"); this.accessSecretsManager = this.getResponseProperty("AccessSecretsManager");
this.limitCollectionCdOwnerAdmin = this.getResponseProperty("LimitCollectionCdOwnerAdmin"); this.limitCollectionCreationDeletion = this.getResponseProperty(
"LimitCollectionCreationDeletion"
);
} }
} }