fix: filter excluded queries at higher level

influxdata · Oct 18, 2024 · e904a25 · e904a25
1 parent 2711c1a
commit e904a25
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 73 deletions.
diff --git a/ui/src/dashboards/components/InfluxQLEditor.tsx b/ui/src/dashboards/components/InfluxQLEditor.tsx
@@ -84,11 +84,6 @@ class InfluxQLEditor extends Component<Props, State> {
     } else {
       isSubmitted = submitted
     }
-    // const isSubmitted = isQueryConfigChanged
-    //   ? isExcludedStatement(query)
-    //     ? config.isManuallySubmitted
-    //     : true
-    //   : submitted
     if ((isSubmitted && isQueryTextChanged) || isQueryConfigChanged) {
       return {
         ...BLURRED_EDITOR_STATE,
@@ -185,7 +180,7 @@ class InfluxQLEditor extends Component<Props, State> {
               <QueryStatus
                 status={config.status}
                 isShowingTemplateValues={isShowingTemplateValues}
-                isSubmitted={submitted && config.status?.error !== 'skipped'}
+                isSubmitted={submitted && !config.status?.loading}
               >
                 {this.queryStatusButtons}
               </QueryStatus>
@@ -300,7 +295,10 @@ class InfluxQLEditor extends Component<Props, State> {
   private handleUpdate = async (isAutoSubmitted?: boolean): Promise<void> => {
     const {onUpdate, config} = this.props
     const {editedQueryText, submitted, isExcluded} = this.state
-    if (!this.isDisabled && (!submitted || !config.isManuallySubmitted)) {
+    if (
+      !this.isDisabled &&
+      (!submitted || (!config.isManuallySubmitted && isExcluded))
+    ) {
       this.cancelPendingUpdates()
       const update = onUpdate(editedQueryText, isAutoSubmitted)
       const cancelableUpdate = makeCancelable(update)

diff --git a/ui/src/dashboards/utils/cellGetters.ts b/ui/src/dashboards/utils/cellGetters.ts
@@ -175,8 +175,7 @@ export const getConfig = async (
   url,
   id: string,
   query: string,
-  templates: Template[],
-  isManuallySubmitted = false
+  templates: Template[]
 ): Promise<QueryConfig> => {
   const renderedQuery = templateReplace(query, templates)
   const queries = await getQueryConfigAndStatus(url, [
@@ -191,8 +190,6 @@ export const getConfig = async (
     queryConfig.rawText = query
   }
 
-  queryConfig.isManuallySubmitted = isManuallySubmitted
-
   return {
     ...queryConfig,
     originalQuery: query,

diff --git a/ui/src/shared/apis/query.ts b/ui/src/shared/apis/query.ts
@@ -4,18 +4,17 @@ import {TEMP_VAR_INTERVAL, DEFAULT_DURATION_MS} from 'src/shared/constants'
 import replaceTemplates, {replaceInterval} from 'src/tempVars/utils/replace'
 import {proxy} from 'src/utils/queryUrlGenerator'
 
-import {Query, Source, Template} from 'src/types'
+import {Source, Template} from 'src/types'
 import {TimeSeriesResponse} from 'src/types/series'
-import {isExcludedStatement} from '../../utils/queryFilter'
 
 // REVIEW: why is this different than the `Query` in src/types?
-// interface Query {
-//   text: string
-//   id: string
-//   database?: string
-//   db?: string
-//   rp?: string
-// }
+interface Query {
+  text: string
+  id: string
+  database?: string
+  db?: string
+  rp?: string
+}
 
 interface QueryResult {
   value: TimeSeriesResponse | null
@@ -34,17 +33,6 @@ export function executeQueries(
     let counter = queries.length
 
     for (let i = 0; i < queries.length; i++) {
-      if (
-        isExcludedStatement(queries[i].text) &&
-        !queries[i].queryConfig.isManuallySubmitted
-      ) {
-        results[i] = {value: null, error: 'skipped'}
-        counter -= 1
-        if (counter === 0) {
-          resolve(results)
-        }
-        continue
-      }
       executeQuery(source, queries[i], templates, uuid)
         .then(result => (results[i] = {value: result, error: null}))
         .catch(result => (results[i] = {value: null, error: result}))
@@ -70,9 +58,9 @@ export const executeQuery = async (
 
   const {data} = await proxy({
     source: source.links.proxy,
-    rp: query.queryConfig.retentionPolicy,
+    rp: query.rp,
     query: text,
-    db: query.queryConfig.database,
+    db: query.db || query.database,
     uuid,
   })
 

diff --git a/ui/src/shared/components/TimeMachine/TimeMachine.tsx b/ui/src/shared/components/TimeMachine/TimeMachine.tsx
@@ -431,13 +431,7 @@ class TimeMachine extends PureComponent<Props, State> {
     let newQueryConfig
 
     try {
-      newQueryConfig = await getConfig(
-        url,
-        activeID,
-        text,
-        templates,
-        !isAutoSubmitted
-      )
+      newQueryConfig = await getConfig(url, activeID, text, templates)
     } catch {
       notify(analyzeQueryFailed)
       return
@@ -454,11 +448,14 @@ class TimeMachine extends PureComponent<Props, State> {
         query: text,
         queryConfig: {
           ...newQueryConfig,
+          isManuallySubmitted: !isAutoSubmitted,
           rawText: text,
           status: {loading: true},
         },
       }
     })
+    // Update global query status to loading, skipped query will remain in this state
+    this.handleEditQueryStatus(activeID, {loading: true})
     onUpdateQueryDrafts(updatedQueryDrafts)
   }
 

diff --git a/ui/src/shared/components/time_series/TimeSeries.tsx b/ui/src/shared/components/time_series/TimeSeries.tsx
@@ -124,18 +124,8 @@ class TimeSeries extends PureComponent<Props, State> {
   }
 
   public async componentDidUpdate(prevProps: Props) {
-    const prevQueries = _.map(prevProps.queries, q => {
-      return {
-        text: q.text,
-        isManuallySubmitted: q.queryConfig?.isManuallySubmitted,
-      }
-    })
-    const currQueries = _.map(this.props.queries, q => {
-      return {
-        text: q.text,
-        isManuallySubmitted: q.queryConfig?.isManuallySubmitted,
-      }
-    })
+    const prevQueries = _.map(prevProps.queries, q => q.text)
+    const currQueries = _.map(this.props.queries, q => q.text)
     const queriesDifferent = !_.isEqual(prevQueries, currQueries)
 
     const prevTemplates = _.get(prevProps, 'templates')

diff --git a/ui/src/utils/buildQueriesForGraphs.ts b/ui/src/utils/buildQueriesForGraphs.ts
@@ -3,6 +3,7 @@ import {buildQuery} from 'src/utils/influxql'
 import {TYPE_QUERY_CONFIG, TYPE_SHIFTED} from 'src/dashboards/constants'
 
 import {Query, QueryConfig, TimeRange, QueryType} from 'src/types'
+import {isExcludedStatement} from './queryFilter'
 
 interface Statement {
   queryConfig: QueryConfig
@@ -15,28 +16,33 @@ const buildQueries = (queryConfigs: QueryConfig[], tR: TimeRange): Query[] => {
     return []
   }
 
-  const statements: Statement[] = queryConfigs.map((query: QueryConfig) => {
-    const {rawText, range, id, shifts, database, measurement, fields} = query
-    const timeRange: TimeRange = range || tR
-    const text: string =
-      rawText || buildQuery(TYPE_QUERY_CONFIG, timeRange, query)
-    const isParsable: boolean =
-      !_.isEmpty(database) && !_.isEmpty(measurement) && fields.length > 0
-
-    if (shifts && shifts.length && isParsable) {
-      const shiftedQueries: string[] = shifts
-        .filter(s => s.unit)
-        .map(s => buildQuery(TYPE_SHIFTED, timeRange, query, s))
-
-      return {
-        text: `${text};${shiftedQueries.join(';')}`,
-        id,
-        queryConfig: query,
+  const statements: Statement[] = queryConfigs
+    .filter(
+      (query: QueryConfig) =>
+        !isExcludedStatement(query.rawText) || query.isManuallySubmitted
+    )
+    .map((query: QueryConfig) => {
+      const {rawText, range, id, shifts, database, measurement, fields} = query
+      const timeRange: TimeRange = range || tR
+      const text: string =
+        rawText || buildQuery(TYPE_QUERY_CONFIG, timeRange, query)
+      const isParsable: boolean =
+        !_.isEmpty(database) && !_.isEmpty(measurement) && fields.length > 0
+
+      if (shifts && shifts.length && isParsable) {
+        const shiftedQueries: string[] = shifts
+          .filter(s => s.unit)
+          .map(s => buildQuery(TYPE_SHIFTED, timeRange, query, s))
+
+        return {
+          text: `${text};${shiftedQueries.join(';')}`,
+          id,
+          queryConfig: query,
+        }
       }
-    }
 
-    return {text, id, queryConfig: query}
-  })
+      return {text, id, queryConfig: query}
+    })
 
   const queries: Query[] = statements
     .filter(s => s.text !== null)

diff --git a/ui/src/utils/queryFilter.ts b/ui/src/utils/queryFilter.ts
@@ -10,6 +10,6 @@ const excludedStatements: string[] = [
 
 export const isExcludedStatement = (query: string): boolean => {
   return excludedStatements.some(statement =>
-    query.toLowerCase().startsWith(statement)
+    query?.toLowerCase().startsWith(statement)
   )
 }