From 83d4736183acb91b9945b356dc4bab24d5edd663 Mon Sep 17 00:00:00 2001 From: Assunta DeSanto Date: Wed, 31 Aug 2022 00:12:02 -0400 Subject: [PATCH 1/3] 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; From 29de980c3206ce5c3fe3d235ebffa83db8a5c444 Mon Sep 17 00:00:00 2001 From: Assunta DeSanto Date: Wed, 31 Aug 2022 00:25:39 -0400 Subject: [PATCH 2/3] running prettier --- client/src/mvc/rules/rule-definitions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/mvc/rules/rule-definitions.js b/client/src/mvc/rules/rule-definitions.js index 2943d16ff78..957c21cd816 100644 --- a/client/src/mvc/rules/rule-definitions.js +++ b/client/src/mvc/rules/rule-definitions.js @@ -272,10 +272,10 @@ const RULES = { } else if (component.addColumnRegexType == "groups" && component.addColumnRegexGroupCount) { rule.group_count = parseInt(component.addColumnRegexGroupCount); rule.replacement = null; - } else if (component.addColumnRegexType == "global"){ + } else if (component.addColumnRegexType == "global") { rule.replacement = null; rule.group_count = null; - }; + } }, apply: (rule, data, sources, columns) => { const target = rule.target_column; From 6c42f3f56cefc77da8dc0479442dc0aee639f99d Mon Sep 17 00:00:00 2001 From: Assunta DeSanto Date: Wed, 31 Aug 2022 23:16:33 -0400 Subject: [PATCH 3/3] adding a watch on the value for group count to validate that it is a natural number --- client/src/components/RuleCollectionBuilder.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/src/components/RuleCollectionBuilder.vue b/client/src/components/RuleCollectionBuilder.vue index cb82c51131a..ab4ae62bf69 100644 --- a/client/src/components/RuleCollectionBuilder.vue +++ b/client/src/components/RuleCollectionBuilder.vue @@ -1148,6 +1148,13 @@ export default { this.addColumnRegexReplacement = null; } }, + addColumnRegexGroupCount: function (oldVal, newVal) { + if (oldVal != newVal) { + if (newVal < 1) { + this.addColumnRegexGroupCount = 1; + } + } + }, }, created() { if (this.elementsType !== "collection_contents") {