From 49924512b87098077440bcd702bd11ef318d19de Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Mon, 31 Mar 2025 15:55:20 +0200
Subject: [PATCH] [PM-19656] Fix zip option not being set correctly after
 navigating to Admin Console (#14058)

* Simplify if to reduce nesting

* Start subscribing to changes of the vaultSelector as soon as possible during ngOnInit

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .../src/components/export.component.ts        | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
index aecc6dcc33..c8efe09376 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
@@ -225,6 +225,20 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
       ),
     );
 
+    combineLatest([
+      this.exportForm.controls.vaultSelector.valueChanges,
+      this.isExportAttachmentsEnabled$,
+    ])
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(([value, isExportAttachmentsEnabled]) => {
+        this.organizationId = value !== "myVault" ? value : undefined;
+
+        this.formatOptions = this.formatOptions.filter((option) => option.value !== "zip");
+        if (value === "myVault" && isExportAttachmentsEnabled) {
+          this.formatOptions.push({ name: ".zip (with attachments)", value: "zip" });
+        }
+      });
+
     merge(
       this.exportForm.get("format").valueChanges,
       this.exportForm.get("fileEncryptionType").valueChanges,
@@ -322,22 +336,6 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
         takeUntil(this.destroy$),
       )
       .subscribe();
-
-    combineLatest([
-      this.exportForm.controls.vaultSelector.valueChanges,
-      this.isExportAttachmentsEnabled$,
-    ])
-      .pipe(takeUntil(this.destroy$))
-      .subscribe(([value, isExportAttachmentsEnabled]) => {
-        this.organizationId = value !== "myVault" ? value : undefined;
-        if (value === "myVault" && isExportAttachmentsEnabled) {
-          if (!this.formatOptions.some((option) => option.value === "zip")) {
-            this.formatOptions.push({ name: ".zip (with attachments)", value: "zip" });
-          }
-        } else {
-          this.formatOptions = this.formatOptions.filter((option) => option.value !== "zip");
-        }
-      });
   }
 
   ngAfterViewInit(): void {