From 82c309dc16024c7ffdfd017e1090d0152f6f6cd8 Mon Sep 17 00:00:00 2001 From: Colin Megill Date: Thu, 12 Oct 2017 19:31:23 -0700 Subject: [PATCH] move url helper to actions, add alphabetical helper to util --- src/util/index.js | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/src/util/index.js b/src/util/index.js index 1c3baad7..9c4fb769 100644 --- a/src/util/index.js +++ b/src/util/index.js @@ -1,34 +1,7 @@ -import URI from "urijs"; - -export const updateCategoricalQueryParams = (category, value) => { - - let newURL; - - /* - there are four cases - 1. there are no query params - 2. there are query params, but our category isn't there yet - 3. there are query params and this is not the first entry to the given category (urijs may handle this with 'normalize') - 4. there are query params and ours already exists (remove it) - */ - - const uri = new URI(window.location.href) - - if (window.location.search === "") { - newURL = uri.addQuery(category, value).toString(); /* #1 */ - } else if (uri.hasQuery(category, value) || uri.hasQuery(category, value, true)) { /* true param here means check arrays as well http://medialize.github.io/URI.js/docs.html#search-has */ - newURL = uri.removeQuery(category, value).toString(); /* #4 */ - } else { - newURL = uri.addQuery(category, value).toString(); /* #2 & #3 are handled by URI */ - } - - window.history.pushState("", "", newURL) - -} - -export const updateContinuousParams = (category, range) => { - /* - this is similar to updateCategoricalQueryParams, but has a different check since - in this case, same key (Unique_reads) different values (>500 vs >5000) should always replace previous range. - */ +export const alphabeticallySortedValues = (values) => { + return Object.keys(values).sort((a, b) => { + var textA = a.toUpperCase(); + var textB = b.toUpperCase(); + return (textA < textB) ? -1 : (textA > textB) ? 1 : 0; + }) }