From 3f12f561163e8aff16c93b4ef696315d3e93ceaa Mon Sep 17 00:00:00 2001 From: Avneesh Hota Date: Fri, 22 Nov 2024 13:52:35 +0530 Subject: [PATCH] fixed conflicts --- .../src/main/java/com/akto/action/CustomDataTypeAction.java | 3 ++- .../src/apps/dashboard/pages/observe/data_types/DataTypes.jsx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/dashboard/src/main/java/com/akto/action/CustomDataTypeAction.java b/apps/dashboard/src/main/java/com/akto/action/CustomDataTypeAction.java index 7a3a20717..d5fc9e0fb 100644 --- a/apps/dashboard/src/main/java/com/akto/action/CustomDataTypeAction.java +++ b/apps/dashboard/src/main/java/com/akto/action/CustomDataTypeAction.java @@ -279,7 +279,8 @@ public String saveAktoDataType(){ Updates.set(AktoDataType.CATEGORIES_LIST, getUniqueValuesOfList(categoriesList)), Updates.set(AktoDataType.KEY_CONDITIONS, keyConditions), Updates.set(AktoDataType.VALUE_CONDITIONS, valueConditions), - Updates.set(AktoDataType.OPERATOR, mainOperator) + Updates.set(AktoDataType.OPERATOR, mainOperator), + Updates.set(AktoDataType.DATA_TYPE_PRIORITY, dataTypePriority) ), options ); diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx index 85f63417e..34ee4943a 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx @@ -170,6 +170,7 @@ function DataTypes() { keyOperator: currState.keyConditions.operator, valueConditionFromUsers: valueArr, valueOperator: currState.valueConditions.operator, + dataTypePriority: currState?.priority ? currState.priority.toUpperCase() : "", ...transform.convertToSensitiveData(currState.sensitiveState), }