From 6dfad8b365be11c077d34ef68c0771288768bd5b Mon Sep 17 00:00:00 2001
From: walesch-yan <yan.walesch@esrf.fr>
Date: Thu, 24 Oct 2024 16:03:44 +0200
Subject: [PATCH] removing system log

---
 mxcubeweb/logging_handler.py               |  11 +--
 ui/src/actions/logger.js                   |   4 -
 ui/src/components/App.jsx                  |   5 -
 ui/src/components/MXNavbar/MXNavbar.jsx    |   3 -
 ui/src/components/Notify/UserMessage.jsx   |   5 -
 ui/src/containers/LoggerContainer.jsx      | 104 ---------------------
 ui/src/containers/SampleQueueContainer.jsx |   5 +-
 ui/src/reducers/logger.js                  |   4 -
 8 files changed, 2 insertions(+), 139 deletions(-)
 delete mode 100644 ui/src/containers/LoggerContainer.jsx

diff --git a/mxcubeweb/logging_handler.py b/mxcubeweb/logging_handler.py
index e96ce72fd..029bada50 100644
--- a/mxcubeweb/logging_handler.py
+++ b/mxcubeweb/logging_handler.py
@@ -1,5 +1,4 @@
 import logging
-import traceback
 
 
 class MX3LoggingHandler(logging.handlers.BufferingHandler):
@@ -13,10 +12,6 @@ def connect():
             pass
 
     def _record_to_json(self, record):
-        if record.exc_info:
-            stack_trace = "".join(traceback.format_exception(*record.exc_info))
-        else:
-            stack_trace = ""
         try:
             record.asctime
         except AttributeError:
@@ -26,14 +21,10 @@ def _record_to_json(self, record):
             "message": record.getMessage(),
             "severity": record.levelname,
             "timestamp": record.asctime,
-            "logger": record.name,
-            "stack_trace": stack_trace,
         }
 
     def emit(self, record):
-        if record.name != "geventwebsocket.handler":
+        if record.name == "user_level_log":
             record_dict = self._record_to_json(record)
             super().emit(record_dict)
             self.server.emit("log_record", record_dict, namespace="/logging")
-        else:
-            super().emit(record)
diff --git a/ui/src/actions/logger.js b/ui/src/actions/logger.js
index 9dfb80baa..df425e118 100644
--- a/ui/src/actions/logger.js
+++ b/ui/src/actions/logger.js
@@ -1,7 +1,3 @@
 export function addLogRecord(data) {
   return { type: 'ADD_LOG_RECORD', data };
 }
-
-export function setLogPage(page) {
-  return { type: 'SET_PAGE_LOGGING', page };
-}
diff --git a/ui/src/components/App.jsx b/ui/src/components/App.jsx
index 12fc7b8d8..95b189c88 100644
--- a/ui/src/components/App.jsx
+++ b/ui/src/components/App.jsx
@@ -10,7 +10,6 @@ import LoginContainer from '../containers/LoginContainer';
 import SampleViewContainer from '../containers/SampleViewContainer';
 import SampleListViewContainer from '../containers/SampleListViewContainer';
 import EquipmentContainer from '../containers/EquipmentContainer';
-import LoggerContainer from '../containers/LoggerContainer';
 import RemoteAccessContainer from '../containers/RemoteAccessContainer';
 import HelpContainer from '../containers/HelpContainer';
 import Main from './Main';
