diff --git a/src/ReleaseNotes.txt b/src/ReleaseNotes.txt index 7f8ef183..425fd053 100644 --- a/src/ReleaseNotes.txt +++ b/src/ReleaseNotes.txt @@ -1,6 +1,6 @@ GNS3 WebUI is web implementation of user interface for GNS3 software. -Current version: GNS3 Web UI 2019.2.0 v11 +Current version: GNS3 Web UI 2020.2.0 What's New - Support for suspended status added diff --git a/src/app/components/project-map/log-console/log-console.component.spec.ts b/src/app/components/project-map/log-console/log-console.component.spec.ts index faf2ce52..f5941c73 100644 --- a/src/app/components/project-map/log-console/log-console.component.spec.ts +++ b/src/app/components/project-map/log-console/log-console.component.spec.ts @@ -74,7 +74,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Current version: 2019.2.0'}); + expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Current version: 2020.1.0-alpha.1'}); }); it('should call show message when unknown command entered', () => { diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts index 9fbec2ba..3bdb2f4e 100644 --- a/src/app/components/project-map/log-console/log-console.component.ts +++ b/src/app/components/project-map/log-console/log-console.component.ts @@ -15,6 +15,7 @@ import { LogEvent } from '../../../models/logEvent'; import { ResizeEvent } from 'angular-resizable-element'; import { ThemeService } from '../../../services/theme.service'; import { FormControl } from '@angular/forms'; +import { version } from '../../../version'; @Component({ @@ -29,6 +30,7 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild('console', {static: false}) console: ElementRef; + private version = version; private nodeSubscription: Subscription; private linkSubscription: Subscription; private drawingSubscription: Subscription; @@ -155,7 +157,7 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { if (this.command === 'help' || this.command === '') { this.showCommand("Available commands: help, version, console {node name}, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}.") } else if (this.command === 'version') { - this.showCommand("Current version: 2019.2.0"); + this.showCommand("Current version: " + this.version); } else if (this.command === 'start all') { this.showCommand("Starting all nodes..."); this.nodeService.startAll(this.server, this.project).subscribe(() => { diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html index cc1c7030..74b52c6f 100644 --- a/src/app/layouts/default-layout/default-layout.component.html +++ b/src/app/layouts/default-layout/default-layout.component.html @@ -35,5 +35,5 @@