Skip to content

Commit b4444c1

Browse files
kibanamachinesemdcnasikas
authored
[7.x] [RAC] Persistent timeline fields fix (#110685) (#110996)
* [RAC] Persistent timeline fields fix (#110685) * fix stringify circular ref crash and default columns on createTimeline * rollback reset buton fix to split PR * adding fields to the storage cleaning * tests fixed * test fix * Skip cypress test Co-authored-by: Sergi Massaneda <sergi.massaneda@elastic.co> Co-authored-by: Christos Nasikas <christos.nasikas@elastic.co>
1 parent 42b95d4 commit b4444c1

File tree

12 files changed

+116
-30
lines changed

12 files changed

+116
-30
lines changed

‎x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,8 @@ describe('Custom detection rules deletion and edition', () => {
358358
});
359359
});
360360

361-
it('Allows a rule to be edited', () => {
361+
// TODO: Remove when https://github.com/elastic/kibana/pull/111251 is merged
362+
it.skip('Allows a rule to be edited', () => {
362363
editFirstRule();
363364
waitForKibana();
364365

‎x-pack/plugins/security_solution/public/common/mock/global_state.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@ export const mockGlobalState: State = {
242242
activeTab: TimelineTabs.query,
243243
prevActiveTab: TimelineTabs.notes,
244244
deletedEventIds: [],
245+
documentType: '',
246+
queryFields: [],
247+
selectAll: false,
245248
id: 'test',
246249
savedObjectId: null,
247250
columns: defaultHeaders,

‎x-pack/plugins/security_solution/public/common/mock/timeline_results.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,6 +1979,7 @@ export const mockTimelineModel: TimelineModel = {
19791979
},
19801980
deletedEventIds: [],
19811981
description: 'This is a sample rule description',
1982+
documentType: '',
19821983
eqlOptions: {
19831984
eventCategoryField: 'event.category',
19841985
tiebreakerField: 'event.sequence',
@@ -2017,13 +2018,15 @@ export const mockTimelineModel: TimelineModel = {
20172018
kqlQuery: {
20182019
filterQuery: null,
20192020
},
2021+
queryFields: [],
20202022
itemsPerPage: 25,
20212023
itemsPerPageOptions: [10, 25, 50, 100],
20222024
loadingEventIds: [],
20232025
noteIds: [],
20242026
pinnedEventIds: {},
20252027
pinnedEventsSaveObject: {},
20262028
savedObjectId: 'ef579e40-jibber-jabber',
2029+
selectAll: false,
20272030
selectedEventIds: {},
20282031
show: false,
20292032
showCheckboxes: false,
@@ -2110,6 +2113,7 @@ export const defaultTimelineProps: CreateTimelineProps = {
21102113
dateRange: { end: '2018-11-05T19:03:25.937Z', start: '2018-11-05T18:58:25.937Z' },
21112114
deletedEventIds: [],
21122115
description: '',
2116+
documentType: '',
21132117
eqlOptions: {
21142118
eventCategoryField: 'event.category',
21152119
query: '',
@@ -2141,7 +2145,9 @@ export const defaultTimelineProps: CreateTimelineProps = {
21412145
noteIds: [],
21422146
pinnedEventIds: {},
21432147
pinnedEventsSaveObject: {},
2148+
queryFields: [],
21442149
savedObjectId: null,
2150+
selectAll: false,
21452151
selectedEventIds: {},
21462152
show: false,
21472153
showCheckboxes: false,

‎x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ describe('alert actions', () => {
148148
},
149149
deletedEventIds: [],
150150
description: 'This is a sample rule description',
151+
documentType: '',
151152
eqlOptions: {
152153
eventCategoryField: 'event.category',
153154
query: '',
@@ -204,7 +205,9 @@ describe('alert actions', () => {
204205
noteIds: [],
205206
pinnedEventIds: {},
206207
pinnedEventsSaveObject: {},
208+
queryFields: [],
207209
savedObjectId: null,
210+
selectAll: false,
208211
selectedEventIds: {},
209212
show: true,
210213
showCheckboxes: false,

‎x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ describe('helpers', () => {
296296
dataProviders: [],
297297
dateRange: { start: '2020-07-07T08:20:18.966Z', end: '2020-07-08T08:20:18.966Z' },
298298
description: '',
299+
documentType: '',
299300
deletedEventIds: [],
300301
eqlOptions: {
301302
eventCategoryField: 'event.category',
@@ -328,7 +329,9 @@ describe('helpers', () => {
328329
noteIds: [],
329330
pinnedEventIds: {},
330331
pinnedEventsSaveObject: {},
332+
queryFields: [],
331333
savedObjectId: 'savedObject-1',
334+
selectAll: false,
332335
selectedEventIds: {},
333336
show: false,
334337
showCheckboxes: false,
@@ -366,6 +369,7 @@ describe('helpers', () => {
366369
dataProviders: [],
367370
dateRange: { start: '2020-07-07T08:20:18.966Z', end: '2020-07-08T08:20:18.966Z' },
368371
description: '',
372+
documentType: '',
369373
deletedEventIds: [],
370374
eqlOptions: {
371375
eventCategoryField: 'event.category',
@@ -398,7 +402,9 @@ describe('helpers', () => {
398402
noteIds: [],
399403
pinnedEventIds: {},
400404
pinnedEventsSaveObject: {},
405+
queryFields: [],
401406
savedObjectId: 'savedObject-1',
407+
selectAll: false,
402408
selectedEventIds: {},
403409
show: false,
404410
showCheckboxes: false,
@@ -436,6 +442,7 @@ describe('helpers', () => {
436442
dataProviders: [],
437443
dateRange: { start: '2020-07-07T08:20:18.966Z', end: '2020-07-08T08:20:18.966Z' },
438444
description: '',
445+
documentType: '',
439446
deletedEventIds: [],
440447
eqlOptions: {
441448
eventCategoryField: 'event.category',
@@ -468,7 +475,9 @@ describe('helpers', () => {
468475
noteIds: [],
469476
pinnedEventIds: {},
470477
pinnedEventsSaveObject: {},
478+
queryFields: [],
471479
savedObjectId: 'savedObject-1',
480+
selectAll: false,
472481
selectedEventIds: {},
473482
show: false,
474483
showCheckboxes: false,
@@ -504,6 +513,7 @@ describe('helpers', () => {
504513
dataProviders: [],
505514
dateRange: { start: '2020-07-07T08:20:18.966Z', end: '2020-07-08T08:20:18.966Z' },
506515
description: '',
516+
documentType: '',
507517
deletedEventIds: [],
508518
eqlOptions: {
509519
eventCategoryField: 'event.category',
@@ -536,7 +546,9 @@ describe('helpers', () => {
536546
noteIds: [],
537547
pinnedEventIds: {},
538548
pinnedEventsSaveObject: {},
549+
queryFields: [],
539550
savedObjectId: 'savedObject-1',
551+
selectAll: false,
540552
selectedEventIds: {},
541553
show: false,
542554
showCheckboxes: false,
@@ -577,6 +589,7 @@ describe('helpers', () => {
577589
dataProviders: [],
578590
dateRange: { start: '2020-07-07T08:20:18.966Z', end: '2020-07-08T08:20:18.966Z' },
579591
description: '',
592+
documentType: '',
580593
deletedEventIds: [],
581594
eqlOptions: {
582595
eventCategoryField: 'event.category',
@@ -612,6 +625,8 @@ describe('helpers', () => {
612625
noteIds: [],
613626
pinnedEventIds: {},
614627
pinnedEventsSaveObject: {},
628+
queryFields: [],
629+
selectAll: false,
615630
selectedEventIds: {},
616631
show: false,
617632
showCheckboxes: false,
@@ -680,6 +695,7 @@ describe('helpers', () => {
680695
dateRange: { start: '2020-07-07T08:20:18.966Z', end: '2020-07-08T08:20:18.966Z' },
681696
dataProviders: [],
682697
description: '',
698+
documentType: '',
683699
deletedEventIds: [],
684700
eqlOptions: {
685701
eventCategoryField: 'event.category',
@@ -758,6 +774,8 @@ describe('helpers', () => {
758774
noteIds: [],
759775
pinnedEventIds: {},
760776
pinnedEventsSaveObject: {},
777+
queryFields: [],
778+
selectAll: false,
761779
selectedEventIds: {},
762780
show: false,
763781
showCheckboxes: false,
@@ -791,6 +809,7 @@ describe('helpers', () => {
791809
dataProviders: [],
792810
dateRange: { end: '2020-10-28T11:37:31.655Z', start: '2020-10-27T11:37:31.655Z' },
793811
description: '',
812+
documentType: '',
794813
deletedEventIds: [],
795814
eqlOptions: {
796815
eventCategoryField: 'event.category',
@@ -823,7 +842,9 @@ describe('helpers', () => {
823842
noteIds: [],
824843
pinnedEventIds: {},
825844
pinnedEventsSaveObject: {},
845+
queryFields: [],
826846
savedObjectId: 'savedObject-1',
847+
selectAll: false,
827848
selectedEventIds: {},
828849
show: false,
829850
showCheckboxes: false,
@@ -861,6 +882,7 @@ describe('helpers', () => {
861882
dataProviders: [],
862883
dateRange: { end: '2020-07-08T08:20:18.966Z', start: '2020-07-07T08:20:18.966Z' },
863884
description: '',
885+
documentType: '',
864886
deletedEventIds: [],
865887
eqlOptions: {
866888
eventCategoryField: 'event.category',
@@ -893,7 +915,9 @@ describe('helpers', () => {
893915
noteIds: [],
894916
pinnedEventIds: {},
895917
pinnedEventsSaveObject: {},
918+
queryFields: [],
896919
savedObjectId: 'savedObject-1',
920+
selectAll: false,
897921
selectedEventIds: {},
898922
show: false,
899923
showCheckboxes: false,

0 commit comments

Comments
 (0)