Symbols datasource and models names refactor

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,

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;

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 { Node } from "../shared/models/node";
-import { Link } from "../shared/models/link.model";
+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 { Size } from "../shared/models/size";
-import { Drawing } from "../shared/models/drawing.model";
+import { Drawing } from "../shared/models/drawing";
-import {Symbol} from "../../shared/models/symbol";
+import {Symbol} from "../shared/models/symbol";
 
 
 @Component({

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', () => {

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()

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', () => {

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";
 

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");
+    });
+  });
+
+});

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);
+  }
+}

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[] = [];

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;

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;

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 {

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 {

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";
 
 

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";

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";
 
 

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 {
 

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 { Node } from "../models/node";
-import { Link } from "../models/link.model";
+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";

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 { Link } from "../models/link";
-import { LinkStatus } from "../models/link-status.model";
+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";

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 {

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";
 
 

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;

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";

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 {Node} from "../../cartography/shared/models/node";
-import {Link} from "../../cartography/shared/models/link.model";
+import {Link} from "../../cartography/shared/models/link";
 
 
 

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 {Link} from "../../cartography/shared/models/link";
-import {Node} from "../../cartography/shared/models/node.model";
+import {Node} from "../../cartography/shared/models/node";
 
 
 export class WebServiceMessage {

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({

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({

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";
 
 

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";
 
 

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';

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';

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 {

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";