Skip to content

Commit 4400f2a

Browse files
Added registration button back
- cleaned up sidebar a bit #6840
1 parent eaab20e commit 4400f2a

2 files changed

Lines changed: 39 additions & 12 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@
8282

8383
<!-- Edit Physical Split button -->
8484
<div style="display: inline-block"
85-
ng-if="$ctrl.canEdit && $ctrl.activeTab.id === 'PHYSICAL' && !$ctrl.isAnyEditorVisible()">
85+
ng-if="$ctrl.canEdit && $ctrl.activeTab.id === 'FLOW_DETAIL' && !$ctrl.isAnyEditorVisible()">
8686
<div class="btn-group"
8787
uib-dropdown>
8888

8989
<a class="btn btn-xs btn-primary"
9090
ui-sref="main.physical-flow.registration ($ctrl.parentEntityRef)">
91-
Edit
91+
Register Physical Flow
9292
</a>
9393
<button type="button"
9494
waltz-has-role="BULK_FLOW_EDITOR"

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

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -256,24 +256,35 @@ <h4 style="padding-top: 2em">
256256

257257
<div class="waltz-sticky-part">
258258
<h4>
259-
<a href="{{$ctrl.logicalFlowUrl}}">
260259
<span>
261260
Logical Flow
262261
<waltz-icon name="{{$ctrl.selectedFlow.source.kind | toIconName:'entity' }}"></waltz-icon>
263262
<waltz-icon name="arrow-right"></waltz-icon>
264263
<waltz-icon name="{{$ctrl.selectedFlow.target.kind | toIconName:'entity'}}"></waltz-icon>
265264
</span>
266-
</a>
267265
<button class="btn btn-skinny btn-xs"
268266
ng-click="$ctrl.onClearSelect()">
267+
<waltz-icon name="times"></waltz-icon>
269268
Clear
270269
</button>
271270
</h4>
272271

273272
<table class="table table-condensed small">
274273
<tbody>
275274
<tr>
276-
<td style="width: 20%">Source</td>
275+
<td style="width: 20%">Name</td>
276+
<td>
277+
<waltz-entity-link tooltip-placement="below"
278+
entity-ref="{
279+
kind: 'LOGICAL_DATA_FLOW',
280+
id: $ctrl.selectedFlow.id,
281+
name: 'Logical Flow'
282+
}">
283+
</waltz-entity-link>
284+
</td>
285+
</tr>
286+
<tr>
287+
<td>Source</td>
277288
<td><waltz-entity-link entity-ref="$ctrl.selectedFlow.source" is-secondary-link="true"></waltz-entity-link></td>
278289
</tr>
279290
<tr>
@@ -336,29 +347,38 @@ <h4>
336347
ng-if="$ctrl.selectedPhysicalFlow">
337348
<div class="waltz-sticky-part">
338349
<h4>
339-
<a href="{{$ctrl.physicalFlowUrl}}">
340350
<span>
341351
Physical Flow
342352
<waltz-icon name="{{$ctrl.selectedPhysicalFlow.source.kind | toIconName:'entity' }}"></waltz-icon>
343353
<waltz-icon name="arrow-right"></waltz-icon>
344354
<waltz-icon name="{{$ctrl.selectedPhysicalFlow.target.kind | toIconName:'entity'}}"></waltz-icon>
345355
</span>
346-
</a>
347356
<button class="btn btn-skinny btn-xs"
348357
ng-click="$ctrl.onClearSelect()">
358+
<waltz-icon name="times"></waltz-icon>
349359
Clear
350360
</button>
351361
</h4>
352362

353-
<div class="help-block"
354-
ng-if="$ctrl.selectedPhysicalFlow.description">
355-
<span ng-bind="$ctrl.selectedPhysicalFlow.description"></span>
356-
</div>
357363

358364
<table class="table table-condensed small">
359365
<tbody>
360366
<tr>
361-
<td style="width: 20%">Source</td>
367+
<td style="width: 20%">Name</td>
368+
<td>
369+
<waltz-entity-link popover-delay="1000"
370+
tooltip-placement="bottom"
371+
entity-ref="{
372+
kind: 'PHYSICAL_FLOW',
373+
id: $ctrl.selectedPhysicalFlow.id,
374+
name: $ctrl.selectedPhysicalFlow.name || $ctrl.selectedPhysicalFlow.physicalSpecification.name || 'unnamed'
375+
}">
376+
</waltz-entity-link>
377+
</td>
378+
379+
</tr>
380+
<tr>
381+
<td>Source</td>
362382
<td><waltz-entity-link entity-ref="$ctrl.selectedPhysicalFlow.source" is-secondary-link="true"></waltz-entity-link></td>
363383
</tr>
364384
<tr>
@@ -383,6 +403,12 @@ <h4>
383403
</waltz-enum-value>
384404
</td>
385405
</tr>
406+
<tr ng-if="$ctrl.selectedPhysicalFlow.description">
407+
<td>Description</td>
408+
<td>
409+
<span ng-bind="$ctrl.selectedPhysicalFlow.description"></span>
410+
</td>
411+
</tr>
386412
</tbody>
387413
</table>
388414

@@ -423,6 +449,7 @@ <h4>
423449
.flow-detail-panel {
424450
width: 30%;
425451
padding-left: 1em;
452+
word-wrap: anywhere;
426453
}
427454

428455
</style>

0 commit comments

Comments
 (0)