From 903cb63efe7885f5661bcdfe1b0c68bb434da6e7 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 19 Dec 2018 10:41:58 -0500 Subject: [PATCH] Renamed validations to issues in relevant places Made the issue pane get the issues from the issue manager rather than validating itself --- modules/ui/commit_warnings.js | 15 +++++++-------- modules/ui/issues.js | 5 ++--- modules/validations/issueManager.js | 1 - 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/modules/ui/commit_warnings.js b/modules/ui/commit_warnings.js index 29ecf44a1..24bb2fbba 100644 --- a/modules/ui/commit_warnings.js +++ b/modules/ui/commit_warnings.js @@ -11,20 +11,19 @@ export function uiCommitWarnings(context) { function commitWarnings(selection) { - // maybe call these issues now? - var validations = context.issueManager().validate(); + var issues = context.issueManager().getIssues(); - validations = _reduce(validations, function(validations, val) { + issues = _reduce(issues, function(issues, val) { var severity = val.severity; - if (validations.hasOwnProperty(severity)) { - validations[severity].push(val); + if (issues.hasOwnProperty(severity)) { + issues[severity].push(val); } else { - validations[severity] = [val]; + issues[severity] = [val]; } - return validations; + return issues; }, {}); - _forEach(validations, function(instances, type) { + _forEach(issues, function(instances, type) { instances = _uniqBy(instances, function(val) { return val.id + '_' + val.message.replace(/\s+/g,''); }); var section = type + '-section'; var instanceItem = type + '-item'; diff --git a/modules/ui/issues.js b/modules/ui/issues.js index 1660aeba5..e12292806 100644 --- a/modules/ui/issues.js +++ b/modules/ui/issues.js @@ -103,8 +103,7 @@ export function uiIssues(context) { var name = 'issues_list'; - var changes = context.history().changes(); - var validations = context.history().validate(changes); + var issues = context.issueManager().getIssues(); /*validations = _reduce(validations, function(validations, val) { var severity = val.severity; @@ -117,7 +116,7 @@ export function uiIssues(context) { }, {});*/ var items = selection.selectAll('li') - .data(validations); + .data(issues); // Exit items.exit() diff --git a/modules/validations/issueManager.js b/modules/validations/issueManager.js index 4bcdc162a..b290d181f 100644 --- a/modules/validations/issueManager.js +++ b/modules/validations/issueManager.js @@ -28,7 +28,6 @@ export function IssueManager(context) { var changes = context.history().changes(); issues = context.history().validate(changes); dispatch.call('reload', self, issues); - return issues; }; return utilRebind(self, dispatch, 'on');