Skip to content

Commit a10b953

Browse files
changes to sponsorship is showing in individual vault (#14627)
1 parent 355bddc commit a10b953

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

apps/web/src/app/billing/settings/sponsored-families.component.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,15 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
112112
});
113113
}
114114
});
115-
116115
this.anyOrgsAvailable$ = this.availableSponsorshipOrgs$.pipe(map((orgs) => orgs.length > 0));
117116

118117
this.activeSponsorshipOrgs$ = this.organizationService
119118
.organizations$(userId)
120-
.pipe(map((orgs) => orgs.filter((o) => o.familySponsorshipFriendlyName !== null)));
121-
119+
.pipe(
120+
map((orgs) =>
121+
orgs.filter((o) => o.familySponsorshipFriendlyName !== null && !o.isAdminInitiated),
122+
),
123+
);
122124
this.anyActiveSponsorships$ = this.activeSponsorshipOrgs$.pipe(map((orgs) => orgs.length > 0));
123125

124126
this.loading = false;

libs/common/src/admin-console/models/data/organization.data.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ describe("ORGANIZATIONS state", () => {
5959
userIsManagedByOrganization: false,
6060
useRiskInsights: false,
6161
useAdminSponsoredFamilies: false,
62+
isAdminInitiated: false,
6263
},
6364
};
6465
const result = sut.deserializer(JSON.parse(JSON.stringify(expectedResult)));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export class OrganizationData {
6161
userIsManagedByOrganization: boolean;
6262
useRiskInsights: boolean;
6363
useAdminSponsoredFamilies: boolean;
64+
isAdminInitiated: boolean;
6465

6566
constructor(
6667
response?: ProfileOrganizationResponse,
@@ -124,6 +125,7 @@ export class OrganizationData {
124125
this.userIsManagedByOrganization = response.userIsManagedByOrganization;
125126
this.useRiskInsights = response.useRiskInsights;
126127
this.useAdminSponsoredFamilies = response.useAdminSponsoredFamilies;
128+
this.isAdminInitiated = response.isAdminInitiated;
127129

128130
this.isMember = options.isMember;
129131
this.isProviderUser = options.isProviderUser;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ export class Organization {
9191
userIsManagedByOrganization: boolean;
9292
useRiskInsights: boolean;
9393
useAdminSponsoredFamilies: boolean;
94+
isAdminInitiated: boolean;
9495

9596
constructor(obj?: OrganizationData) {
9697
if (obj == null) {
@@ -150,6 +151,7 @@ export class Organization {
150151
this.userIsManagedByOrganization = obj.userIsManagedByOrganization;
151152
this.useRiskInsights = obj.useRiskInsights;
152153
this.useAdminSponsoredFamilies = obj.useAdminSponsoredFamilies;
154+
this.isAdminInitiated = obj.isAdminInitiated;
153155
}
154156

155157
get canAccess() {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
5656
userIsManagedByOrganization: boolean;
5757
useRiskInsights: boolean;
5858
useAdminSponsoredFamilies: boolean;
59+
isAdminInitiated: boolean;
5960

6061
constructor(response: any) {
6162
super(response);
@@ -123,5 +124,6 @@ export class ProfileOrganizationResponse extends BaseResponse {
123124
this.userIsManagedByOrganization = this.getResponseProperty("UserIsManagedByOrganization");
124125
this.useRiskInsights = this.getResponseProperty("UseRiskInsights");
125126
this.useAdminSponsoredFamilies = this.getResponseProperty("UseAdminSponsoredFamilies");
127+
this.isAdminInitiated = this.getResponseProperty("IsAdminInitiated");
126128
}
127129
}

0 commit comments

Comments
 (0)