From 4c7390807801a806bd6bf7683437536156650787 Mon Sep 17 00:00:00 2001
From: Pavel Zavora <pavel.zavora@bonitoo.io>
Date: Thu, 3 Feb 2022 11:30:52 +0100
Subject: [PATCH] fix(fluxWizard): use existing fluxString helper

---
 .../TimeMachine/fluxQueryBuilder/apis/fluxQueries.ts       | 7 ++-----
 .../TimeMachine/fluxQueryBuilder/util/generateFlux.ts      | 4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/fluxQueries.ts b/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/fluxQueries.ts
index 8c0b67e68..3d9974d9c 100644
--- a/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/fluxQueries.ts
+++ b/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/fluxQueries.ts
@@ -6,11 +6,8 @@ import {TimeRange, Source} from 'src/types'
 import {CancelBox} from 'src/types/promises'
 import {parseResponse} from 'src/shared/parsing/flux/response'
 import {BuilderTagsType} from '../types'
-import {
-  fluxString,
-  formatTimeRangeArguments,
-  tagToFlux,
-} from '../util/generateFlux'
+import {formatTimeRangeArguments, tagToFlux} from '../util/generateFlux'
+import fluxString from 'src/flux/helpers/fluxString'
 
 const DEFAULT_TIME_RANGE: TimeRange = {lower: 'now() - 30d', lowerFlux: '-30d'}
 const DEFAULT_LIMIT = 200
diff --git a/ui/src/shared/components/TimeMachine/fluxQueryBuilder/util/generateFlux.ts b/ui/src/shared/components/TimeMachine/fluxQueryBuilder/util/generateFlux.ts
index ebb94a037..fcd5d7e97 100644
--- a/ui/src/shared/components/TimeMachine/fluxQueryBuilder/util/generateFlux.ts
+++ b/ui/src/shared/components/TimeMachine/fluxQueryBuilder/util/generateFlux.ts
@@ -1,3 +1,4 @@
+import fluxString from 'src/flux/helpers/fluxString'
 import {TimeRange} from 'src/types'
 import {BuilderTagsType, QueryBuilderState} from '../types'
 import {AGG_WINDOW_AUTO, FUNCTIONS} from './constants'
@@ -14,9 +15,6 @@ export function tagToFlux(tag: BuilderTagsType) {
     .map(value => `r["${fluxString(tag.tagKey)}"] == "${fluxString(value)}"`)
     .join(' or ')
 }
-export function fluxString(s: string = '') {
-  return s.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
-}
 
 export function buildQuery(state: QueryBuilderState): string | undefined {
   const bucket = state.buckets.selectedBucket