From 7206b2d600c47c3af47244a18341576be9c22646 Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Tue, 19 Mar 2019 14:35:36 -0400 Subject: [PATCH 1/4] add query parameter --- .../addon/components/osf-navbar/auth-dropdown/component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts b/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts index c645ef0ef78..2d3ff250f49 100644 --- a/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts +++ b/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts @@ -55,7 +55,7 @@ export class AuthBase extends Component { @computed('signUpURL', 'signUpNext') get signUpRoute() { - return this.features.isEnabled(featureFlagNames.routes.register) ? 'register' : + return this.features.isEnabled(featureFlagNames.routes.register) ? `register?${param(this.signUpQueryParams)}` : `${this.signUpURL}?${param(this.signUpQueryParams)}`; } From d894cc2db7347cf6cdcdbd07d459e96e4be8e921 Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Tue, 16 Apr 2019 16:50:57 -0400 Subject: [PATCH 2/4] use route instead of signUpRoute --- .../components/osf-navbar/auth-dropdown/component.ts | 8 +------- .../components/osf-navbar/auth-dropdown/template.hbs | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts b/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts index 2d3ff250f49..dd6c63b2bc2 100644 --- a/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts +++ b/lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts @@ -19,7 +19,7 @@ import pathJoin from 'ember-osf-web/utils/path-join'; import styles from './styles'; import template from './template'; -const { OSF: { url: baseUrl }, featureFlagNames } = config; +const { OSF: { url: baseUrl } } = config; export class AuthBase extends Component { @service analytics!: Analytics; @@ -53,12 +53,6 @@ export class AuthBase extends Component { return pathJoin(baseUrl, this.router.currentURL); } - @computed('signUpURL', 'signUpNext') - get signUpRoute() { - return this.features.isEnabled(featureFlagNames.routes.register) ? `register?${param(this.signUpQueryParams)}` : - `${this.signUpURL}?${param(this.signUpQueryParams)}`; - } - @computed('router.currentRouteName', 'signUpNext') get signUpQueryParams() { const params: Record = {}; diff --git a/lib/osf-components/addon/components/osf-navbar/auth-dropdown/template.hbs b/lib/osf-components/addon/components/osf-navbar/auth-dropdown/template.hbs index c42eeb89416..b674d51c7dd 100644 --- a/lib/osf-components/addon/components/osf-navbar/auth-dropdown/template.hbs +++ b/lib/osf-components/addon/components/osf-navbar/auth-dropdown/template.hbs @@ -5,7 +5,7 @@ data-test-ad-sign-up-button data-analytics-name='SignUp' class='btn btn-success btn-top-signup m-l-sm m-r-xs' - @href={{this.signUpRoute}} + @route='register' @queryParams={{this.signUpQueryParams}} > {{t 'auth_dropdown.sign_up'}} From 4205be329af686a5c180e733aea2661b1cde501d Mon Sep 17 00:00:00 2001 From: Abram Booth Date: Wed, 17 Apr 2019 17:03:07 -0400 Subject: [PATCH 3/4] fix failing test --- .../components/registries-navbar/component-test.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/engines/registries/integration/components/registries-navbar/component-test.ts b/tests/engines/registries/integration/components/registries-navbar/component-test.ts index da018cc2903..9e8352ca316 100644 --- a/tests/engines/registries/integration/components/registries-navbar/component-test.ts +++ b/tests/engines/registries/integration/components/registries-navbar/component-test.ts @@ -95,10 +95,6 @@ module('Registries | Integration | Component | registries-navbar', hooks => { await render(hbs``); assert.dom('a[data-test-join]').hasText(`${t('navbar.join')}`); - assert.dom('a[data-test-join]').hasAttribute( - 'href', - `http://example.com?campaign=osf-registries&next=${osfUrlEncoded}FakeURL`, - ); assert.dom('a[data-test-join]').isVisible('Join button is visible'); assert.dom('a[role="button"][data-test-login]').hasText(`${t('navbar.login')}`); From 0062049eee33da229165ddd8637c007aaf051cd8 Mon Sep 17 00:00:00 2001 From: Abram Booth Date: Wed, 17 Apr 2019 17:05:42 -0400 Subject: [PATCH 4/4] fix failing test fix --- .../components/registries-navbar/component-test.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/engines/registries/integration/components/registries-navbar/component-test.ts b/tests/engines/registries/integration/components/registries-navbar/component-test.ts index 9e8352ca316..62e6aa85f7a 100644 --- a/tests/engines/registries/integration/components/registries-navbar/component-test.ts +++ b/tests/engines/registries/integration/components/registries-navbar/component-test.ts @@ -1,6 +1,5 @@ import Service from '@ember/service'; import { click, fillIn, render, triggerKeyEvent } from '@ember/test-helpers'; -import config from 'ember-get-config'; import { t } from 'ember-i18n/test-support'; import { setupEngineRenderingTest } from 'ember-osf-web/tests/helpers/engines'; import { setBreakpoint } from 'ember-responsive/test-support'; @@ -10,8 +9,6 @@ import $ from 'jquery'; import { module, test } from 'qunit'; import sinon from 'sinon'; -const { OSF: { url: osfUrl } } = config; - const statusMessagesStub = Service.extend({ messages: [], @@ -88,7 +85,6 @@ module('Registries | Integration | Component | registries-navbar', hooks => { }); test('desktop layout (logged out)', async function(assert) { - const osfUrlEncoded = encodeURIComponent(osfUrl); setBreakpoint('desktop'); this.owner.lookup('service:session').set('isAuthenticated', false);