Merge branch 'main' into autofill/pm-5189-fix-issues-present-with-inline-menu-rendering-in-iframes

apps/desktop/src/auth/login/login.component.ts

@@ -3,7 +3,6 @@ import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
 
-import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components/environment-selector.component";
 import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component";
 import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
@@ -37,8 +36,6 @@ const BroadcasterSubscriptionId = "LoginComponent";
 export class LoginComponent extends BaseLoginComponent implements OnDestroy {
   @ViewChild("environment", { read: ViewContainerRef, static: true })
   environmentModal: ViewContainerRef;
-  @ViewChild("environmentSelector", { read: ViewContainerRef, static: true })
-  environmentSelector: EnvironmentSelectorComponent;
 
   protected componentDestroyed$: Subject<void> = new Subject();
   webVaultHostname = "";

apps/web/src/app/admin-console/organizations/core/views/organization-user.view.ts

@@ -26,6 +26,10 @@ export class OrganizationUserView {
   twoFactorEnabled: boolean;
   usesKeyConnector: boolean;
   hasMasterPassword: boolean;
+  /**
+   * True if this organizaztion user has been granted access to Secrets Manager, false otherwise.
+   */
+  accessSecretsManager: boolean;
 
   collections: CollectionAccessSelectionView[] = [];
   groups: string[] = [];

apps/web/src/app/admin-console/organizations/members/people.component.ts

@@ -571,7 +571,8 @@ export class PeopleComponent
   }
 
   async bulkEnableSM() {
-    const users = this.getCheckedUsers();
+    const users = this.getCheckedUsers().filter((ou) => !ou.accessSecretsManager);
+
     if (users.length === 0) {
       this.platformUtilsService.showToast(
         "error",
@@ -588,6 +589,7 @@ export class PeopleComponent
 
     await lastValueFrom(dialogRef.closed);
     this.selectAll(false);
+    await this.load();
   }
 
   async events(user: OrganizationUserView) {

apps/web/src/app/billing/organizations/organization-billing-tab.component.ts

@@ -1,31 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { map, Observable, switchMap } from "rxjs";
-
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-
-@Component({
-  templateUrl: "organization-billing-tab.component.html",
-})
-export class OrganizationBillingTabComponent implements OnInit {
-  showPaymentAndHistory$: Observable<boolean>;
-
-  constructor(
-    private route: ActivatedRoute,
-    private organizationService: OrganizationService,
-    private platformUtilsService: PlatformUtilsService,
-  ) {}
-
-  ngOnInit() {
-    this.showPaymentAndHistory$ = this.route.params.pipe(
-      switchMap((params) => this.organizationService.get$(params.organizationId)),
-      map(
-        (org) =>
-          !this.platformUtilsService.isSelfHost() &&
-          org.canViewBillingHistory &&
-          org.canEditPaymentMethods,
-      ),
-    );
-  }
-}

apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts

@@ -41,7 +41,7 @@ export class BulkMoveDialogComponent implements OnInit {
   cipherIds: string[] = [];
 
   formGroup = this.formBuilder.group({
-    folderId: ["", [Validators.required]],
+    folderId: ["", [Validators.nullValidator]],
   });
   folders$: Observable<FolderView[]>;
 

libs/angular/src/auth/components/environment-selector.component.html

@@ -1,79 +1,81 @@
-<div class="environment-selector-btn">
+<ng-container
-  {{ "loggingInOn" | i18n }}:
+  *ngIf="{
-  <button
+    selectedRegion: selectedRegion$ | async
-    type="button"
+  } as data"
-    (click)="toggle(null)"
-    cdkOverlayOrigin
-    #trigger="cdkOverlayOrigin"
-    aria-haspopup="dialog"
-    aria-controls="cdk-overlay-container"
-  >
-    <span class="text-primary">
-      <ng-container *ngIf="selectedRegion$ | async as selectedRegion; else fallback">
-        {{ selectedRegion.domain }}
-      </ng-container>
-      <ng-template #fallback>
-        {{ "selfHostedServer" | i18n }}
-      </ng-template>
-    </span>
-    <i class="bwi bwi-fw bwi-sm bwi-angle-down" aria-hidden="true"></i>
-  </button>
-</div>
-
-<ng-template
-  cdkConnectedOverlay
-  [cdkConnectedOverlayOrigin]="trigger"
-  [cdkConnectedOverlayOpen]="isOpen"
-  [cdkConnectedOverlayPositions]="overlayPosition"
-  [cdkConnectedOverlayHasBackdrop]="true"
-  [cdkConnectedOverlayBackdropClass]="'cdk-overlay-transparent-backdrop'"
-  (backdropClick)="isOpen = false"
-  (detach)="close()"
 >
-  <div class="box-content">
+  <div class="environment-selector-btn">
-    <div
+    {{ "loggingInOn" | i18n }}:
-      class="environment-selector-dialog"
+    <button
-      [@transformPanel]="'open'"
+      type="button"
-      cdkTrapFocus
+      (click)="toggle(null)"
-      cdkTrapFocusAutoCapture
+      cdkOverlayOrigin
-      role="dialog"
+      #trigger="cdkOverlayOrigin"
-      aria-modal="true"
+      aria-haspopup="dialog"
+      aria-controls="cdk-overlay-container"
     >
-      <ng-container *ngFor="let region of availableRegions">
+      <span class="text-primary">
+        <ng-container *ngIf="data.selectedRegion; else fallback">
+          {{ data.selectedRegion.domain }}
+        </ng-container>
+        <ng-template #fallback>
+          {{ "selfHostedServer" | i18n }}
+        </ng-template>
+      </span>
+      <i class="bwi bwi-fw bwi-sm bwi-angle-down" aria-hidden="true"></i>
+    </button>
+  </div>
+
+  <ng-template
+    cdkConnectedOverlay
+    [cdkConnectedOverlayOrigin]="trigger"
+    [cdkConnectedOverlayOpen]="isOpen"
+    [cdkConnectedOverlayPositions]="overlayPosition"
+    [cdkConnectedOverlayHasBackdrop]="true"
+    [cdkConnectedOverlayBackdropClass]="'cdk-overlay-transparent-backdrop'"
+    (backdropClick)="isOpen = false"
+    (detach)="close()"
+  >
+    <div class="box-content">
+      <div
+        class="environment-selector-dialog"
+        [@transformPanel]="'open'"
+        cdkTrapFocus
+        cdkTrapFocusAutoCapture
+        role="dialog"
+        aria-modal="true"
+      >
+        <ng-container *ngFor="let region of availableRegions">
+          <button
+            type="button"
+            class="environment-selector-dialog-item"
+            (click)="toggle(region.key)"
+            [attr.aria-pressed]="data.selectedRegion === region ? 'true' : 'false'"
+          >
+            <i
+              class="bwi bwi-fw bwi-sm bwi-check"
+              style="padding-bottom: 1px"
+              aria-hidden="true"
+              [style.visibility]="data.selectedRegion === region ? 'visible' : 'hidden'"
+            ></i>
+            <span>{{ region.domain }}</span>
+          </button>
+          <br />
+        </ng-container>
         <button
           type="button"
           class="environment-selector-dialog-item"
-          (click)="toggle(region.key)"
+          (click)="toggle(ServerEnvironmentType.SelfHosted)"
-          [attr.aria-pressed]="selectedEnvironment === region.key ? 'true' : 'false'"
+          [attr.aria-pressed]="data.selectedRegion ? 'false' : 'true'"
         >
           <i
             class="bwi bwi-fw bwi-sm bwi-check"
             style="padding-bottom: 1px"
             aria-hidden="true"
-            [style.visibility]="selectedEnvironment === region.key ? 'visible' : 'hidden'"
+            [style.visibility]="data.selectedRegion ? 'hidden' : 'visible'"
           ></i>
-          <span>{{ region.domain }}</span>
+          <span>{{ "selfHostedServer" | i18n }}</span>
         </button>
-        <br />
+      </div>
-      </ng-container>
-      <button
-        type="button"
-        class="environment-selector-dialog-item"
-        (click)="toggle(ServerEnvironmentType.SelfHosted)"
-        [attr.aria-pressed]="
-          selectedEnvironment === ServerEnvironmentType.SelfHosted ? 'true' : 'false'
-        "
-      >
-        <i
-          class="bwi bwi-fw bwi-sm bwi-check"
-          style="padding-bottom: 1px"
-          aria-hidden="true"
-          [style.visibility]="
-            selectedEnvironment === ServerEnvironmentType.SelfHosted ? 'visible' : 'hidden'
-          "
-        ></i>
-        <span>{{ "selfHostedServer" | i18n }}</span>
-      </button>
     </div>
-  </div>
+  </ng-template>
-</ng-template>
+</ng-container>

libs/angular/src/auth/components/environment-selector.component.ts

@@ -36,11 +36,9 @@ import {
 })
 export class EnvironmentSelectorComponent {
   @Output() onOpenSelfHostedSettings = new EventEmitter();
-  isOpen = false;
+  protected isOpen = false;
-  showingModal = false;
+  protected ServerEnvironmentType = Region;
-  selectedEnvironment: Region;
+  protected overlayPosition: ConnectedPosition[] = [
-  ServerEnvironmentType = Region;
-  overlayPosition: ConnectedPosition[] = [
     {
       originX: "start",
       originY: "bottom",

libs/components/src/menu/menu-divider.component.html

@@ -1,4 +1,5 @@
 <div
   class="tw-my-2 tw-border-0 tw-border-t tw-border-solid tw-border-t-secondary-500"
   role="separator"
+  aria-hidden="true"
 ></div>

libs/components/src/menu/menu-trigger-for.directive.ts

@@ -88,6 +88,7 @@ export class MenuTriggerForDirective implements OnDestroy {
       }
       this.destroyMenu();
     });
+    this.menu.keyManager.setFirstItemActive();
     this.keyDownEventsSub =
       this.menu.keyManager &&
       this.overlayRef