Update default event priority filtering (#25313)

* update default event priority filter

* update cl

* cleanup

* Update graylog2-web-interface/src/components/common/EntityFilters/FilterConfiguration/StaticOptionsList.tsx

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: ryan-carroll-graylog

changelog/unreleased/issue-24889.toml

@@ -2,4 +2,4 @@ type = "a"
 message = "Added an 'Info' Events priority level."
 
 issues = ["24889"]
-pulls = ["25240", "graylog-plugin-enterprise#13456"]
+pulls = ["25240", "graylog-plugin-enterprise#13456", "25313", "graylog-plugin-enterprise#13506"]

graylog2-web-interface/src/components/common/EntityFilters/FilterConfiguration/StaticOptionsList.tsx

@@ -18,7 +18,6 @@ import React from 'react';
 
 import type { Attribute } from 'stores/PaginationTypes';
 import { MenuItem } from 'components/bootstrap';
-import { defaultCompare } from 'logic/DefaultCompare';
 import type { Filters } from 'components/common/EntityFilters/types';
 
 type Props = {
@@ -30,8 +29,9 @@ type Props = {
 
 const StaticOptionsList = ({ allActiveFilters, attribute, filterValueRenderer, onSubmit }: Props) => (
   <>
-    {attribute.filter_options
-      .sort(({ title: title1 }, { title: title2 }) => defaultCompare(title1.toLowerCase(), title2.toLowerCase()))
+    {(attribute.id === 'priority'
+      ? attribute.filter_options
+      : [...attribute.filter_options].sort((a, b) => a.title.localeCompare(b.title)))
       .map(({ title, value }) => {
         const disabled = !!allActiveFilters?.get(attribute.id)?.find(({ value: filterValue }) => value === filterValue);
 

graylog2-web-interface/src/components/events/Constants.ts

@@ -15,16 +15,15 @@
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
 import type { Sort, Attribute } from 'stores/PaginationTypes';
-import EventDefinitionPriorityEnum, { EXCLUDE_INFO_FILTER } from 'logic/alerts/EventDefinitionPriorityEnum';
+import EventDefinitionPriorityEnum from 'logic/alerts/EventDefinitionPriorityEnum';
 import type { MiddleSectionProps } from 'components/common/PaginatedEntityTable/PaginatedEntityTable';
 
 export const EVENTS_ENTITY_TABLE_ID = 'events';
 
 export const commonEventAttributes: Array<Attribute> = [
   {
     filter_options: [
-      { value: EXCLUDE_INFO_FILTER, title: 'Exclude Info' },
-      ...Object.keys(EventDefinitionPriorityEnum.properties).map((num) => ({ value: num, title: num })),
+      ...Object.keys(EventDefinitionPriorityEnum.properties).reverse().map((num) => ({ value: num, title: num })),
     ],
     filterable: true,
     id: 'priority',

graylog2-web-interface/src/components/events/EventsEntityTable.tsx

@@ -34,13 +34,16 @@ import QueryHelper from 'components/common/QueryHelper';
 import EventsWidgets from 'components/events/EventsWidgets';
 import EventsRefreshProvider from 'components/events/EventsRefreshProvider';
 import type { UrlQueryFilters } from 'components/common/EntityFilters/types';
-import { EXCLUDE_INFO_FILTER } from 'logic/alerts/EventDefinitionPriorityEnum';
+import EventDefinitionPriorityEnum from 'logic/alerts/EventDefinitionPriorityEnum';
 
 const additionalSearchFields = {
   key: 'The key of the event',
 };
 
-const defaultFilters = OrderedMap({ priority: [EXCLUDE_INFO_FILTER] });
+const nonInfoPriorities = Object.keys(EventDefinitionPriorityEnum.properties)
+  .reverse()
+  .filter((key) => key !== String(EventDefinitionPriorityEnum.INFO));
+const defaultFilters = OrderedMap({ priority: nonInfoPriorities });
 
 const EventsEntityTable = () => {
   const { stream_id: streamId } = useQuery();

graylog2-web-interface/src/components/events/events/PriorityName.tsx

@@ -16,18 +16,14 @@
  */
 import * as React from 'react';
 
-import EventDefinitionPriorityEnum, { EXCLUDE_INFO_FILTER } from 'logic/alerts/EventDefinitionPriorityEnum';
+import EventDefinitionPriorityEnum from 'logic/alerts/EventDefinitionPriorityEnum';
 import StringUtils from 'util/StringUtils';
 
 type Props = {
   priority: number | string;
 };
-const PriorityName = ({ priority }: Props) => {
-  if (String(priority) === EXCLUDE_INFO_FILTER) {
-    return <>Exclude Info</>;
-  }
-
-  return <>{StringUtils.capitalizeFirstLetter(EventDefinitionPriorityEnum.properties[priority].name)}</>;
-};
+const PriorityName = ({ priority }: Props) => (
+  <>{StringUtils.capitalizeFirstLetter(EventDefinitionPriorityEnum.properties[priority].name)}</>
+);
 
 export default PriorityName;

graylog2-web-interface/src/components/events/fetchEvents.test.ts

@@ -20,7 +20,6 @@ import fetch from 'logic/rest/FetchProvider';
 import asMock from 'helpers/mocking/AsMock';
 import type { SearchParams } from 'stores/PaginationTypes';
 import type { UrlQueryFilters } from 'components/common/EntityFilters/types';
-import { EXCLUDE_INFO_FILTER } from 'logic/alerts/EventDefinitionPriorityEnum';
 
 import fetchEvents, { defaultTimeRange, parseFilters, parseTypeFilter } from './fetchEvents';
 
@@ -129,20 +128,6 @@ describe('fetchEvents', () => {
       expect(result.filter.priority).toEqual(['1', '2']);
     });
 
-    it('expands exclude info filter to all non-info priorities', () => {
-      const filters: UrlQueryFilters = OrderedMap({ priority: [EXCLUDE_INFO_FILTER] });
-      const result = parseFilters(filters);
-
-      expect(result.filter.priority).toEqual(['1', '2', '3', '4']);
-    });
-
-    it('drops exclude info filter when specific priorities are also selected', () => {
-      const filters: UrlQueryFilters = OrderedMap({ priority: [EXCLUDE_INFO_FILTER, '3'] });
-      const result = parseFilters(filters);
-
-      expect(result.filter.priority).toEqual(['3']);
-    });
-
     it('includes id filter when present', () => {
       const filters: UrlQueryFilters = OrderedMap({ id: ['evt-1'] });
       const result = parseFilters(filters);

graylog2-web-interface/src/components/events/fetchEvents.ts

@@ -26,8 +26,6 @@ import { additionalAttributes } from 'components/events/Constants';
 import type { UrlQueryFilters } from 'components/common/EntityFilters/types';
 import parseTimerangeFilter from 'components/common/PaginatedEntityTable/parseTimerangeFilter';
 import type { TimeRange, RelativeTimeRange } from 'views/logic/queries/Query';
-import EventDefinitionPriorityEnum, { EXCLUDE_INFO_FILTER } from 'logic/alerts/EventDefinitionPriorityEnum';
-
 const url = URLUtils.qualifyUrl('/events/search');
 
 type FiltersResult = {
@@ -58,23 +56,6 @@ export const parseTypeFilter = (alert: string) => {
   }
 };
 
-const allPriorityKeys = Object.keys(EventDefinitionPriorityEnum.properties);
-
-const expandPriorityFilters = (priorities: Array<string>): Array<string> => {
-  const hasNegated = priorities.includes(EXCLUDE_INFO_FILTER);
-  const specificValues = priorities.filter((p) => p !== EXCLUDE_INFO_FILTER);
-
-  if (hasNegated && specificValues.length > 0) {
-    return specificValues;
-  }
-
-  if (hasNegated) {
-    return allPriorityKeys.filter((key) => key !== String(EventDefinitionPriorityEnum.INFO));
-  }
-
-  return priorities;
-};
-
 const allTime = { type: 'relative', range: 0 } as const;
 
 export const parseFilters = (filters: UrlQueryFilters, defaultTimerange: TimeRange = allTime) => {
@@ -107,7 +88,7 @@ export const parseFilters = (filters: UrlQueryFilters, defaultTimerange: TimeRan
   }
 
   if (filters.get('priority')?.length > 0) {
-    result.filter.priority = expandPriorityFilters(filters.get('priority'));
+    result.filter.priority = filters.get('priority');
   }
 
   if (filters.get('id')?.length > 0) {

graylog2-web-interface/src/logic/alerts/EventDefinitionPriorityEnum.ts

@@ -29,6 +29,4 @@ const EventDefinitionPriorityEnum = {
   },
 } as const;
 
-export const EXCLUDE_INFO_FILTER = '!0';
-
 export default EventDefinitionPriorityEnum;