feat(filterUnusedVars): turns out this works great with the new subgr…

…aph implementation so I removed the comment also add the featureflag back to the feature
influxdata · Jun 2, 2020 · 8d087aa · 8d087aa
1 parent f04303e
commit 8d087aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ui/src/shared/utils/filterUnusedVars.ts b/ui/src/shared/utils/filterUnusedVars.ts
@@ -20,8 +20,6 @@ export const filterUnusedVars = (variables: Variable[], views: View[]) => {
     (acc, vp) => [...acc, ...vp.queries.map(query => query.text)],
     [] as Array<string>
   )
-  // TODO: make sure to parse out variables for other used variables
-  // console.log('queryTexts: ', queryTexts)
 
   const varsInUse = variables.filter(variable =>
     queryTexts.some(text => isInQuery(text, variable))

diff --git a/ui/src/variables/utils/hydrateVars.ts b/ui/src/variables/utils/hydrateVars.ts
@@ -74,7 +74,7 @@ export const createVariableGraph = (
   return Object.values(nodesByID)
 }
 
-export const isInQuery = (query: string, v: Variable) => {
+export const isInQuery = (query: string, v: Variable): boolean => {
   const regexp = new RegExp(
     `${BOUNDARY_GROUP}${OPTION_NAME}.${v.name}${BOUNDARY_GROUP}`
   )
@@ -194,6 +194,7 @@ const getDeduplicatedRootChild = (
   - The node for one of the passed variables depends on this node
 
 */
+// TODO(ariel): rename this back to findSubgraph & update tests once feature flag is removed
 export const findSubgraphFeature = (
   graph: VariableNode[],
   variables: Variable[]
@@ -513,8 +514,7 @@ export const hydrateVars = (
   options: HydrateVarsOptions
 ): EventedCancelBox<Variable[]> => {
   let findSubgraphFunction = findSubgraph
-  if (true) {
-    // if (isFlagEnabled('hydratevars')) {
+  if (isFlagEnabled('hydratevars')) {
     findSubgraphFunction = findSubgraphFeature
   }