ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-06 01:01:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused code

Browse Source
This commit is contained in:
ziajka 2018-11-26 14:10:14 +01:00
parent 8b91549984
commit 1217c4e31c
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/cartography/models/interface-label.ts
View File

@ -1,14 +0,0 @@
import { Indexed } from "../datasources/map-datasource";
export class InterfaceLabel implements Indexed {
constructor(
public id: string,
public link_id: string,
public direction: string,
public x: number,
public y: number,
public text: string,
public style: string,
public rotation = 0,
) {}
}

14
src/app/cartography/widgets/interface-label.spec.ts
View File

@ -1,7 +1,6 @@
import { Selection } from "d3-selection"; import { Selection } from "d3-selection";
import { TestSVGCanvas } from "../testing"; import { TestSVGCanvas } from "../testing";
import { InterfaceLabel } from "../models/interface-label";
import { InterfaceLabelWidget } from "./interface-label"; import { InterfaceLabelWidget } from "./interface-label";
import { CssFixer } from "../helpers/css-fixer"; import { CssFixer } from "../helpers/css-fixer";
import { MapNode } from "../models/map/map-node"; import { MapNode } from "../models/map/map-node";
@ -9,6 +8,7 @@ import { MapLink } from "../models/map/map-link";
import { MapLinkNode } from "../models/map/map-link-node"; import { MapLinkNode } from "../models/map/map-link-node";
import { MapLabel } from "../models/map/map-label"; import { MapLabel } from "../models/map/map-label";
import { FontFixer } from "../helpers/font-fixer"; import { FontFixer } from "../helpers/font-fixer";
import { SelectionManager } from "../managers/selection-manager";
describe('InterfaceLabelsWidget', () => { describe('InterfaceLabelsWidget', () => {
@ -68,7 +68,7 @@ describe('InterfaceLabelsWidget', () => {
.exit() .exit()
.remove(); .remove();
widget = new InterfaceLabelWidget(new CssFixer(), new FontFixer()); widget = new InterfaceLabelWidget(new CssFixer(), new FontFixer(), new SelectionManager());
}); });
afterEach(() => { afterEach(() => {
@ -78,24 +78,22 @@ describe('InterfaceLabelsWidget', () => {
it('should draw interface labels', () => { it('should draw interface labels', () => {
widget.draw(linksEnter); widget.draw(linksEnter);
const drew = svg.canvas.selectAll<SVGGElement, InterfaceLabel>('g.interface_label_container'); const drew = svg.canvas.selectAll<SVGGElement, MapLinkNode>('g.interface_label_container');
expect(drew.nodes().length).toEqual(2); expect(drew.nodes().length).toEqual(2);
const sourceInterface = drew.nodes()[0] as Element; const sourceInterface = drew.nodes()[0] as Element;
expect(sourceInterface.getAttribute('transform')).toEqual('translate(110, 220) rotate(5, 110, 220)');
const sourceIntefaceRect = sourceInterface.firstChild as Element; const sourceIntefaceRect = sourceInterface.firstChild as Element;
expect(sourceIntefaceRect.attributes.getNamedItem('class').value).toEqual('interface_label_border'); expect(sourceIntefaceRect.attributes.getNamedItem('class').value).toEqual('interface_label_selection');
const sourceIntefaceText = sourceInterface.children[1]; const sourceIntefaceText = sourceInterface.children[1];
expect(sourceIntefaceText.attributes.getNamedItem('class').value).toEqual('interface_label noselect'); expect(sourceIntefaceText.attributes.getNamedItem('class').value).toEqual('interface_label noselect');
expect(sourceIntefaceText.attributes.getNamedItem('style').value).toEqual('font-size:12px'); expect(sourceIntefaceText.attributes.getNamedItem('style').value).toEqual('font-size:12px');
const targetInterface = drew.nodes()[1]; const targetInterface = drew.nodes()[1];
expect(targetInterface.getAttribute('transform')).toEqual('translate(270, 360) rotate(0, 270, 360)');
const targetIntefaceRect = targetInterface.firstChild as Element; const targetIntefaceRect = targetInterface.firstChild as Element;
expect(targetIntefaceRect.attributes.getNamedItem('class').value).toEqual('interface_label_border'); expect(targetIntefaceRect.attributes.getNamedItem('class').value).toEqual('interface_label_selection');
const targetIntefaceText = targetInterface.children[1] as Element; const targetIntefaceText = targetInterface.children[1] as Element;
expect(targetIntefaceText.attributes.getNamedItem('class').value).toEqual('interface_label noselect'); expect(targetIntefaceText.attributes.getNamedItem('class').value).toEqual('interface_label noselect');
expect(targetIntefaceText.attributes.getNamedItem('style').value).toEqual(''); expect(targetIntefaceText.attributes.getNamedItem('style').value).toEqual('');
@ -106,7 +104,7 @@ describe('InterfaceLabelsWidget', () => {
widget.setEnabled(false); widget.setEnabled(false);
widget.draw(linksEnter); widget.draw(linksEnter);
const drew = svg.canvas.selectAll<SVGGElement, InterfaceLabel>('g.interface_label_container'); const drew = svg.canvas.selectAll<SVGGElement, MapLinkNode>('g.interface_label_container');
expect(drew.nodes().length).toEqual(0); expect(drew.nodes().length).toEqual(0);
}); });

3
src/app/cartography/widgets/interface-label.ts
View File

@ -1,7 +1,6 @@
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { SVGSelection } from "../models/types"; import { SVGSelection } from "../models/types";
import { InterfaceLabel } from "../models/interface-label";
import { CssFixer } from "../helpers/css-fixer"; import { CssFixer } from "../helpers/css-fixer";
import { select } from "d3-selection"; import { select } from "d3-selection";
import { MapLink } from "../models/map/map-link"; import { MapLink } from "../models/map/map-link";
@ -49,7 +48,7 @@ export class InterfaceLabelWidget {
}); });
const labels = merge_link_node_position const labels = merge_link_node_position
.selectAll<SVGGElement, InterfaceLabel>('g.interface_label_container') .selectAll<SVGGElement, [MapNode, MapLinkNode]>('g.interface_label_container')
.data((nodeAndMapLinkNode: [MapNode, MapLinkNode]) => { .data((nodeAndMapLinkNode: [MapNode, MapLinkNode]) => {
if (this.enabled) { if (this.enabled) {
return [nodeAndMapLinkNode[1]]; return [nodeAndMapLinkNode[1]];