Skip to content

Commit 6af890b

Browse files
authored
Update props for EventProcedureForm (#22510)
* Update props for EventProcedureForm * changelog * Fix typescript error * Revert change * Wording
1 parent 13a18ed commit 6af890b

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

changelog/unreleased/issue-enterprise-9163.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ type="a"
22
message="Added support in Event Definitions for new Event Procedures."
33

44
issues=["Graylog2/graylog-plugin-enterprise#9163"]
5-
pulls=["22297"]
5+
pulls=["22297", "22510"]

graylog2-web-interface/src/components/event-definitions/event-definition-form/EventDetailsForm.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,27 @@ const EventDetailsForm = ({ eventDefinition, eventDefinitionEventProcedure, vali
8080

8181
const readOnly = !canEdit || isSystemEventDefinition(eventDefinition) || eventDefinition.config.type === 'sigma-v1';
8282
const hasEventProcedure = !!eventDefinitionEventProcedure;
83+
const hasRemediationSteps = eventDefinition?.remediation_steps;
8384

8485
const renderEventProcedure = () => {
8586
if (isEventProceduresEnabled) {
8687
return (
8788
<>
88-
{hasEventProcedure || showAddEventProcedureForm ? (
89+
{hasEventProcedure || hasRemediationSteps || showAddEventProcedureForm ? (
8990
<>
9091
{pluggableEventProcedureForm.map(({ component: PluggableEventProcedureForm }) => (
9192
<PluggableEventProcedureForm
92-
eventDefinition={eventDefinition}
9393
eventProcedureID={eventDefinitionEventProcedure}
94+
remediationSteps={eventDefinition?.remediation_steps}
9495
onClose={() => setShowAddEventProcedureForm(false)}
9596
onSave={(eventProcedureId) => onChange('event_procedure', eventProcedureId)}
96-
canEdit={canEdit}
9797
/>
9898
))}
9999
</>
100100
) : (
101101
<>
102102
<ControlLabel>Event Procedure Summary</ControlLabel>
103-
<p>This Event does not have any Event Procedures yet.</p>
103+
<p>This Event Definition does not have any Event Procedures yet.</p>
104104
<Button bsStyle="success" onClick={() => setShowAddEventProcedureForm(true)}>
105105
Add Event Procedure
106106
</Button>

graylog2-web-interface/src/views/types.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ import type { Event } from 'components/events/events/types';
6363
import type { PluggableReducer } from 'store';
6464
import type { WidgetMapping } from 'views/logic/views/types';
6565
import type { ValueRendererProps } from 'views/components/messagelist/decoration/ValueRenderer';
66-
import type { EventDefinition } from 'components/event-definitions/event-definitions-types';
6766

6867
export type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[]
6968
? ElementType
@@ -317,11 +316,10 @@ type AssetInformationComponentProps = {
317316
};
318317

319318
type EventProcedureFormProps = {
320-
eventDefinition: EventDefinition;
321319
eventProcedureID: string | undefined;
320+
remediationSteps: string;
322321
onClose: () => void;
323322
onSave: (eventProcedureId: string) => void;
324-
canEdit: boolean;
325323
};
326324

327325
type EventProcedureSummaryProps = {

0 commit comments

Comments
 (0)