ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2024-12-22 06:17:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unit tests fixed

Browse Source
This commit is contained in:
Piotr Pekala 2019-09-30 05:53:30 -07:00
parent 8764a417d3
commit a242c1c66f
7 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/cartography/components/draggable-selection/draggable-selection.component.ts
View File

@ -96,6 +96,7 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy {
const selected = this.selectionManager.getSelected();
// update nodes
let mapNodes = selected.filter(item => item instanceof MapNode);
const lockedNodes = mapNodes.filter((item: MapNode) => item.locked);
const selectedNodes = mapNodes.filter((item: MapNode) => !item.locked);
selectedNodes.forEach((node: MapNode) => {
node.x += evt.dx;
@ -127,7 +128,7 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy {
// update labels
let mapLabels = selected.filter(item => item instanceof MapLabel);
const selectedLabels = mapLabels.filter((item: MapLabel) => selectedNodes.filter((node) => node.id === item.nodeId).length > 0);
const selectedLabels = mapLabels.filter((item: MapLabel) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0);
selectedLabels.forEach((label: MapLabel) => {
const isParentNodeSelected = selectedNodes.filter(node => node.id === label.nodeId).length > 0;
if (isParentNodeSelected) {
@ -142,7 +143,7 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy {
// update interface labels
let mapLinkNodes = selected.filter(item => item instanceof MapLinkNode);
const selectedLinkNodes = mapLinkNodes.filter((item: MapLinkNode) => selectedNodes.filter((node) => node.id === item.nodeId).length > 0);
const selectedLinkNodes = mapLinkNodes.filter((item: MapLinkNode) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0);
selectedLinkNodes.forEach((interfaceLabel: MapLinkNode) => {
const isParentNodeSelected = selectedNodes.filter(node => node.id === interfaceLabel.nodeId).length > 0;
if (isParentNodeSelected) {
@ -176,6 +177,7 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy {
const selected = this.selectionManager.getSelected();
let mapNodes = selected.filter(item => item instanceof MapNode);
const lockedNodes = mapNodes.filter((item: MapNode) => item.locked);
const selectedNodes = mapNodes.filter((item: MapNode) => !item.locked);
selectedNodes.forEach((item: MapNode) => {
this.nodesEventSource.dragged.emit(new DraggedDataEvent<MapNode>(item, evt.dx, evt.dy));
@ -188,7 +190,7 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy {
});
let mapLabels = selected.filter(item => item instanceof MapLabel);
const selectedLabels = mapLabels.filter((item: MapLabel) => selectedNodes.filter((node) => node.id === item.nodeId).length > 0);
const selectedLabels = mapLabels.filter((item: MapLabel) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0);
selectedLabels.forEach((label: MapLabel) => {
const isParentNodeSelected = selectedNodes.filter(node => node.id === label.nodeId).length > 0;
if (isParentNodeSelected) {
@ -199,7 +201,7 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy {
});
let mapLinkNodes = selected.filter(item => item instanceof MapLinkNode);
const selectedLinkNodes = mapLinkNodes.filter((item: MapLinkNode) => selectedNodes.filter((node) => node.id === item.nodeId).length > 0);
const selectedLinkNodes = mapLinkNodes.filter((item: MapLinkNode) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0)
selectedLinkNodes.forEach((label: MapLinkNode) => {
const isParentNodeSelected = selectedNodes.filter(node => node.id === label.nodeId).length > 0;
if (isParentNodeSelected) {

1
src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.spec.ts
View File

@ -48,6 +48,7 @@ describe('DrawingDraggedComponent', () => {
};
const mapDrawing: MapDrawing = {
id: 'sampleId',
locked: false,
projectId: 'sampleprojectId',
rotation: 0,
svg: 'sampleSvg',

1
src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.spec.ts
View File

@ -51,6 +51,7 @@ describe('DrawingResizedComponent', () => {
};
const mapDrawing: MapDrawing = {
id: 'sampleId',
locked: false,
projectId: 'sampleprojectId',
rotation: 0,
svg: 'sampleSvg',

1
src/app/components/drawings-listeners/link-created/link-created.component.spec.ts
View File

@ -72,6 +72,7 @@ describe('LinkCreatedComponent', () => {
firstPortName: 'sampleFirstPortName',
height: 0,
label: {} as MapLabel,
locked: false,
name: 'sampleName',
nodeDirectory: 'sampleNodeDirectory',
nodeType: 'sampleNodeType',

1
src/app/components/drawings-listeners/node-dragged/node-dragged.component.spec.ts
View File

@ -52,6 +52,7 @@ describe('NodeDraggedComponent', () => {
firstPortName: 'sampleFirstPortName',
height: 0,
label: {} as MapLabel,
locked: false,
name: 'sampleName',
nodeDirectory: 'sampleNodeDirectory',
nodeType: 'sampleNodeType',

2
src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.html
View File

@ -1,4 +1,4 @@
<button mat-menu-item (click)="lock()">
<mat-icon>lock</mat-icon>
<span>Lock</span>
<span>{{command}}</span>
</button>

4
src/app/services/drawing.service.spec.ts
View File

@ -111,6 +111,7 @@ describe('DrawingService', () => {
drawing.z = 30;
drawing.rotation = 0;
drawing.svg = '<svg></svg>';
drawing.locked = false;
service.update(server, drawing).subscribe();
@ -121,7 +122,8 @@ describe('DrawingService', () => {
y: 20,
z: 30,
rotation: 0,
svg: '<svg></svg>'
svg: '<svg></svg>',
locked: false
});
}));