fixed conflicts

akto-api-security · Nov 22, 2024 · 25a3c96 · 25a3c96
1 parent 8260cfe
commit 25a3c96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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),
 
       }