Merge pull request #344 from kamransaleem/waltz-339-ent-stats-view-refresh

- fix for old values in person ent stat view spilling over to new criteria

Author: davidwatkins73

waltz-ng/client/entity-statistics/person-entity-statistic-view.js

@@ -1,5 +1,5 @@
 import _ from "lodash";
-
+import {kindToViewState, initialiseData} from "../common";
 
 const initData = {
     statistic: {
@@ -30,7 +30,7 @@ function controller($q,
                     entityStatisticStore,
                     personStore) {
 
-    const vm = Object.assign(this, initData);
+    const vm = initialiseData(this, initData);
     const statId = $stateParams.statId;
     const personId = $stateParams.id;
 
@@ -47,7 +47,16 @@ function controller($q,
     $q.all([personPromise, definitionPromise])
         .then(([person, definitions]) => vm.onSelectPerson(person));
 
+
+    function resetValueData() {
+        const clearData = initialiseData({}, initData);
+        vm.statistic.summary = clearData.statistic.summary;
+        vm.statistic.values = clearData.statistic.values;
+        vm.summaries = clearData.summaries;
+    }
+
     vm.onSelectPerson = (person) => {
+        resetValueData();
         vm.person = person;
 
         const entityReference = {
@@ -62,9 +71,23 @@ function controller($q,
         };
 
         entityStatisticStore
-            .findStatTallies(vm.relatedDefinitions, selector)
-            .then(summaries => vm.summaries = summaries)
-            .then(summaries => vm.statistic.summary = _.find(summaries, { entityReference: { id: statId }}));
+            .findStatTallies([statId], selector)
+            .then(summaries => vm.statistic.summary = summaries[0])
+            .then(() => {
+                const related = [
+                    vm.relatedDefinitions.parent,
+                    ...vm.relatedDefinitions.siblings,
+                    ...vm.relatedDefinitions.children ];
+
+                const relatedIds = _.chain(related)
+                    .filter(s => s != null)
+                    .map('id')
+                    .value();
+
+                return entityStatisticStore.findStatTallies(relatedIds, selector);
+            })
+            .then(summaries => vm.summaries = summaries);
+
 
         entityStatisticStore
             .findStatValuesByIdSelector(statId, selector)
@@ -105,7 +128,4 @@ const page = {
 };
 
 
-export default page;
-
-
-// http://localhost:8000/#/entity-statistic/PERSON/mwpHhjMzq/34
+export default page;