diff --git a/src/app/components/project-map/log-console/log-console.component.html b/src/app/components/project-map/log-console/log-console.component.html index 0d3b16f8..ac93623b 100644 --- a/src/app/components/project-map/log-console/log-console.component.html +++ b/src/app/components/project-map/log-console/log-console.component.html @@ -1,9 +1,15 @@ -
+
-
Console
@@ -20,7 +26,7 @@
-
+
{{event.message}}
diff --git a/src/app/components/project-map/log-console/log-console.component.scss b/src/app/components/project-map/log-console/log-console.component.scss index e3b1ec5d..0b052a23 100644 --- a/src/app/components/project-map/log-console/log-console.component.scss +++ b/src/app/components/project-map/log-console/log-console.component.scss @@ -15,6 +15,11 @@ background: #263238; color: white; border: none; + margin-top: 0px; + outline: none; + color: #dbd5d5; + font-weight: bold; + padding: 0px; } .consoleFiltering { 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 22c9091f..01a54848 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 @@ -12,6 +12,7 @@ import { Port } from '../../../models/port'; import { LogEventsDataSource } from './log-events-datasource'; import { HttpServer } from '../../../services/http-server.service'; import { LogEvent } from '../../../models/logEvent'; +import { ResizeEvent } from 'angular-resizable-element'; @Component({ @@ -44,6 +45,9 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { private regexShow: RegExp = /^show (.*?)$/; private regexConsole: RegExp = /^console (.*?)$/; + public style: object = {}; + public styleInside: object = { height: `120px` }; + constructor( private projectWebServiceHandler: ProjectWebServiceHandler, private nodeService: NodeService, @@ -124,6 +128,33 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { this.infoSubscription.unsubscribe(); } + validate(event: ResizeEvent): boolean { + if ( + event.rectangle.width && + event.rectangle.height && + (event.rectangle.width < 600 || + event.rectangle.height < 180) + ) { + return false; + } + return true; + } + + onResizeEnd(event: ResizeEvent): void { + this.style = { + position: 'fixed', + left: `${event.rectangle.left}px`, + top: `${event.rectangle.top}px`, + width: `${event.rectangle.width}px`, + height: `${event.rectangle.height}px` + }; + + this.styleInside = { + height: `${event.rectangle.height - 60}px`, + width: `${event.rectangle.width}px` + }; + } + applyFilter(filter: string) { this.selectedFilter = filter; this.filteredEvents = this.getFilteredEvents(); diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index fbe54469..ce35d84a 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -79,8 +79,8 @@ export class ProjectMapComponent implements OnInit, OnDestroy { public server: Server; public ws: WebSocket; public isProjectMapMenuVisible: boolean = false; - public isConsoleVisible: boolean = false; - public isTopologySummaryVisible: boolean = false; + public isConsoleVisible: boolean = true; + public isTopologySummaryVisible: boolean = true; public isInterfaceLabelVisible: boolean = false; tools = { diff --git a/src/app/services/mapsettings.service.ts b/src/app/services/mapsettings.service.ts index ec9f8e54..3030dd7b 100644 --- a/src/app/services/mapsettings.service.ts +++ b/src/app/services/mapsettings.service.ts @@ -4,8 +4,8 @@ import { Subject } from 'rxjs'; @Injectable() export class MapSettingsService { public isMapLocked = new Subject(); - public isTopologySummaryVisible: boolean = false; - public isLogConsoleVisible: boolean = false; + public isTopologySummaryVisible: boolean = true; + public isLogConsoleVisible: boolean = true; public interfaceLabels: Map = new Map(); constructor() {}