[Backport 2.6] Fixed a bug with doc level trigger creation. (#537)

* Fixed a bug with doc level trigger creation. See issue 448 for more details. (#513) Signed-off-by: AWSHurneyt <[email protected]> * Updated test workflow dependency references. Signed-off-by: AWSHurneyt <[email protected]> * Adjusted package versions used by tests. Signed-off-by: AWSHurneyt <[email protected]> --------- Signed-off-by: AWSHurneyt <[email protected]>
opensearch-project · Apr 26, 2023 · 1e92e30 · 1e92e30
1 parent 8bd0c73
commit 1e92e30
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml
@@ -7,9 +7,9 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.6.0'
   OPENSEARCH_VERSION: '2.6.0-SNAPSHOT'
-  ALERTING_PLUGIN_BRANCH: '2.x'
+  ALERTING_PLUGIN_BRANCH: '2.6.0.0'
 jobs:
   tests:
     name: Run Cypress E2E tests

diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml
@@ -7,7 +7,7 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.6.0'
 jobs:
   tests:
     name: Run unit tests

diff --git a/public/pages/CreateTrigger/containers/CreateTrigger/utils/formikToTrigger.js b/public/pages/CreateTrigger/containers/CreateTrigger/utils/formikToTrigger.js
@@ -108,8 +108,7 @@ export function getDocumentLevelScriptSource(conditions) {
     }
     if (!_.isEmpty(query) && !_.isEmpty(query.queryName)) {
       const queryExpression = _.get(query, 'expression');
-      const operator = query.operator === '!=' ? '!' : '';
-      scriptSourceContents.push(`${operator}query[${queryExpression}]`);
+      scriptSourceContents.push(`query[${queryExpression}]`);
     }
   });
   return scriptSourceContents.join(' ');