Merge pull request #149 from GNS3/progress

Progress, small refactor and sentry fixes.

src/app/app-routing.module.ts

@@ -3,12 +3,12 @@ import { environment } from "../environments/environment";
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { ProjectMapComponent } from './project-map/project-map.component';
-import { ServersComponent } from "./servers/servers.component";
-import { ProjectsComponent } from "./projects/projects.component";
-import { DefaultLayoutComponent } from "./default-layout/default-layout.component";
-import { SettingsComponent } from "./settings/settings.component";
-import { LocalServerComponent } from "./local-server/local-server.component";
+import { ProjectMapComponent } from './components/project-map/project-map.component';
+import { ServersComponent } from "./components/servers/servers.component";
+import { ProjectsComponent } from "./components/projects/projects.component";
+import { DefaultLayoutComponent } from "./layouts/default-layout/default-layout.component";
+import { SettingsComponent } from "./components/settings/settings.component";
+import { LocalServerComponent } from "./components/local-server/local-server.component";
 
 
 const routes: Routes = [

src/app/app.component.spec.ts

@@ -3,7 +3,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { AppComponent } from './app.component';
 import { MatIconModule } from "@angular/material";
-import { SettingsService } from "./shared/services/settings.service";
+import { SettingsService } from "./services/settings.service";
 import { PersistenceService } from "angular-persistence";
 import { ElectronService, NgxElectronModule } from "ngx-electron";
 import createSpyObj = jasmine.createSpyObj;

src/app/app.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { MatIconRegistry } from "@angular/material";
 import { DomSanitizer } from "@angular/platform-browser";
 import { ElectronService } from "ngx-electron";
-import { SettingsService } from "./shared/services/settings.service";
+import { SettingsService } from "./services/settings.service";
 
 
 @Component({

src/app/app.module.ts

@@ -23,7 +23,8 @@ import {
   MatListModule,
   MatExpansionModule,
   MatSortModule,
-  MatSelectModule
+  MatSelectModule,
+  MatTooltipModule
 } from '@angular/material';
 
 import { D3Service } from 'd3-ng2-service';
@@ -34,55 +35,60 @@ import { NgxElectronModule } from 'ngx-electron';
 
 import { AppRoutingModule } from './app-routing.module';
 
-import { VersionService } from './shared/services/version.service';
-import { ProjectService } from './shared/services/project.service';
-import { SymbolService } from "./shared/services/symbol.service";
-import { ServerService } from "./shared/services/server.service";
-import { IndexedDbService } from "./shared/services/indexed-db.service";
-import { HttpServer } from "./shared/services/http-server.service";
-import { SnapshotService } from "./shared/services/snapshot.service";
-import { ProgressDialogService } from "./shared/progress-dialog/progress-dialog.service";
-import { NodeService } from "./shared/services/node.service";
-import { ApplianceService } from "./shared/services/appliance.service";
-import { LinkService } from "./shared/services/link.service";
+import { VersionService } from './services/version.service';
+import { ProjectService } from './services/project.service';
+import { SymbolService } from "./services/symbol.service";
+import { ServerService } from "./services/server.service";
+import { IndexedDbService } from "./services/indexed-db.service";
+import { HttpServer } from "./services/http-server.service";
+import { SnapshotService } from "./services/snapshot.service";
+import { ProgressDialogService } from "./common/progress-dialog/progress-dialog.service";
+import { NodeService } from "./services/node.service";
+import { ApplianceService } from "./services/appliance.service";
+import { LinkService } from "./services/link.service";
 
-import { ProjectsComponent } from './projects/projects.component';
-import { DefaultLayoutComponent } from './default-layout/default-layout.component';
-import { ProgressDialogComponent } from './shared/progress-dialog/progress-dialog.component';
+import { ProjectsComponent } from './components/projects/projects.component';
+import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component';
+import { ProgressDialogComponent } from './common/progress-dialog/progress-dialog.component';
 import { AppComponent } from './app.component';
 
-import { CreateSnapshotDialogComponent, ProjectMapComponent } from './project-map/project-map.component';
-import { ServersComponent, AddServerDialogComponent } from './servers/servers.component';
-import { NodeContextMenuComponent } from './shared/node-context-menu/node-context-menu.component';
-import { StartNodeActionComponent } from './shared/node-context-menu/actions/start-node-action/start-node-action.component';
-import { StopNodeActionComponent } from './shared/node-context-menu/actions/stop-node-action/stop-node-action.component';
-import { ApplianceComponent } from './appliance/appliance.component';
-import { ApplianceListDialogComponent } from './appliance/appliance-list-dialog/appliance-list-dialog.component';
-import { NodeSelectInterfaceComponent } from './shared/node-select-interface/node-select-interface.component';
+import { CreateSnapshotDialogComponent, ProjectMapComponent } from './components/project-map/project-map.component';
+import { ServersComponent, AddServerDialogComponent } from './components/servers/servers.component';
+import { NodeContextMenuComponent } from './components/project-map/node-context-menu/node-context-menu.component';
+import { StartNodeActionComponent } from './components/project-map/node-context-menu/actions/start-node-action/start-node-action.component';
+import { StopNodeActionComponent } from './components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component';
+import { ApplianceComponent } from './components/appliance/appliance.component';
+import { ApplianceListDialogComponent } from './components/appliance/appliance-list-dialog/appliance-list-dialog.component';
+import { NodeSelectInterfaceComponent } from './components/project-map/node-select-interface/node-select-interface.component';
 import { CartographyModule } from './cartography/cartography.module';
-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";
-import { SelectionManager } from "./cartography/shared/managers/selection-manager";
-import { InRectangleHelper } from "./cartography/map/helpers/in-rectangle-helper";
-import { DrawingsDataSource } from "./cartography/shared/datasources/drawings-datasource";
-import { MoveLayerDownActionComponent } from './shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component';
-import { MoveLayerUpActionComponent } from './shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component';
-import { ProjectMapShortcutsComponent } from './project-map/project-map-shortcuts/project-map-shortcuts.component';
-import { SettingsComponent } from './settings/settings.component';
-import { SettingsService } from "./shared/services/settings.service";
+import { ToasterService } from './services/toaster.service';
+import { ProjectWebServiceHandler } from "./handlers/project-web-service-handler";
+import { LinksDataSource } from "./cartography/datasources/links-datasource";
+import { NodesDataSource } from "./cartography/datasources/nodes-datasource";
+import { SymbolsDataSource } from "./cartography/datasources/symbols-datasource";
+import { SelectionManager } from "./cartography/managers/selection-manager";
+import { InRectangleHelper } from "./cartography/components/map/helpers/in-rectangle-helper";
+import { DrawingsDataSource } from "./cartography/datasources/drawings-datasource";
+import { MoveLayerDownActionComponent } from './components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component';
+import { MoveLayerUpActionComponent } from './components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component';
+import { ProjectMapShortcutsComponent } from './components/project-map/project-map-shortcuts/project-map-shortcuts.component';
+import { SettingsComponent } from './components/settings/settings.component';
+import { SettingsService } from "./services/settings.service";
 
 import { RavenErrorHandler } from "./raven-error-handler";
-import { LocalServerComponent } from './local-server/local-server.component';
+import { LocalServerComponent } from './components/local-server/local-server.component';
+import { ProgressComponent } from './common/progress/progress.component';
+import { ProgressService } from "./common/progress/progress.service";
+import { version } from "./version";
+
 
 Raven
-  .config('https://b2b1cfd9b043491eb6b566fd8acee358@sentry.io/842726')
+  .config('https://b2b1cfd9b043491eb6b566fd8acee358@sentry.io/842726', {
+    release: version
+  })
   .install();
 
 
-
 @NgModule({
   declarations: [
     AppComponent,
@@ -104,6 +110,7 @@ Raven
     ProjectMapShortcutsComponent,
     SettingsComponent,
     LocalServerComponent,
+    ProgressComponent,
   ],
   imports: [
     NgbModule.forRoot(),
@@ -130,6 +137,7 @@ Raven
     MatExpansionModule,
     MatSortModule,
     MatSelectModule,
+    MatTooltipModule,
     CartographyModule,
     HotkeyModule.forRoot(),
     PersistenceModule,
@@ -151,6 +159,7 @@ Raven
     SnapshotService,
     ProgressDialogService,
     ToasterService,
+    ProgressService,
     ProjectWebServiceHandler,
     LinksDataSource,
     NodesDataSource,

src/app/cartography/cartography.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MapComponent } from './map/map.component';
+import { MapComponent } from './components/map/map.component';
 
 @NgModule({
   imports: [

src/app/cartography/components/map/helpers/in-rectangle-helper.spec.ts

@@ -1,5 +1,5 @@
 import { InRectangleHelper } from "./in-rectangle-helper";
-import { Rectangle } from "../../shared/models/rectangle";
+import { Rectangle } from "../../../models/rectangle";
 
 
 

src/app/cartography/components/map/helpers/in-rectangle-helper.ts

@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 
-import { Selectable } from "../../shared/managers/selection-manager";
-import { Rectangle } from "../../shared/models/rectangle";
+import { Selectable } from "../../../managers/selection-manager";
+import { Rectangle } from "../../../models/rectangle";
 
 
 @Injectable()

src/app/cartography/components/map/helpers/multi-link-calculator-helper.ts

@@ -1,4 +1,4 @@
-import {Link} from "../../shared/models/link";
+import {Link} from "../../../models/link";
 
 export class MultiLinkCalculatorHelper {
   LINK_WIDTH = 2;

src/app/cartography/components/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";
-import { Link } from "../shared/models/link";
-import { GraphLayout } from "../shared/widgets/graph-layout";
-import { Context } from "../shared/models/context";
-import { Size } from "../shared/models/size";
-import { Drawing } from "../shared/models/drawing";
-import {Symbol} from "../shared/models/symbol";
+import { Node } from "../../models/node";
+import { Link } from "../../models/link";
+import { GraphLayout } from "../../widgets/graph-layout";
+import { Context } from "../../models/context";
+import { Size } from "../../models/size";
+import { Drawing } from "../../models/drawing";
+import {Symbol} from "../../models/symbol";
 
 
 @Component({

src/app/cartography/managers/selection-manager.spec.ts

@@ -7,7 +7,7 @@ import { Rectangle } from "../models/rectangle";
 import { SelectionManager } from "./selection-manager";
 import { NodesDataSource } from "../datasources/nodes-datasource";
 import { LinksDataSource } from "../datasources/links-datasource";
-import { InRectangleHelper } from "../../map/helpers/in-rectangle-helper";
+import { InRectangleHelper } from "../components/map/helpers/in-rectangle-helper";
 import { DrawingsDataSource } from "../datasources/drawings-datasource";
 
 

src/app/cartography/managers/selection-manager.ts

@@ -6,7 +6,7 @@ import { Subscription } from "rxjs/Subscription";
 import { NodesDataSource } from "../datasources/nodes-datasource";
 import { LinksDataSource } from "../datasources/links-datasource";
 import { Node } from "../models/node";
-import { InRectangleHelper } from "../../map/helpers/in-rectangle-helper";
+import { InRectangleHelper } from "../components/map/helpers/in-rectangle-helper";
 import { Rectangle } from "../models/rectangle";
 import { Link} from "../models/link";
 import { DataSource } from "../datasources/datasource";

src/app/cartography/models/node.ts

@@ -1,5 +1,5 @@
 import {Label} from "./label";
-import {Port} from "../../../shared/models/port";
+import {Port} from "../../models/port";
 import {Selectable} from "../managers/selection-manager";
 
 

src/app/cartography/tools/moving-tool.spec.ts

@@ -1,7 +1,7 @@
 import { Context } from "../models/context";
 import { SVGSelection } from "../models/types";
 import { MovingTool } from "./moving-tool";
-import { TestSVGCanvas } from "../../testing";
+import { TestSVGCanvas } from "../testing";
 import { Size } from "../models/size";
 
 

src/app/cartography/tools/selection-tool.spec.ts

@@ -4,7 +4,7 @@ import { SelectionTool } from "./selection-tool";
 import { Context } from "../models/context";
 import { SVGSelection } from "../models/types";
 import { Rectangle } from "../models/rectangle";
-import { TestSVGCanvas } from "../../testing";
+import { TestSVGCanvas } from "../testing";
 
 
 describe('SelectionTool', () => {

src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts

@@ -1,4 +1,4 @@
-import { TestSVGCanvas } from "../../../testing";
+import { TestSVGCanvas } from "../../testing";
 import { Drawing } from "../../models/drawing";
 import { EllipseDrawingWidget } from "./ellipse-drawing";
 import { EllipseElement } from "../../models/drawings/ellipse-element";

src/app/cartography/widgets/drawings/image-drawing.spec.ts

@@ -1,4 +1,4 @@
-import { TestSVGCanvas } from "../../../testing";
+import { TestSVGCanvas } from "../../testing";
 import { Drawing } from "../../models/drawing";
 import { ImageDrawingWidget } from "./image-drawing";
 import { ImageElement } from "../../models/drawings/image-element";

src/app/cartography/widgets/drawings/line-drawing.spec.ts

@@ -1,4 +1,4 @@
-import { TestSVGCanvas } from "../../../testing";
+import { TestSVGCanvas } from "../../testing";
 import { Drawing } from "../../models/drawing";
 import { LineDrawingWidget } from "./line-drawing";
 import { LineElement } from "../../models/drawings/line-element";

src/app/cartography/widgets/drawings/rect-drawing.spec.ts

@@ -1,4 +1,4 @@
-import { TestSVGCanvas } from "../../../testing";
+import { TestSVGCanvas } from "../../testing";
 import { Drawing } from "../../models/drawing";
 import { RectDrawingWidget } from "./rect-drawing";
 import { RectElement } from "../../models/drawings/rect-element";

src/app/cartography/widgets/drawings/text-drawing.spec.ts

@@ -1,4 +1,4 @@
-import { TestSVGCanvas } from "../../../testing";
+import { TestSVGCanvas } from "../../testing";
 import { TextDrawingWidget } from "./text-drawing";
 import { Drawing } from "../../models/drawing";
 import { TextElement } from "../../models/drawings/text-element";

src/app/cartography/widgets/interface-label.spec.ts

@@ -1,6 +1,6 @@
 import { Selection } from "d3-selection";
 
-import { TestSVGCanvas } from "../../testing";
+import { TestSVGCanvas } from "../testing";
 import { Node } from "../models/node";
 import { Link } from "../models/link";
 import { LinkNode } from "../models/link-node";

src/app/cartography/widgets/layers.spec.ts

@@ -1,6 +1,6 @@
 import { instance, mock, when } from "ts-mockito";
 
-import { TestSVGCanvas } from "../../testing";
+import { TestSVGCanvas } from "../testing";
 import { LayersWidget } from "./layers";
 import { Layer } from "../models/layer";
 import { LinksWidget } from "./links";
@@ -30,7 +30,7 @@ describe('LayersWidget', () => {
     when(mockedGraphLayout.getDrawingsWidget()).thenReturn(instance(mockedDrawingsWidget));
 
     widget.graphLayout = instance(mockedGraphLayout);
-    
+
     const layer_1 = new Layer();
     layer_1.index = 1;
     const layer_2 = new Layer();

src/app/cartography/widgets/links.spec.ts

@@ -2,7 +2,7 @@ import { anything, instance, mock, verify } from "ts-mockito";
 import { Selection } from "d3-selection";
 
 
-import { TestSVGCanvas } from "../../testing";
+import { TestSVGCanvas } from "../testing";
 import { Layer } from "../models/layer";
 import { LinksWidget } from "./links";
 import { Node } from "../models/node";

src/app/cartography/widgets/links.ts

@@ -4,7 +4,7 @@ import { Widget } from "./widget";
 import { SVGSelection } from "../models/types";
 import { Link } from "../models/link";
 import { LinkStatus } from "../models/link-status";
-import { MultiLinkCalculatorHelper } from "../../map/helpers/multi-link-calculator-helper";
+import { MultiLinkCalculatorHelper } from "../components/map/helpers/multi-link-calculator-helper";
 import { SerialLinkWidget } from "./serial-link";
 import { EthernetLinkWidget } from "./ethernet-link";
 import { Layer } from "../models/layer";

src/app/cartography/widgets/nodes.spec.ts

@@ -1,5 +1,5 @@
 
-import { TestSVGCanvas } from "../../testing";
+import { TestSVGCanvas } from "../testing";
 import { NodesWidget } from "./nodes";
 import { Node } from "../models/node";
 import { Label } from "../models/label";