From 2e0defae427381b22a889d427b0acf785284678f Mon Sep 17 00:00:00 2001
From: Thomas Avery <tavery@bitwarden.com>
Date: Fri, 19 Jul 2024 11:35:52 -0500
Subject: [PATCH 1/3] fix org id not being updated in new-menu on org swaps

---
 .../shared/new-menu.component.ts              | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
index d2533d8dbf74..d344ded3db6a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { Subject, takeUntil, concatMap, map } from "rxjs";
+import { Subject, takeUntil, concatMap, map, distinctUntilChanged } from "rxjs";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { DialogService } from "@bitwarden/components";
@@ -34,18 +34,19 @@ export class NewMenuComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit() {
-    this.route.params
+    const orgId$ = this.route.params.pipe(
+      map((p) => p.organizationId),
+      distinctUntilChanged(),
+    );
+
+    orgId$
       .pipe(
-        concatMap((params) =>
-          this.organizationService
-            .get$(params.organizationId)
-            .pipe(map((organization) => ({ params, organization }))),
-        ),
+        concatMap(async (orgId) => await this.organizationService.get(orgId)),
         takeUntil(this.destroy$),
       )
-      .subscribe((mapResult) => {
-        this.organizationId = mapResult?.params?.organizationId;
-        this.organizationEnabled = mapResult?.organization?.enabled;
+      .subscribe((org) => {
+        this.organizationId = org.id;
+        this.organizationEnabled = org.enabled;
       });
   }
 

From d16623770a08076685e8daf69a4323354f0c0dd7 Mon Sep 17 00:00:00 2001
From: Thomas Avery <tavery@bitwarden.com>
Date: Fri, 19 Jul 2024 14:19:02 -0500
Subject: [PATCH 2/3] fix org suspended component

---
 .../src/app/secrets-manager/shared/org-suspended.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
index 1683d4479061..e0293ba53168 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
@@ -16,7 +16,7 @@ export class OrgSuspendedComponent {
 
   protected NoAccess: Icon = Icons.NoAccess;
   protected organizationName$ = this.route.params.pipe(
-    concatMap((params) => this.organizationService.get$(params.organizationId)),
+    concatMap(async (params) => await this.organizationService.get(params.organizationId)),
     map((org) => org?.name),
   );
 }

From bcd45feea3bc0360bf8bf8554c457f49906e858a Mon Sep 17 00:00:00 2001
From: Thomas Avery <tavery@bitwarden.com>
Date: Fri, 19 Jul 2024 14:26:55 -0500
Subject: [PATCH 3/3] cleanup fix

---
 .../app/secrets-manager/shared/new-menu.component.ts  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
index d344ded3db6a..ce499ee9bda9 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { Subject, takeUntil, concatMap, map, distinctUntilChanged } from "rxjs";
+import { Subject, takeUntil, concatMap } from "rxjs";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { DialogService } from "@bitwarden/components";
@@ -34,14 +34,9 @@ export class NewMenuComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit() {
-    const orgId$ = this.route.params.pipe(
-      map((p) => p.organizationId),
-      distinctUntilChanged(),
-    );
-
-    orgId$
+    this.route.params
       .pipe(
-        concatMap(async (orgId) => await this.organizationService.get(orgId)),
+        concatMap(async (params) => await this.organizationService.get(params.organizationId)),
         takeUntil(this.destroy$),
       )
       .subscribe((org) => {