Skip to content

Commit

Permalink
Fix issue with highlight warning
Browse files Browse the repository at this point in the history
Warning was displayed when deleting finding
Deleting finding should not have warning
  • Loading branch information
yeln4ts committed Jun 22, 2023
1 parent 9da2f69 commit 1616580
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions frontend/src/pages/audits/edit/findings/edit/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export default {
proofsTabVisited: false,
detailsTabVisited: false,
vulnTypes: [],
AUDIT_VIEW_STATE: Utils.AUDIT_VIEW_STATE
AUDIT_VIEW_STATE: Utils.AUDIT_VIEW_STATE,
overrideLeaveCheck: false
}
},

Expand Down Expand Up @@ -238,6 +239,7 @@ export default {
position: 'top-right'
})
this.findingOrig = this.finding
this.overrideLeaveCheck = true
var currentIndex = this.$parent.audit.findings.findIndex(e => e._id === this.findingId)
if (this.$parent.audit.findings.length === 1)
this.$router.push(`/audits/${this.$parent.auditId}/findings/add`)
Expand Down Expand Up @@ -309,6 +311,9 @@ export default {
},

unsavedChanges: function() {
if (this.overrideLeaveCheck)
return false

if (this.finding.title !== this.findingOrig.title)
return true
if ((this.finding.vulnType || this.findingOrig.vulnType) && this.finding.vulnType !== this.findingOrig.vulnType)
Expand Down Expand Up @@ -348,8 +353,11 @@ export default {
},

displayHighlightWarning: function() {
if (this.overrideLeaveCheck)
return null

if (!this.$settings.report.enabled || !this.$settings.report.public.highlightWarning)
return null
return null

var matchString = `(<mark data-color="${this.$settings.report.public.highlightWarningColor}".+?>.+?)</mark>`
var regex = new RegExp(matchString)
Expand Down

0 comments on commit 1616580

Please sign in to comment.