diff --git a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx index 82c3c0d49d99..b87cc93ee481 100644 --- a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx +++ b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx @@ -92,8 +92,8 @@ const StyledListGroupItem = styled(BootstrapListGroupItem)( color: ${theme.colors.variant.darkest.default}; } - &:hover:not(.disabled):not(.active), - &:focus:not(.disabled):not(.active) { + &:hover:not(.disabled, .active), + &:focus:not(.disabled, .active) { color: inherit; background-color: ${theme.utils.colorLevel(theme.colors.global.contentBackground, 10)}; diff --git a/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFilterValueSuggestions.ts b/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFilterValueSuggestions.ts index 34ed9ea53027..1e276f69164d 100644 --- a/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFilterValueSuggestions.ts +++ b/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFilterValueSuggestions.ts @@ -79,11 +79,29 @@ const useFilterValueSuggestions = ( } const { data, isInitialLoading } = useQuery({ - queryKey: ['filters', 'suggestions', collection, collectionProperty, relatedIdentifier, identifierType, searchParams, displayFields, displayTemplate], + queryKey: [ + 'filters', + 'suggestions', + collection, + collectionProperty, + relatedIdentifier, + identifierType, + searchParams, + displayFields, + displayTemplate, + ], queryFn: () => defaultOnError( - fetchFilterValueSuggestions(collection, searchParams, relatedIdentifier, displayFields, displayTemplate, identifierType, collectionProperty), + fetchFilterValueSuggestions( + collection, + searchParams, + relatedIdentifier, + displayFields, + displayTemplate, + identifierType, + collectionProperty, + ), 'Loading suggestions for filter failed with status', 'Could not load filter suggestions', ), diff --git a/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFiltersWithTitle.ts b/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFiltersWithTitle.ts index b17eb00f27a4..78b1b94e256e 100644 --- a/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFiltersWithTitle.ts +++ b/graylog2-web-interface/src/components/common/EntityFilters/hooks/useFiltersWithTitle.ts @@ -37,12 +37,14 @@ type CollectionsByAttributeId = { }; type IdentifierMetaByAttributeId = { - [attributeId: string]: { - identifier_field?: string; - identifier_type?: string; - display_fields?: string[]; - display_template?: string; - } | undefined; + [attributeId: string]: + | { + identifier_field?: string; + identifier_type?: string; + display_fields?: string[]; + display_template?: string; + } + | undefined; }; type RequestedFilterTitles = Array<{ @@ -65,21 +67,24 @@ const _collectionsByAttributeId = (attributesMetaData: Attributes) => }, {}); const _identifierMetaByAttributeId = (attributesMetaData: Attributes): IdentifierMetaByAttributeId => - attributesMetaData?.reduce((col, { id, related_collection, related_identifier, type, related_display_fields, related_display_template }) => { - if (!related_collection) { - return col; - } + attributesMetaData?.reduce( + (col, { id, related_collection, related_identifier, type, related_display_fields, related_display_template }) => { + if (!related_collection) { + return col; + } - return { - ...col, - [id]: { - identifier_field: related_identifier, - identifier_type: related_identifier ? type : undefined, - display_fields: related_display_fields, - display_template: related_display_template, - }, - }; - }, {}); + return { + ...col, + [id]: { + identifier_field: related_identifier, + identifier_type: related_identifier ? type : undefined, + display_fields: related_display_fields, + display_template: related_display_template, + }, + }; + }, + {}, + ); const _urlQueryFiltersWithoutTitle = (filters: UrlQueryFilters, collectionsByAttributeId: CollectionsByAttributeId) => filters.entrySeq().reduce((col, [attributeId, filterValues]) => { @@ -215,7 +220,11 @@ const useFiltersWithTitle = ( const collectionsByAttributeId = _collectionsByAttributeId(attributesMetaData); const identifierMetaByAttributeId = _identifierMetaByAttributeId(attributesMetaData); const urlQueryFiltersWithoutTitle = _urlQueryFiltersWithoutTitle(urlQueryFilters, collectionsByAttributeId); - const payload = filtersWithoutTitlePayload(urlQueryFiltersWithoutTitle, collectionsByAttributeId, identifierMetaByAttributeId); + const payload = filtersWithoutTitlePayload( + urlQueryFiltersWithoutTitle, + collectionsByAttributeId, + identifierMetaByAttributeId, + ); const { data, isInitialLoading, isError } = useQuery({ queryKey: ['entity_titles', payload], @@ -240,7 +249,11 @@ const useFiltersWithTitle = ( const onChange = useCallback( (newFiltersWithTitle: Filters, newUrlQueryFilters: UrlQueryFilters) => { const newURLQueryFiltersWithoutTitle = _urlQueryFiltersWithoutTitle(newUrlQueryFilters, collectionsByAttributeId); - const newPayload = filtersWithoutTitlePayload(newURLQueryFiltersWithoutTitle, collectionsByAttributeId, identifierMetaByAttributeId); + const newPayload = filtersWithoutTitlePayload( + newURLQueryFiltersWithoutTitle, + collectionsByAttributeId, + identifierMetaByAttributeId, + ); const newResponse = filtersWithTitleToResponse(newFiltersWithTitle, attributesMetaData); queryClient.setQueryData(['entity_titles', newPayload], { entities: newResponse });