1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 06:13:38 +00:00

[PM-7100] Remove conditional routing for extension refresh (#12485)

* Remove conditional routing for new vault page (header/footer)

Redirect tabs/current to tabs/vault (new home)

* Remove unused TabsComponent

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
Daniel James Smith
2024-12-20 16:39:37 +01:00
committed by GitHub
parent a728331ec1
commit acd3ab05f6
4 changed files with 7 additions and 86 deletions

View File

@@ -105,10 +105,8 @@ import { clearVaultStateGuard } from "../vault/guards/clear-vault-state.guard";
import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component";
import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component";
import { CollectionsComponent } from "../vault/popup/components/vault/collections.component";
import { CurrentTabComponent } from "../vault/popup/components/vault/current-tab.component";
import { PasswordHistoryComponent } from "../vault/popup/components/vault/password-history.component";
import { ShareComponent } from "../vault/popup/components/vault/share.component";
import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filter.component";
import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component";
import { VaultV2Component } from "../vault/popup/components/vault/vault-v2.component";
import { ViewComponent } from "../vault/popup/components/vault/view.component";
@@ -130,7 +128,6 @@ import { VaultSettingsComponent } from "../vault/popup/settings/vault-settings.c
import { RouteElevation } from "./app-routing.animations";
import { debounceNavigationGuard } from "./services/debounce-navigation.service";
import { TabsV2Component } from "./tabs-v2.component";
import { TabsComponent } from "./tabs.component";
/**
* Data properties acceptable for use in extension route objects
@@ -748,8 +745,9 @@ const routes: Routes = [
},
],
},
...extensionRefreshSwap(TabsComponent, TabsV2Component, {
{
path: "tabs",
component: TabsV2Component,
data: { elevation: 0 } satisfies RouteDataProperties,
children: [
{
@@ -759,18 +757,15 @@ const routes: Routes = [
},
{
path: "current",
component: CurrentTabComponent,
canActivate: [authGuard],
canMatch: [extensionRefreshRedirect("/tabs/vault")],
data: { elevation: 0 } satisfies RouteDataProperties,
runGuardsAndResolvers: "always",
redirectTo: "/tabs/vault",
},
...extensionRefreshSwap(VaultFilterComponent, VaultV2Component, {
{
path: "vault",
component: VaultV2Component,
canActivate: [authGuard, NewDeviceVerificationNoticeGuard],
canDeactivate: [clearVaultStateGuard],
data: { elevation: 0 } satisfies RouteDataProperties,
}),
},
...extensionRefreshSwap(GeneratorComponent, CredentialGeneratorComponent, {
path: "generator",
canActivate: [authGuard],
@@ -788,7 +783,7 @@ const routes: Routes = [
data: { elevation: 0 } satisfies RouteDataProperties,
}),
],
}),
},
{
path: "account-switcher",
component: AccountSwitcherComponent,