feat: add filters in list format (#1835)

aziontech · Oct 22, 2024 · 5c485a8 · 5c485a8
1 parent da648d9
commit 5c485a8
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 16 deletions.
diff --git a/src/helpers/real-time-filters-rules.js b/src/helpers/real-time-filters-rules.js
@@ -7,7 +7,17 @@ const FILTER_BLACK_LIST = [
   'naxsiAttackFamilyEq',
   'naxsiAttackFamilyNe',
   'naxsiAttackFamilyLike',
-  'naxsiAttackFamilyIlike'
+  'naxsiAttackFamilyIlike',
+  'classifiedLike',
+  'classifiedIlike',
+  'classifiedIn',
+  'classifiedNotIn',
+  'classifiedIsNull',
+  'actionLike',
+  'actionIlike',
+  'actionIn',
+  'actionNotIn',
+  'actionIsNull'
 ]
 
 const SUPPORTED_FILTER_TYPE = ['String', 'Int', 'Float', 'IntRange', 'FloatRange', 'GenericScalar']
@@ -84,11 +94,17 @@ const FILTER_LIKE_TYPE = {
   zoneIdIn: 'ArrayObject',
   edgeFunctionIdIn: 'ArrayObject',
   botCategoryIn: 'ArrayObject',
-  challengeSolvedEq: 'Boolean'
+  challengeSolvedEq: 'Boolean',
+  classifiedEq: 'StringObject',
+  classifiedNe: 'StringObject',
+  actionEq: 'StringObject',
+  actionNe: 'StringObject',
 }
 
 const FILTER_LIKE_ALIAS = {
-  configurationIdIn: 'Domain'
+  configurationIdIn: 'Domain',
+  classifiedEq: 'Classified',
+  classifiedNe: 'Classified',
 }
 
 /**

diff --git a/src/modules/real-time-metrics/constants/dashboards.js b/src/modules/real-time-metrics/constants/dashboards.js
@@ -130,7 +130,7 @@ const PAGES_DASHBOARDS = {
     },
     {
       id: 9,
-      label: 'Bot Manager Advanced',
+      label: 'Bot Manager',
       path: 'bot-manager-advanced',
       groupId: 2,
       dashboards: [

diff --git a/src/modules/real-time-metrics/constants/services-operator-in.js b/src/modules/real-time-metrics/constants/services-operator-in.js
@@ -3,15 +3,21 @@ import {
   searchDomainsService,
   searchEdgeDnsService,
   searchBotCategoryService,
-  searchClassifiedService
+  searchChallengeSolvedService,
+  searchClassifiedService,
+  searchActionService
 } from '@/services/real-time-metrics-services'
 
 const MAP_SERVICE_OPERATION = {
   configurationIdIn: searchDomainsService,
   zoneIdIn: searchEdgeDnsService,
   edgeFunctionIdIn: searchEdgeFunctionsService,
   botCategoryIn: searchBotCategoryService,
-  challengeSolvedEq: searchClassifiedService
+  challengeSolvedEq: searchChallengeSolvedService,
+  classifiedEq: searchClassifiedService,
+  classifiedNe: searchClassifiedService,
+  actionEq: searchActionService,
+  actionNe: searchActionService
 }
 
 export default MAP_SERVICE_OPERATION
diff --git a/src/services/real-time-metrics-services/index.js b/src/services/real-time-metrics-services/index.js
@@ -3,13 +3,17 @@ import { searchEdgeDnsService } from './search-edge-dns-service'
 import { searchEdgeFunctionsService } from './search-edge-functions'
 import { loadRealTimeMetricsData } from './load-real-time-metrics-data'
 import { searchBotCategoryService } from './search-bot-category-service'
+import { searchChallengeSolvedService } from './search-challenge-solved-service'
 import { searchClassifiedService } from './search-classified-service'
+import { searchActionService } from './search-action-service'
 
 export {
   searchDomainsService,
   searchEdgeDnsService,
   searchEdgeFunctionsService,
   loadRealTimeMetricsData,
   searchBotCategoryService,
-  searchClassifiedService
+  searchChallengeSolvedService,
+  searchClassifiedService,
+  searchActionService
 }
diff --git a/src/services/real-time-metrics-services/search-action-service.js b/src/services/real-time-metrics-services/search-action-service.js
@@ -0,0 +1,11 @@
+export const searchActionService = () => {
+  return [
+    { label: 'Allow', value: 'allow' },
+    { label: 'Custom HTML', value: 'custom html' },
+    { label: 'Deny ', value: 'deny' },
+    { label: 'Drop', value: 'drop' },
+    { label: 'Hold Connection', value: 'hold connection' },
+    { label: 'Random Delay', value: 'random delay' },
+    { label: 'Redirect', value: 'redirect' },
+  ]
+}
diff --git a/src/services/real-time-metrics-services/search-challenge-solved-service.js b/src/services/real-time-metrics-services/search-challenge-solved-service.js
@@ -0,0 +1,6 @@
+export const searchChallengeSolvedService = () => {
+  return [
+    { label: 'Solved', value: true },
+    { label: 'Not Solved', value: false }
+  ]
+}
diff --git a/src/services/real-time-metrics-services/search-classified-service.js b/src/services/real-time-metrics-services/search-classified-service.js
@@ -1,6 +1,8 @@
 export const searchClassifiedService = () => {
   return [
-    { label: 'Solved', value: true },
-    { label: 'Not Solved', value: false }
+    { label: 'Legitimate', value: 'legitimate' },
+    { label: 'Good Bot', value: 'good bot' },
+    { label: 'Bad Bot ', value: 'bad bot' },
+    { label: 'Under Evaluation', value: 'under evaluation' },
   ]
 }
diff --git a/src/templates/advanced-filter/component/display/chips-default-display.vue b/src/templates/advanced-filter/component/display/chips-default-display.vue
@@ -22,7 +22,7 @@
 
   const formattedValue = (filter) => {
     let newFilter = { ...filter }
-    if (filter?.type === 'Boolean')
+    if (['Boolean', 'StringObject'].includes(filter?.type))
       newFilter = { ...filter, value: filter?.value?.label.toLowerCase() }
 
     const isEmptyString = !newFilter?.value && newFilter?.type === 'String'

diff --git a/src/templates/advanced-filter/component/index.js b/src/templates/advanced-filter/component/index.js
@@ -16,6 +16,7 @@ export const FIELDS_MAPPING = {
   FloatRange: h(floatRangeFilter),
   ArrayObject: h(multiselectFilter),
   Boolean: h(selectFilter),
+  StringObject: h(selectFilter),
   ArrayString: h(chipsFilter),
   GenericScalar: h(textFilter)
 }

diff --git a/src/templates/advanced-filter/dialog-filter.vue b/src/templates/advanced-filter/dialog-filter.vue
@@ -169,7 +169,8 @@
         type: operatorSelected.type
       }
 
-      if (filterSelected.operator[0].value.type === 'Boolean') {
+      const operatorType = filterSelected.operator[0].value.type
+      if (['Boolean', 'StringObject'].includes(operatorType)) {
         data.value = selectedValue
       } else {
         data.value = selectedValue ?? { begin, end }

diff --git a/src/tests/helpers/realt-time-filter-rules.test.js b/src/tests/helpers/realt-time-filter-rules.test.js
@@ -18,7 +18,17 @@ describe('RealTimeMetricsModule', () => {
           'naxsiAttackFamilyEq',
           'naxsiAttackFamilyNe',
           'naxsiAttackFamilyLike',
-          'naxsiAttackFamilyIlike'
+          'naxsiAttackFamilyIlike',
+          'classifiedLike',
+          'classifiedIlike',
+          'classifiedIn',
+          'classifiedNotIn',
+          'classifiedIsNull',
+          'actionLike',
+          'actionIlike',
+          'actionIn',
+          'actionNotIn',
+          'actionIsNull'
         ],
         FILTER_WHITELIST: {
           SUPPORTED_FILTER_TYPE: [
@@ -110,10 +120,16 @@ describe('RealTimeMetricsModule', () => {
           zoneIdIn: 'ArrayObject',
           edgeFunctionIdIn: 'ArrayObject',
           botCategoryIn: 'ArrayObject',
-          challengeSolvedEq: 'Boolean'
+          challengeSolvedEq: 'Boolean',
+          classifiedEq: 'StringObject',
+          classifiedNe: 'StringObject',
+          actionEq: 'StringObject',
+          actionNe: 'StringObject',
         },
         FILTER_LIKE_ALIAS: {
-          configurationIdIn: 'Domain'
+          configurationIdIn: 'Domain',
+          classifiedEq: 'Classified',
+          classifiedNe: 'Classified',
         },
         ALIAS_MAPPING: { configurationId: 'domain' }
       }

diff --git a/src/tests/modules/real-time-metrics/constants/dashboards.test.js b/src/tests/modules/real-time-metrics/constants/dashboards.test.js
@@ -125,7 +125,7 @@ describe('RealTimeMetricsModule', () => {
             },
             {
               id: 9,
-              label: 'Bot Manager Advanced',
+              label: 'Bot Manager',
               path: 'bot-manager-advanced',
               groupId: 2,
               dashboards: [

diff --git a/src/tests/modules/real-time-metrics/constants/map-services-operator-in.test.js b/src/tests/modules/real-time-metrics/constants/map-services-operator-in.test.js
@@ -14,7 +14,11 @@ describe('RealTimeMetricsModule', () => {
         zoneIdIn: services.searchEdgeDnsService,
         edgeFunctionIdIn: services.searchEdgeFunctionsService,
         botCategoryIn: services.searchBotCategoryService,
-        challengeSolvedEq: services.searchClassifiedService
+        challengeSolvedEq: services.searchChallengeSolvedService,
+        classifiedEq: services.searchClassifiedService,
+        classifiedNe: services.searchClassifiedService,
+        actionEq: services.searchActionService,
+        actionNe: services.searchActionService
       }
 
       expect(MAP_SERVICE_OPERATION).toEqual(mapServiceOperation)

diff --git a/src/views/RealTimeMetrics/blocks/content-filter-block.vue b/src/views/RealTimeMetrics/blocks/content-filter-block.vue
@@ -189,6 +189,18 @@
         return
       }
 
+      if (item.type === 'StringObject') {
+        createAndFilter({
+          [field]: {
+            value: item.value.value,
+            meta: {
+              inputType: 'String'
+            }
+          }
+        })
+        return
+      }
+
       createAndFilter({
         [field]: {
           value: item.type !== 'Boolean' ? item.value : item.value.value,