Added in support for navigating to Topo View from Intent View
Change-Id: Ia62428dee29013cc7fa52727662b67f5673d725c
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts
index c669c1c..197ac3c 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts
@@ -28,6 +28,10 @@
y: number;
}
+/*
+ * LinkSvgComponent gets its data from 2 sources - the force SVG regionData (which
+ * gives the Link below), and other state data here.
+ */
@Component({
selector: '[onos-linksvg]',
templateUrl: './linksvg.component.html',
@@ -47,9 +51,8 @@
})
export class LinkSvgComponent extends NodeVisual implements OnChanges {
@Input() link: Link;
- @Input() highlighted: string = '';
+ @Input() linkHighlight: LinkHighlight;
@Input() highlightsEnabled: boolean = true;
- @Input() label: string;
@Input() scale = 1.0;
isHighlighted: boolean = false;
@Output() selectedEvent = new EventEmitter<SelectedEvent>();
@@ -70,23 +73,28 @@
if (changes['linkHighlight']) {
const hl: LinkHighlight = changes['linkHighlight'].currentValue;
clearTimeout(this.lastTimer);
- this.highlighted = hl.css;
- this.label = hl.label;
this.isHighlighted = true;
- this.log.debug('Link hightlighted', this.link.id, this.highlighted);
+ this.log.debug('Link highlighted', this.link.id);
+
if (hl.fadems > 0) {
this.lastTimer = setTimeout(() => {
this.isHighlighted = false;
- this.highlighted = '';
+ this.linkHighlight = <LinkHighlight>{};
this.ref.markForCheck();
- }, hl.fadems); // Disappear slightly before next one comes in
+ }, this.linkHighlight.fadems); // Disappear slightly before next one comes in
}
-
}
this.ref.markForCheck();
}
+ highlightAsString(): string {
+ if (this.linkHighlight && this.linkHighlight.css) {
+ return this.linkHighlight.css;
+ }
+ return '';
+ }
+
enhance() {
if (!this.highlightsEnabled) {
return;