bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 00:03:56 +00:00
Code Issues Releases Wiki Activity

[PM-20633] rename personal ownership (#15228)

Browse Source 
* sensible renames

* renames

* clean up comments
This commit is contained in:
Brandon Treston
2025-06-24 09:31:40 -04:00
committed by GitHub
parent fa23a905e0
commit 1c237a3753
37 changed files with 170 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/browser/src/autofill/background/notification.background.ts
View File

@@ -1056,7 +1056,7 @@ export default class NotificationBackground {
this.accountService.activeAccount$.pipe(
getUserId,
switchMap((userId) =>
this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
),
),
);

6
apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
View File

@@ -228,10 +228,10 @@ describe("VaultPopupListFiltersService", () => {
});
});
describe("PersonalOwnership policy", () => {
it('calls policyAppliesToUser$ with "PersonalOwnership"', () => {
describe("OrganizationDataOwnership policy", () => {
it('calls policyAppliesToUser$ with "OrganizationDataOwnership"', () => {
expect(policyService.policyAppliesToUser$).toHaveBeenCalledWith(
PolicyType.PersonalOwnership,
PolicyType.OrganizationDataOwnership,
"userId",
);
});

16
apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
View File

@@ -293,30 +293,30 @@ export class VaultPopupListFiltersService {
switchMap((userId) =>
combineLatest([
this.organizationService.memberOrganizations$(userId),
this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
]),
),
map(([orgs, personalOwnershipApplies]): [Organization[], boolean] => [
map(([orgs, organizationDataOwnership]): [Organization[], boolean] => [
orgs.sort(Utils.getSortFunction(this.i18nService, "name")),
personalOwnershipApplies,
organizationDataOwnership,
]),
map(([orgs, personalOwnershipApplies]) => {
map(([orgs, organizationDataOwnership]) => {
// When there are no organizations return an empty array,
// resulting in the org filter being hidden
if (!orgs.length) {
return [];
}
// When there is only one organization and personal ownership policy applies,
// When there is only one organization and organization data ownership policy applies,
// return an empty array, resulting in the org filter being hidden
if (orgs.length === 1 && personalOwnershipApplies) {
if (orgs.length === 1 && organizationDataOwnership) {
return [];
}
const myVaultOrg: ChipSelectOption<Organization>[] = [];
// Only add "My vault" if personal ownership policy does not apply
if (!personalOwnershipApplies) {
// Only add "My vault" if organization data ownership policy does not apply
if (!organizationDataOwnership) {
myVaultOrg.push({
value: { id: MY_VAULT_ID } as Organization,
label: this.i18nService.t("myVault"),