From d8dbb15d24789aa7dd6fb669c4bb50ba632d4b3b Mon Sep 17 00:00:00 2001
From: Addison Beck <addisonbeck1@gmail.com>
Date: Fri, 13 May 2022 12:34:26 -0400
Subject: [PATCH] [fix] Organization switcher not loading on initial login
 (#2681)

---
 .../popup/vault/vault-select.component.html   |  2 +-
 .../src/popup/vault/vault-select.component.ts | 40 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/apps/browser/src/popup/vault/vault-select.component.html b/apps/browser/src/popup/vault/vault-select.component.html
index 1b389dcdc6..ec7cd9d706 100644
--- a/apps/browser/src/popup/vault/vault-select.component.html
+++ b/apps/browser/src/popup/vault/vault-select.component.html
@@ -1,4 +1,4 @@
-<div class="content org-filter-content" *ngIf="loaded && showOrganizations">
+<div class="content org-filter-content" *ngIf="loaded && show">
   <button
     class="org-filter"
     (click)="toggle()"
diff --git a/apps/browser/src/popup/vault/vault-select.component.ts b/apps/browser/src/popup/vault/vault-select.component.ts
index d323d2fe59..fd66e23ebd 100644
--- a/apps/browser/src/popup/vault/vault-select.component.ts
+++ b/apps/browser/src/popup/vault/vault-select.component.ts
@@ -1,8 +1,9 @@
 import { animate, state, style, transition, trigger } from "@angular/animations";
 import { ConnectedPosition } from "@angular/cdk/overlay";
-import { Component, EventEmitter, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, NgZone, OnInit, Output } from "@angular/core";
 
 import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model";
+import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { Organization } from "jslib-common/models/domain/organization";
 
@@ -37,7 +38,6 @@ export class VaultSelectComponent implements OnInit {
 
   isOpen = false;
   loaded = false;
-  showOrganizations = false;
   organizations: Organization[];
   vaultFilter: VaultFilter = new VaultFilter();
   vaultFilterDisplay = "";
@@ -51,20 +51,42 @@ export class VaultSelectComponent implements OnInit {
     },
   ];
 
-  constructor(private vaultFilterService: VaultFilterService, private i18nService: I18nService) {}
+  get show() {
+    return (
+      (this.organizations.length > 0 && !this.enforcePersonalOwnwership) ||
+      (this.organizations.length > 1 && this.enforcePersonalOwnwership)
+    );
+  }
+
+  constructor(
+    private vaultFilterService: VaultFilterService,
+    private i18nService: I18nService,
+    private ngZone: NgZone,
+    private broadcasterService: BroadcasterService
+  ) {}
 
   async ngOnInit() {
+    await this.load();
+    this.broadcasterService.subscribe(this.constructor.name, (message: any) => {
+      this.ngZone.run(async () => {
+        switch (message.command) {
+          case "syncCompleted":
+            await this.load();
+            break;
+          default:
+            break;
+        }
+      });
+    });
+  }
+
+  async load() {
     this.vaultFilter = this.vaultFilterService.getVaultFilter();
     this.organizations = await this.vaultFilterService.buildOrganizations();
     this.enforcePersonalOwnwership =
       await this.vaultFilterService.checkForPersonalOwnershipPolicy();
 
-    if (
-      (!this.enforcePersonalOwnwership && this.organizations.length > 0) ||
-      (this.enforcePersonalOwnwership && this.organizations.length > 1)
-    ) {
-      this.showOrganizations = true;
-
+    if (this.show) {
       if (this.enforcePersonalOwnwership && !this.vaultFilter.myVaultOnly) {
         this.vaultFilterService.setVaultFilter(this.organizations[0].id);
         this.vaultFilter.selectedOrganizationId = this.organizations[0].id;