Skip to content

[EMB-610] Add query parameter. #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 18, 2019
Merged

[EMB-610] Add query parameter. #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7206b2d
add query parameter
adlius Mar 19, 2019
d894cc2
use route instead of signUpRoute
adlius Apr 16, 2019
a3812df
Merge branch 'develop' into Emb-610_Add_campaign_query_param_for_regi…
jamescdavis Apr 17, 2019
4205be3
fix failing test
aaxelb Apr 17, 2019
0062049
fix failing test fix
aaxelb Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions lib/osf-components/addon/components/osf-navbar/auth-dropdown/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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' :
`${this.signUpURL}?${param(this.signUpQueryParams)}`;
}

@computed('router.currentRouteName', 'signUpNext')
get signUpQueryParams() {
const params: Record<string, string> = {};
Expand Down
2 changes: 1 addition & 1 deletion lib/osf-components/addon/components/osf-navbar/auth-dropdown/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}}
Expand Down
8 changes: 0 additions & 8 deletions tests/engines/registries/integration/components/registries-navbar/component-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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: [],

Expand Down Expand Up @@ -88,17 +85,12 @@ 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);

await render(hbs`<RegistriesNavbar @campaign="osf-registries" @signUpURL="http://example.com" />`);

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')}`);
Expand Down