enforce feature toggle

Author: mdvictor

packages/scenes/src/variables/adhoc/AdHocFiltersVariable.tsx

@@ -323,8 +323,6 @@ export class AdHocFiltersVariable
           this.restoreOriginalFilter(filter);
         }
       });
-
-      this.setState({ applicabilityEnabled: false });
     };
   };
 
@@ -738,6 +736,10 @@ export class AdHocFiltersVariable
   }
 
   public async _verifyApplicability() {
+    if (!this.state.applicabilityEnabled) {
+      return;
+    }
+
     const filters = [...this.state.filters, ...(this.state.originFilters ?? [])];
     const queries = this.state.useQueriesAsFilterForOptions ? getQueriesForVariables(this) : undefined;
 

packages/scenes/src/variables/groupby/GroupByVariable.tsx

@@ -244,8 +244,6 @@ export class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
       if (this.state.defaultValue) {
         this.restoreDefaultValues();
       }
-
-      this.setState({ applicabilityEnabled: false });
     };
   };
 
@@ -297,6 +295,10 @@ export class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
   }
 
   public async _verifyApplicability() {
+    if (!this.state.applicabilityEnabled) {
+      return;
+    }
+
     const queries = getQueriesForVariables(this);
     const value = this.state.value;