From c3144d1a3d0de55cbfd0e921257f706d47a640f3 Mon Sep 17 00:00:00 2001 From: "Dr. Lint-a-lot" Date: Mon, 13 Jul 2026 16:58:37 +0000 Subject: [PATCH] Running lint --fix & prettier --- .../src/components/bootstrap/ListGroup.tsx | 7 +++++- .../components/bootstrap/ListGroupItem.tsx | 23 ++++++++++++++++--- .../hooks/useInstancePendingChanges.ts | 4 +++- .../instances/InstanceDetailDrawer.test.tsx | 7 +++++- .../hooks/useActionsColumnDefinition.tsx | 11 +++++++-- .../FilterAggregationSummary.tsx | 6 +---- .../event-definition-types/FilterForm.tsx | 4 +--- .../EventDefinitionActions.tsx | 5 +--- .../InputDiagnosisOverviewTab.tsx | 4 +++- .../streams/StreamsOverview/Constants.ts | 8 +------ .../cells/ProcessingTimeBadge.tsx | 4 +--- .../src/integrations/aws/StepAuthorize.tsx | 9 ++------ .../aws/utils/awsValidation.test.ts | 5 +--- .../integrations/aws/utils/awsValidation.ts | 5 +--- .../src/pages/ViewEventDefinitionPage.tsx | 1 - 15 files changed, 56 insertions(+), 47 deletions(-) diff --git a/graylog2-web-interface/src/components/bootstrap/ListGroup.tsx b/graylog2-web-interface/src/components/bootstrap/ListGroup.tsx index 53e8d5aca703..3893d39d540f 100644 --- a/graylog2-web-interface/src/components/bootstrap/ListGroup.tsx +++ b/graylog2-web-interface/src/components/bootstrap/ListGroup.tsx @@ -42,7 +42,12 @@ const ListGroup = ({ 'data-testid': dataTestId = undefined, style = undefined, }: Props) => ( - + {children} ); diff --git a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx index 214698f69efa..8450a96d6c22 100644 --- a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx +++ b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx @@ -135,14 +135,31 @@ type ItemBodyProps = StyledProps & { onKeyDown?: React.KeyboardEventHandler; }; -const ItemBody = ({ href = undefined, disabled = undefined, onClick = undefined, onKeyDown = undefined, children, ...styledProps }: ItemBodyProps) => { +const ItemBody = ({ + href = undefined, + disabled = undefined, + onClick = undefined, + onKeyDown = undefined, + children, + ...styledProps +}: ItemBodyProps) => { if (href) { - return {children}; + return ( + + {children} + + ); } if (onClick) { return ( - + {children} ); diff --git a/graylog2-web-interface/src/components/collectors/hooks/useInstancePendingChanges.ts b/graylog2-web-interface/src/components/collectors/hooks/useInstancePendingChanges.ts index ec38233987aa..a43029c880a6 100644 --- a/graylog2-web-interface/src/components/collectors/hooks/useInstancePendingChanges.ts +++ b/graylog2-web-interface/src/components/collectors/hooks/useInstancePendingChanges.ts @@ -27,7 +27,9 @@ import type { PendingChangesResponse } from '../types'; export const pendingChangesKey = (instanceUid: string) => ['collectors', 'instances', instanceUid, 'pending_changes']; const fetchPendingChanges = (instanceUid: string): Promise => - Collectors.instancePendingChanges(instanceUid, { requestShouldExtendSession: false }) as Promise; + Collectors.instancePendingChanges(instanceUid, { + requestShouldExtendSession: false, + }) as Promise; const useInstancePendingChanges = ( instanceUid: string, diff --git a/graylog2-web-interface/src/components/collectors/instances/InstanceDetailDrawer.test.tsx b/graylog2-web-interface/src/components/collectors/instances/InstanceDetailDrawer.test.tsx index 63fd1fd13e14..365c995e5e26 100644 --- a/graylog2-web-interface/src/components/collectors/instances/InstanceDetailDrawer.test.tsx +++ b/graylog2-web-interface/src/components/collectors/instances/InstanceDetailDrawer.test.tsx @@ -166,7 +166,12 @@ describe('InstanceDetailDrawer', () => { const staleInstance = { ...mockInstance, has_pending_changes: false }; render( - , + , ); await screen.findByText('Synchronization'); diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/hooks/useActionsColumnDefinition.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/hooks/useActionsColumnDefinition.tsx index 4be88c8b8c8c..9567b48dab41 100644 --- a/graylog2-web-interface/src/components/common/EntityDataTable/hooks/useActionsColumnDefinition.tsx +++ b/graylog2-web-interface/src/components/common/EntityDataTable/hooks/useActionsColumnDefinition.tsx @@ -23,7 +23,11 @@ import styled, { css } from 'styled-components'; import useResizeObserver from '@react-hook/resize-observer'; import { ButtonToolbar } from 'components/bootstrap'; -import { TABLE_ROW_HOVER_TRANSITION, TABLE_ROW_PINNED_HOVER_BG_VAR, flattenTableBackground } from 'components/bootstrap/Table'; +import { + TABLE_ROW_HOVER_TRANSITION, + TABLE_ROW_PINNED_HOVER_BG_VAR, + flattenTableBackground, +} from 'components/bootstrap/Table'; import type { EntityBase } from 'components/common/EntityDataTable/types'; import { ACTIONS_COL_ID, CELL_PADDING } from 'components/common/EntityDataTable/Constants'; import { actionsHeaderWidthVar } from 'components/common/EntityDataTable/CSSVariables'; @@ -50,7 +54,10 @@ const Actions = styled.div<{ $isEvenRow: boolean }>( display: flex; justify-content: flex-end; padding: ${CELL_PADDING}px; - background-color: ${flattenTableBackground(theme, $isEvenRow ? theme.colors.table.row.background : theme.colors.table.row.backgroundStriped)}; + background-color: ${flattenTableBackground( + theme, + $isEvenRow ? theme.colors.table.row.background : theme.colors.table.row.backgroundStriped, + )}; height: 100%; align-items: flex-start; transition: ${TABLE_ROW_HOVER_TRANSITION}; diff --git a/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterAggregationSummary.tsx b/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterAggregationSummary.tsx index b1ab4cdf4c40..3eb26211e9f9 100644 --- a/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterAggregationSummary.tsx +++ b/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterAggregationSummary.tsx @@ -76,11 +76,7 @@ const getConditionType = (config: EventDefinition['config']) => { : 'aggregation'; }; -const QueryParameters = ({ - queryParameters, -}: { - queryParameters: Array; -}) => { +const QueryParameters = ({ queryParameters }: { queryParameters: Array }) => { if (queryParameters.some((p) => p.embryonic)) { const undeclaredParameters = queryParameters .filter((p) => p.embryonic) diff --git a/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterForm.tsx b/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterForm.tsx index b581760d52af..ace5a5854465 100644 --- a/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterForm.tsx +++ b/graylog2-web-interface/src/components/event-definitions/event-definition-types/FilterForm.tsx @@ -130,9 +130,7 @@ const QueryParameters = ({ eventDefinition, onChange, validation, userCanViewLoo ); if (!userCanViewLookupTables) { - return ( - This account lacks permission to declare Query Parameters from Lookup Tables. - ); + return This account lacks permission to declare Query Parameters from Lookup Tables.; } const parameterButtons = queryParameters.map((queryParam) => { diff --git a/graylog2-web-interface/src/components/event-definitions/event-definitions/EventDefinitionActions.tsx b/graylog2-web-interface/src/components/event-definitions/event-definitions/EventDefinitionActions.tsx index 1aec8031fce8..9028f2ee4e7b 100644 --- a/graylog2-web-interface/src/components/event-definitions/event-definitions/EventDefinitionActions.tsx +++ b/graylog2-web-interface/src/components/event-definitions/event-definitions/EventDefinitionActions.tsx @@ -41,10 +41,7 @@ import { MoreActions } from 'components/common/EntityDataTable'; import usePluggableEntitySharedActions from 'hooks/usePluggableEntitySharedActions'; import type { EventDefinition } from '../event-definitions-types'; -import { - isAggregationEventDefinition, - isSystemEventDefinition, -} from '../event-definitions-types'; +import { isAggregationEventDefinition, isSystemEventDefinition } from '../event-definitions-types'; type Props = { eventDefinition: EventDefinition; diff --git a/graylog2-web-interface/src/components/inputs/InputDiagnosis/InputDiagnosisOverviewTab.tsx b/graylog2-web-interface/src/components/inputs/InputDiagnosis/InputDiagnosisOverviewTab.tsx index a16f72a637c8..469d72c50579 100644 --- a/graylog2-web-interface/src/components/inputs/InputDiagnosis/InputDiagnosisOverviewTab.tsx +++ b/graylog2-web-interface/src/components/inputs/InputDiagnosis/InputDiagnosisOverviewTab.tsx @@ -305,7 +305,9 @@ const InputDiagnosisOverviewTab = ({ {Object.keys(inputNodeStates.states).map((state: InputState) => ( ))} - {Object.keys(inputNodeStates.states).length === 0 && Input is not running.} + {Object.keys(inputNodeStates.states).length === 0 && ( + Input is not running. + )} diff --git a/graylog2-web-interface/src/components/streams/StreamsOverview/Constants.ts b/graylog2-web-interface/src/components/streams/StreamsOverview/Constants.ts index ccbab11b0abd..6ac0a9dcb8a9 100644 --- a/graylog2-web-interface/src/components/streams/StreamsOverview/Constants.ts +++ b/graylog2-web-interface/src/components/streams/StreamsOverview/Constants.ts @@ -70,13 +70,7 @@ const getStreamTableElements = ( METRIC_COLUMN_IDS.maxProcessingTime, ]; - const defaultColumnOrder = [ - ...defaultCols, - ...routingCols, - ...performanceCols, - ...ungroupedExtNames, - 'created_at', - ]; + const defaultColumnOrder = [...defaultCols, ...routingCols, ...performanceCols, ...ungroupedExtNames, 'created_at']; const defaultVariantLayout = { ...SHARED_LAYOUT, diff --git a/graylog2-web-interface/src/components/streams/StreamsOverview/cells/ProcessingTimeBadge.tsx b/graylog2-web-interface/src/components/streams/StreamsOverview/cells/ProcessingTimeBadge.tsx index f5dbb686a14c..c1782040cedd 100644 --- a/graylog2-web-interface/src/components/streams/StreamsOverview/cells/ProcessingTimeBadge.tsx +++ b/graylog2-web-interface/src/components/streams/StreamsOverview/cells/ProcessingTimeBadge.tsx @@ -23,8 +23,6 @@ type Props = { title: string; }; -const ProcessingTimeBadge = ({ ms, title }: Props) => ( - {formatProcessingTime(ms)} -); +const ProcessingTimeBadge = ({ ms, title }: Props) => {formatProcessingTime(ms)}; export default ProcessingTimeBadge; diff --git a/graylog2-web-interface/src/integrations/aws/StepAuthorize.tsx b/graylog2-web-interface/src/integrations/aws/StepAuthorize.tsx index 9484200dae34..c9d0d0eace67 100644 --- a/graylog2-web-interface/src/integrations/aws/StepAuthorize.tsx +++ b/graylog2-web-interface/src/integrations/aws/StepAuthorize.tsx @@ -112,10 +112,7 @@ const StepAuthorize = ({ onChange, onSubmit, sidebarComponent = null }: StepAuth }, [setStreamsFetch]); const handleSubmit = () => { - const arnError = validateExternalIdRequiresArn( - formData?.awsAssumeRoleARN?.value, - formData?.awsExternalId?.value, - ); + const arnError = validateExternalIdRequiresArn(formData?.awsAssumeRoleARN?.value, formData?.awsExternalId?.value); if (arnError) { setExternalIdError(arnError); @@ -137,9 +134,7 @@ const StepAuthorize = ({ onChange, onSubmit, sidebarComponent = null }: StepAuth }; }, [clearSidebar, setSidebar, sidebarComponent]); - const formError = externalIdError - ? { full_message: externalIdError, nice_message: externalIdError } - : fetchError; + const formError = externalIdError ? { full_message: externalIdError, nice_message: externalIdError } : fetchError; const authType = formData.awsAuthenticationType && formData.awsAuthenticationType.value; const isFormValid = formValidation.isFormValid( diff --git a/graylog2-web-interface/src/integrations/aws/utils/awsValidation.test.ts b/graylog2-web-interface/src/integrations/aws/utils/awsValidation.test.ts index 4d5f029410ef..2a2caafe4bc3 100644 --- a/graylog2-web-interface/src/integrations/aws/utils/awsValidation.test.ts +++ b/graylog2-web-interface/src/integrations/aws/utils/awsValidation.test.ts @@ -20,10 +20,7 @@ import { validateExternalIdRequiresArn } from './awsValidation'; describe('awsValidation', () => { describe('validateExternalIdRequiresArn', () => { it('returns undefined when both ARN and External ID are provided', () => { - const result = validateExternalIdRequiresArn( - 'arn:aws:iam::123456789012:role/test-role', - 'test-external-id', - ); + const result = validateExternalIdRequiresArn('arn:aws:iam::123456789012:role/test-role', 'test-external-id'); expect(result).toBeUndefined(); }); diff --git a/graylog2-web-interface/src/integrations/aws/utils/awsValidation.ts b/graylog2-web-interface/src/integrations/aws/utils/awsValidation.ts index af3c270426b4..2390749af1e4 100644 --- a/graylog2-web-interface/src/integrations/aws/utils/awsValidation.ts +++ b/graylog2-web-interface/src/integrations/aws/utils/awsValidation.ts @@ -23,10 +23,7 @@ * @param externalId - The External ID value * @returns An error message if validation fails, undefined if valid */ -export const validateExternalIdRequiresArn = ( - assumeRoleArn?: string, - externalId?: string, -): string | undefined => { +export const validateExternalIdRequiresArn = (assumeRoleArn?: string, externalId?: string): string | undefined => { const hasExternalId = externalId && externalId.trim().length > 0; const hasAssumeRoleArn = assumeRoleArn && assumeRoleArn.trim().length > 0; diff --git a/graylog2-web-interface/src/pages/ViewEventDefinitionPage.tsx b/graylog2-web-interface/src/pages/ViewEventDefinitionPage.tsx index c382218a8712..38fc2407e241 100644 --- a/graylog2-web-interface/src/pages/ViewEventDefinitionPage.tsx +++ b/graylog2-web-interface/src/pages/ViewEventDefinitionPage.tsx @@ -37,7 +37,6 @@ import { EVENT_DEFINITIONS_QUERY_KEY, } from 'components/event-definitions/hooks/useEventDefinitions'; - const ViewEventDefinitionPage = () => { const params = useParams<{ definitionId?: string }>(); const currentUser = useCurrentUser();