Skip unreviewed-snapshot warning when no reviewer is set
This commit is contained in:
@@ -110,7 +110,12 @@ func confirmMerge(_ taskId: String, _ store: Store, _ overlays: Overlays, keepOp
|
||||
|
||||
@MainActor
|
||||
private func reviewWarnings(_ taskId: String, _ f: MergeFacts, _ store: Store, _ leave: @escaping Leave) -> [MergeWarning] {
|
||||
let task = store.findTask(taskId)
|
||||
let reviewing = !(store.projects.first { $0.id == task?.projectId }?.reviewWorkflow.isEmpty ?? true)
|
||||
if f.reviewSnapshot == 0 {
|
||||
if !reviewing {
|
||||
return []
|
||||
}
|
||||
return [MergeWarning(text: "These changes haven't been reviewed")]
|
||||
}
|
||||
var items: [MergeWarning] = []
|
||||
@@ -119,7 +124,7 @@ private func reviewWarnings(_ taskId: String, _ f: MergeFacts, _ store: Store, _
|
||||
store.jumpTo(taskId, .review(f.reviewSnapshot))
|
||||
}
|
||||
}
|
||||
if f.reviewCount == 0 {
|
||||
if f.reviewCount == 0 && reviewing {
|
||||
items.append(MergeWarning(text: "The latest snapshot hasn't been reviewed", open: open))
|
||||
}
|
||||
if f.reviewRunning {
|
||||
@@ -131,7 +136,7 @@ private func reviewWarnings(_ taskId: String, _ f: MergeFacts, _ store: Store, _
|
||||
if f.reviewFindings > 0 {
|
||||
items.append(MergeWarning(text: "The review of the latest snapshot has \(f.reviewFindings) open finding\(f.reviewFindings == 1 ? "" : "s")", open: open))
|
||||
}
|
||||
if f.unreviewedChanges {
|
||||
if f.unreviewedChanges && reviewing {
|
||||
items.append(MergeWarning(text: "Changes since the last snapshot haven't been reviewed"))
|
||||
}
|
||||
return items
|
||||
|
||||
Reference in New Issue
Block a user