From b60d2362ef6aa5ddeae26452f64f98805cbb5d67 Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Tue, 20 Mar 2018 08:18:36 +0100
Subject: [PATCH] Symbols datasource and models names refactor
---
src/app/app.module.ts | 4 ++-
.../helpers/multi-link-calculator-helper.ts | 2 +-
src/app/cartography/map/map.component.ts | 10 +++---
.../datasources/links-datasource.spec.ts | 2 +-
.../shared/datasources/links-datasource.ts | 2 +-
.../datasources/nodes-datasource.spec.ts | 2 +-
.../shared/datasources/nodes-datasource.ts | 2 +-
.../datasources/symbols-datasource.spec.ts | 33 +++++++++++++++++++
.../shared/datasources/symbols-datasource.ts | 12 +++++++
.../shared/managers/selection-manager.ts | 2 +-
...{drawing-line.model.ts => drawing-line.ts} | 2 +-
.../models/{drawing.model.ts => drawing.ts} | 0
.../models/{label.model.ts => label.ts} | 0
.../{link-status.model.ts => link-status.ts} | 0
.../shared/models/{link.model.ts => link.ts} | 2 +-
.../shared/models/{node.model.ts => node.ts} | 2 +-
.../models/{point.model.ts => point.ts} | 0
.../shared/models/{size.model.ts => size.ts} | 0
.../{ => cartography}/shared/models/symbol.ts | 0
.../shared/tools/selection-tool.spec.ts | 2 +-
.../shared/tools/selection-tool.ts | 2 +-
.../shared/widgets/drawing-line.widget.ts | 4 +--
.../shared/widgets/drawings.widget.ts | 2 +-
.../shared/widgets/ethernet-link.widget.ts | 2 +-
.../shared/widgets/graph.widget.ts | 6 ++--
.../shared/widgets/links.widget.ts | 4 +--
.../shared/widgets/nodes.widget.ts | 4 +--
.../shared/widgets/serial-link.widget.ts | 2 +-
src/app/map/models/context.ts | 4 +--
src/app/project-map/project-map.component.ts | 8 ++---
.../project-web-service-handler.spec.ts | 4 +--
.../handlers/project-web-service-handler.ts | 4 +--
.../start-node-action.component.ts | 2 +-
.../stop-node-action.component.ts | 2 +-
.../node-context-menu.component.ts | 2 +-
.../node-select-interface.component.ts | 2 +-
src/app/shared/services/link.service.ts | 2 +-
src/app/shared/services/node.service.ts | 2 +-
src/app/shared/services/project.service.ts | 6 ++--
src/app/shared/services/symbol.service.ts | 2 +-
40 files changed, 96 insertions(+), 49 deletions(-)
create mode 100644 src/app/cartography/shared/datasources/symbols-datasource.spec.ts
create mode 100644 src/app/cartography/shared/datasources/symbols-datasource.ts
rename src/app/cartography/shared/models/{drawing-line.model.ts => drawing-line.ts} (61%)
rename src/app/cartography/shared/models/{drawing.model.ts => drawing.ts} (100%)
rename src/app/cartography/shared/models/{label.model.ts => label.ts} (100%)
rename src/app/cartography/shared/models/{link-status.model.ts => link-status.ts} (100%)
rename src/app/cartography/shared/models/{link.model.ts => link.ts} (91%)
rename src/app/cartography/shared/models/{node.model.ts => node.ts} (93%)
rename src/app/cartography/shared/models/{point.model.ts => point.ts} (100%)
rename src/app/cartography/shared/models/{size.model.ts => size.ts} (100%)
rename src/app/{ => cartography}/shared/models/symbol.ts (100%)
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 68c3b5d4..ec1d4c4c 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -56,6 +56,7 @@ import { ToasterService } from './shared/services/toaster.service';
import {ProjectWebServiceHandler} from "./shared/handlers/project-web-service-handler";
import {LinksDataSource} from "./cartography/shared/datasources/links-datasource";
import {NodesDataSource} from "./cartography/shared/datasources/nodes-datasource";
+import {SymbolsDataSource} from "./cartography/shared/datasources/symbols-datasource";
@NgModule({
@@ -114,7 +115,8 @@ import {NodesDataSource} from "./cartography/shared/datasources/nodes-datasource
ToasterService,
ProjectWebServiceHandler,
LinksDataSource,
- NodesDataSource
+ NodesDataSource,
+ SymbolsDataSource
],
entryComponents: [
AddServerDialogComponent,
diff --git a/src/app/cartography/map/helpers/multi-link-calculator-helper.ts b/src/app/cartography/map/helpers/multi-link-calculator-helper.ts
index 10ff65ba..da482dc9 100644
--- a/src/app/cartography/map/helpers/multi-link-calculator-helper.ts
+++ b/src/app/cartography/map/helpers/multi-link-calculator-helper.ts
@@ -1,4 +1,4 @@
-import {Link} from "../../shared/models/link.model";
+import {Link} from "../../shared/models/link";
export class MultiLinkCalculatorHelper {
LINK_WIDTH = 2;
diff --git a/src/app/cartography/map/map.component.ts b/src/app/cartography/map/map.component.ts
index 6b4b8a4a..5077bcbf 100644
--- a/src/app/cartography/map/map.component.ts
+++ b/src/app/cartography/map/map.component.ts
@@ -4,13 +4,13 @@ import {
import { D3, D3Service } from 'd3-ng2-service';
import {select, Selection} from 'd3-selection';
-import { Node } from "../shared/models/node.model";
-import { Link } from "../shared/models/link.model";
+import { Node } from "../shared/models/node";
+import { Link } from "../shared/models/link";
import { GraphLayout } from "../shared/widgets/graph.widget";
import { Context } from "../../map/models/context";
-import { Size } from "../shared/models/size.model";
-import { Drawing } from "../shared/models/drawing.model";
-import {Symbol} from "../../shared/models/symbol";
+import { Size } from "../shared/models/size";
+import { Drawing } from "../shared/models/drawing";
+import {Symbol} from "../shared/models/symbol";
@Component({
diff --git a/src/app/cartography/shared/datasources/links-datasource.spec.ts b/src/app/cartography/shared/datasources/links-datasource.spec.ts
index f66ba4ab..9556028c 100644
--- a/src/app/cartography/shared/datasources/links-datasource.spec.ts
+++ b/src/app/cartography/shared/datasources/links-datasource.spec.ts
@@ -1,5 +1,5 @@
import {LinksDataSource} from "./links-datasource";
-import {Link} from "../models/link.model";
+import {Link} from "../models/link";
describe('LinksDataSource', () => {
diff --git a/src/app/cartography/shared/datasources/links-datasource.ts b/src/app/cartography/shared/datasources/links-datasource.ts
index 9bc9962e..cd747b43 100644
--- a/src/app/cartography/shared/datasources/links-datasource.ts
+++ b/src/app/cartography/shared/datasources/links-datasource.ts
@@ -1,7 +1,7 @@
import {Injectable} from "@angular/core";
import {DataSource} from "./datasource";
-import {Link} from "../models/link.model";
+import {Link} from "../models/link";
@Injectable()
diff --git a/src/app/cartography/shared/datasources/nodes-datasource.spec.ts b/src/app/cartography/shared/datasources/nodes-datasource.spec.ts
index dd05391c..fca5534b 100644
--- a/src/app/cartography/shared/datasources/nodes-datasource.spec.ts
+++ b/src/app/cartography/shared/datasources/nodes-datasource.spec.ts
@@ -1,5 +1,5 @@
import {NodesDataSource} from "./nodes-datasource";
-import {Node} from "../models/node.model";
+import {Node} from "../models/node";
describe('NodesDataSource', () => {
diff --git a/src/app/cartography/shared/datasources/nodes-datasource.ts b/src/app/cartography/shared/datasources/nodes-datasource.ts
index 1a6fd5d7..c5c58eb4 100644
--- a/src/app/cartography/shared/datasources/nodes-datasource.ts
+++ b/src/app/cartography/shared/datasources/nodes-datasource.ts
@@ -1,4 +1,4 @@
-import {Node} from "../models/node.model";
+import {Node} from "../models/node";
import {DataSource} from "./datasource";
import {Injectable} from "@angular/core";
diff --git a/src/app/cartography/shared/datasources/symbols-datasource.spec.ts b/src/app/cartography/shared/datasources/symbols-datasource.spec.ts
new file mode 100644
index 00000000..84deecaa
--- /dev/null
+++ b/src/app/cartography/shared/datasources/symbols-datasource.spec.ts
@@ -0,0 +1,33 @@
+import {SymbolsDataSource} from "./symbols-datasource";
+import {Symbol} from "../models/symbol";
+
+
+describe('SymbolsDataSource', () => {
+ let dataSource: SymbolsDataSource;
+ let data: Symbol[];
+
+ beforeEach(() => {
+ dataSource = new SymbolsDataSource();
+ dataSource.connect().subscribe((symbols: Symbol[]) => {
+ data = symbols;
+ });
+ });
+
+ describe('Symbol can be updated', () => {
+ beforeEach(() => {
+ const symbol = new Symbol();
+ symbol.symbol_id = "1";
+ symbol.filename = "test-1";
+ dataSource.add(symbol);
+
+ symbol.filename = "test-2";
+ dataSource.update(symbol);
+ });
+
+ it('filename should change', () => {
+ expect(data[0].symbol_id).toEqual("1");
+ expect(data[0].filename).toEqual("test-2");
+ });
+ });
+
+});
diff --git a/src/app/cartography/shared/datasources/symbols-datasource.ts b/src/app/cartography/shared/datasources/symbols-datasource.ts
new file mode 100644
index 00000000..b08b36ca
--- /dev/null
+++ b/src/app/cartography/shared/datasources/symbols-datasource.ts
@@ -0,0 +1,12 @@
+import {Node} from "../models/node";
+import {DataSource} from "./datasource";
+import {Injectable} from "@angular/core";
+import {Symbol} from "../models/symbol";
+
+
+@Injectable()
+export class SymbolsDataSource extends DataSource<Symbol> {
+ protected findIndex(symbol: Symbol) {
+ return this.data.findIndex((s: Symbol) => s.symbol_id === symbol.symbol_id);
+ }
+}
diff --git a/src/app/cartography/shared/managers/selection-manager.ts b/src/app/cartography/shared/managers/selection-manager.ts
index e964ba1b..16652948 100644
--- a/src/app/cartography/shared/managers/selection-manager.ts
+++ b/src/app/cartography/shared/managers/selection-manager.ts
@@ -1,4 +1,4 @@
-import {Node} from "../models/node.model";
+import {Node} from "../models/node";
export class SelectionManager {
private selectedNodes: Node[] = [];
diff --git a/src/app/cartography/shared/models/drawing-line.model.ts b/src/app/cartography/shared/models/drawing-line.ts
similarity index 61%
rename from src/app/cartography/shared/models/drawing-line.model.ts
rename to src/app/cartography/shared/models/drawing-line.ts
index 764100e9..57c03631 100644
--- a/src/app/cartography/shared/models/drawing-line.model.ts
+++ b/src/app/cartography/shared/models/drawing-line.ts
@@ -1,4 +1,4 @@
-import {Point} from "./point.model";
+import {Point} from "./point";
export class DrawingLine {
start: Point;
diff --git a/src/app/cartography/shared/models/drawing.model.ts b/src/app/cartography/shared/models/drawing.ts
similarity index 100%
rename from src/app/cartography/shared/models/drawing.model.ts
rename to src/app/cartography/shared/models/drawing.ts
diff --git a/src/app/cartography/shared/models/label.model.ts b/src/app/cartography/shared/models/label.ts
similarity index 100%
rename from src/app/cartography/shared/models/label.model.ts
rename to src/app/cartography/shared/models/label.ts
diff --git a/src/app/cartography/shared/models/link-status.model.ts b/src/app/cartography/shared/models/link-status.ts
similarity index 100%
rename from src/app/cartography/shared/models/link-status.model.ts
rename to src/app/cartography/shared/models/link-status.ts
diff --git a/src/app/cartography/shared/models/link.model.ts b/src/app/cartography/shared/models/link.ts
similarity index 91%
rename from src/app/cartography/shared/models/link.model.ts
rename to src/app/cartography/shared/models/link.ts
index a87c697c..f7ab66bf 100644
--- a/src/app/cartography/shared/models/link.model.ts
+++ b/src/app/cartography/shared/models/link.ts
@@ -1,4 +1,4 @@
-import {Node} from "./node.model";
+import {Node} from "./node";
export class Link {
capture_file_name: string;
diff --git a/src/app/cartography/shared/models/node.model.ts b/src/app/cartography/shared/models/node.ts
similarity index 93%
rename from src/app/cartography/shared/models/node.model.ts
rename to src/app/cartography/shared/models/node.ts
index ce68d27a..99e6e12a 100644
--- a/src/app/cartography/shared/models/node.model.ts
+++ b/src/app/cartography/shared/models/node.ts
@@ -1,4 +1,4 @@
-import {Label} from "./label.model";
+import {Label} from "./label";
import {Port} from "../../../shared/models/port";
export class Node {
diff --git a/src/app/cartography/shared/models/point.model.ts b/src/app/cartography/shared/models/point.ts
similarity index 100%
rename from src/app/cartography/shared/models/point.model.ts
rename to src/app/cartography/shared/models/point.ts
diff --git a/src/app/cartography/shared/models/size.model.ts b/src/app/cartography/shared/models/size.ts
similarity index 100%
rename from src/app/cartography/shared/models/size.model.ts
rename to src/app/cartography/shared/models/size.ts
diff --git a/src/app/shared/models/symbol.ts b/src/app/cartography/shared/models/symbol.ts
similarity index 100%
rename from src/app/shared/models/symbol.ts
rename to src/app/cartography/shared/models/symbol.ts
diff --git a/src/app/cartography/shared/tools/selection-tool.spec.ts b/src/app/cartography/shared/tools/selection-tool.spec.ts
index 9ad40018..37473880 100644
--- a/src/app/cartography/shared/tools/selection-tool.spec.ts
+++ b/src/app/cartography/shared/tools/selection-tool.spec.ts
@@ -2,7 +2,7 @@ import {SelectionTool} from "./selection-tool";
import {select} from "d3-selection";
import {Context} from "../../../map/models/context";
import {SVGSelection} from "../../../map/models/types";
-import {Node} from "../models/node.model";
+import {Node} from "../models/node";
class OnSelectedListenerMock {
diff --git a/src/app/cartography/shared/tools/selection-tool.ts b/src/app/cartography/shared/tools/selection-tool.ts
index 218b6042..164597dc 100644
--- a/src/app/cartography/shared/tools/selection-tool.ts
+++ b/src/app/cartography/shared/tools/selection-tool.ts
@@ -1,7 +1,7 @@
import {SVGSelection} from "../../../map/models/types";
import {mouse, select} from "d3-selection";
import {Context} from "../../../map/models/context";
-import {Node} from "../models/node.model";
+import {Node} from "../models/node";
import {Subject} from "rxjs/Subject";
diff --git a/src/app/cartography/shared/widgets/drawing-line.widget.ts b/src/app/cartography/shared/widgets/drawing-line.widget.ts
index b6e4c9e6..b0300726 100644
--- a/src/app/cartography/shared/widgets/drawing-line.widget.ts
+++ b/src/app/cartography/shared/widgets/drawing-line.widget.ts
@@ -1,6 +1,6 @@
-import {DrawingLine} from "../models/drawing-line.model";
+import {DrawingLine} from "../models/drawing-line";
import {SVGSelection} from "../../../map/models/types";
-import {Point} from "../models/point.model";
+import {Point} from "../models/point";
import {line} from "d3-shape";
import {mouse} from "d3-selection";
import {Context} from "../../../map/models/context";
diff --git a/src/app/cartography/shared/widgets/drawings.widget.ts b/src/app/cartography/shared/widgets/drawings.widget.ts
index 621b0c8c..f036e9f2 100644
--- a/src/app/cartography/shared/widgets/drawings.widget.ts
+++ b/src/app/cartography/shared/widgets/drawings.widget.ts
@@ -1,5 +1,5 @@
import {Widget} from "./widget";
-import {Drawing} from "../models/drawing.model";
+import {Drawing} from "../models/drawing";
import {SVGSelection} from "../../../map/models/types";
diff --git a/src/app/cartography/shared/widgets/ethernet-link.widget.ts b/src/app/cartography/shared/widgets/ethernet-link.widget.ts
index 69240a10..15b519f2 100644
--- a/src/app/cartography/shared/widgets/ethernet-link.widget.ts
+++ b/src/app/cartography/shared/widgets/ethernet-link.widget.ts
@@ -2,7 +2,7 @@ import {Widget} from "./widget";
import {SVGSelection} from "../../../map/models/types";
import { line } from "d3-shape";
-import {Link} from "../models/link.model";
+import {Link} from "../models/link";
export class EthernetLinkWidget implements Widget {
diff --git a/src/app/cartography/shared/widgets/graph.widget.ts b/src/app/cartography/shared/widgets/graph.widget.ts
index 9483f2d7..6303f8c6 100644
--- a/src/app/cartography/shared/widgets/graph.widget.ts
+++ b/src/app/cartography/shared/widgets/graph.widget.ts
@@ -1,11 +1,11 @@
import { Context } from "../../../map/models/context";
-import { Node } from "../models/node.model";
-import { Link } from "../models/link.model";
+import { Node } from "../models/node";
+import { Link } from "../models/link";
import { NodesWidget } from "./nodes.widget";
import { Widget } from "./widget";
import { SVGSelection } from "../../../map/models/types";
import { LinksWidget } from "./links.widget";
-import { Drawing } from "../models/drawing.model";
+import { Drawing } from "../models/drawing";
import { DrawingsWidget } from "./drawings.widget";
import { DrawingLineWidget } from "./drawing-line.widget";
import {SelectionTool} from "../tools/selection-tool";
diff --git a/src/app/cartography/shared/widgets/links.widget.ts b/src/app/cartography/shared/widgets/links.widget.ts
index 4d003169..063ab9cd 100644
--- a/src/app/cartography/shared/widgets/links.widget.ts
+++ b/src/app/cartography/shared/widgets/links.widget.ts
@@ -2,8 +2,8 @@ import {BaseType, select, Selection} from "d3-selection";
import { Widget } from "./widget";
import { SVGSelection } from "../../../map/models/types";
-import { Link } from "../models/link.model";
-import { LinkStatus } from "../models/link-status.model";
+import { Link } from "../models/link";
+import { LinkStatus } from "../models/link-status";
import { MultiLinkCalculatorHelper } from "../../map/helpers/multi-link-calculator-helper";
import {SerialLinkWidget} from "./serial-link.widget";
import {EthernetLinkWidget} from "./ethernet-link.widget";
diff --git a/src/app/cartography/shared/widgets/nodes.widget.ts b/src/app/cartography/shared/widgets/nodes.widget.ts
index 0e3dc493..8bae6622 100644
--- a/src/app/cartography/shared/widgets/nodes.widget.ts
+++ b/src/app/cartography/shared/widgets/nodes.widget.ts
@@ -1,9 +1,9 @@
import { Widget } from "./widget";
-import { Node } from "../models/node.model";
+import { Node } from "../models/node";
import { SVGSelection } from "../../../map/models/types";
import {event, select} from "d3-selection";
import {D3DragEvent, drag} from "d3-drag";
-import {Symbol} from "../../../shared/models/symbol";
+import {Symbol} from "../models/symbol";
export class NodesWidget implements Widget {
diff --git a/src/app/cartography/shared/widgets/serial-link.widget.ts b/src/app/cartography/shared/widgets/serial-link.widget.ts
index 325b1dfd..9e70d145 100644
--- a/src/app/cartography/shared/widgets/serial-link.widget.ts
+++ b/src/app/cartography/shared/widgets/serial-link.widget.ts
@@ -1,6 +1,6 @@
import {Widget} from "./widget";
import {SVGSelection} from "../../../map/models/types";
-import {Link} from "../models/link.model";
+import {Link} from "../models/link";
import { path } from "d3-path";
diff --git a/src/app/map/models/context.ts b/src/app/map/models/context.ts
index e8053d7e..28319b38 100644
--- a/src/app/map/models/context.ts
+++ b/src/app/map/models/context.ts
@@ -1,6 +1,6 @@
-import {Size} from "../../cartography/shared/models/size.model";
+import {Size} from "../../cartography/shared/models/size";
import {Selection} from "d3-selection";
-import {Point} from "../../cartography/shared/models/point.model";
+import {Point} from "../../cartography/shared/models/point";
export class Context {
private size: Size;
diff --git a/src/app/project-map/project-map.component.ts b/src/app/project-map/project-map.component.ts
index b643e6aa..18ce4684 100644
--- a/src/app/project-map/project-map.component.ts
+++ b/src/app/project-map/project-map.component.ts
@@ -12,9 +12,9 @@ import 'rxjs/add/observable/dom/webSocket';
import { Project } from '../shared/models/project';
-import { Node } from '../cartography/shared/models/node.model';
+import { Node } from '../cartography/shared/models/node';
import { SymbolService } from '../shared/services/symbol.service';
-import { Link } from "../cartography/shared/models/link.model";
+import { Link } from "../cartography/shared/models/link";
import { MapComponent } from "../cartography/map/map.component";
import { ServerService } from "../shared/services/server.service";
import { ProjectService } from '../shared/services/project.service';
@@ -24,11 +24,11 @@ import { SnapshotService } from "../shared/services/snapshot.service";
import { Snapshot } from "../shared/models/snapshot";
import { ProgressDialogService } from "../shared/progress-dialog/progress-dialog.service";
import { ProgressDialogComponent } from "../shared/progress-dialog/progress-dialog.component";
-import { Drawing } from "../cartography/shared/models/drawing.model";
+import { Drawing } from "../cartography/shared/models/drawing";
import { NodeContextMenuComponent } from "../shared/node-context-menu/node-context-menu.component";
import { Appliance } from "../shared/models/appliance";
import { NodeService } from "../shared/services/node.service";
-import { Symbol } from "../shared/models/symbol";
+import { Symbol } from "../cartography/shared/models/symbol";
import { NodeSelectInterfaceComponent } from "../shared/node-select-interface/node-select-interface.component";
import { Port } from "../shared/models/port";
import { LinkService } from "../shared/services/link.service";
diff --git a/src/app/shared/handlers/project-web-service-handler.spec.ts b/src/app/shared/handlers/project-web-service-handler.spec.ts
index 25beeb9c..64adda2f 100644
--- a/src/app/shared/handlers/project-web-service-handler.spec.ts
+++ b/src/app/shared/handlers/project-web-service-handler.spec.ts
@@ -3,8 +3,8 @@ import {Subject} from "rxjs/Subject";
import {inject, TestBed} from "@angular/core/testing";
import {NodesDataSource} from "../../cartography/shared/datasources/nodes-datasource";
import {LinksDataSource} from "../../cartography/shared/datasources/links-datasource";
-import {Node} from "../../cartography/shared/models/node.model";
-import {Link} from "../../cartography/shared/models/link.model";
+import {Node} from "../../cartography/shared/models/node";
+import {Link} from "../../cartography/shared/models/link";
diff --git a/src/app/shared/handlers/project-web-service-handler.ts b/src/app/shared/handlers/project-web-service-handler.ts
index 7a731ef3..ad65b360 100644
--- a/src/app/shared/handlers/project-web-service-handler.ts
+++ b/src/app/shared/handlers/project-web-service-handler.ts
@@ -2,8 +2,8 @@ import {Injectable} from "@angular/core";
import {NodesDataSource} from "../../cartography/shared/datasources/nodes-datasource";
import {LinksDataSource} from "../../cartography/shared/datasources/links-datasource";
import {Subject} from "rxjs/Subject";
-import {Link} from "../../cartography/shared/models/link.model";
-import {Node} from "../../cartography/shared/models/node.model";
+import {Link} from "../../cartography/shared/models/link";
+import {Node} from "../../cartography/shared/models/node";
export class WebServiceMessage {
diff --git a/src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.ts b/src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.ts
index a2c6f65f..f13e7b73 100644
--- a/src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.ts
+++ b/src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.ts
@@ -1,7 +1,7 @@
import {Component, Input, OnInit} from '@angular/core';
import {Server} from "../../../models/server";
import {NodeService} from "../../../services/node.service";
-import {Node} from "../../../../cartography/shared/models/node.model";
+import {Node} from "../../../../cartography/shared/models/node";
@Component({
diff --git a/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.ts b/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.ts
index 5cb8fc47..3885f45d 100644
--- a/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.ts
+++ b/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.ts
@@ -1,7 +1,7 @@
import {Component, Input, OnInit} from '@angular/core';
import {Server} from "../../../models/server";
import {NodeService} from "../../../services/node.service";
-import {Node} from "../../../../cartography/shared/models/node.model";
+import {Node} from "../../../../cartography/shared/models/node";
@Component({
diff --git a/src/app/shared/node-context-menu/node-context-menu.component.ts b/src/app/shared/node-context-menu/node-context-menu.component.ts
index cc397011..f37b1a8f 100644
--- a/src/app/shared/node-context-menu/node-context-menu.component.ts
+++ b/src/app/shared/node-context-menu/node-context-menu.component.ts
@@ -1,7 +1,7 @@
import {ChangeDetectorRef, Component, Input, OnInit, ViewChild} from '@angular/core';
import {MatMenuTrigger} from "@angular/material";
import {DomSanitizer} from "@angular/platform-browser";
-import {Node} from "../../cartography/shared/models/node.model";
+import {Node} from "../../cartography/shared/models/node";
import {Server} from "../models/server";
diff --git a/src/app/shared/node-select-interface/node-select-interface.component.ts b/src/app/shared/node-select-interface/node-select-interface.component.ts
index 74558b00..ecc3818f 100644
--- a/src/app/shared/node-select-interface/node-select-interface.component.ts
+++ b/src/app/shared/node-select-interface/node-select-interface.component.ts
@@ -1,7 +1,7 @@
import {ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
import {MatMenuTrigger} from "@angular/material";
import {DomSanitizer} from "@angular/platform-browser";
-import {Node} from "../../cartography/shared/models/node.model";
+import {Node} from "../../cartography/shared/models/node";
import {Port} from "../models/port";
diff --git a/src/app/shared/services/link.service.ts b/src/app/shared/services/link.service.ts
index 7cb5cd0e..a1817998 100644
--- a/src/app/shared/services/link.service.ts
+++ b/src/app/shared/services/link.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { Node } from '../../cartography/shared/models/node.model';
+import { Node } from '../../cartography/shared/models/node';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/map';
diff --git a/src/app/shared/services/node.service.ts b/src/app/shared/services/node.service.ts
index 62ff87d1..0ea15945 100644
--- a/src/app/shared/services/node.service.ts
+++ b/src/app/shared/services/node.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { Project } from '../models/project';
-import { Node } from '../../cartography/shared/models/node.model';
+import { Node } from '../../cartography/shared/models/node';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/map';
diff --git a/src/app/shared/services/project.service.ts b/src/app/shared/services/project.service.ts
index 985c3bfc..29273ef3 100644
--- a/src/app/shared/services/project.service.ts
+++ b/src/app/shared/services/project.service.ts
@@ -1,13 +1,13 @@
import { Injectable } from '@angular/core';
import { Project } from '../models/project';
-import { Node } from '../../cartography/shared/models/node.model';
+import { Node } from '../../cartography/shared/models/node';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/map';
-import { Link } from "../../cartography/shared/models/link.model";
+import { Link } from "../../cartography/shared/models/link";
import { Server } from "../models/server";
import { HttpServer } from "./http-server.service";
-import {Drawing} from "../../cartography/shared/models/drawing.model";
+import {Drawing} from "../../cartography/shared/models/drawing";
@Injectable()
export class ProjectService {
diff --git a/src/app/shared/services/symbol.service.ts b/src/app/shared/services/symbol.service.ts
index 712d72a7..b4cdb196 100644
--- a/src/app/shared/services/symbol.service.ts
+++ b/src/app/shared/services/symbol.service.ts
@@ -6,7 +6,7 @@ import 'rxjs/add/operator/map';
import 'rxjs/add/observable/forkJoin';
import 'rxjs/add/observable/of';
-import { Symbol } from '../models/symbol';
+import { Symbol } from '../../cartography/shared/models/symbol';
import { Server } from "../models/server";
import { HttpServer } from "./http-server.service";