diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
index be9a85ffe4..d557073895 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -55,10 +55,7 @@
;
organizationIsUnmanaged$: Observable;
- protected isBreadcrumbEventLogsEnabled$: Observable;
protected showSponsoredFamiliesDropdown$: Observable;
- protected canShowPoliciesTab$: Observable;
protected paymentDetailsPageData$: Observable<{
route: string;
@@ -94,9 +92,6 @@ export class OrganizationLayoutComponent implements OnInit {
) {}
async ngOnInit() {
- this.isBreadcrumbEventLogsEnabled$ = this.configService.getFeatureFlag$(
- FeatureFlag.PM12276_BreadcrumbEventLogs,
- );
document.body.classList.remove("layout_frontend");
this.organization$ = this.route.params.pipe(
@@ -141,18 +136,6 @@ export class OrganizationLayoutComponent implements OnInit {
this.integrationPageEnabled$ = this.organization$.pipe(map((org) => org.canAccessIntegrations));
- this.canShowPoliciesTab$ = this.organization$.pipe(
- switchMap((organization) =>
- this.organizationBillingService
- .isBreadcrumbingPoliciesEnabled$(organization)
- .pipe(
- map(
- (isBreadcrumbingEnabled) => isBreadcrumbingEnabled || organization.canManagePolicies,
- ),
- ),
- ),
- );
-
this.paymentDetailsPageData$ = this.configService
.getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
.pipe(
diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.html b/apps/web/src/app/admin-console/organizations/manage/events.component.html
index 02be3476ad..344e8afef5 100644
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.html
@@ -1,4 +1,4 @@
-@let usePlaceHolderEvents = !organization?.useEvents && (isBreadcrumbEventLogsEnabled$ | async);
+@let usePlaceHolderEvents = !organization?.useEvents;
();
readonly ProductTierType = ProductTierType;
- protected isBreadcrumbEventLogsEnabled$ = this.configService.getFeatureFlag$(
- FeatureFlag.PM12276_BreadcrumbEventLogs,
- );
-
constructor(
private apiService: ApiService,
private route: ActivatedRoute,
diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.component.html b/apps/web/src/app/admin-console/organizations/policies/policies.component.html
index 8eb204b65a..843d1d18d5 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.html
@@ -1,20 +1,7 @@
-
- @let organization = organization$ | async;
- @if (isBreadcrumbingEnabled$ | async) {
-
- }
-
+
+ @let organization = organization$ | async;
@if (loading) {
;
+ organization$: Observable;
private orgPolicies: PolicyResponse[];
protected policiesEnabledMap: Map = new Map();
- protected isBreadcrumbingEnabled$: Observable;
constructor(
private route: ActivatedRoute,
- private accountService: AccountService,
private organizationService: OrganizationService,
+ private accountService: AccountService,
private policyApiService: PolicyApiServiceAbstraction,
private policyListService: PolicyListService,
- private organizationBillingService: OrganizationBillingServiceAbstraction,
private dialogService: DialogService,
protected configService: ConfigService,
) {}
@@ -62,9 +53,11 @@ export class PoliciesComponent implements OnInit {
const userId = await firstValueFrom(
this.accountService.activeAccount$.pipe(map((a) => a?.id)),
);
+
this.organization$ = this.organizationService
.organizations$(userId)
.pipe(getOrganizationById(this.organizationId));
+
this.policies = this.policyListService.getPolicies();
await this.load();
@@ -100,11 +93,7 @@ export class PoliciesComponent implements OnInit {
this.orgPolicies.forEach((op) => {
this.policiesEnabledMap.set(op.type, op.enabled);
});
- this.isBreadcrumbingEnabled$ = this.organization$.pipe(
- switchMap((organization) =>
- this.organizationBillingService.isBreadcrumbingPoliciesEnabled$(organization),
- ),
- );
+
this.loading = false;
}
@@ -117,34 +106,8 @@ export class PoliciesComponent implements OnInit {
});
const result = await lastValueFrom(dialogRef.closed);
- switch (result) {
- case PolicyEditDialogResult.Saved:
- await this.load();
- break;
- case PolicyEditDialogResult.UpgradePlan:
- await this.changePlan(await firstValueFrom(this.organization$));
- break;
+ if (result === PolicyEditDialogResult.Saved) {
+ await this.load();
}
}
-
- protected readonly CollectionDialogTabType = CollectionDialogTabType;
- protected readonly All = All;
-
- protected async changePlan(organization: Organization) {
- const reference = openChangePlanDialog(this.dialogService, {
- data: {
- organizationId: organization.id,
- subscription: null,
- productTierType: organization.productTierType,
- },
- });
-
- const result = await lastValueFrom(reference.closed);
-
- if (result === ChangePlanDialogResultType.Closed) {
- return;
- }
-
- await this.load();
- }
}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
index 90cfb52e5a..6573801ad2 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
@@ -1,17 +1,5 @@