Merge pull request #205 from davidwatkins73/master

ratings explorer, boingy graph limits, logo overlays and more
finos · Jun 15, 2016 · bac0509 · bac0509
2 parents 0bed102 + 89777c9
commit bac0509
Show file tree

Hide file tree

Showing 21 changed files with 219 additions and 104 deletions.
diff --git a/...urce_data_rating/SourceDataRatingDAO.java → ...urce_data_rating/SourceDataRatingDao.java b/...urce_data_rating/SourceDataRatingDAO.java → ...urce_data_rating/SourceDataRatingDao.java
@@ -12,24 +12,34 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.Collection;
+import java.util.Optional;
 
 import static com.khartec.waltz.schema.tables.SourceDataRating.SOURCE_DATA_RATING;
 
+
 @Repository
 public class SourceDataRatingDao {
 
     private static final RecordMapper<? super Record, SourceDataRating> MAPPER = r -> {
         SourceDataRatingRecord record = r.into(SOURCE_DATA_RATING);
+
+        Optional<LocalDateTime> lastImportDateTime = Optional
+                .ofNullable(record.getLastImport())
+                .map(t -> t.toLocalDateTime());
+
         return ImmutableSourceDataRating.builder()
                 .sourceName(record.getSourceName())
                 .entityKind(EntityKind.valueOf(record.getEntityKind()))
                 .authoritativeness(RagRating.valueOf(record.getAuthoritativeness()))
                 .accuracy(RagRating.valueOf(record.getAccuracy()))
                 .completeness(RagRating.valueOf(record.getCompleteness()))
+                .lastImportDate(lastImportDateTime)
                 .build();
     };
 
+
     private final DSLContext dsl;
 
 
@@ -44,7 +54,6 @@ public Collection<SourceDataRating> findAll() {
         return dsl.select(SOURCE_DATA_RATING.fields())
                 .from(SOURCE_DATA_RATING)
                 .fetch(MAPPER);
-
     }
 
 }
diff --git a/waltz-model/src/main/java/com/khartec/waltz/model/source_data_rating/SourceDataRating.java b/waltz-model/src/main/java/com/khartec/waltz/model/source_data_rating/SourceDataRating.java
@@ -6,6 +6,9 @@
 import com.khartec.waltz.model.capabilityrating.RagRating;
 import org.immutables.value.Value;
 
+import java.time.LocalDateTime;
+import java.util.Optional;
+
 @Value.Immutable
 @JsonSerialize(as = ImmutableSourceDataRating.class)
 @JsonDeserialize(as = ImmutableSourceDataRating.class)
@@ -17,4 +20,6 @@ public abstract class SourceDataRating {
     public abstract RagRating authoritativeness();
     public abstract RagRating accuracy();
     public abstract RagRating completeness();
+
+    public abstract Optional<LocalDateTime> lastImportDate();
 }
