Merge branch 'main' into autofill/pm-6426-create-alarms-manager-and-update-usage-of-long-lived-timeouts-rework

apps/browser/src/popup/app-routing.module.ts

@@ -40,6 +40,7 @@ import { AboutPageV2Component } from "../tools/popup/settings/about-page/about-p
 import { AboutPageComponent } from "../tools/popup/settings/about-page/about-page.component";
 import { MoreFromBitwardenPageV2Component } from "../tools/popup/settings/about-page/more-from-bitwarden-page-v2.component";
 import { MoreFromBitwardenPageComponent } from "../tools/popup/settings/about-page/more-from-bitwarden-page.component";
+import { ExportBrowserV2Component } from "../tools/popup/settings/export/export-browser-v2.component";
 import { ExportBrowserComponent } from "../tools/popup/settings/export/export-browser.component";
 import { ImportBrowserV2Component } from "../tools/popup/settings/import/import-browser-v2.component";
 import { ImportBrowserComponent } from "../tools/popup/settings/import/import-browser.component";
@@ -243,12 +244,11 @@ const routes: Routes = [
     canActivate: [AuthGuard],
     data: { state: "import" },
   }),
-  {
+  ...extensionRefreshSwap(ExportBrowserComponent, ExportBrowserV2Component, {
     path: "export",
-    component: ExportBrowserComponent,
     canActivate: [AuthGuard],
     data: { state: "export" },
-  },
+  }),
   {
     path: "autofill",
     component: AutofillComponent,

apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html

@@ -0,0 +1,27 @@
+<popup-page>
+  <popup-header slot="header" [pageTitle]="'exportVault' | i18n" showBackButton>
+    <ng-container slot="end">
+      <app-pop-out></app-pop-out>
+    </ng-container>
+  </popup-header>
+
+  <tools-export
+    (formDisabled)="this.disabled = $event"
+    (formLoading)="this.loading = $event"
+    (onSuccessfulExport)="this.onSuccessfulExport($event)"
+  ></tools-export>
+
+  <popup-footer slot="footer">
+    <button
+      [disabled]="disabled"
+      [loading]="loading"
+      form="export_form_exportForm"
+      bitButton
+      type="submit"
+      bitFormButton
+      buttonType="primary"
+    >
+      {{ "exportVault" | i18n }}
+    </button>
+  </popup-footer>
+</popup-page>

apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts

@@ -0,0 +1,40 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+import { Router, RouterLink } from "@angular/router";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
+import { ExportComponent } from "@bitwarden/vault-export-ui";
+
+import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
+import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-footer.component";
+import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
+import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
+
+@Component({
+  templateUrl: "export-browser-v2.component.html",
+  standalone: true,
+  imports: [
+    CommonModule,
+    RouterLink,
+    JslibModule,
+    DialogModule,
+    AsyncActionsModule,
+    ButtonModule,
+    ExportComponent,
+    PopupPageComponent,
+    PopupFooterComponent,
+    PopupHeaderComponent,
+    PopOutComponent,
+  ],
+})
+export class ExportBrowserV2Component {
+  protected disabled = false;
+  protected loading = false;
+
+  constructor(private router: Router) {}
+
+  protected async onSuccessfulExport(organizationId: string): Promise<void> {
+    await this.router.navigate(["/vault-settings"]);
+  }
+}