From f5245a280e1cab5bae613d35e5aacf33983d173e Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Wed, 11 May 2022 15:39:39 -0400
Subject: [PATCH] [bug:euvr] Create Organization Updates (#1664)
---
src/app/accounts/login.component.ts | 2 +-
src/app/accounts/register.component.ts | 2 +-
.../organization-switcher.component.html | 2 +-
.../components/organization-filter.component.html | 6 +++---
src/app/oss-routing.module.ts | 10 +++++-----
.../settings/create-organization.component.html | 14 ++++++++++----
src/app/vault/share.component.html | 2 +-
7 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 21a1f6d02e..524137a680 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -74,7 +74,7 @@ export class LoginComponent extends BaseLoginComponent {
if (qParams.premium != null) {
this.routerService.setPreviousUrl("/settings/premium");
} else if (qParams.org != null) {
- const route = this.router.createUrlTree(["settings/create-organization"], {
+ const route = this.router.createUrlTree(["create-organization"], {
queryParams: { plan: qParams.org },
});
this.routerService.setPreviousUrl(route.toString());
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index fd2f3b567d..542bb8e3cb 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -71,7 +71,7 @@ export class RegisterComponent extends BaseRegisterComponent {
} else if (qParams.org != null) {
this.showCreateOrgMessage = true;
this.referenceData.flow = qParams.org;
- const route = this.router.createUrlTree(["settings/create-organization"], {
+ const route = this.router.createUrlTree(["create-organization"], {
queryParams: { plan: qParams.org },
});
this.routerService.setPreviousUrl(route.toString());
diff --git a/src/app/components/organization-switcher.component.html b/src/app/components/organization-switcher.component.html
index 69bf5e59e8..7975fd9e1b 100644
--- a/src/app/components/organization-switcher.component.html
+++ b/src/app/components/organization-switcher.component.html
@@ -58,7 +58,7 @@
-
+
{{ "newOrganization" | i18n }}
diff --git a/src/app/modules/vault-filter/components/organization-filter.component.html b/src/app/modules/vault-filter/components/organization-filter.component.html
index 90c283595d..23e3508e77 100644
--- a/src/app/modules/vault-filter/components/organization-filter.component.html
+++ b/src/app/modules/vault-filter/components/organization-filter.component.html
@@ -12,7 +12,7 @@
-
+
{{ "newOrganization" | i18n }}
@@ -47,7 +47,7 @@
@@ -112,7 +112,7 @@
diff --git a/src/app/oss-routing.module.ts b/src/app/oss-routing.module.ts
index 0eea2fd306..72faa67b3d 100644
--- a/src/app/oss-routing.module.ts
+++ b/src/app/oss-routing.module.ts
@@ -155,6 +155,11 @@ const routes: Routes = [
.IndividualVaultModule,
},
{ path: "sends", component: SendComponent, data: { title: "Send" } },
+ {
+ path: "create-organization",
+ component: CreateOrganizationComponent,
+ data: { titleId: "newOrganization" },
+ },
{
path: "settings",
component: SettingsComponent,
@@ -181,11 +186,6 @@ const routes: Routes = [
loadChildren: async () =>
(await import("./settings/subscription-routing.module")).SubscriptionRoutingModule,
},
- {
- path: "create-organization",
- component: CreateOrganizationComponent,
- data: { titleId: "newOrganization" },
- },
{
path: "emergency-access",
children: [
diff --git a/src/app/settings/create-organization.component.html b/src/app/settings/create-organization.component.html
index 815442fe06..f5b4219aa6 100644
--- a/src/app/settings/create-organization.component.html
+++ b/src/app/settings/create-organization.component.html
@@ -1,5 +1,11 @@
-