add apply_fetch_values_predicate to QueryObject

apache-superset · Mar 8, 2021 · cfe6de8 · cfe6de8
1 parent 8239476
commit cfe6de8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/superset-ui-core/src/query/buildQueryObject.ts b/packages/superset-ui-core/src/query/buildQueryObject.ts
@@ -48,13 +48,13 @@ export default function buildQueryObject<T extends QueryFormData>(
     filters: QueryObjectFilterClause[];
     adhoc_filters: AdhocFilter[];
   } = {
-    filters: [...(formData.filters || []), ...(append_form_data.filters || [])],
+    filters: [...(extras.filters || []), ...(append_form_data.filters || [])],
     adhoc_filters: [...(formData.adhoc_filters || []), ...(append_form_data.adhoc_filters || [])],
   };
   const extrasAndfilters = processFilters({
     ...formData,
-    ...filterFormData,
     ...extras,
+    ...filterFormData,
   });
 
   let queryObject: QueryObject = {
@@ -80,5 +80,6 @@ export default function buildQueryObject<T extends QueryFormData>(
   };
   // override extra form data used by native and cross filters
   queryObject = overrideExtraFormData(queryObject, override_form_data);
+
   return { ...queryObject, custom_form_data };
 }
diff --git a/packages/superset-ui-core/src/query/types/Query.ts b/packages/superset-ui-core/src/query/types/Query.ts
@@ -76,6 +76,9 @@ export interface QueryObject extends QueryFields, TimeRange, ResidualQueryObject
   /** Time filters that have been applied to the query object */
   applied_time_extras?: AppliedTimeExtras;
 
+  /** add fetch value predicate to query if defined in datasource */
+  apply_fetch_values_predicate?: boolean;
+
   /**
    * Extra form data. Current stores information about time granularity, may be
    * cleaned up in the future.