hi
"], + ])("returns false when sender origin is %s", (_, senderOrigin) => { + const result = BrowserApi.senderIsInternal({ origin: senderOrigin }); + + expect(result).toBe(false); + }); + + it("returns false when sender is from a non-top-level frame", () => { + const result = BrowserApi.senderIsInternal({ origin: EXTENSION_ORIGIN, frameId: 5 }); + + expect(result).toBe(false); + }); + + it("returns true when sender origin matches and no frameId is present (popup)", () => { + const result = BrowserApi.senderIsInternal({ origin: EXTENSION_ORIGIN }); + + expect(result).toBe(true); + }); + + it("returns true when sender origin matches and frameId is 0 (top-level frame)", () => { + const result = BrowserApi.senderIsInternal({ origin: EXTENSION_ORIGIN, frameId: 0 }); + + expect(result).toBe(true); + }); + + it("calls logger.warning when sender has no origin", () => { + const logger = mock
@@ -61,79 +63,87 @@
{{ "noEventsInList" | i18n }}
-
- = {
[EventSystemUser.SCIM]: null, // SCIM acronym not able to be translated so just display SCIM
[EventSystemUser.DomainVerification]: "domainVerification",
[EventSystemUser.PublicApi]: "publicApi",
+ [EventSystemUser.BitwardenPortal]: "system",
};
-// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
-// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
+ changeDetection: ChangeDetectionStrategy.OnPush,
templateUrl: "events.component.html",
imports: [SharedModule, HeaderModule],
})
@@ -167,7 +167,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
}
}
await this.refreshEvents();
- this.loaded = true;
+ this.loaded.set(true);
}
protected requestEvents(startDate: string, endDate: string, continuationToken: string) {
diff --git a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts
index 46599d7da46..d96e2cbb6c0 100644
--- a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts
+++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts
@@ -1,3 +1,4 @@
+import { OverlayModule } from "@angular/cdk/overlay";
import { NgModule } from "@angular/core";
import { ReportsSharedModule } from "../../../dirt/reports";
@@ -8,7 +9,13 @@ import { OrganizationReportingRoutingModule } from "./organization-reporting-rou
import { ReportsHomeComponent } from "./reports-home.component";
@NgModule({
- imports: [SharedModule, ReportsSharedModule, OrganizationReportingRoutingModule, HeaderModule],
+ imports: [
+ SharedModule,
+ OverlayModule,
+ ReportsSharedModule,
+ OrganizationReportingRoutingModule,
+ HeaderModule,
+ ],
declarations: [ReportsHomeComponent],
})
export class OrganizationReportingModule {}
diff --git a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.html b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.html
index 59eac5b6300..9a931f66af9 100644
--- a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.html
+++ b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.html
@@ -8,9 +8,26 @@
+
+
diff --git a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts
index 6043bfd3193..503a4f88050 100644
--- a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts
+++ b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts
@@ -1,6 +1,18 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { Component, OnInit } from "@angular/core";
+import { Overlay, OverlayRef } from "@angular/cdk/overlay";
+import { TemplatePortal } from "@angular/cdk/portal";
+import {
+ AfterViewInit,
+ Component,
+ inject,
+ OnDestroy,
+ OnInit,
+ TemplateRef,
+ viewChild,
+ ViewContainerRef,
+} from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { ActivatedRoute, NavigationEnd, Router } from "@angular/router";
import { filter, map, Observable, startWith, concatMap, firstValueFrom } from "rxjs";
@@ -21,16 +33,30 @@ import { ReportVariant, reports, ReportType, ReportEntry } from "../../../dirt/r
templateUrl: "reports-home.component.html",
standalone: false,
})
-export class ReportsHomeComponent implements OnInit {
+export class ReportsHomeComponent implements OnInit, AfterViewInit, OnDestroy {
reports$: Observable;
homepage$: Observable;
+ private readonly backButtonTemplate =
+ viewChild.required>("backButtonTemplate");
+
+ private overlayRef: OverlayRef | null = null;
+ private overlay = inject(Overlay);
+ private viewContainerRef = inject(ViewContainerRef);
+
constructor(
private route: ActivatedRoute,
private organizationService: OrganizationService,
private accountService: AccountService,
private router: Router,
- ) {}
+ ) {
+ this.router.events
+ .pipe(
+ takeUntilDestroyed(),
+ filter((event) => event instanceof NavigationEnd),
+ )
+ .subscribe(() => this.updateOverlay());
+ }
async ngOnInit() {
this.homepage$ = this.router.events.pipe(
@@ -51,6 +77,46 @@ export class ReportsHomeComponent implements OnInit {
);
}
+ ngAfterViewInit(): void {
+ this.updateOverlay();
+ }
+
+ ngOnDestroy(): void {
+ this.overlayRef?.dispose();
+ }
+
+ returnFocusToPage(event: Event): void {
+ if ((event as KeyboardEvent).shiftKey) {
+ return; // Allow natural Shift+Tab behavior
+ }
+ event.preventDefault();
+ const firstFocusable = document.querySelector(
+ "[cdktrapfocus] a:not([tabindex='-1'])",
+ ) as HTMLElement;
+ firstFocusable?.focus();
+ }
+
+ focusOverlayButton(event: Event): void {
+ if ((event as KeyboardEvent).shiftKey) {
+ return; // Allow natural Shift+Tab behavior
+ }
+ event.preventDefault();
+ const button = this.overlayRef?.overlayElement?.querySelector("a") as HTMLElement;
+ button?.focus();
+ }
+
+ private updateOverlay(): void {
+ if (this.isReportsHomepageRouteUrl(this.router.url)) {
+ this.overlayRef?.dispose();
+ this.overlayRef = null;
+ } else if (!this.overlayRef) {
+ this.overlayRef = this.overlay.create({
+ positionStrategy: this.overlay.position().global().bottom("20px").right("32px"),
+ });
+ this.overlayRef.attach(new TemplatePortal(this.backButtonTemplate(), this.viewContainerRef));
+ }
+ }
+
private buildReports(productType: ProductTierType): ReportEntry[] {
const reportRequiresUpgrade =
productType == ProductTierType.Free ? ReportVariant.RequiresUpgrade : ReportVariant.Enabled;
diff --git a/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts b/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts
index 27a6226f964..13467e222d2 100644
--- a/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts
@@ -4,9 +4,9 @@ import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/pre
import { ItemModule } from "@bitwarden/components";
import { DangerZoneComponent } from "../../../auth/settings/account/danger-zone.component";
+import { AccountFingerprintComponent } from "../../../key-management/account-fingerprint/account-fingerprint.component";
import { HeaderModule } from "../../../layouts/header/header.module";
import { SharedModule } from "../../../shared";
-import { AccountFingerprintComponent } from "../../../shared/components/account-fingerprint/account-fingerprint.component";
import { AccountComponent } from "./account.component";
import { OrganizationSettingsRoutingModule } from "./organization-settings-routing.module";
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
index 3e23eff13a9..f5c6939c284 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
@@ -25,7 +25,7 @@ const render: Story["render"] = (args) => ({
...args,
},
template: `
-
+
Access selector
diff --git a/apps/web/src/app/auth/organization-invite/accept-organization.component.html b/apps/web/src/app/auth/organization-invite/accept-organization.component.html
index cc08b840c30..63bfbf3ef0b 100644
--- a/apps/web/src/app/auth/organization-invite/accept-organization.component.html
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.component.html
@@ -2,12 +2,11 @@
-
+ @if (!displayedEvents || !displayedEvents.length) {
+
-
+
+}
diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
index 62f6539cc16..01d6515c486 100644
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
@@ -1,6 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
-import { Component, OnDestroy, OnInit } from "@angular/core";
+import { Component, OnDestroy, OnInit, ChangeDetectionStrategy } from "@angular/core";
import { ActivatedRoute } from "@angular/router";
import { concatMap, firstValueFrom, lastValueFrom, map, of, switchMap, takeUntil, tap } from "rxjs";
@@ -44,11 +44,11 @@ const EVENT_SYSTEM_USER_TO_TRANSLATION: Record{{ "noEventsInList" | i18n }}
+ } -- {{ "upgradeEventLogTitleMessage" | i18n }} -
-- {{ "upgradeForFullEventsMessage" | i18n }} -
- -
-
- {{ "loading" | i18n }}
+
-
- {{ "loading" | i18n }}
+
-
+
{{ "pickAnAvatarColor" | i18n }}
@@ -31,10 +31,11 @@ class="tw-relative tw-flex tw-size-24 tw-cursor-pointer tw-place-content-center tw-rounded-full tw-border tw-border-solid tw-border-secondary-600 tw-outline tw-outline-0 tw-outline-offset-1 hover:tw-outline-1 hover:tw-outline-primary-300 focus:tw-outline-2 focus:tw-outline-primary-600" [style.background-color]="customColor$ | async" > - + class="!tw-text-muted tw-m-auto tw-text-3xl" + > - - {{ "loading" | i18n }} +