From 1cec0657db424252f7ac200f0228bc4f7ca7cea1 Mon Sep 17 00:00:00 2001 From: Ajay Devarakonda Date: Tue, 5 Dec 2023 12:16:27 +0530 Subject: [PATCH] TP-49982 | Modified incidents to tag already resolved incidents as duplicates (#308) * TP-38709 | Merging the changes to master on the logfix * TP-49982 | Modified to accept resolved incidents for duplicating the incidents --- internal/processor/action/incident_mark_duplicate_action.go | 2 +- internal/processor/action/view/incident_duplicate_text.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/processor/action/incident_mark_duplicate_action.go b/internal/processor/action/incident_mark_duplicate_action.go index b70474f..b00724d 100644 --- a/internal/processor/action/incident_mark_duplicate_action.go +++ b/internal/processor/action/incident_mark_duplicate_action.go @@ -157,7 +157,7 @@ func (dip *DuplicateIncidentAction) isRcaValid(RCA string, currentId uint) (bool if originalIncident == nil { return false, nil, nil } - if originalIncident.Status == 5 || originalIncident.Status == 4 { + if originalIncident.Status == 5 { return false, nil, nil } return originalIncident.ID != currentId, originalIncident, nil diff --git a/internal/processor/action/view/incident_duplicate_text.go b/internal/processor/action/view/incident_duplicate_text.go index 9d151f1..093f6dc 100644 --- a/internal/processor/action/view/incident_duplicate_text.go +++ b/internal/processor/action/view/incident_duplicate_text.go @@ -6,12 +6,12 @@ import ( ) func BuildDuplicateIncidentText(channel slack.Channel) slack.ModalViewRequest { - titleText := slack.NewTextBlockObject(slack.PlainTextType, "Enter active Houston ID", false, false) + titleText := slack.NewTextBlockObject(slack.PlainTextType, "Enter Houston ID", false, false) closeText := slack.NewTextBlockObject(slack.PlainTextType, "Close", false, false) submitText := slack.NewTextBlockObject(slack.PlainTextType, "Submit", false, false) rcaText := slack.NewTextBlockObject(slack.PlainTextType, "Attach incident to", false, false) - numberInputPlaceholder := slack.NewTextBlockObject(slack.PlainTextType, "Enter active incident id (Ex: 1234 for #_houston-1234)", false, false) + numberInputPlaceholder := slack.NewTextBlockObject(slack.PlainTextType, "Enter incident id (Ex: 1234 for #_houston-1234)", false, false) numberInputElement := slack.NewNumberInputBlockElement(numberInputPlaceholder, "rca", false) numberInputElement.MinValue = "1"