From 4f1cb0dc467033690f5e9b8b149a4baf86582002 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 14 Jan 2019 12:33:32 -0500 Subject: [PATCH] Made the entity issues UI update when the issues reload --- modules/ui/entity_editor.js | 8 -------- modules/ui/entity_issues.js | 17 +++++++++++++++++ modules/ui/issues.js | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js index 880b92142..7ab144d60 100644 --- a/modules/ui/entity_editor.js +++ b/modules/ui/entity_editor.js @@ -219,14 +219,6 @@ export function uiEntityEditor(context) { .style('display', 'none'); } - if (context.issueManager().getIssuesForEntityWithID(_entityID).length > 0) { - body.select('.entity-issues') - .style('display', 'block'); - } else { - body.select('.entity-issues') - .style('display', 'none'); - } - body.select('.raw-membership-editor') .call(rawMembershipEditor .entityID(_entityID) diff --git a/modules/ui/entity_issues.js b/modules/ui/entity_issues.js index d7ccdece2..d5623ba50 100644 --- a/modules/ui/entity_issues.js +++ b/modules/ui/entity_issues.js @@ -16,6 +16,13 @@ export function uiEntityIssues(context) { var dispatch = d3_dispatch('change'); var _entityID; + context.issueManager().on('reload.entity_issues', update); + + function update() { + var selection = d3_select('.entity-issues .disclosure-wrap'); + render(selection); + } + function entityIssues(selection) { selection.call(uiDisclosure(context, 'entity_issues', true) .title(t('issues.title')) @@ -25,8 +32,18 @@ export function uiEntityIssues(context) { function render(selection) { + var issues = context.issueManager().getIssuesForEntityWithID(_entityID); + if (issues.length > 0) { + d3_select('.entity-issues') + .style('display', 'block'); + } else { + d3_select('.entity-issues') + .style('display', 'none'); + return; + } + var items = selection.selectAll('.issue') .data(issues, function(d) { return d.id(); }); diff --git a/modules/ui/issues.js b/modules/ui/issues.js index 01be90005..b2bb8d638 100644 --- a/modules/ui/issues.js +++ b/modules/ui/issues.js @@ -20,7 +20,7 @@ export function uiIssues(context) { var _issuesList = d3_select(null); var _shown = false; - context.issueManager().on('reload', update); + context.issueManager().on('reload.issues_pane', update); function renderIssuesOptions(selection) { var container = selection.selectAll('.issues-options-container')