diff --git a/waltz-ng/client/applications/directives/app-table.js b/waltz-ng/client/applications/directives/app-table.js
@@ -45,32 +45,30 @@ function controller(uiGridConstants, $scope, $animate) {
             {
                 field: 'name',
                 cellTemplate: '<div class="ui-grid-cell-contents"> <a ui-sref="main.app.view ({ id: row.entity[\'id\'] })">{{ COL_FIELD }}</a></div>'
-            },
-            {
+            }, {
                 field: 'kind',
-                cellTemplate: '<div class="ui-grid-cell-contents"> {{ COL_FIELD | toDisplayName:"applicationKind" }}</div>',
+                cellTemplate: '<div class="ui-grid-cell-contents"><span ng-bind="COL_FIELD | toDisplayName:\'applicationKind\'"></span></div>',
                 filter: {
                     type: uiGridConstants.filter.SELECT,
                     selectOptions: _.map(applicationKindDisplayNames, (label, value) => ({ label, value }))
                 }
-            },
-            {
+            }, {
+                field: 'assetCode'
+            }, {
                 field: 'overallRating',
-                cellTemplate: '<div class="ui-grid-cell-contents"> {{ COL_FIELD | toDisplayName:"investmentRating" }}</div>',
+                cellTemplate: '<div class="ui-grid-cell-contents"><span ng-bind="COL_FIELD | toDisplayName:\'investmentRating\'"></span></div>',
                 filter: {
                     type: uiGridConstants.filter.SELECT,
                     selectOptions: _.map(investmentRatingNames, (label, value) => ({ label, value }))
                 }
-            },
-            {
+            }, {
                 field: 'lifecyclePhase',
-                cellTemplate: '<div class="ui-grid-cell-contents"> {{ COL_FIELD | toDisplayName:"lifecyclePhase" }}</div>',
+                cellTemplate: '<div class="ui-grid-cell-contents"><span ng-bind="COL_FIELD | toDisplayName:\'lifecyclePhase\'"></span></span></div>',
                 filter: {
                     type: uiGridConstants.filter.SELECT,
                     selectOptions: _.map(lifecyclePhaseDisplayNames, (label, value) => ({ label, value }))
                 }
-            },
-            {
+            }, {
                 field: 'description',
                 cellTooltip: (row) => row.entity.description
             }

diff --git a/waltz-ng/client/data-flow/directives/boingy-graph/boingy-graph.js b/waltz-ng/client/data-flow/directives/boingy-graph/boingy-graph.js
@@ -25,10 +25,9 @@ function handleNodeClick(node) {
 
 
 const force = d3.layout.force()
-    .gravity(0.05)
-    .friction(0.6)
     .distance(100)
-    .charge(-100);
+    .linkDistance(60)
+    .charge(-120);
 
 
 function setup(holder) {

diff --git a/waltz-ng/client/data-flow/directives/data-flows-tabgroup.html b/waltz-ng/client/data-flow/directives/data-flows-tabgroup.html
@@ -50,15 +50,39 @@ <h4>Data Categories</h4>
                                             name="Loading Flow Data">
                 </waltz-loading-notification>
 
-                <div ng-if="ctrl.boingyEverShown && ctrl.flowData.flows.length > 0">
+                <div ng-if="ctrl.filteredFlowData.entities.length == 0  && ctrl.flowData.flows.length > 0">
+                    <div class="alert alert-warning">
+                        <strong>No data to show</strong> given the current filter options.  Use the
+                        configure button above to adjust these options.
+                    </div>
+                </div>
+
+
+                <div ng-if="ctrl.filteredFlowData.entities.length >= 200 && !ctrl.visibility.ignoreLimits">
+                    <div class="alert alert-warning">
+                        This graph will have <strong>too many nodes</strong> to render smoothly.
+                        Use the configure button too limit the amount of data to show.  Alternatively
+                        the data is available via the 'Table' tab.
+
+                        <br>
+
+                        If you still want to see the graph click
+                        <a href ng-click="ctrl.visibility.ignoreLimits = true">here</a>
+                        - however be aware that your machine may struggle.
+                    </div>
+                </div>
+
 
-                    <waltz-data-flow-diagram data="ctrl.filteredFlowData"
-                                             tweakers="ctrl.graphTweakers">
-                    </waltz-data-flow-diagram>
+                <div ng-if="ctrl.boingyEverShown && ctrl.filteredFlowData.flows.length > 0">
+                    <div ng-if="ctrl.filteredFlowData.entities.length < 200  || ctrl.visibility.ignoreLimits">
+                        <waltz-data-flow-diagram data="ctrl.filteredFlowData"
+                                                 tweakers="ctrl.graphTweakers">
+                        </waltz-data-flow-diagram>
 
-                    <div class="small text-muted">
-                        Dragging nodes will pin them.  Double click to unpin.  If an application is gray
-                        it is not a member of this group.
+                        <div class="small text-muted">
+                            Dragging nodes will pin them.  Double click to unpin.  If an application is gray
+                            it is not a member of this group.
+                        </div>
                     </div>
                 </div>
 

diff --git a/waltz-ng/client/navbar/index.js b/waltz-ng/client/navbar/index.js
@@ -11,52 +11,5 @@
  *
  */
 
-import tmpl from "./navbar.html";
-import _ from "lodash";
 
-function controller(applicationStore, personStore, capabilityStore, orgUnitStore, timeout) {
-    const searchResults = {
-        show: false
-    };
-
-    function doSearch(query) {
-        if (_.isEmpty(query)) {
-            searchResults.show = false;
-        } else {
-            searchResults.show = true;
-            applicationStore
-                .search(query)
-                .then(r => searchResults.apps = r);
-            personStore
-                .search(query)
-                .then(r => searchResults.people = r);
-            capabilityStore
-                .search(query)
-                .then(r => searchResults.capabilities = r);
-            orgUnitStore
-                .search(query)
-                .then(r => searchResults.orgUnits = r);
-        }
-    }
-
-    function dismissResults() {
-        timeout(() => { searchResults.show = false; }, 400);
-    }
-
-    const vm = this;
-    vm.doSearch = () => doSearch(vm.query);
-    vm.showSearch = () => searchResults.show;
-    vm.dismissResults = dismissResults;
-    vm.searchResults = searchResults;
-}
-
-controller.$inject = ['ApplicationStore', 'PersonStore', 'CapabilityStore', 'OrgUnitStore', '$timeout'];
-
-export default (module) => module.directive('waltzNavbar', () => {
-    return {
-        restrict: 'E',
-        template: tmpl,
-        controller,
-        controllerAs: 'ctrl'
-    };
-});
+export default (module) => module.directive('waltzNavbar', require('./navbar'));
diff --git a/waltz-ng/client/navbar/navbar.html b/waltz-ng/client/navbar/navbar.html
@@ -8,6 +8,12 @@
                      style="position: relative; top: -6px;"
                      src="../../images/branding/waltz_badge+text_horizontal_positive_bw_300px.png">
             </a>
+            <span ng-bind='ctrl.logoOverlayText'
+                  style='position: relative; left: -35px; top:30px; color: {{ ctrl.logoOverlayColor }}; font-weight: bold; font-style: italic'>
+
+            </span>
+
+            <span ng-bind="ctrl.logoOverlay" ></span>
         </div>
 
         <ul class="nav navbar-nav nav-bar-left">

diff --git a/waltz-ng/client/navbar/navbar.js b/waltz-ng/client/navbar/navbar.js
@@ -0,0 +1,71 @@
+import _ from "lodash";
+
+
+function controller($timeout,
+                    applicationStore,
+                    capabilityStore,
+                    personStore,
+                    orgUnitStore,
+                    settingsStore) {
+    const searchResults = {
+        show: false
+    };
+
+    settingsStore
+        .findAll()
+        .then(settings => {
+            vm.logoOverlayText = settingsStore.findOrDefault(settings, "ui.logo.overlay.text", "");
+            vm.logoOverlayColor = settingsStore.findOrDefault(settings, "ui.logo.overlay.color", "");
+        });
+
+    function doSearch(query) {
+        if (_.isEmpty(query)) {
+            searchResults.show = false;
+        } else {
+            searchResults.show = true;
+            applicationStore
+                .search(query)
+                .then(r => searchResults.apps = r);
+            personStore
+                .search(query)
+                .then(r => searchResults.people = r);
+            capabilityStore
+                .search(query)
+                .then(r => searchResults.capabilities = r);
+            orgUnitStore
+                .search(query)
+                .then(r => searchResults.orgUnits = r);
+        }
+    }
+
+    function dismissResults() {
+        $timeout(() => { searchResults.show = false; }, 400);
+    }
+
+    const vm = this;
+    vm.doSearch = () => doSearch(vm.query);
+    vm.showSearch = () => searchResults.show;
+    vm.dismissResults = dismissResults;
+    vm.searchResults = searchResults;
+
+    vm.logoOverlayText = "beta";
+    vm.logoOverlayColor = '#a90000';
+}
+
+controller.$inject = [
+    '$timeout',
+    'ApplicationStore',
+    'CapabilityStore',
+    'PersonStore',
+    'OrgUnitStore',
+    'SettingsStore'
+];
+
+export default () => {
+    return {
+        restrict: 'E',
+        template: require("./navbar.html"),
+        controller,
+        controllerAs: 'ctrl'
+    };
+};
diff --git a/waltz-ng/client/playpen/index.js b/waltz-ng/client/playpen/index.js
@@ -26,8 +26,5 @@ export default (module) => {
         }
     ]);
 
-    module.directive('waltzRagLine', require('./rag-line'));
-    module.directive('waltzRatingExplorerSection', require('./rating-explorer-section'));
-    module.directive('waltzSimpleStackChart', require('./simple-stack-chart'));
 
 };
