@grafana/scenes 6.29.1 → 6.29.2--canary.1202.16723575264.0

package/dist/esm/variables/adhoc/getAdHocFiltersFromScopes.js

@@ -7,6 +7,10 @@ function isEqualityOrMultiOperator(value) {
   const operators = /* @__PURE__ */ new Set(["equals", "not-equals", "one-of", "not-one-of"]);
   return operators.has(value);
 }
+function isRegexOperator(value) {
+  const operators = /* @__PURE__ */ new Set(["regex-match", "regex-not-match"]);
+  return operators.has(value);
+}
 function getAdHocFiltersFromScopes(scopes) {
   const formattedFilters = /* @__PURE__ */ new Map();
   const duplicatedFilters = [];
@@ -22,8 +26,11 @@ function processFilter(formattedFilters, duplicatedFilters, filter) {
     return;
   }
   const existingFilter = formattedFilters.get(filter.key);
-  if (existingFilter && canValueBeMerged(existingFilter.operator, filter.operator)) {
+  if (existingFilter && isEqualityValue(existingFilter.operator, filter.operator)) {
     mergeFilterValues(existingFilter, filter);
+  } else if (existingFilter && isRegexValue(existingFilter.operator, filter.operator)) {
+    existingFilter.value += `|${filter.value}`;
+    existingFilter.values = [existingFilter.value];
   } else if (!existingFilter) {
     formattedFilters.set(filter.key, {
       key: filter.key,
@@ -59,16 +66,26 @@ function mergeFilterValues(adHocFilter, filter) {
     adHocFilter.operator = reverseScopeFilterOperatorMap["not-one-of"];
   }
 }
-function canValueBeMerged(adHocFilterOperator, filterOperator) {
+function isRegexValue(adHocFilterOperator, filterOperator) {
+  const scopeConvertedOperator = scopeFilterOperatorMap[adHocFilterOperator];
+  if (!isRegexOperator(scopeConvertedOperator) || !isRegexOperator(filterOperator)) {
+    return false;
+  }
+  return hasSameOperators(scopeConvertedOperator, filterOperator);
+}
+function isEqualityValue(adHocFilterOperator, filterOperator) {
   const scopeConvertedOperator = scopeFilterOperatorMap[adHocFilterOperator];
   if (!isEqualityOrMultiOperator(scopeConvertedOperator) || !isEqualityOrMultiOperator(filterOperator)) {
     return false;
   }
+  return hasSameOperators(scopeConvertedOperator, filterOperator);
+}
+function hasSameOperators(scopeConvertedOperator, filterOperator) {
   if (scopeConvertedOperator.includes("not") && !filterOperator.includes("not") || !scopeConvertedOperator.includes("not") && filterOperator.includes("not")) {
     return false;
   }
   return true;
 }
 
-export { getAdHocFiltersFromScopes, isEqualityOrMultiOperator, reverseScopeFilterOperatorMap };
+export { getAdHocFiltersFromScopes, isEqualityOrMultiOperator, isRegexOperator, reverseScopeFilterOperatorMap };
 //# sourceMappingURL=getAdHocFiltersFromScopes.js.map

package/dist/esm/variables/adhoc/getAdHocFiltersFromScopes.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAdHocFiltersFromScopes.js","sources":["../../../../src/variables/adhoc/getAdHocFiltersFromScopes.ts"],"sourcesContent":["import { Scope, ScopeFilterOperator, ScopeSpecFilter, scopeFilterOperatorMap } from '@grafana/data';\nimport { AdHocFilterWithLabels } from './AdHocFiltersVariable';\n\nexport type EqualityOrMultiOperator = Extract<ScopeFilterOperator, 'equals' | 'not-equals' | 'one-of' | 'not-one-of'>;\n\nexport const reverseScopeFilterOperatorMap: Record<ScopeFilterOperator, string> = Object.fromEntries(\n  Object.entries(scopeFilterOperatorMap).map(([symbol, operator]) => [operator, symbol])\n) as Record<ScopeFilterOperator, string>;\n\nexport function isEqualityOrMultiOperator(value: string): value is EqualityOrMultiOperator {\n  const operators = new Set(['equals', 'not-equals', 'one-of', 'not-one-of']);\n  return operators.has(value);\n}\n\n// this function returns processed adhoc filters after parsing and processing\n// all scope filters from a scope list. The reason we need to process these filters is\n// because scopes can have multiple filter values with the same key. For example:\n// we have selected ScopeA which has a filter with a key1, operator one-of, a value1,\n// and a ScopeB which has a filter with key1, operator one-of, and value2. After processing,\n// the result will be just one adhoc filter with both values. This is held in formattedFilters.\n// DuplicatedFilters will containg unprocessable filters: if scopeA has instead of the one-of op\n// an equal op, then the result will be 2 adhoc filters with the same key, but diferent operator\n// and value. We return them this way and let the adhoc interface deal with this.\nexport function getAdHocFiltersFromScopes(scopes: Scope[]): AdHocFilterWithLabels[] {\n  const formattedFilters: Map<string, AdHocFilterWithLabels> = new Map();\n  // duplicated filters that could not be processed in any way are just appended to the list\n  const duplicatedFilters: AdHocFilterWithLabels[] = [];\n  const allFilters = scopes.flatMap((scope) => scope.spec.filters);\n\n  for (const filter of allFilters) {\n    processFilter(formattedFilters, duplicatedFilters, filter);\n  }\n\n  return [...formattedFilters.values(), ...duplicatedFilters];\n}\n\nfunction processFilter(\n  formattedFilters: Map<string, AdHocFilterWithLabels>,\n  duplicatedFilters: AdHocFilterWithLabels[],\n  filter: ScopeSpecFilter\n) {\n  if (!filter) {\n    return;\n  }\n\n  const existingFilter = formattedFilters.get(filter.key);\n\n  if (existingFilter && canValueBeMerged(existingFilter.operator, filter.operator)) {\n    mergeFilterValues(existingFilter, filter);\n  } else if (!existingFilter) {\n    // Add filter to map either only if it is new.\n    // Otherwise it is an existing filter that cannot be converted to multi-value\n    // and thus will be moved to the duplicatedFilters list\n    formattedFilters.set(filter.key, {\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: 'scope',\n    });\n  } else {\n    duplicatedFilters.push({\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: 'scope',\n    });\n  }\n}\n\nfunction mergeFilterValues(adHocFilter: AdHocFilterWithLabels, filter: ScopeSpecFilter) {\n  const values = filter.values ?? [filter.value];\n\n  for (const value of values) {\n    if (!adHocFilter.values?.includes(value)) {\n      adHocFilter.values?.push(value);\n    }\n  }\n\n  // If there's only one value, there's no need to update the\n  // operator to its multi-value equivalent\n  if (adHocFilter.values?.length === 1) {\n    return;\n  }\n\n  // Otherwise update it to the equivalent multi-value operator\n  if (filter.operator === 'equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['one-of'];\n  } else if (filter.operator === 'not-equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['not-equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['not-one-of'];\n  }\n}\n\nfunction canValueBeMerged(adHocFilterOperator: string, filterOperator: string) {\n  const scopeConvertedOperator = scopeFilterOperatorMap[adHocFilterOperator];\n\n  if (!isEqualityOrMultiOperator(scopeConvertedOperator) || !isEqualityOrMultiOperator(filterOperator)) {\n    return false;\n  }\n\n  if (\n    (scopeConvertedOperator.includes('not') && !filterOperator.includes('not')) ||\n    (!scopeConvertedOperator.includes('not') && filterOperator.includes('not'))\n  ) {\n    return false;\n  }\n\n  return true;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"getAdHocFiltersFromScopes.js","sources":["../../../../src/variables/adhoc/getAdHocFiltersFromScopes.ts"],"sourcesContent":["import { Scope, ScopeFilterOperator, ScopeSpecFilter, scopeFilterOperatorMap } from '@grafana/data';\nimport { AdHocFilterWithLabels } from './AdHocFiltersVariable';\n\nexport type EqualityOrMultiOperator = Extract<ScopeFilterOperator, 'equals' | 'not-equals' | 'one-of' | 'not-one-of'>;\nexport type RegexOperator = Extract<ScopeFilterOperator, 'regex-match' | 'regex-not-match'>;\n\nexport const reverseScopeFilterOperatorMap: Record<ScopeFilterOperator, string> = Object.fromEntries(\n  Object.entries(scopeFilterOperatorMap).map(([symbol, operator]) => [operator, symbol])\n) as Record<ScopeFilterOperator, string>;\n\nexport function isEqualityOrMultiOperator(value: string): value is EqualityOrMultiOperator {\n  const operators = new Set(['equals', 'not-equals', 'one-of', 'not-one-of']);\n  return operators.has(value);\n}\n\nexport function isRegexOperator(value: string): value is RegexOperator {\n  const operators = new Set(['regex-match', 'regex-not-match']);\n  return operators.has(value);\n}\n\n// this function returns processed adhoc filters after parsing and processing\n// all scope filters from a scope list. The reason we need to process these filters is\n// because scopes can have multiple filter values with the same key. For example:\n// we have selected ScopeA which has a filter with a key1, operator one-of, a value1,\n// and a ScopeB which has a filter with key1, operator one-of, and value2. After processing,\n// the result will be just one adhoc filter with both values. This is held in formattedFilters.\n// DuplicatedFilters will containg unprocessable filters: if scopeA has instead of the one-of op\n// an equal op, then the result will be 2 adhoc filters with the same key, but diferent operator\n// and value. We return them this way and let the adhoc interface deal with this.\nexport function getAdHocFiltersFromScopes(scopes: Scope[]): AdHocFilterWithLabels[] {\n  const formattedFilters: Map<string, AdHocFilterWithLabels> = new Map();\n  // duplicated filters that could not be processed in any way are just appended to the list\n  const duplicatedFilters: AdHocFilterWithLabels[] = [];\n  const allFilters = scopes.flatMap((scope) => scope.spec.filters);\n\n  for (const filter of allFilters) {\n    processFilter(formattedFilters, duplicatedFilters, filter);\n  }\n\n  return [...formattedFilters.values(), ...duplicatedFilters];\n}\n\nfunction processFilter(\n  formattedFilters: Map<string, AdHocFilterWithLabels>,\n  duplicatedFilters: AdHocFilterWithLabels[],\n  filter: ScopeSpecFilter\n) {\n  if (!filter) {\n    return;\n  }\n\n  const existingFilter = formattedFilters.get(filter.key);\n\n  if (existingFilter && isEqualityValue(existingFilter.operator, filter.operator)) {\n    mergeFilterValues(existingFilter, filter);\n  } else if (existingFilter && isRegexValue(existingFilter.operator, filter.operator)) {\n    existingFilter.value += `|${filter.value}`;\n    existingFilter.values = [existingFilter.value];\n  } else if (!existingFilter) {\n    // Add filter to map either only if it is new.\n    // Otherwise it is an existing filter that cannot be converted to multi-value\n    // and thus will be moved to the duplicatedFilters list\n    formattedFilters.set(filter.key, {\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: 'scope',\n    });\n  } else {\n    duplicatedFilters.push({\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: 'scope',\n    });\n  }\n}\n\nfunction mergeFilterValues(adHocFilter: AdHocFilterWithLabels, filter: ScopeSpecFilter) {\n  const values = filter.values ?? [filter.value];\n\n  for (const value of values) {\n    if (!adHocFilter.values?.includes(value)) {\n      adHocFilter.values?.push(value);\n    }\n  }\n\n  // If there's only one value, there's no need to update the\n  // operator to its multi-value equivalent\n  if (adHocFilter.values?.length === 1) {\n    return;\n  }\n\n  // Otherwise update it to the equivalent multi-value operator\n  if (filter.operator === 'equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['one-of'];\n  } else if (filter.operator === 'not-equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['not-equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['not-one-of'];\n  }\n}\n\nfunction isRegexValue(adHocFilterOperator: string, filterOperator: string) {\n  const scopeConvertedOperator = scopeFilterOperatorMap[adHocFilterOperator];\n\n  if (!isRegexOperator(scopeConvertedOperator) || !isRegexOperator(filterOperator)) {\n    return false;\n  }\n\n  return hasSameOperators(scopeConvertedOperator, filterOperator);\n}\n\nfunction isEqualityValue(adHocFilterOperator: string, filterOperator: string) {\n  const scopeConvertedOperator = scopeFilterOperatorMap[adHocFilterOperator];\n\n  if (!isEqualityOrMultiOperator(scopeConvertedOperator) || !isEqualityOrMultiOperator(filterOperator)) {\n    return false;\n  }\n\n  return hasSameOperators(scopeConvertedOperator, filterOperator);\n}\n\nfunction hasSameOperators(scopeConvertedOperator: string, filterOperator: string) {\n  if (\n    (scopeConvertedOperator.includes('not') && !filterOperator.includes('not')) ||\n    (!scopeConvertedOperator.includes('not') && filterOperator.includes('not'))\n  ) {\n    return false;\n  }\n\n  return true;\n}\n"],"names":[],"mappings":";;AAMO,MAAM,gCAAqE,MAAO,CAAA,WAAA;AAAA,EACvF,MAAO,CAAA,OAAA,CAAQ,sBAAsB,CAAA,CAAE,GAAI,CAAA,CAAC,CAAC,MAAA,EAAQ,QAAQ,CAAA,KAAM,CAAC,QAAA,EAAU,MAAM,CAAC;AACvF;AAEO,SAAS,0BAA0B,KAAiD,EAAA;AACzF,EAAM,MAAA,SAAA,uBAAgB,GAAI,CAAA,CAAC,UAAU,YAAc,EAAA,QAAA,EAAU,YAAY,CAAC,CAAA;AAC1E,EAAO,OAAA,SAAA,CAAU,IAAI,KAAK,CAAA;AAC5B;AAEO,SAAS,gBAAgB,KAAuC,EAAA;AACrE,EAAA,MAAM,4BAAgB,IAAA,GAAA,CAAI,CAAC,aAAA,EAAe,iBAAiB,CAAC,CAAA;AAC5D,EAAO,OAAA,SAAA,CAAU,IAAI,KAAK,CAAA;AAC5B;AAWO,SAAS,0BAA0B,MAA0C,EAAA;AAClF,EAAM,MAAA,gBAAA,uBAA2D,GAAI,EAAA;AAErE,EAAA,MAAM,oBAA6C,EAAC;AACpD,EAAA,MAAM,aAAa,MAAO,CAAA,OAAA,CAAQ,CAAC,KAAU,KAAA,KAAA,CAAM,KAAK,OAAO,CAAA;AAE/D,EAAA,KAAA,MAAW,UAAU,UAAY,EAAA;AAC/B,IAAc,aAAA,CAAA,gBAAA,EAAkB,mBAAmB,MAAM,CAAA;AAAA;AAG3D,EAAA,OAAO,CAAC,GAAG,gBAAA,CAAiB,MAAO,EAAA,EAAG,GAAG,iBAAiB,CAAA;AAC5D;AAEA,SAAS,aAAA,CACP,gBACA,EAAA,iBAAA,EACA,MACA,EAAA;AA9CF,EAAA,IAAA,EAAA,EAAA,EAAA;AA+CE,EAAA,IAAI,CAAC,MAAQ,EAAA;AACX,IAAA;AAAA;AAGF,EAAA,MAAM,cAAiB,GAAA,gBAAA,CAAiB,GAAI,CAAA,MAAA,CAAO,GAAG,CAAA;AAEtD,EAAA,IAAI,kBAAkB,eAAgB,CAAA,cAAA,CAAe,QAAU,EAAA,MAAA,CAAO,QAAQ,CAAG,EAAA;AAC/E,IAAA,iBAAA,CAAkB,gBAAgB,MAAM,CAAA;AAAA,aAC/B,cAAkB,IAAA,YAAA,CAAa,eAAe,QAAU,EAAA,MAAA,CAAO,QAAQ,CAAG,EAAA;AACnF,IAAe,cAAA,CAAA,KAAA,IAAS,CAAI,CAAA,EAAA,MAAA,CAAO,KAAK,CAAA,CAAA;AACxC,IAAe,cAAA,CAAA,MAAA,GAAS,CAAC,cAAA,CAAe,KAAK,CAAA;AAAA,GAC/C,MAAA,IAAW,CAAC,cAAgB,EAAA;AAI1B,IAAiB,gBAAA,CAAA,GAAA,CAAI,OAAO,GAAK,EAAA;AAAA,MAC/B,KAAK,MAAO,CAAA,GAAA;AAAA,MACZ,QAAA,EAAU,6BAA8B,CAAA,MAAA,CAAO,QAAQ,CAAA;AAAA,MACvD,OAAO,MAAO,CAAA,KAAA;AAAA,MACd,SAAQ,EAAO,GAAA,MAAA,CAAA,MAAA,KAAP,IAAiB,GAAA,EAAA,GAAA,CAAC,OAAO,KAAK,CAAA;AAAA,MACtC,MAAQ,EAAA;AAAA,KACT,CAAA;AAAA,GACI,MAAA;AACL,IAAA,iBAAA,CAAkB,IAAK,CAAA;AAAA,MACrB,KAAK,MAAO,CAAA,GAAA;AAAA,MACZ,QAAA,EAAU,6BAA8B,CAAA,MAAA,CAAO,QAAQ,CAAA;AAAA,MACvD,OAAO,MAAO,CAAA,KAAA;AAAA,MACd,SAAQ,EAAO,GAAA,MAAA,CAAA,MAAA,KAAP,IAAiB,GAAA,EAAA,GAAA,CAAC,OAAO,KAAK,CAAA;AAAA,MACtC,MAAQ,EAAA;AAAA,KACT,CAAA;AAAA;AAEL;AAEA,SAAS,iBAAA,CAAkB,aAAoC,MAAyB,EAAA;AAhFxF,EAAA,IAAA,EAAA,EAAA,EAAA,EAAA,EAAA,EAAA,EAAA;AAiFE,EAAA,MAAM,UAAS,EAAO,GAAA,MAAA,CAAA,MAAA,KAAP,IAAiB,GAAA,EAAA,GAAA,CAAC,OAAO,KAAK,CAAA;AAE7C,EAAA,KAAA,MAAW,SAAS,MAAQ,EAAA;AAC1B,IAAA,IAAI,EAAC,CAAA,EAAA,GAAA,WAAA,CAAY,MAAZ,KAAA,IAAA,GAAA,MAAA,GAAA,EAAA,CAAoB,SAAS,KAAQ,CAAA,CAAA,EAAA;AACxC,MAAY,CAAA,EAAA,GAAA,WAAA,CAAA,MAAA,KAAZ,mBAAoB,IAAK,CAAA,KAAA,CAAA;AAAA;AAC3B;AAKF,EAAA,IAAA,CAAA,CAAI,EAAY,GAAA,WAAA,CAAA,MAAA,KAAZ,IAAoB,GAAA,MAAA,GAAA,EAAA,CAAA,MAAA,MAAW,CAAG,EAAA;AACpC,IAAA;AAAA;AAIF,EAAA,IAAI,OAAO,QAAa,KAAA,QAAA,IAAY,YAAY,QAAa,KAAA,6BAAA,CAA8B,QAAQ,CAAG,EAAA;AACpG,IAAY,WAAA,CAAA,QAAA,GAAW,8BAA8B,QAAQ,CAAA;AAAA,GAC/D,MAAA,IAAW,OAAO,QAAa,KAAA,YAAA,IAAgB,YAAY,QAAa,KAAA,6BAAA,CAA8B,YAAY,CAAG,EAAA;AACnH,IAAY,WAAA,CAAA,QAAA,GAAW,8BAA8B,YAAY,CAAA;AAAA;AAErE;AAEA,SAAS,YAAA,CAAa,qBAA6B,cAAwB,EAAA;AACzE,EAAM,MAAA,sBAAA,GAAyB,uBAAuB,mBAAmB,CAAA;AAEzE,EAAA,IAAI,CAAC,eAAgB,CAAA,sBAAsB,KAAK,CAAC,eAAA,CAAgB,cAAc,CAAG,EAAA;AAChF,IAAO,OAAA,KAAA;AAAA;AAGT,EAAO,OAAA,gBAAA,CAAiB,wBAAwB,cAAc,CAAA;AAChE;AAEA,SAAS,eAAA,CAAgB,qBAA6B,cAAwB,EAAA;AAC5E,EAAM,MAAA,sBAAA,GAAyB,uBAAuB,mBAAmB,CAAA;AAEzE,EAAA,IAAI,CAAC,yBAA0B,CAAA,sBAAsB,KAAK,CAAC,yBAAA,CAA0B,cAAc,CAAG,EAAA;AACpG,IAAO,OAAA,KAAA;AAAA;AAGT,EAAO,OAAA,gBAAA,CAAiB,wBAAwB,cAAc,CAAA;AAChE;AAEA,SAAS,gBAAA,CAAiB,wBAAgC,cAAwB,EAAA;AAChF,EAAA,IACG,uBAAuB,QAAS,CAAA,KAAK,CAAK,IAAA,CAAC,eAAe,QAAS,CAAA,KAAK,CACxE,IAAA,CAAC,uBAAuB,QAAS,CAAA,KAAK,KAAK,cAAe,CAAA,QAAA,CAAS,KAAK,CACzE,EAAA;AACA,IAAO,OAAA,KAAA;AAAA;AAGT,EAAO,OAAA,IAAA;AACT;;;;"}

package/dist/index.js

@@ -5631,6 +5631,10 @@ function isEqualityOrMultiOperator(value) {
   const operators = /* @__PURE__ */ new Set(["equals", "not-equals", "one-of", "not-one-of"]);
   return operators.has(value);
 }
+function isRegexOperator(value) {
+  const operators = /* @__PURE__ */ new Set(["regex-match", "regex-not-match"]);
+  return operators.has(value);
+}
 function getAdHocFiltersFromScopes(scopes) {
   const formattedFilters = /* @__PURE__ */ new Map();
   const duplicatedFilters = [];
@@ -5646,8 +5650,11 @@ function processFilter(formattedFilters, duplicatedFilters, filter) {
     return;
   }
   const existingFilter = formattedFilters.get(filter.key);
-  if (existingFilter && canValueBeMerged(existingFilter.operator, filter.operator)) {
+  if (existingFilter && isEqualityValue(existingFilter.operator, filter.operator)) {
     mergeFilterValues(existingFilter, filter);
+  } else if (existingFilter && isRegexValue(existingFilter.operator, filter.operator)) {
+    existingFilter.value += `|${filter.value}`;
+    existingFilter.values = [existingFilter.value];
   } else if (!existingFilter) {
     formattedFilters.set(filter.key, {
       key: filter.key,
@@ -5683,11 +5690,21 @@ function mergeFilterValues(adHocFilter, filter) {
     adHocFilter.operator = reverseScopeFilterOperatorMap["not-one-of"];
   }
 }
-function canValueBeMerged(adHocFilterOperator, filterOperator) {
+function isRegexValue(adHocFilterOperator, filterOperator) {
+  const scopeConvertedOperator = data.scopeFilterOperatorMap[adHocFilterOperator];
+  if (!isRegexOperator(scopeConvertedOperator) || !isRegexOperator(filterOperator)) {
+    return false;
+  }
+  return hasSameOperators(scopeConvertedOperator, filterOperator);
+}
+function isEqualityValue(adHocFilterOperator, filterOperator) {
   const scopeConvertedOperator = data.scopeFilterOperatorMap[adHocFilterOperator];
   if (!isEqualityOrMultiOperator(scopeConvertedOperator) || !isEqualityOrMultiOperator(filterOperator)) {
     return false;
   }
+  return hasSameOperators(scopeConvertedOperator, filterOperator);
+}
+function hasSameOperators(scopeConvertedOperator, filterOperator) {
   if (scopeConvertedOperator.includes("not") && !filterOperator.includes("not") || !scopeConvertedOperator.includes("not") && filterOperator.includes("not")) {
     return false;
   }