From a801e96511d9f06169abed1d2d668a4b59c0cf10 Mon Sep 17 00:00:00 2001 From: Sam Carlton Date: Sun, 5 Jun 2022 11:43:52 -0500 Subject: [PATCH] Set filterSeparator as constant --- helpers/constants.js | 2 ++ helpers/statuses.js | 8 +++----- helpers/stork/browser.js | 13 +++++-------- 3 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 helpers/constants.js diff --git a/helpers/constants.js b/helpers/constants.js new file mode 100644 index 0000000..1bc0880 --- /dev/null +++ b/helpers/constants.js @@ -0,0 +1,2 @@ + +export const filterSeparator = '_' diff --git a/helpers/statuses.js b/helpers/statuses.js index 82bfc2a..6edd9c5 100644 --- a/helpers/statuses.js +++ b/helpers/statuses.js @@ -1,4 +1,4 @@ - +import { filterSeparator } from '~/helpers/constants.js' const statuses = { @@ -38,8 +38,6 @@ const statusesByIcon = Object.keys( statuses ).reduce( ( acc, key ) => { export const statusFilterPrefix = 'status' -export const statusFilterSeparator = '_' - // Example: // { @@ -48,11 +46,11 @@ export const statusFilterSeparator = '_' // }, export const defaultStatusFilters = Object.keys( statuses ).reduce( ( acc, key ) => { const status = statuses[ key ] - acc[ statusFilterPrefix + statusFilterSeparator + key ] = status.filterLabel + acc[ statusFilterPrefix + filterSeparator + key ] = status.filterLabel acc = [...acc, { label: `${ status.icon } ${ status.filterLabel }`, - query: statusFilterPrefix + statusFilterSeparator + status.snakeSlug + query: statusFilterPrefix + filterSeparator + status.snakeSlug }] return acc }, [] ) diff --git a/helpers/stork/browser.js b/helpers/stork/browser.js index c0b54e8..612f397 100644 --- a/helpers/stork/browser.js +++ b/helpers/stork/browser.js @@ -1,3 +1,4 @@ +import { filterSeparator } from '~/helpers/constants.js' import { isString } from '~/helpers/check-types.js' @@ -6,7 +7,6 @@ import { storkScriptURL } from '~/helpers/stork/config.js' - export function makeHighlightedMarkup ( options = {} ) { const { text, @@ -227,9 +227,6 @@ export class StorkClient { } } - -const statusFilterSeparator = '_' - export class StorkFilters { constructor({ initialFilters = {} @@ -243,7 +240,7 @@ export class StorkFilters { get list () { return Object.entries( this.filters ).map( ([ filterKey, filterValue ]) => { - return `${ filterKey }${ statusFilterSeparator }${ filterValue }` + return `${ filterKey }${ filterSeparator }${ filterValue }` } ) } @@ -252,12 +249,12 @@ export class StorkFilters { } isQueryValue ( filterNameOrQueryValue ) { - return filterNameOrQueryValue.includes( statusFilterSeparator ) + return filterNameOrQueryValue.includes( filterSeparator ) } getKeyAndValue ( filterQueryValue ) { - const key = filterQueryValue.substring(0, filterQueryValue.indexOf( statusFilterSeparator )) - const value = filterQueryValue.substring(filterQueryValue.indexOf( statusFilterSeparator )+1) + const key = filterQueryValue.substring(0, filterQueryValue.indexOf( filterSeparator )) + const value = filterQueryValue.substring(filterQueryValue.indexOf( filterSeparator )+1) return { key, value } }