@@ -48,10 +47,6 @@ const router = createBrowserRouter([
             path: 'equipment',
             element: <EquipmentContainer />,
           },
-          {
-            path: 'logging',
-            element: <LoggerContainer />,
-          },
           {
             path: 'remoteaccess',
             element: <RemoteAccessContainer />,
diff --git a/ui/src/components/MXNavbar/MXNavbar.jsx b/ui/src/components/MXNavbar/MXNavbar.jsx
index 95f9e6cc5..90b6a907d 100644
--- a/ui/src/components/MXNavbar/MXNavbar.jsx
+++ b/ui/src/components/MXNavbar/MXNavbar.jsx
@@ -63,9 +63,6 @@ function MXNavbar() {
             <Nav.Link as={NavLink} className={styles.navLink} to="/equipment">
               Equipment
             </Nav.Link>
-            <Nav.Link as={NavLink} className={styles.navLink} to="/logging">
-              System log
-            </Nav.Link>
           </Nav>
           <Nav className={styles.subNav}>
             <Nav.Link as={NavLink} className={styles.navLink} to="/help">
diff --git a/ui/src/components/Notify/UserMessage.jsx b/ui/src/components/Notify/UserMessage.jsx
index 997e473dd..7dca89d2e 100644
--- a/ui/src/components/Notify/UserMessage.jsx
+++ b/ui/src/components/Notify/UserMessage.jsx
@@ -17,11 +17,6 @@ export default class UserMessage extends React.Component {
       include = false;
     }
 
-    // Message is not for this component, skip !
-    if (this.props.target && this.props.target !== message.logger) {
-      include = false;
-    }
-
     // Filter function returns true for messages to exclude, skip !
     if (this.props.filter && this.props.filter(message)) {
       include = false;
diff --git a/ui/src/containers/LoggerContainer.jsx b/ui/src/containers/LoggerContainer.jsx
deleted file mode 100644
index d6e453b37..000000000
--- a/ui/src/containers/LoggerContainer.jsx
+++ /dev/null
@@ -1,104 +0,0 @@
-/* eslint-disable react/jsx-handler-names */
-import React from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { Container, Row, Col, Table, Pagination } from 'react-bootstrap';
-import { setLogPage } from '../actions/logger';
-
-export class LoggerContainer extends React.Component {
-  constructor(props) {
-    super(props);
-    this.firstPage = props.setLogPage.bind(this, 0);
-    this.lastPage = this.lastPage.bind(this);
-    this.backwardPage = this.changePage.bind(this, -1);
-    this.forwardPage = this.changePage.bind(this, 1);
-  }
-
-  changePage(amount) {
-    const newPage = this.props.page + amount;
-    if (newPage >= 0 && newPage <= Math.floor(this.props.records.length / 20)) {
-      this.props.setLogPage(newPage);
-    }
-  }
-
-  lastPage() {
-    this.props.setLogPage(Math.floor(this.props.records.length / 20));
-  }
-
-  render() {
-    const { records, page } = this.props;
-
-    const filteredRecords = records
-      .slice(page * 20, page * 20 + 20)
-      .map((record, index) => (
-        // eslint-disable-next-line react/no-array-index-key
-        <tr key={index}>
-          <td>{record.timestamp}</td>
-          <td>{record.logger}</td>
-          <td>{record.severity}</td>
-          <td>{record.message}</td>
-        </tr>
-      ));
-
-    return (
-      <Container fluid className="mt-4">
-        <Row>
-          <Col
-            className="col-xs-12 text-center"
-            style={{ float: 'none', margin: '0 auto' }}
-          >
-            <nav>
-              <Pagination size="sm" className="pagination">
-                <Pagination.Item onClick={this.firstPage}>
-                  <span aria-hidden="true">first</span>
-                </Pagination.Item>
-                <Pagination.Item onClick={this.backwardPage}>
-                  <span aria-hidden="true">&laquo;</span>
-                </Pagination.Item>
-                <Pagination.Item>
-                  <span>{page}</span>
-                </Pagination.Item>
-                <Pagination.Item onClick={this.forwardPage}>
-                  <span aria-hidden="true">&raquo;</span>
-                </Pagination.Item>
-                <Pagination.Item onClick={this.lastPage}>
-                  <span aria-hidden="true">last</span>
-                </Pagination.Item>
-              </Pagination>
-            </nav>
-          </Col>
-        </Row>
-        <Row>
-          <Col className="col-xs-12">
-            <Table striped bordered hover className="table-condensed">
-              <thead>
-                <tr>
-                  <th className="col-sm-2">Time</th>
-                  <th className="col-sm-1">Logger</th>
-                  <th className="col-sm-1">Severity</th>
-                  <th>Message</th>
-                </tr>
-              </thead>
-              <tbody>{filteredRecords}</tbody>
-            </Table>
-          </Col>
-        </Row>
-      </Container>
-    );
-  }
-}
-
-function mapStateToProps(state) {
-  return {
-    records: state.logger.logRecords,
-    page: state.logger.activePage,
-  };
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    setLogPage: bindActionCreators(setLogPage, dispatch),
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(LoggerContainer);
diff --git a/ui/src/containers/SampleQueueContainer.jsx b/ui/src/containers/SampleQueueContainer.jsx
index 1def70132..8277783df 100644
--- a/ui/src/containers/SampleQueueContainer.jsx
+++ b/ui/src/containers/SampleQueueContainer.jsx
@@ -191,10 +191,7 @@ class SampleQueueContainer extends React.Component {
               />
               Log messages:
             </div>
-            <UserMessage
-              messages={this.props.logRecords}
-              target="user_level_log"
-            />
+            <UserMessage messages={this.props.logRecords} />
           </div>
         </div>
       </div>
diff --git a/ui/src/reducers/logger.js b/ui/src/reducers/logger.js
index 9b2d090b2..c3992803a 100644
--- a/ui/src/reducers/logger.js
+++ b/ui/src/reducers/logger.js
@@ -1,6 +1,5 @@
 const INITIAL_STATE = {
   logRecords: [],
-  activePage: 0,
 };
 
 function loggerReducer(state = INITIAL_STATE, action = {}) {
@@ -11,9 +10,6 @@ function loggerReducer(state = INITIAL_STATE, action = {}) {
         logRecords: [...state.logRecords.slice(-100), action.data],
       };
     }
-    case 'SET_PAGE_LOGGING': {
-      return { ...state, activePage: action.page };
-    }
     case 'SET_INITIAL_STATE': {
       return { ...state, logRecords: [...action.data.logger] };
     }