refactor: migrate comments to overmind

Author: Spring3

.eslintrc.json

@@ -81,6 +81,7 @@
     "max-classes-per-file": "off",
     "no-use-before-define": "off",
     "arrow-parens": "off",
+    "consistent-return": "off",
     "react/jsx-filename-extension": [
       2,
       { "extensions": [".js", ".jsx", ".ts", ".tsx"] }

main/redmine.js

@@ -54,7 +54,7 @@ const createRequestClient = () => {
 
         return {
           success: true,
-          payload
+          data: payload
         };
       }
 
@@ -86,11 +86,17 @@ const createRequestClient = () => {
 
       if (response.statusCode === 200) {
         return {
-          payload: transform({ route: data.route, method: data.method }, response.body),
+          data: transform({ route: data.route, method: data.method }, response.body),
           success: true,
         };
       }
 
+      if (data.method === 'PUT' && response.statusCode === 204) {
+        return {
+          success: true
+        };
+      }
+
       return handleUnsuccessfulRequest(response.body);
     } catch (error) {
       return handleUnsuccessfulRequest(error);

main/storage.js

@@ -109,7 +109,7 @@ const eventHandlers = (event, message) => {
 
       event.reply(`session-response:${id}`, {
         success: true,
-        payload: sessionWithoutHash
+        data: sessionWithoutHash
       });
       break;
     }

main/transformers/issues.js

@@ -22,6 +22,14 @@ const transform = ({ route }, responseBody) => {
         totalSpentHours: issue.total_spent_hours,
         createdOn: issue.created_on,
         updatedOn: issue.updated_on,
+        journals: issue.journals?.map((journal) => ({
+          id: journal.id,
+          user: journal.user,
+          createdOn: journal.created_on,
+          notes: journal.notes,
+          privateNotes: journal.private_notes,
+          details: journal.details
+        })) || [],
         closedOn: issue.closed_on
       })),
       total: responseBody.total_count,
@@ -58,7 +66,9 @@ const transform = ({ route }, responseBody) => {
         id: journal.id,
         user: journal.user,
         createdOn: journal.created_on,
-        notes: journal.notes
+        notes: journal.notes,
+        privateNotes: journal.private_notes,
+        details: journal.details
       })) || [],
       closedOn: issue.closed_on
     };

render/App.jsx

@@ -85,7 +85,7 @@ const App = ({ dispatch }) => {
       if (response.success) {
         const loginResponse = await actions.users.login({
           apiKey: token,
-          redmineEndpoint: response.payload.endpoint
+          redmineEndpoint: response.data.endpoint
         });
         if (loginResponse.success) {
           navigate('/issues', { replace: true });

render/about/AboutPage.jsx

@@ -8,7 +8,7 @@ import { version, name } from '../../package.json';
 import LogoIcon from '../../assets/icon.png';
 
 import DragArea from '../components/DragArea';
-import Link from '../components/Link';
+import { Link } from '../components/Link';
 // import { report } from '../../common/reporter';
 import License from './License';
 
@@ -141,7 +141,7 @@ class AboutPage extends Component {
               <IconContainer>
                 <Link
                   href="https://www.dvasylenko.com/redshape/"
-                  type="external"
+                  external
                 >
                   <img alt="App icon" height="70" src={LogoIcon} />
                 </Link>
@@ -163,7 +163,7 @@ class AboutPage extends Component {
                   <span>&nbsp;issues/proposals on Github or </span>
                   <Link
                     href="mailto:redshape.app@gmail.com"
-                    type="external"
+                    external
                   >
                     by e-mail
                   </Link>
@@ -172,7 +172,7 @@ class AboutPage extends Component {
                   <span>Visit the Redshape</span>
                   <Link
                     href="https://www.dvasylenko.com/redshape/"
-                    type="external"
+                    external
                   >
                     homepage
                   </Link>
@@ -187,14 +187,14 @@ class AboutPage extends Component {
                   Copyright © 2020&nbsp;
                   <Link
                     href="https://www.dvasylenko.com/redshape/"
-                    type="external"
+                    external
                   >
                     Daniyil Vasylenko
                   </Link>
                   &
                   <Link
                     href="https://github.com/Spring3/redshape/graphs/contributors"
-                    type="external"
+                    external
                   >
                     Contributors
                   </Link>

render/about/License.jsx

@@ -3,7 +3,7 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import Link from '../components/Link';
+import { Link } from '../components/Link';
 
 const Container = styled.div`
   text-align: justify;
@@ -15,7 +15,7 @@ export default () => (
     <p align="center">Version 3, 29 June 2007</p>
     <p>
       Copyright &copy; 2007 Free Software Foundation, Inc. &lt;
-      <Link href="http://fsf.org/" type="external">http://fsf.org/</Link>
+      <Link href="http://fsf.org/" external>http://fsf.org/</Link>
       &gt;
     </p>
     <p>Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.</p>

render/actions/issues.actions.js

@@ -1,48 +1,9 @@
 import _ from 'lodash';
-import moment from 'moment';
 
 import request, { notify } from './helper';
 
-export const ISSUES_COMMENTS_SEND = 'ISSUES_COMMENTS_SEND';
 export const ISSUES_TIME_ENTRY_GET = 'ISSUES_TIME_ENTRY_GET';
 
-const sendComments = (issueId, comments) => (dispatch, getState) => {
-  const { user = {} } = getState();
-
-  dispatch(notify.start(ISSUES_COMMENTS_SEND, { subject: 'comments' }));
-
-  return request({
-    url: `/issues/${issueId}.json`,
-    data: {
-      issue: {
-        notes: comments
-      }
-    },
-    method: 'PUT'
-  }).then(() => dispatch(
-    notify.ok(
-      ISSUES_COMMENTS_SEND,
-      {
-        created_on: moment().toLocaleString(),
-        details: [],
-        id: Date.now(),
-        notes: comments,
-        private_notes: false,
-        user: {
-          id: user.id,
-          name: user.name
-        }
-      },
-      { subject: 'comments' }
-    )
-  ))
-    .catch((error) => {
-      // eslint-disable-next-line
-      console.error(`Error when trying to assign the issue with id ${issueId}:`, error.message);
-      dispatch(notify.nok(ISSUES_COMMENTS_SEND, error, { subject: 'comments' }));
-    });
-};
-
 const getTimeEntriesPage = (issueId, projectId, pageNumber, batchSize) => (dispatch, getState) => {
   const { issues } = getState();
   const { page, limit } = issues.selected.spentTime;
@@ -72,5 +33,4 @@ const getTimeEntriesPage = (issueId, projectId, pageNumber, batchSize) => (dispa
 
 export default {
   getTimeEntriesPage,
-  sendComments,
 };

render/components/Copyrights.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import { css } from '@emotion/react';
+
+import { Link } from './Link';
+
+const Copyrights = () => (
+  <p css={css`color: #FF7079`}>
+    Created by&nbsp;
+    <Link
+      external
+      href="https://www.dvasylenko.com/redshape"
+      testId="copyrights-link"
+    >
+      danv
+    </Link>
+  </p>
+);
+
+export {
+  Copyrights
+}