diff --git a/waltz-ng/client/playpen/playpen.html b/waltz-ng/client/playpen/playpen.html
@@ -10,9 +10,11 @@
     </waltz-page-header>
 
 
-    <waltz-rating-explorer-section applications="ctrl.applications"
-                                   app-capabilities="ctrl.appCapabilities"
-                                   capabilities="ctrl.allCapabilities"
-                                   ratings="ctrl.ratings">
-    </waltz-rating-explorer-section>
+    <!-- FLOWS -->
+    <waltz-data-flows-tabgroup-section ratings="ctrl.sourceDataRatings"
+                                       flow-data="ctrl.dataFlows"
+                                       on-load-detail="ctrl.loadFlowDetail"
+                                       applications="ctrl.applications">
+    </waltz-data-flows-tabgroup-section>
+
 </div>
diff --git a/waltz-ng/client/playpen/playpen.js b/waltz-ng/client/playpen/playpen.js
@@ -1,18 +1,13 @@
 const initData = {
-    allCapabilities: [],
-    appCapabilities: [],
     applications: [],
-    ratings: [],
     visibility: {}
 };
 
 
 function controller($q,
                     $stateParams,
                     appStore,
-                    appCapabilityStore,
-                    capabilityStore,
-                    ratingStore) {
+                    dataFlowViewService) {
 
     const vm = Object.assign(this, initData);
 
@@ -31,28 +26,22 @@ function controller($q,
         .findBySelector(appIdSelector)
         .then(apps => vm.applications = apps);
 
-    appCapabilityStore
-        .findApplicationCapabilitiesByAppIdSelector(appIdSelector)
-        .then(acs => vm.appCapabilities = acs);
+    dataFlowViewService.initialise(appIdSelector.entityReference.id, appIdSelector.entityReference.kind)
+        .then(flows => vm.dataFlows = flows);
 
-    ratingStore
-        .findByAppIdSelector(appIdSelector)
-        .then(rs => vm.ratings = rs);
 
-    capabilityStore
-        .findAll()
-        .then(cs => vm.allCapabilities = cs);
+    vm.loadFlowDetail = () => dataFlowViewService.loadDetail();
 
+
+    global.vm = vm;
 }
 
 
 controller.$inject = [
     '$q',
     '$stateParams',
     'ApplicationStore',
-    'AppCapabilityStore',
-    'CapabilityStore',
-    'RatingStore'
+    'DataFlowViewService'
 ];
 
 

diff --git a/waltz-ng/client/playpen/rag-line.js → ...gs/directives/rating-explorer/rag-line.js b/waltz-ng/client/playpen/rag-line.js → ...gs/directives/rating-explorer/rag-line.js
@@ -1,5 +1,5 @@
 import d3 from "d3";
-import {red, amber, green, grey} from "../common/colors";
+import {red, amber, green, grey} from "../../../common/colors";
 
 
 const BINDINGS = {

diff --git a/...ient/playpen/rating-explorer-section.html → ...ing-explorer/rating-explorer-section.html b/...ient/playpen/rating-explorer-section.html → ...ing-explorer/rating-explorer-section.html
diff --git a/...client/playpen/rating-explorer-section.js → ...ating-explorer/rating-explorer-section.js b/...client/playpen/rating-explorer-section.js → ...ating-explorer/rating-explorer-section.js
@@ -1,6 +1,6 @@
 import _ from "lodash";
 import d3 from "d3";
-import {buildHierarchies} from "../common";
+import {buildHierarchies} from "../../../common";
 
 const BINDINGS = {
     applications: '=',