Skip to content

[Backport 3.3] allow keyword filter to be attached to bucket level monitor trigger #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 3.3
Choose a base branch
from
Open

[Backport 3.3] allow keyword filter to be attached to bucket level monitor trigger #1329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion public/pages/CreateMonitor/components/MonitorExpressions/expressions/utils/whereHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@

import _ from 'lodash';
import { OPERATORS_MAP, Expressions } from './constants';
import { TRIGGER_COMPARISON_OPERATORS } from '../../../../../CreateTrigger/containers/DefineBucketLevelTrigger/DefineBucketLevelTrigger';
import {
TRIGGER_COMPARISON_OPERATORS,
TRIGGER_OPERATORS_MAP,
} from '../../../../../CreateTrigger/containers/DefineBucketLevelTrigger/DefineBucketLevelTrigger';
import { DATA_TYPES } from '../../../../../../utils/constants';
import { FORMIK_INITIAL_WHERE_EXPRESSION_VALUES } from '../../../../containers/CreateMonitor/utils/constants';

Expand Down Expand Up @@ -98,6 +101,10 @@ export const validateWhereFilter = (filter = FORMIK_INITIAL_WHERE_EXPRESSION_VAL
// These operators don't store a query value in the FORMIK_INITIAL_WHERE_EXPRESSION_VALUES.
// No further validation needed.
break;
case TRIGGER_OPERATORS_MAP.INCLUDE:
case TRIGGER_OPERATORS_MAP.EXCLUDE:
filterIsValid = filterIsValid && !_.isEmpty(filter.fieldValue?.toString());
break;
default:
console.log('Unknown query operator detected:', fieldOperator);
filterIsValid = false;
Expand Down
Loading