From f38ccb32f800a3d098e6058dbc99c15dc4204059 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 18 Aug 2025 16:49:56 -0400 Subject: [PATCH] remove navigation/router logic and use new policy link --- .../no-data-modal.component.html | 14 ++++---- .../no-data-modal.component.ts | 33 ------------------- 2 files changed, 8 insertions(+), 39 deletions(-) diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.html index 7d67e804f47..e3fedc7e6bd 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.html +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.html @@ -30,18 +30,18 @@

- Remove individual vaults + Enforce organization data ownership (recommended)

Turn on the enforce organization data ownership policy - Remove individual vault policy - to get complete visibility of all organization vault data. This setting can be enabled at any time.

@@ -76,6 +76,8 @@
- +
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.ts index 0627596412b..4ea42b8acd5 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.ts +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/no-data-modal.component.ts @@ -1,6 +1,5 @@ import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog"; import { Component, Inject } from "@angular/core"; -import { Router } from "@angular/router"; import { ButtonModule } from "@bitwarden/components"; @@ -14,40 +13,8 @@ export class NoDataModalComponent { constructor( public dialogRef: DialogRef, @Inject(DIALOG_DATA) public data: any, - private router: Router, ) {} - async navigateToPolicy(): Promise { - // Check if we have the organizationId - if (!this.data.organizationId) { - return; - } - - // Close the modal first - this.dialogRef.close(true); - - // Add a small delay to ensure modal closes before navigation - await new Promise((resolve) => setTimeout(resolve, 100)); - - // Try to navigate using router first - try { - const result = await this.router.navigate([ - "/organizations", - this.data.organizationId, - "settings", - "policies", - ]); - - // If router navigation fails, use window.location as fallback - if (!result) { - window.location.href = `/#/organizations/${this.data.organizationId}/settings/policies`; - } - } catch { - // Fallback to window.location if router navigation throws an error - window.location.href = `/#/organizations/${this.data.organizationId}/settings/policies`; - } - } - async runReport(): Promise { // Close the modal first this.dialogRef.close(true);