[SDC] Onboarding 1710 rebase.

[sdc.git] / openecomp-ui / src / sdc-app / common / activity-log / ActivityLogView.jsx

diff --git a/openecomp-ui/src/nfvo-components/activity-log/ActivityLogView.jsx b/openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx
similarity index 95%
rename from openecomp-ui/src/nfvo-components/activity-log/ActivityLogView.jsx
rename to openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx
index 6ff3c80..19ab570 100644 (file)
--- a/openecomp-ui/src/nfvo-components/activity-log/ActivityLogView.jsx
+++ b/openecomp-ui/src/sdc-app/common/activity-log/ActivityLogView.jsx
@@ -17,8 +17,9 @@ import React, {Component} from 'react';
 import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger.js';
 import Tooltip from 'react-bootstrap/lib/Tooltip.js';
 import ListEditorView from 'nfvo-components/listEditor/ListEditorView.jsx';
-import SVGIcon from 'nfvo-components/icon/SVGIcon.jsx';
+import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js';
 import i18n from 'nfvo-utils/i18n/i18n.js';
+import LogDetails from './LogixUtil.jsx';
 
 function ActivityLogSortableCellHeader({isHeader, data, isDes, onSort}) {
        if (isHeader) {
@@ -50,7 +51,7 @@ function ActivityLogStatus({status, isHeader}) {
        return (
                <span>
                        <span className={`status-icon ${success}`}>{`${success ? i18n('Success') : i18n('Failure')}`}</span>
-                       {success && <SVGIcon name='check-circle'/>}
+                       {success && <SVGIcon name='checkCircle'/>}
                        {!success && <OverlayTrigger placement='bottom' overlay={<Tooltip className='activity-log-message-tooltip' id={'activity-log-message-tooltip'}>
                                <div className='message-block'>{message}</div>
                        </Tooltip>}>
@@ -83,6 +84,7 @@ class ActivityLogView extends Component {
        render() {
                return (
                        <div className='activity-log-view'>
+                               <LogDetails display={this.state.localFilter}/>
                                <ListEditorView
                                        title={i18n('Activity Log')}
                                        filterValue={this.state.localFilter}