Merge pull request #229 from Ohtuilmo/fix/topic-pages-crash

Fix issue causing topic pages to crash
Ohtuilmo · Mar 26, 2024 · d4a613f · d4a613f
2 parents fd3b5a0 + 2b4cdf7
commit d4a613f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/frontend/src/components/TimeLogsPage/TimeLogsPage.css b/frontend/src/components/TimeLogsPage/TimeLogsPage.css
@@ -42,7 +42,6 @@
 
     .input-container {
         display: flex;
-        align-items: flex-end;
         flex-wrap: wrap;
         gap: 14px;
     }

diff --git a/frontend/src/components/ViewTopicPage.js b/frontend/src/components/ViewTopicPage.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
+import { withRouter } from 'react-router-dom'
 import Topic from './Topic'
 import TopicEditPage from './TopicEditPage'
 import viewTopicPageActions from '../reducers/actions/viewTopicPageActions'
@@ -28,8 +29,7 @@ class ViewTopicPage extends React.Component {
   copyToConfiguration = async () => {
     // eslint-disable-next-line
     const ok = confirm('sure?')
-    console.log(this.props.topic.id )
-    if ( ok ) {
+    if (ok) {
       try {
         // eslint-disable-next-line
         const createdTopic = await topicService.copy(this.props.topic.id)
@@ -72,7 +72,7 @@ const mapStateToProps = (state) => {
     topic: state.viewTopicPage.topic,
     isEditable: state.viewTopicPage.isEditable,
     isOnEditMode: state.viewTopicPage.isOnEditMode,
-    user: state.login.user
+    user: state.login.user,
   }
 }
 
@@ -81,9 +81,6 @@ const mapDispatchToProps = {
   setSuccess: notificationActions.setSuccess,
 }
 
-const ConnectedViewTopicPage = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ViewTopicPage)
-
-export default ConnectedViewTopicPage
+export default withRouter(
+  connect(mapStateToProps, mapDispatchToProps)(ViewTopicPage)
+)