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

Duplication option added

Browse Source
This commit is contained in:
Piotr Pekala 2019-06-17 06:50:26 -07:00
parent da896ac783
commit 67741ca601
10 changed files with 192 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.module.ts
View File

@ -186,6 +186,7 @@ import { DefaultConsoleService } from './services/settings/default-console.servi
import { NodeCreatedLabelStylesFixer } from './components/project-map/helpers/node-created-label-styles-fixer';
import { NonNegativeValidator } from './validators/non-negative-validator';
import { RotationValidator } from './validators/rotation-validator';
import { DuplicateActionComponent } from './components/project-map/context-menu/actions/duplicate-action/duplicate-action.component';
if (environment.production) {
Raven.config('https://b2b1cfd9b043491eb6b566fd8acee358@sentry.io/842726', {
@ -220,6 +221,7 @@ if (environment.production) {
EditStyleActionComponent,
EditTextActionComponent,
DeleteActionComponent,
DuplicateActionComponent,
PacketFiltersActionComponent,
StartCaptureActionComponent,
StopCaptureActionComponent,

4
src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.html Normal file
View File

@ -0,0 +1,4 @@
<button mat-menu-item (click)="duplicate()">
<mat-icon>filter_none</mat-icon>
<span>Duplicate</span>
</button>

78
src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.spec.ts Normal file
View File

@ -0,0 +1,78 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIconModule, MatMenuModule } from '@angular/material';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
import { DrawingsDataSource } from '../../../../../cartography/datasources/drawings-datasource';
import { NodeService } from '../../../../../services/node.service';
import { DrawingService } from '../../../../../services/drawing.service';
import { MockedDrawingService, MockedNodeService } from '../../../project-map.component.spec';
import { Node } from '../../../../../cartography/models/node';
import { Drawing } from '../../../../../cartography/models/drawing';
import { of } from 'rxjs';
import { DuplicateActionComponent } from './duplicate-action.component';
describe('DuplicateActionComponent', () => {
let component: DuplicateActionComponent;
let fixture: ComponentFixture<DuplicateActionComponent>;
let mockedNodeService: MockedNodeService = new MockedNodeService();
let mockedDrawingService: MockedDrawingService = new MockedDrawingService();
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [MatIconModule, MatMenuModule, NoopAnimationsModule],
providers: [
{ provide: NodesDataSource, useClass: NodesDataSource },
{ provide: DrawingsDataSource, useClass: DrawingsDataSource },
{ provide: NodeService, useValue: mockedNodeService },
{ provide: DrawingService, useValue: mockedDrawingService }
],
declarations: [DuplicateActionComponent]
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DuplicateActionComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
it('should call duplicate action in drawing service', () => {
let drawing = { drawing_id: '1' } as Drawing;
component.drawings = [drawing];
component.nodes = [];
spyOn(mockedDrawingService, 'duplicate').and.returnValue(of());
component.duplicate();
expect(mockedDrawingService.duplicate).toHaveBeenCalled();
});
it('should call duplicate action in node service', () => {
let node = { node_id: '1' } as Node;
component.nodes = [node];
component.drawings = [];
spyOn(mockedNodeService, 'duplicate').and.returnValue(of());
component.duplicate();
expect(mockedNodeService.duplicate).toHaveBeenCalled();
});
it('should call duplicate action in both services', () => {
let drawing = { drawing_id: '1' } as Drawing;
component.drawings = [drawing];
let node = { node_id: '1' } as Node;
component.nodes = [node];
spyOn(mockedDrawingService, 'duplicate').and.returnValue(of());
spyOn(mockedNodeService, 'duplicate').and.returnValue(of());
component.duplicate();
expect(mockedDrawingService.duplicate).toHaveBeenCalled();
expect(mockedNodeService.duplicate).toHaveBeenCalled();
});
});

41
src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts Normal file
View File

@ -0,0 +1,41 @@
import { Component, OnInit, Input } from '@angular/core';
import { Server } from '../../../../../models/server';
import { Node } from '../../../../../cartography/models/node';
import { Drawing } from '../../../../../cartography/models/drawing';
import { Project } from '../../../../../models/project';
import { NodeService } from '../../../../../services/node.service';
import { DrawingService } from '../../../../../services/drawing.service';
import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
import { DrawingsDataSource } from '../../../../../cartography/datasources/drawings-datasource';
@Component({
selector: 'app-duplicate-action',
templateUrl: './duplicate-action.component.html'
})
export class DuplicateActionComponent {
@Input() server: Server;
@Input() project: Project;
@Input() drawings: Drawing[];
@Input() nodes: Node[];
constructor(
private nodeService: NodeService,
private nodesDataSource: NodesDataSource,
private drawingService: DrawingService,
private drawingsDataSource: DrawingsDataSource
) {}
duplicate() {
for(let node of this.nodes) {
this.nodeService.duplicate(this.server, node).subscribe((node: Node) => {
this.nodesDataSource.add(node);
});
}
for(let drawing of this.drawings) {
this.drawingService.duplicate(this.server, drawing.project_id, drawing).subscribe((drawing: Drawing) => {
this.drawingsDataSource.add(drawing);
})
}
}
}

6
src/app/components/project-map/context-menu/context-menu.component.html
View File

@ -8,6 +8,12 @@
[server]="server"
[nodes]="nodes"
></app-console-device-action>
<app-duplicate-action *ngIf="drawings.length>0 || nodes.length>0"
[server]="server"
[project]="project"
[nodes]="nodes"
[drawings]="drawings"
></app-duplicate-action>
<app-edit-style-action *ngIf="drawings.length===1 && !hasTextCapabilities"
[server]="server"
[project]="project"

8
src/app/components/project-map/project-map.component.spec.ts
View File

@ -81,6 +81,10 @@ export class MockedNodeService {
reloadAll(server: Server, project: Project) {
return of();
}
duplicate(server: Server, node: Node) {
return of(node);
}
}
export class MockedDrawingService {
@ -91,6 +95,10 @@ export class MockedDrawingService {
return of(this.drawing);
}
duplicate(server: Server, project_id: string, drawing: Drawing) {
return of(drawing);
}
updatePosition(_server: Server, _drawing: Drawing, _x: number, _y: number) {
return of(this.drawing);
}

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

@ -135,4 +135,27 @@ describe('DrawingService', () => {
const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/projects/myproject/drawings/id');
expect(req.request.method).toEqual('DELETE');
}));
it('should duplicate drawing', inject([DrawingService], (service: DrawingService) => {
const drawing = new Drawing();
drawing.project_id = "project_id_1";
drawing.drawing_id = "drawing_id_1";
drawing.x = 100;
drawing.y = 90;
drawing.z = 1;
drawing.rotation = 0;
drawing.svg = "<svg height=\"100\" width=\"200\"><rect fill=\"#ffffff\" fill-opacity=\"1.0\" height=\"100\" stroke=\"#000000\" stroke-width=\"2\" width=\"200\" /></svg>";
service.duplicate(server, drawing.project_id, drawing).subscribe();
const req = httpTestingController.expectOne(`http://127.0.0.1:3080/v2/projects/${drawing.project_id}/drawings`);
expect(req.request.method).toEqual('POST');
expect(req.request.body).toEqual({
svg: drawing.svg,
rotation: 0,
x: 110,
y: 100,
z: 1
});
}));
});

10
src/app/services/drawing.service.ts
View File

@ -19,6 +19,16 @@ export class DrawingService {
});
}
duplicate(server: Server, project_id: string, drawing: Drawing) {
return this.httpServer.post<Drawing>(server, `/projects/${project_id}/drawings`, {
svg: drawing.svg,
rotation: drawing.rotation,
x: drawing.x + 10,
y: drawing.y + 10,
z: drawing.z
});
}
updatePosition(server: Server, drawing: Drawing, x: number, y: number): Observable<Drawing> {
return this.httpServer.put<Drawing>(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, {
x: Math.round(x),

11
src/app/services/node.service.spec.ts
View File

@ -215,4 +215,15 @@ describe('NodeService', () => {
const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/projects/myproject/nodes/id');
expect(req.request.method).toEqual('DELETE');
}));
it('should duplicate node', inject([NodeService], (service: NodeService) => {
const node = new Node();
node.project_id = "project_id_1";
node.node_id = "node_id_1";
service.duplicate(server, node).subscribe();
const req = httpTestingController.expectOne(`http://127.0.0.1:3080/v2/projects/${node.project_id}/nodes/${node.node_id}/duplicate`);
expect(req.request.method).toEqual('POST');
}));
});

9
src/app/services/node.service.ts
View File

@ -75,4 +75,13 @@ export class NodeService {
delete(server: Server, node: Node) {
return this.httpServer.delete<Node>(server, `/projects/${node.project_id}/nodes/${node.node_id}`);
}
duplicate(server: Server, node: Node) {
return this.httpServer.post(server, `/projects/${node.project_id}/nodes/${node.node_id}/duplicate`,
{
"x": node.x + 10,
"y": node.y + 10,
"z": node.z
});
}
}