Merge pull request #326 from davidwatkins73/waltz-323-stat-bookmarks

Waltz 323 stat bookmarks

Author: davidwatkins73

waltz-ng/client/bookmarks/bookmark-editor.js

@@ -15,19 +15,14 @@ import angular from "angular";
 import {kindToViewState} from "../common";
 
 
-function getParentRef(params) {
-    return {
-        id: params.entityId,
-        kind: params.kind,
-        name: params.parentName
-    };
-}
-
-
-function controller(bookmarkStore, notification, params, $state) {
+function controller($state,
+                    $stateParams,
+                    $window,
+                    bookmarkStore,
+                    notification) {
     const vm = this;
 
-    const parentRef = getParentRef(params);
+    const parentRef = getParentRef($stateParams);
 
     vm.save = (b) => {
         b.parent = parentRef;
@@ -79,19 +74,31 @@ function controller(bookmarkStore, notification, params, $state) {
     vm.parentRef = parentRef;
 
     vm.goToParent = () => {
-        const nextState = kindToViewState(parentRef.kind);
-        $state.go(nextState, parentRef);
-    }
-
+        try {
+            const nextState = kindToViewState(parentRef.kind);
+            $state.go(nextState, parentRef);
+        } catch (e) {
+            $window.history.back();
+        }
+    };
 }
 
 
+function getParentRef(params) {
+    return {
+        id: params.entityId,
+        kind: params.kind,
+        name: params.parentName
+    };
+}
+
 
 controller.$inject = [
-    'BookmarkStore',
-    'Notification',
+    '$state',
     '$stateParams',
-    '$state'
+    '$window',
+    'BookmarkStore',
+    'Notification'
 ];
 
 

waltz-ng/client/common/services/display_names.js

@@ -1,17 +1,3 @@
-
-/*
- *  Waltz
- * Copyright (c) David Watkins. All rights reserved.
- * The use and distribution terms for this software are covered by the
- * Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
- * which can be found in the file epl-v10.html at the root of this distribution.
- * By using this software in any fashion, you are agreeing to be bound by
- * the terms of this license.
- * You must not remove this notice, or any other, from this software.
- *
- */
-
-
 export const applicationKindDisplayNames = {
     IN_HOUSE: 'In House',
     INTERNALLY_HOSTED: 'Hosted Internally',
@@ -107,6 +93,7 @@ export const entityNames = {
     CHANGE_INITIATIVE: 'Change Initiative',
     DATABASE: 'Database',
     END_USER_APPLICATION: 'End User App',
+    ENTITY_STATISTIC: 'Statistic',
     INVOLVEMENT: 'Involvement',
     LOGICAL_DATA_FLOW: "Logical Data Flow",
     ORG_UNIT: 'Org Unit',

waltz-ng/client/entity-statistics/entity-statistic-view.html

@@ -67,4 +67,15 @@ <h3>Related Indicators</h3>
 
     </div>
 
+
+    <br>
+
+    <!-- BOOKMARKS -->
+    <waltz-bookmarks-section bookmarks="ctrl.bookmarks"
+                             entity-id="{{ ctrl.statistic.definition.id }}"
+                             kind="ENTITY_STATISTIC"
+                             parent-name="{{ ctrl.statistic.definition.name }}"
+                             source-data-ratings="ctrl.sourceDataRatings">
+    </waltz-bookmarks-section>
+
 </div>

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

@@ -37,6 +37,7 @@ function hasRelatedDefinitions(defs) {
 function controller($q,
                     $state,
                     $stateParams,
+                    bookmarkStore,
                     entityStatisticUtilities,
                     entityStatisticStore) {
 
@@ -45,6 +46,14 @@ function controller($q,
     const entityKind = $stateParams.kind;
     const entityId = $stateParams.id;
 
+    const statRef = {
+        id: statId,
+        kind: 'ENTITY_STATISTIC'
+    };
+
+    bookmarkStore
+        .findByParent(statRef)
+        .then(bs => vm.bookmarks = bs);
 
     const definitionPromise = entityStatisticStore
         .findRelatedStatDefinitions(statId)
@@ -90,14 +99,15 @@ function controller($q,
         const stateName = kindToViewState(entityKind);
         const navId = vm.selectedNavItem.id;
         $state.go(stateName, { id: navId });
-    }
+    };
 }
 
 
 controller.$inject = [
     '$q',
     '$state',
     '$stateParams',
+    'BookmarkStore',
     'EntityStatisticUtilities',
     'EntityStatisticStore'
 ];