yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-07-18 14:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes navigating to datasets from rail: numbers were previously excluded from parsed string. DRY's urn regex

Browse Source
This commit is contained in:
Seyi Adebajo 2017-05-01 11:33:40 -07:00 committed by Mars Lan
parent d008767304
commit c74858b198
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wherehows-web/app/components/browser/containers/browser-rail.js
View File

@ -1,5 +1,6 @@
import Ember from 'ember'; import Ember from 'ember';
import connect from 'ember-redux/components/connect'; import connect from 'ember-redux/components/connect';
import { urnRegex } from 'wherehows-web/utils/validators/urn';
const { Component } = Ember; const { Component } = Ember;
@ -10,19 +11,12 @@ const { Component } = Ember;
*/ */
const pageRegex = /\/page\/([0-9]+)/i; const pageRegex = /\/page\/([0-9]+)/i;
/** /**
* Matches a url string with a `urn` query. urn query starts with letters or underscore segment of any length greater * Matches a url string path segment that optionally starts with a hash followed by forward slash,
* than 1 followed by colon and 3 forward slashes and a segment containing letters, _ or /, or none * either datasets or flows or metrics, forward slash, number of varying length and optional trailing slash
* The value following the urn key is retained
* @type {RegExp}
*/
const urnRegex = /urn=([a-z_]+[:\/]{3}[a-z_\/]*)/i;
/**
* Matches a url string path segment that optionally starts with a hash followed by forward slash, at least one
* alphabet, forward slash, number of varying length and optional trailing slash
* The number is retained * The number is retained
* @type {RegExp} * @type {RegExp}
*/ */
const entityRegex = /^#?\/[a-z]+\/([0-9]+)\/?/i; const entityRegex = /^#?\/(?:datasets|metrics|flows)\/([0-9]+)\/?/;
/** /**
* Takes a node url and parses out the query params and path spec to be included in the link component * Takes a node url and parses out the query params and path spec to be included in the link component
@ -46,7 +40,8 @@ const nodeUrlToQueryParams = nodeUrl => {
// If we have a urn match, append the urn to eventual query params object // If we have a urn match, append the urn to eventual query params object
if (Array.isArray(urnMatch)) { if (Array.isArray(urnMatch)) {
queryParams = Object.assign({}, queryParams, { queryParams = Object.assign({}, queryParams, {
urn: urnMatch[1] // Extract the entire match as urn value
urn: urnMatch[0]
}); });
} }

4
wherehows-web/app/utils/validators/urn.js
View File

@ -1,10 +1,10 @@
/** /**
* Matches a url string with a `urn` query. urn query starts with letters or underscore segment of any length greater * Matches a url string with a `urn` query. urn query with letters or underscore segment of any length greater
* than 1 followed by colon and 3 forward slashes and a segment containing letters, _ or /, or none * than 1 followed by colon and 3 forward slashes and a segment containing letters, _ or /, or none
* The value following the urn key is retained * The value following the urn key is retained
* @type {RegExp} * @type {RegExp}
*/ */
const urnRegex = /^([a-z_]+):\/{3}([a-z_\-\/]*)/i; const urnRegex = /([a-z_]+):\/{3}([a-z0-9_\-\/]*)/i;
/** /**
* Asserts that a provided string matches the urn pattern above * Asserts that a provided string matches the urn pattern above
* @param {String} candidateUrn the string to test on * @param {String} candidateUrn the string to test on