diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx index 6597089f638e7..ee5472860bf6f 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx @@ -61,7 +61,7 @@ describe('UpdatePrePackagedRulesCallOut', () => { }); it('renders callOutMessage correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines = 0', () => { - const wrapper = shallow( + shallow( { }); it('renders buttonTitle correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines = 0', () => { - const wrapper = shallow( + shallow( { }); it('renders callOutMessage correctly: numberOfUpdatedRules = 0 and numberOfUpdatedTimelines > 0', () => { - const wrapper = shallow( + shallow( { }); it('renders buttonTitle correctly: numberOfUpdatedRules = 0 and numberOfUpdatedTimelines > 0', () => { - const wrapper = shallow( + shallow( { }); it('renders callOutMessage correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines > 0', () => { - const wrapper = shallow( + shallow( { }); it('renders buttonTitle correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines > 0', () => { - const wrapper = shallow( + shallow( { const rulesInstalled = 0; const rulesNotInstalled = 1; const rulesNotUpdated = 0; - const result: boolean = getPrePackagedRuleStatus( + const result: string = getPrePackagedRuleStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated @@ -415,7 +415,7 @@ describe('rule helpers', () => { const rulesInstalled = 1; const rulesNotInstalled = 0; const rulesNotUpdated = 0; - const result: boolean = getPrePackagedRuleStatus( + const result: string = getPrePackagedRuleStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated @@ -428,7 +428,7 @@ describe('rule helpers', () => { const rulesInstalled = 1; const rulesNotInstalled = 1; const rulesNotUpdated = 0; - const result: boolean = getPrePackagedRuleStatus( + const result: string = getPrePackagedRuleStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated @@ -441,7 +441,7 @@ describe('rule helpers', () => { const rulesInstalled = 1; const rulesNotInstalled = 0; const rulesNotUpdated = 1; - const result: boolean = getPrePackagedRuleStatus( + const result: string = getPrePackagedRuleStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated @@ -456,7 +456,7 @@ describe('rule helpers', () => { const rulesInstalled = 0; const rulesNotInstalled = 1; const rulesNotUpdated = 0; - const result: boolean = getPrePackagedTimelineStatus( + const result: string = getPrePackagedTimelineStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated @@ -469,7 +469,7 @@ describe('rule helpers', () => { const rulesInstalled = 1; const rulesNotInstalled = 0; const rulesNotUpdated = 0; - const result: boolean = getPrePackagedTimelineStatus( + const result: string = getPrePackagedTimelineStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated @@ -482,7 +482,7 @@ describe('rule helpers', () => { const rulesInstalled = 1; const rulesNotInstalled = 1; const rulesNotUpdated = 0; - const result: boolean = getPrePackagedTimelineStatus( + const result: string = getPrePackagedTimelineStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated @@ -495,7 +495,7 @@ describe('rule helpers', () => { const rulesInstalled = 1; const rulesNotInstalled = 0; const rulesNotUpdated = 1; - const result: boolean = getPrePackagedTimelineStatus( + const result: string = getPrePackagedTimelineStatus( rulesInstalled, rulesNotInstalled, rulesNotUpdated diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts index 97b26cac61e0d..6afc888ccf2e0 100644 --- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts +++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts @@ -80,7 +80,8 @@ export class CompareTimelinesStatus { this.isHandlingTemplateTimeline) || (this.templateTimelineObject.isCreatable && !this.timelineObject.isCreatable && - this.timelineObject.getData?.timelineType === this.timelineType)) + this.timelineObject.getData?.timelineType === this.timelineType && + this.isHandlingTemplateTimeline)) ); }