Merge branch 'master' into unit-tests

electron-builder.yml

@@ -4,6 +4,7 @@ productName: "GNS3 Web UI"
 artifactName: "${productName}-${os}-${arch}-${version}.${ext}"
 asar: true
 compression: normal
+generateUpdatesFilesForAllChannels: true
 
 directories:
   output: build

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gns3-web-ui",
-  "version": "0.0.1-beta.0",
+  "version": "2019.1.0-alpha.1dev",
   "author": {
     "name": "GNS3 Technology Inc.",
     "email": "developers@gns3.com"

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

@@ -57,6 +57,12 @@ export class MovingTool {
       });
     };
 
+    // disable zooming on wheel
+    this.zoom.filter(() => {
+      const e: D3ZoomEvent<SVGSVGElement, any> = event;
+      return e.type === 'mousedown';
+    });
+
     this.zoom.on('zoom', onZoom);
     selection.call(this.zoom);
   }

src/app/components/project-map/project-map.component.html

@@ -87,7 +87,7 @@
     </mat-toolbar>
   </div>
 
-  <div id="show-menu-wrapper" [ngClass]="{ shadowed: !drawTools.visibility }">
+  <div id="show-menu-wrapper" [ngClass]="{ shadowed: !drawTools.visibility }" *ngIf="!readonly">
     <button class="arrow-button" mat-icon-button (click)="showMenu()"><mat-icon>keyboard_arrow_right</mat-icon></button>
   </div>
 

src/app/components/settings/settings.component.html

@@ -21,11 +21,11 @@
             >
           </div>
 
-          <div>
+          <!-- <div>
             <mat-checkbox [(ngModel)]="settings.angular_map"
               >Enable experimental Angular Map (WARNING: IT CAN BREAK YOU LABS!)</mat-checkbox
             >
-          </div>
+          </div> -->
         </mat-expansion-panel>
       </mat-accordion>
     </div>

src/app/layouts/default-layout/default-layout.component.css

@@ -67,6 +67,10 @@ header {
   width: 100%;
 }
 
+.container {
+  padding: 0%;
+}
+
 .mat-dialog-content > * {
   width: 100%;
 }

src/app/services/server.service.ts

@@ -70,6 +70,7 @@ export class ServerService {
           server.name = 'local';
           server.host = host;
           server.port = port;
+          server.location = 'local';
           server.is_local = true;
           this.create(server).then(created => {
             resolve(created);