Merge pull request #645 from davidwatkins73/master

Fixing some timing issues with ou-view

waltz-ng/client/applications/components/apps-by-investment-pie.js

@@ -47,7 +47,7 @@ const config = {
 };
 
 
-function calcAppInvestmentPieStats(apps) {
+function calcAppInvestmentPieStats(apps = []) {
     return toKeyCounts(apps, a => a.overallRating);
 }
 

waltz-ng/client/common/index.js

@@ -1,5 +1,5 @@
 import _ from "lodash";
-
+import d3 from 'd3';
 
 /**
  * Given data that looks like:
@@ -184,10 +184,11 @@ function toCountData(data) {
 
 
 export function toKeyCounts(items = [], fn = x => x) {
+    if (! items) return [];
     return toCountData(d3.nest()
         .key(fn)
         .rollup(d => d.length)
-        .entries(items))
+        .entries(items));
 }
 
 

waltz-ng/client/org-units/components/overview/org-unit-overview.js

@@ -60,7 +60,8 @@ function buildTree(orgUnits = [], self = {}) {
 }
 
 
-function calcParentsAndChildren(hierarchy = [], orgUnit = {}) {
+function calcParentsAndChildren(hierarchy = [], orgUnit) {
+    if (! orgUnit) return { parentOrgUnits: [], childOrgUnits: [] };
     const self = _.find(hierarchy, { entityReference: { id: orgUnit.id } });
     const parentOrgUnits = self
         ? _.filter(hierarchy, h => h.level < self.level)

waltz-ng/client/org-units/unit-view.js

@@ -10,10 +10,8 @@
  * You must not remove this notice, or any other, from this software.
  *
  */
-import EventDispatcher from "../common/EventDispatcher";
-
-
 const addToHistory = (historyStore, orgUnit) => {
+    if (! orgUnit) { return; }
     historyStore.put(
         orgUnit.name,
         'ORG_UNIT',
@@ -22,6 +20,12 @@ const addToHistory = (historyStore, orgUnit) => {
 };
 
 
+function initTour(tourService, holder = {}) {
+    return tourService.initialiseForKey('main.org-unit.view', true)
+        .then(tour => holder.tour = tour);
+}
+
+
 function controller($stateParams,
                     $scope,
                     viewDataService,
@@ -32,16 +36,15 @@ function controller($stateParams,
     const vm = this;
 
     vm.entityRef = { kind: 'ORG_UNIT', id };
-
-    vm.eventDispatcher = new EventDispatcher();
-
     vm.viewData = viewDataService.data;
 
     viewDataService
         .loadAll(id)
         .then(() => addToHistory(historyStore, vm.viewData.orgUnit))
-        .then(() => tourService.initialiseForKey('main.org-unit.view', true))
-        .then(tour => vm.tour = tour);
+        .then(() => initTour(tourService, vm));
+
+
+    // -- INTERACTIONS ---
 
     vm.onAssetBucketSelect = (bucket) => {
         $scope.$applyAsync(() => viewDataService.selectAssetBucket(bucket));
@@ -51,7 +54,6 @@ function controller($stateParams,
         .loadFlowDetail()
         .then(flowData => vm.viewData.dataFlows = flowData);
 
-
     vm.loadOrgUnitDescendants = (id) => viewDataService
         .loadOrgUnitDescendants(id)
         .then(descendants => vm.viewData.orgUnitDescendants = descendants);