Merge pull request #6842 from davidwatkins73/waltz-6840-phys-names

Use flow name, drop back to spec name.

Author: jessica-woodland-scott

waltz-ng/client/data-flow/components/data-flow-section/data-flow-section.html

@@ -82,13 +82,13 @@
 
         <!-- Edit Physical Split button -->
         <div style="display: inline-block"
-             ng-if="$ctrl.canEdit && $ctrl.activeTab.id === 'PHYSICAL' && !$ctrl.isAnyEditorVisible()">
+             ng-if="$ctrl.canEdit && $ctrl.activeTab.id === 'FLOW_DETAIL' && !$ctrl.isAnyEditorVisible()">
             <div class="btn-group"
                  uib-dropdown>
 
                 <a class="btn btn-xs btn-primary"
                    ui-sref="main.physical-flow.registration ($ctrl.parentEntityRef)">
-                    Edit
+                    Register Physical Flow
                 </a>
                 <button type="button"
                         waltz-has-role="BULK_FLOW_EDITOR"

waltz-ng/client/data-flow/components/logical-flow-view-grid/logical-flow-view-grid.html

@@ -256,24 +256,35 @@ <h4 style="padding-top: 2em">
 
         <div class="waltz-sticky-part">
             <h4>
-                <a href="{{$ctrl.logicalFlowUrl}}">
                 <span>
                     Logical Flow
                     <waltz-icon name="{{$ctrl.selectedFlow.source.kind | toIconName:'entity' }}"></waltz-icon>
                     <waltz-icon name="arrow-right"></waltz-icon>
                     <waltz-icon name="{{$ctrl.selectedFlow.target.kind | toIconName:'entity'}}"></waltz-icon>
                 </span>
-                </a>
                 <button class="btn btn-skinny btn-xs"
                         ng-click="$ctrl.onClearSelect()">
+                    <waltz-icon name="times"></waltz-icon>
                     Clear
                 </button>
             </h4>
 
             <table class="table table-condensed small">
                 <tbody>
                 <tr>
-                    <td style="width: 20%">Source</td>
+                    <td style="width: 20%">Name</td>
+                    <td>
+                        <waltz-entity-link tooltip-placement="below"
+                                           entity-ref="{
+                                                kind: 'LOGICAL_DATA_FLOW',
+                                                id: $ctrl.selectedFlow.id,
+                                                name: 'Logical Flow'
+                                            }">
+                        </waltz-entity-link>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Source</td>
                     <td><waltz-entity-link entity-ref="$ctrl.selectedFlow.source" is-secondary-link="true"></waltz-entity-link></td>
                 </tr>
                 <tr>
@@ -336,29 +347,38 @@ <h4>
          ng-if="$ctrl.selectedPhysicalFlow">
         <div class="waltz-sticky-part">
             <h4>
-                <a href="{{$ctrl.physicalFlowUrl}}">
                 <span>
                     Physical Flow
                     <waltz-icon name="{{$ctrl.selectedPhysicalFlow.source.kind | toIconName:'entity' }}"></waltz-icon>
                     <waltz-icon name="arrow-right"></waltz-icon>
                     <waltz-icon name="{{$ctrl.selectedPhysicalFlow.target.kind | toIconName:'entity'}}"></waltz-icon>
                 </span>
-                </a>
                 <button class="btn btn-skinny btn-xs"
                         ng-click="$ctrl.onClearSelect()">
+                    <waltz-icon name="times"></waltz-icon>
                     Clear
                 </button>
             </h4>
 
-            <div class="help-block"
-                 ng-if="$ctrl.selectedPhysicalFlow.description">
-                <span ng-bind="$ctrl.selectedPhysicalFlow.description"></span>
-            </div>
 
             <table class="table table-condensed small">
                 <tbody>
                 <tr>
-                    <td style="width: 20%">Source</td>
+                    <td style="width: 20%">Name</td>
+                    <td>
+                        <waltz-entity-link popover-delay="1000"
+                                           tooltip-placement="bottom"
+                                           entity-ref="{
+                                                kind: 'PHYSICAL_FLOW',
+                                                id: $ctrl.selectedPhysicalFlow.id,
+                                                name: $ctrl.selectedPhysicalFlow.name || $ctrl.selectedPhysicalFlow.physicalSpecification.name || 'unnamed'
+                                            }">
+                        </waltz-entity-link>
+                    </td>
+
+                </tr>
+                <tr>
+                    <td>Source</td>
                     <td><waltz-entity-link entity-ref="$ctrl.selectedPhysicalFlow.source" is-secondary-link="true"></waltz-entity-link></td>
                 </tr>
                 <tr>
@@ -383,6 +403,12 @@ <h4>
                         </waltz-enum-value>
                     </td>
                 </tr>
+                <tr ng-if="$ctrl.selectedPhysicalFlow.description">
+                    <td>Description</td>
+                    <td>
+                        <span ng-bind="$ctrl.selectedPhysicalFlow.description"></span>
+                    </td>
+                </tr>
                 </tbody>
             </table>
 
@@ -423,6 +449,7 @@ <h4>
     .flow-detail-panel {
         width: 30%;
         padding-left: 1em;
+        word-wrap: anywhere;
     }
 
 </style>

waltz-ng/client/data-flow/components/logical-flow-view-grid/logical-flow-view-grid.js

@@ -140,11 +140,10 @@ const physicalFlowColDefs = [
                        </div>`
     },
     {
-        field: "name",
         name: "Name",
         width: "10%",
         cellTemplate: `<div style="padding-top: 0.5em">
-                            <span ng-bind="COL_FIELD"></span>
+                            <span ng-bind="row.entity.name || row.entity.physicalSpecification.name"></span>
                        </div>`
     },
     {
@@ -239,7 +238,7 @@ function filterFlowOnDataTypes(flows, dataTypes = [], ratings = []) {
             const hasFilteredRating = containsAny(ratings, d.assessmentRatings);
 
             return hasFilteredDt && (noRatingFilters || hasFilteredRating);
-        })
+        });
 }
 
 function controller($q, $scope, $state, serviceBroker) {
@@ -395,7 +394,6 @@ function controller($q, $scope, $state, serviceBroker) {
 
                 vm.physicalRows = vm.physicalFlowsByDirection.ALL;
                 vm.logicalRows = vm.logicalFlowsByDirection.ALL;
-
             })
             .then(() => vm.visibility.loading = false);
     }
@@ -405,7 +403,7 @@ function controller($q, $scope, $state, serviceBroker) {
             vm.selectionOptions = mkSelectionOptions(vm.parentEntityRef);
             loadFlows();
         }
-    }
+    };
 
     vm.onLogicalRowSelect = (r) => {
         if (vm.selectedFlow === r || _.isNil(r)) {