From 41eab22d1b4f38aa5fb9205dd3fcf058e5c879f3 Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 9 Oct 2024 10:40:21 -0700 Subject: [PATCH 1/7] edit correlation Alert Trigger fix Signed-off-by: Riya Saxena --- .../containers/CreateCorrelationRule.tsx | 23 +++++++++---------- public/store/CorrelationsStore.ts | 1 + types/Correlations.ts | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx index 3c060f58..d4e28334 100644 --- a/public/pages/Correlations/containers/CreateCorrelationRule.tsx +++ b/public/pages/Correlations/containers/CreateCorrelationRule.tsx @@ -85,7 +85,7 @@ export interface CreateCorrelationRuleProps extends DataSourceProps { history: RouteComponentProps< any, any, - { rule: CorrelationRuleModel; isReadOnly: boolean } + { rule: CorrelationRule; isReadOnly: boolean } >['history']; notifications: NotificationsStart | null; notificationsService: NotificationsService; @@ -234,20 +234,20 @@ export const CreateCorrelationRule: React.FC = ( setNotificationChannels(parsedChannels); setLoadingNotifications(false); }; + const setInitialRuleValues = async (ruleId: string) => { + const ruleRes = await correlationStore.getCorrelationRule(ruleId); + if (ruleRes) { + setInitialValues(ruleRes); + } + }; + if (props.history.location.state?.rule) { setAction('Edit'); - setInitialValues(props.history.location.state?.rule); + setInitialRuleValues(props.history.location.state?.rule.id); } else if (params.ruleId) { - const setInitialRuleValues = async () => { - const ruleRes = await correlationStore.getCorrelationRule(params.ruleId); - if (ruleRes) { - setInitialValues(ruleRes); - } - }; - - setAction('Edit'); - setInitialRuleValues(); + setInitialRuleValues(params.ruleId); } + const setupLogTypeOptions = async () => { const options = await getLogTypeOptions(); setLogTypeOptions(options); @@ -388,7 +388,6 @@ export const CreateCorrelationRule: React.FC = ( query.field = ''; }); } - // Modify or set default values for trigger if present if (values.trigger) { // Set default values for ids diff --git a/public/store/CorrelationsStore.ts b/public/store/CorrelationsStore.ts index b117d97b..639d275e 100644 --- a/public/store/CorrelationsStore.ts +++ b/public/store/CorrelationsStore.ts @@ -148,6 +148,7 @@ export class CorrelationsStore implements ICorrelationsStore { name: hit._source.name, time_window: hit._source.time_window || 300000, queries, + trigger: hit._source?.trigger }; } diff --git a/types/Correlations.ts b/types/Correlations.ts index 1bb33189..6a10fb2a 100644 --- a/types/Correlations.ts +++ b/types/Correlations.ts @@ -54,7 +54,7 @@ export interface CorrelationRuleModel { name: string; time_window: number; // Time in milliseconds queries: CorrelationRuleQuery[]; - trigger: CorrelationRuleTrigger | undefined; + trigger?: CorrelationRuleTrigger; } export interface CorrelationRule extends CorrelationRuleModel { @@ -76,7 +76,7 @@ export interface CorrelationRuleSource { name: string; time_window: number; correlate: CorrelationRuleSourceQueries[]; - trigger?: CorrelationRuleTrigger | undefined; + trigger?: CorrelationRuleTrigger; } export interface CorrelationRuleHit { From 104e1ecb8ed1061c1ac87e3b0ee633a92c42a0e8 Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 9 Oct 2024 11:11:14 -0700 Subject: [PATCH 2/7] delete correlation alert trigger fix Signed-off-by: Riya Saxena --- .../pages/Correlations/containers/CreateCorrelationRule.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx index d4e28334..1a4e199d 100644 --- a/public/pages/Correlations/containers/CreateCorrelationRule.tsx +++ b/public/pages/Correlations/containers/CreateCorrelationRule.tsx @@ -1078,7 +1078,11 @@ export const CreateCorrelationRule: React.FC = ( data-test-subj="delete-alert-trigger-icon" iconType="trash" color="danger" - onClick={() => setShowForm(false)} + onClick={() => { + // Clear the trigger values by setting them to an empty object or your initial state + props.setFieldValue('trigger', {}); // Assuming an empty object represents no trigger + setShowForm(false); // Optionally hide the form if that's desired + }} /> From 619b8ccbd6643de9cde454354418d03f566fc833 Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 9 Oct 2024 11:12:59 -0700 Subject: [PATCH 3/7] delete correlation alert trigger fix Signed-off-by: Riya Saxena --- .../pages/Correlations/containers/CreateCorrelationRule.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx index 1a4e199d..737d8b32 100644 --- a/public/pages/Correlations/containers/CreateCorrelationRule.tsx +++ b/public/pages/Correlations/containers/CreateCorrelationRule.tsx @@ -1080,8 +1080,8 @@ export const CreateCorrelationRule: React.FC = ( color="danger" onClick={() => { // Clear the trigger values by setting them to an empty object or your initial state - props.setFieldValue('trigger', {}); // Assuming an empty object represents no trigger - setShowForm(false); // Optionally hide the form if that's desired + props.setFieldValue('trigger', {}); + setShowForm(false); }} /> From 625c54a38380ee4292963fb84918cb3f4eddc92d Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 9 Oct 2024 16:26:23 -0700 Subject: [PATCH 4/7] edit correlation rule trigger fix Signed-off-by: Riya Saxena --- .../containers/CreateCorrelationRule.tsx | 18 ++++++++++-------- public/store/CorrelationsStore.ts | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx index 737d8b32..f76a3eb1 100644 --- a/public/pages/Correlations/containers/CreateCorrelationRule.tsx +++ b/public/pages/Correlations/containers/CreateCorrelationRule.tsx @@ -234,18 +234,20 @@ export const CreateCorrelationRule: React.FC = ( setNotificationChannels(parsedChannels); setLoadingNotifications(false); }; - const setInitialRuleValues = async (ruleId: string) => { - const ruleRes = await correlationStore.getCorrelationRule(ruleId); - if (ruleRes) { - setInitialValues(ruleRes); - } - }; if (props.history.location.state?.rule) { setAction('Edit'); - setInitialRuleValues(props.history.location.state?.rule.id); + setInitialValues(props.history.location.state?.rule); } else if (params.ruleId) { - setInitialRuleValues(params.ruleId); + const setInitialRuleValues = async () => { + const ruleRes = await correlationStore.getCorrelationRule(params.ruleId); + if (ruleRes) { + setInitialValues(ruleRes); + } + }; + + setAction('Edit'); + setInitialRuleValues(); } const setupLogTypeOptions = async () => { diff --git a/public/store/CorrelationsStore.ts b/public/store/CorrelationsStore.ts index 639d275e..cb8ef9d2 100644 --- a/public/store/CorrelationsStore.ts +++ b/public/store/CorrelationsStore.ts @@ -174,6 +174,7 @@ export class CorrelationsStore implements ICorrelationsStore { name: hit._source.name, time_window: hit._source.time_window || 300000, queries, + trigger: hit._source?.trigger }; }); } From 907af25a2cbd6de9c40b66902f7d25a17c0cd9bc Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 9 Oct 2024 16:28:10 -0700 Subject: [PATCH 5/7] edit correlation rule trigger fix Signed-off-by: Riya Saxena --- public/pages/Correlations/containers/CreateCorrelationRule.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx index f76a3eb1..40e2dc05 100644 --- a/public/pages/Correlations/containers/CreateCorrelationRule.tsx +++ b/public/pages/Correlations/containers/CreateCorrelationRule.tsx @@ -85,7 +85,7 @@ export interface CreateCorrelationRuleProps extends DataSourceProps { history: RouteComponentProps< any, any, - { rule: CorrelationRule; isReadOnly: boolean } + { rule: CorrelationRuleModel; isReadOnly: boolean } >['history']; notifications: NotificationsStart | null; notificationsService: NotificationsService; From ac91916f3d9048a98aca212a94c29e200c844861 Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 9 Oct 2024 16:29:44 -0700 Subject: [PATCH 6/7] edit correlation rule trigger fix Signed-off-by: Riya Saxena --- public/pages/Correlations/containers/CreateCorrelationRule.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx index 40e2dc05..3a2ed4ab 100644 --- a/public/pages/Correlations/containers/CreateCorrelationRule.tsx +++ b/public/pages/Correlations/containers/CreateCorrelationRule.tsx @@ -234,7 +234,6 @@ export const CreateCorrelationRule: React.FC = ( setNotificationChannels(parsedChannels); setLoadingNotifications(false); }; - if (props.history.location.state?.rule) { setAction('Edit'); setInitialValues(props.history.location.state?.rule); @@ -245,7 +244,6 @@ export const CreateCorrelationRule: React.FC = ( setInitialValues(ruleRes); } }; - setAction('Edit'); setInitialRuleValues(); } @@ -390,6 +388,7 @@ export const CreateCorrelationRule: React.FC = ( query.field = ''; }); } + // Modify or set default values for trigger if present if (values.trigger) { // Set default values for ids From 31d945dde379a3f99af741d847fab0e10c4ae4d2 Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 9 Oct 2024 16:33:03 -0700 Subject: [PATCH 7/7] extra spacing removed Signed-off-by: Riya Saxena --- public/pages/Correlations/containers/CreateCorrelationRule.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx index 3a2ed4ab..bbb61278 100644 --- a/public/pages/Correlations/containers/CreateCorrelationRule.tsx +++ b/public/pages/Correlations/containers/CreateCorrelationRule.tsx @@ -247,7 +247,6 @@ export const CreateCorrelationRule: React.FC = ( setAction('Edit'); setInitialRuleValues(); } - const setupLogTypeOptions = async () => { const options = await getLogTypeOptions(); setLogTypeOptions(options); @@ -388,7 +387,7 @@ export const CreateCorrelationRule: React.FC = ( query.field = ''; }); } - + // Modify or set default values for trigger if present if (values.trigger) { // Set default values for ids