1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 05:43:41 +00:00

[PM-15920] Remove v1 export page (#12349)

* Remove v1 export page and extension refresh conditional routing

* Remove unused RouterLink import

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
Daniel James Smith
2024-12-16 18:32:06 +01:00
committed by GitHub
parent 6132df395c
commit d317051d45
4 changed files with 4 additions and 71 deletions

View File

@@ -95,7 +95,6 @@ import { AboutPageComponent } from "../tools/popup/settings/about-page/about-pag
import { MoreFromBitwardenPageV2Component } from "../tools/popup/settings/about-page/more-from-bitwarden-page-v2.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 { MoreFromBitwardenPageComponent } from "../tools/popup/settings/about-page/more-from-bitwarden-page.component";
import { ExportBrowserV2Component } from "../tools/popup/settings/export/export-browser-v2.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 { ImportBrowserV2Component } from "../tools/popup/settings/import/import-browser-v2.component";
import { ImportBrowserComponent } from "../tools/popup/settings/import/import-browser.component"; import { ImportBrowserComponent } from "../tools/popup/settings/import/import-browser.component";
import { SettingsV2Component } from "../tools/popup/settings/settings-v2.component"; import { SettingsV2Component } from "../tools/popup/settings/settings-v2.component";
@@ -355,11 +354,12 @@ const routes: Routes = [
canActivate: [authGuard], canActivate: [authGuard],
data: { elevation: 1 } satisfies RouteDataProperties, data: { elevation: 1 } satisfies RouteDataProperties,
}), }),
...extensionRefreshSwap(ExportBrowserComponent, ExportBrowserV2Component, { {
path: "export", path: "export",
component: ExportBrowserV2Component,
canActivate: [authGuard], canActivate: [authGuard],
data: { elevation: 2 } satisfies RouteDataProperties, data: { elevation: 2 } satisfies RouteDataProperties,
}), },
...extensionRefreshSwap(AutofillV1Component, AutofillComponent, { ...extensionRefreshSwap(AutofillV1Component, AutofillComponent, {
path: "autofill", path: "autofill",
canActivate: [authGuard], canActivate: [authGuard],

View File

@@ -1,6 +1,6 @@
import { CommonModule } from "@angular/common"; import { CommonModule } from "@angular/common";
import { Component } from "@angular/core"; import { Component } from "@angular/core";
import { Router, RouterLink } from "@angular/router"; import { Router } from "@angular/router";
import { JslibModule } from "@bitwarden/angular/jslib.module"; import { JslibModule } from "@bitwarden/angular/jslib.module";
import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components"; import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
@@ -16,7 +16,6 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
standalone: true, standalone: true,
imports: [ imports: [
CommonModule, CommonModule,
RouterLink,
JslibModule, JslibModule,
DialogModule, DialogModule,
AsyncActionsModule, AsyncActionsModule,

View File

@@ -1,26 +0,0 @@
<header>
<div class="left">
<button type="button" routerLink="/vault-settings">
<span class="header-icon" aria-hidden="true"><i class="bwi bwi-angle-left"></i></span>
<span>{{ "back" | i18n }}</span>
</button>
</div>
<h1 class="center">
<span class="title">{{ "exportVault" | i18n }}</span>
</h1>
<div class="right">
<button form="export_form_exportForm" type="submit" [disabled]="disabled">
<span [hidden]="loading">{{ "submit" | i18n }}</span>
<i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!loading" aria-hidden="true"></i>
</button>
</div>
</header>
<main tabindex="-1">
<div class="tw-p-4">
<tools-export
(formDisabled)="this.disabled = $event"
(formLoading)="this.loading = $event"
(onSuccessfulExport)="this.onSuccessfulExport($event)"
></tools-export>
</div>
</main>

View File

@@ -1,40 +0,0 @@
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";
@Component({
templateUrl: "export-browser.component.html",
standalone: true,
imports: [
CommonModule,
RouterLink,
JslibModule,
DialogModule,
AsyncActionsModule,
ButtonModule,
ExportComponent,
],
})
export class ExportBrowserComponent {
/**
* Used to control the disabled state of the Submit button
* Gets set indirectly by the disabled state being emitted from the sub-form when thier form gets disabled or the submit button is clicked
*/
protected disabled = false;
/**
* Used to control the disabled state of the Submit button
* Gets set indirectly by the loading state being emitted from the sub-form when their form is loading or finished loading
*/
protected loading = false;
constructor(private router: Router) {}
protected async onSuccessfulExport(organizationId: string): Promise<void> {
await this.router.navigate(["/vault-settings"]);
}
}