From 83d4736183acb91b9945b356dc4bab24d5edd663 Mon Sep 17 00:00:00 2001 From: Assunta DeSanto Date: Wed, 31 Aug 2022 00:12:02 -0400 Subject: [PATCH] modifying save method for regex rules to check for type of regex rule being changed and nullify unneccessary attributes --- client/src/mvc/rules/rule-definitions.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client/src/mvc/rules/rule-definitions.js b/client/src/mvc/rules/rule-definitions.js index 7087f31550b..2943d16ff78 100644 --- a/client/src/mvc/rules/rule-definitions.js +++ b/client/src/mvc/rules/rule-definitions.js @@ -266,12 +266,16 @@ const RULES = { save: (component, rule) => { rule.target_column = component.addColumnRegexTarget; rule.expression = component.addColumnRegexExpression; - if (component.addColumnRegexReplacement) { + if (component.addColumnRegexType == "replacement" && component.addColumnRegexReplacement) { rule.replacement = component.addColumnRegexReplacement; - } - if (component.addColumnRegexGroupCount) { + rule.group_count = null; + } else if (component.addColumnRegexType == "groups" && component.addColumnRegexGroupCount) { rule.group_count = parseInt(component.addColumnRegexGroupCount); - } + rule.replacement = null; + } else if (component.addColumnRegexType == "global"){ + rule.replacement = null; + rule.group_count = null; + }; }, apply: (rule, data, sources, columns) => { const target = rule.target_column;