From c1ccc5428cdb26b47dc6f6f5f8222808c3db3075 Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 19 Jul 2019 09:50:33 +0200 Subject: Rework the logs Provide data to logs viewer and rework the look and feel Issue-ID: CLAMP-428 Change-Id: I7445c491faa7a061da4a959b4ca7646c7c14a88d Signed-off-by: sebdet --- .../src/components/loop_viewer/logs/LoopLogs.js | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 ui-react/src/components/loop_viewer/logs/LoopLogs.js (limited to 'ui-react/src/components/loop_viewer/logs/LoopLogs.js') diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js new file mode 100644 index 000000000..d7d983d6f --- /dev/null +++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js @@ -0,0 +1,95 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ +import React from 'react'; +import Table from 'react-bootstrap/Table'; +import LoopCache from '../../../api/LoopCache'; +import styled from 'styled-components'; + +const TableRow = ({ logRow }) => ( + + {logRow.logInstant} + {logRow.logType} + {logRow.logComponent} + {logRow.message} + + +) + +const LoopLogsHeaderDivStyled = styled.div` + background-color: ${props => props.theme.loopViewerHeaderBackgroundColor}; + padding: 10px 10px; + color: ${props => props.theme.loopViewerHeaderFontColor}; + overflow: auto; +` + +export default class LoopLogs extends React.Component { + + state = { + loopCache: new LoopCache({}), + } + constructor(props) { + super(props); + this.renderLogs = this.renderLogs.bind(this); + this.state.loopCache=props.loopCache; + } + + shouldComponentUpdate(nextProps, nextState) { + return this.state.loopCache !== nextState.loopCache; + } + + componentWillReceiveProps(newProps) { + this.setState({ + loopCache: newProps.loopCache, + }); + } + + renderLogs() { + if (this.state.loopCache.getLoopLogsArray() != null) { + return ( + this.state.loopCache.getLoopLogsArray().map(row => ) + ) + } + } + + render() { + return ( + + + + + + + + + + + + + {this.renderLogs()} + +
DateTypeComponentLog
+
+ + ); + } +} -- cgit From 190227aa1bbcdc164a17fbcc8de06f78c11ebdff Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 19 Jul 2019 16:51:19 +0200 Subject: Rework the status Add status data when we load a loop + rework the look and feel of status DIV Issue-ID: CLAMP-429 Change-Id: Ibeb58e2653d603f29a0b71023d8afd49cf89aba1 Signed-off-by: sebdet --- .../src/components/loop_viewer/logs/LoopLogs.js | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'ui-react/src/components/loop_viewer/logs/LoopLogs.js') diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js index d7d983d6f..b6a777a40 100644 --- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js +++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js @@ -25,6 +25,15 @@ import Table from 'react-bootstrap/Table'; import LoopCache from '../../../api/LoopCache'; import styled from 'styled-components'; +const LoopLogsHeaderDivStyled = styled.div` + background-color: ${props => props.theme.loopViewerHeaderBackgroundColor}; + padding: 10px 10px; + color: ${props => props.theme.loopViewerHeaderFontColor}; +` +const TableStyled = styled(Table)` + + overflow: auto; +` const TableRow = ({ logRow }) => ( {logRow.logInstant} @@ -35,13 +44,6 @@ const TableRow = ({ logRow }) => ( ) -const LoopLogsHeaderDivStyled = styled.div` - background-color: ${props => props.theme.loopViewerHeaderBackgroundColor}; - padding: 10px 10px; - color: ${props => props.theme.loopViewerHeaderFontColor}; - overflow: auto; -` - export default class LoopLogs extends React.Component { state = { @@ -50,7 +52,7 @@ export default class LoopLogs extends React.Component { constructor(props) { super(props); this.renderLogs = this.renderLogs.bind(this); - this.state.loopCache=props.loopCache; + this.state.loopCache = props.loopCache; } shouldComponentUpdate(nextProps, nextState) { @@ -65,17 +67,17 @@ export default class LoopLogs extends React.Component { renderLogs() { if (this.state.loopCache.getLoopLogsArray() != null) { - return ( - this.state.loopCache.getLoopLogsArray().map(row => ) - ) - } + return ( + this.state.loopCache.getLoopLogsArray().map(row => ) + ) + } } render() { return ( - + @@ -87,7 +89,7 @@ export default class LoopLogs extends React.Component { {this.renderLogs()} -
Date
+
); -- cgit From 337f36602a553ecb937c041a27b1c7270571c647 Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 6 Sep 2019 18:11:51 +0200 Subject: Fix sonar issues FIx some issues reported incorrectly by sonar for the new javascript code Issue-ID: CLAMP-425 Change-Id: I485b727c3a6007c0f0f9301fcda526b028d6251f Signed-off-by: sebdet --- ui-react/src/components/loop_viewer/logs/LoopLogs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui-react/src/components/loop_viewer/logs/LoopLogs.js') diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js index b6a777a40..6abdc4b4f 100644 --- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js +++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js @@ -47,7 +47,7 @@ const TableRow = ({ logRow }) => ( export default class LoopLogs extends React.Component { state = { - loopCache: new LoopCache({}), + loopCache: new LoopCache({}) } constructor(props) { super(props); @@ -61,7 +61,7 @@ export default class LoopLogs extends React.Component { componentWillReceiveProps(newProps) { this.setState({ - loopCache: newProps.loopCache, + loopCache: newProps.loopCache }); } -- cgit From edaf4f9e6d0f8e1b95115cc39492c84d730ba1a2 Mon Sep 17 00:00:00 2001 From: sebdet Date: Thu, 16 Apr 2020 00:43:48 +0200 Subject: Add template name to UI Add template name to the UI loop viewer + change color of logs panel Issue-ID: CLAMP-826 Signed-off-by: sebdet Change-Id: I6776729cefc0597067ae8ef722f7d6e488a12cad --- ui-react/src/components/loop_viewer/logs/LoopLogs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui-react/src/components/loop_viewer/logs/LoopLogs.js') diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js index 6abdc4b4f..b3f052626 100644 --- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js +++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js @@ -26,9 +26,9 @@ import LoopCache from '../../../api/LoopCache'; import styled from 'styled-components'; const LoopLogsHeaderDivStyled = styled.div` - background-color: ${props => props.theme.loopViewerHeaderBackgroundColor}; + background-color: ${props => props.theme.loopLogsHeaderBackgroundColor}; padding: 10px 10px; - color: ${props => props.theme.loopViewerHeaderFontColor}; + color: ${props => props.theme.loopLogsHeaderFontColor}; ` const TableStyled = styled(Table)` -- cgit