Merge remote-tracking branch 'origin/release/v11.2.1' into release/v11.2.1

Author: mjabascal10

backend/src/main/java/com/park/utmstack/domain/correlation/rules/UtmCorrelationRules.java

@@ -148,7 +148,7 @@ public void setDeduplicateBy(List<String> deduplicateBy) throws UtmSerialization
     private List<String> groupBy;
 
     public List<String> getGroupBy() throws UtmSerializationException {
-        if (StringUtils.hasText(deduplicateByDef))
+        if (StringUtils.hasText(ruleGroupByDef))
             groupBy = UtilSerializer.jsonDeserializeList(String.class, ruleGroupByDef);
         return groupBy == null ? new ArrayList<>() : groupBy;
     }

backend/src/main/java/com/park/utmstack/domain/network_scan/enums/PropertyFilter.java

@@ -23,6 +23,7 @@ public enum PropertyFilter implements Property {
     COLLECTOR_GROUP("assetGroup.groupName", "UtmCollector", ""),
     RULE_TECHNIQUE("ruleTechnique","UtmCorrelationRules", ""),
     RULE_ADVERSARY("ruleAdversary","UtmCorrelationRules", ""),
+    RULE_STATUS("ruleActive","UtmCorrelationRules", ""),
     RULE_CATEGORY("ruleCategory","UtmCorrelationRules", "");
     //RULE_DATA_TYPES("jt.dataType","UtmCorrelationRules", "dataTypes");
     //DATA_TYPES("jt.dataType","UtmNetworkScan", "dataInputSourceList");