Merge branch 'hotfix/19.1.2'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [19.1.2] - 2019-02-12
+### Fixed
+- Utils:
+ - `transitionTargetURL` - clean guid routing path components from URLs
+### Added:
+- Route Flags:
+ - `guid-node.index` -> `ember_project_detail_page`
+ - `guid-registration.index` -> `ember_old_registration_detail_page`
+
 ## [19.1.1] - 2019-02-11
 ### Fixed
 - Router:

app/locations/guid-mixin.ts

@@ -1,21 +1,17 @@
 import Mixin from '@ember/object/mixin';
 
-export default Mixin.create({
- pattern: /(?:^|\/)--[^/]+/g,
-
- cleanURL(url: string) {
- return url.replace(this.pattern, '');
- },
+import cleanURL from 'ember-osf-web/utils/clean-url';
 
+export default Mixin.create({
  setURL(url: string) {
- return this._super(this.cleanURL(url));
+ return this._super(cleanURL(url));
  },
 
  replaceURL(url: string) {
- return this._super(this.cleanURL(url));
+ return this._super(cleanURL(url));
  },
 
  formatURL(url: string): string {
- return this._super(this.cleanURL(url));
+ return this._super(cleanURL(url));
  },
 });

app/utils/clean-url.ts

@@ -0,0 +1,7 @@
+/**
+ * Remove the --guidtype portions of a URL that are only used for guid routing
+ * and should never appear in a real URL.
+ */
+export default function cleanURL(url: string) {
+ return url.replace(/(?:^|\/)--[^/]+/g, '');
+}

app/utils/transition-target-url.ts

@@ -1,5 +1,7 @@
 import Transition from '@ember/routing/-private/transition';
 
+import cleanURL from 'ember-osf-web/utils/clean-url';
+
 /**
  * Get the URL (path and query string) that the given transition will resolve to,
  * using the given router.
@@ -10,9 +12,11 @@ export default function transitionTargetURL(
  const params = Object.values(transition.params).filter(
  param => Object.values(param).length,
  );
- return transition.router.generate(
- transition.targetName,
- ...params,
- { queryParams: transition.queryParams },
+ return cleanURL(
+ transition.router.generate(
+ transition.targetName,
+ ...params,
+ { queryParams: transition.queryParams },
+ ),
  );
 }

config/environment.js

@@ -215,6 +215,8 @@ module.exports = function(environment) {
  },
  featureFlagNames: {
  routes: {
+ 'guid-node.index': 'ember_project_detail_page',
+ 'guid-registration.index': 'ember_old_registration_detail_page',
  settings: 'ember_user_settings_profile_page',
  'settings.profile': 'ember_user_settings_profile_page',
  'settings.profile.education': 'ember_user_settings_profile_page',

package.json

@@ -1,6 +1,6 @@
 {
  "name": "ember-osf-web",
- "version": "19.1.1",
+ "version": "19.1.2",
  "description": "Ember front-end for the Open Science Framework",
  "license": "Apache-2.0",
  "author": "Center for Open Science <support@cos.io>",

tests/unit/locations/auto-guid-test.ts

@@ -2,47 +2,10 @@ import GuidAutoLocation from 'ember-osf-web/locations/auto';
 import { setupTest } from 'ember-qunit';
 import { module, test } from 'qunit';
 
-const TEST_CASES = [{
- input: '/--user/abcd/',
- output: '/abcd/',
-}, {
- input: '/--user/abcd',
- output: '/abcd',
-}, {
- input: '/--user/--nested/abcd/',
- output: '/abcd/',
-}, {
- input: '/--registries-engine/overview/',
- output: '/overview/',
-}, {
- input: '/collections/--something--else/here/',
- output: '/collections/here/',
-}, {
- input: '/--registries/',
- output: '/',
-}, {
- input: '/AttheEnd/--registries/',
- output: '/AttheEnd/',
-}, {
- input: '/AttheEnd/--registries',
- output: '/AttheEnd',
-}, {
- input: '/normal--url/',
- output: '/normal--url/',
-}];
-
 module('Unit | Location | guid-auto ', hooks => {
  setupTest(hooks);
 
  test('it exists', function(assert) {
  assert.ok(this.owner.lookup('location:auto') instanceof GuidAutoLocation);
  });
-
- test('cleanURL', function(assert) {
- const location = this.owner.lookup('location:auto') as GuidAutoLocation;
-
- for (const testCase of TEST_CASES) {
- assert.equal(location.cleanURL(testCase.input), testCase.output);
- }
- });
 });

tests/unit/locations/none-guid-test.ts

@@ -35,14 +35,6 @@ module('Unit | Location | none-auto ', hooks => {
  assert.ok(this.owner.lookup('location:none') instanceof GuidNoneLocation);
  });
 
- test('cleanURL', function(assert) {
- const location = this.owner.lookup('location:none') as GuidNoneLocation;
-
- for (const testCase of TEST_CASES) {
- assert.equal(location.cleanURL(testCase.input), testCase.output);
- }
- });
-
  test('setURL does not clean', function(assert) {
  const location = this.owner.lookup('location:none') as GuidNoneLocation;
 

tests/unit/utils/clean-url-test.ts

@@ -0,0 +1,37 @@
+import { module, test } from 'qunit';
+
+import cleanURL from 'ember-osf-web/utils/clean-url';
+
+const TEST_CASES = [{
+ input: '/--user/abcd',
+ output: '/abcd',
+}, {
+ input: '/--user/--nested/abcd',
+ output: '/abcd',
+}, {
+ input: '/--registries-engine/overview',
+ output: '/overview',
+}, {
+ input: '/collections/--something--else/here',
+ output: '/collections/here',
+}, {
+ input: '/--registries',
+ output: '',
+}, {
+ input: '/AttheEnd/--registries',
+ output: '/AttheEnd',
+}, {
+ input: '/normal--url',
+ output: '/normal--url',
+}];
+
+module('Unit | Utility | cleanURL', () => {
+ test('cleanURL cleans urls', assert => {
+ assert.expect(TEST_CASES.length * 2);
+
+ for (const testCase of TEST_CASES) {
+ assert.equal(cleanURL(testCase.input), testCase.output);
+ assert.equal(cleanURL(`${testCase.input}/`), `${testCase.output}/`);
+ }
+ });
+});