Merge pull request #53 from Spring3/refactor/migrate-time-entry-state

refactor: migrate issue details page to overmind

Author: Spring3

.eslintrc.json

@@ -28,6 +28,7 @@
     "object-curly-newline": "warn",
     "no-plusplus": "off",
     "no-param-reassign": "warn",
+    "prefer-destructuring": "off",
     "no-underscore-dangle": [
       "error",
       {
@@ -80,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"] }

common/utils.js

@@ -18,6 +18,7 @@ const { redmineClient } = require('./redmine');
 const Tray = require('./tray');
 
 const utils = require('./utils');
+const { openExternalUrl } = require('./utils');
 require('./exceptionCatcher')();
 
 app.setAppUserModelId('app.spring3.redshape');
@@ -387,6 +388,10 @@ const initialize = () => {
         event.reply(`system-response:${id}`, { success: true });
         break;
       }
+      case 'open-url': {
+        await openExternalUrl(payload.url);
+        break;
+      }
       default:
         break;
     }

main/index.js

@@ -39,11 +39,11 @@ const createRequestClient = () => {
 
       console.log(response.statusCode, response.body);
 
-      const loginSuccess = response.statusCode === 200;
+      const loginSuccess = [204, 200].includes(response.statusCode);
       isInitialized = loginSuccess;
 
       if (loginSuccess) {
-        const payload = transform(route, response.body);
+        const payload = transform({ route, method: 'GET' }, response.body);
 
         instance = got.extend({
           ...configuration,
@@ -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(data.route, 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/redmine.js

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

main/storage.js

@@ -1,17 +1,25 @@
 const users = require('./users');
 const issues = require('./issues');
+const issueStatuses = require('./issueStatuses');
 const projects = require('./projects');
+const timeEntries = require('./timeEntries');
 
-const transform = (route, responseBody) => {
-  const [entity] = route.split('/');
+const transform = ({ route, method }, responseBody) => {
+  const [entity] = route.split('/')[0].split('.');
+
+  console.log('entity', entity);
 
   switch (entity) {
     case 'users':
-      return users.transform(route, responseBody);
-    case 'issues.json':
-      return issues.transform(route, responseBody);
-    case 'projects.json':
-      return projects.transform(route, responseBody);
+      return users.transform({ route, method }, responseBody);
+    case 'issues':
+      return issues.transform({ route, method }, responseBody);
+    case 'issue_statuses':
+      return issueStatuses.transform({ route, method }, responseBody);
+    case 'projects':
+      return projects.transform({ route, method }, responseBody);
+    case 'time_entries':
+      return timeEntries.transform({ route, method }, responseBody);
     default:
       return responseBody;
   }

main/transformers/index.js

@@ -0,0 +1,21 @@
+const transform = ({ route }, responseBody) => {
+  if (route === 'issue_statuses.json') {
+    const { issue_statuses: issueStatuses } = responseBody;
+    return {
+      issueStatuses: issueStatuses.map((issueStatus) => ({
+        id: issueStatus.id,
+        name: issueStatus.name,
+        isClosed: issueStatus.is_closed
+      })),
+      total: responseBody.total_count,
+      offset: responseBody.offset,
+      limit: responseBody.limit
+    };
+  }
+
+  return responseBody;
+};
+
+module.exports = {
+  transform
+};

main/transformers/issueStatuses.js

@@ -1,4 +1,4 @@
-const transform = (route, responseBody) => {
+const transform = ({ route }, responseBody) => {
   if (route === 'issues.json') {
     const { issues } = responseBody;
     return {
@@ -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,
@@ -30,7 +38,7 @@ const transform = (route, responseBody) => {
     };
   }
 
-  if (/issues\/\d\.json/.test(route)) {
+  if (/issues\/\d{1,}\.json/.test(route)) {
     const { issue } = responseBody;
     return {
       id: issue.id,
@@ -53,13 +61,15 @@ const transform = (route, responseBody) => {
       createdOn: issue.created_on,
       updatedOn: issue.updated_on,
       subTasks: issue.children,
-      customFields: issue.custom_fields,
+      customFields: issue.custom_fields || [],
       journals: issue.journals?.map((journal) => ({
         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
     };
   }

main/transformers/issues.js

@@ -1,4 +1,4 @@
-const transform = (route, responseBody) => {
+const transform = ({ route }, responseBody) => {
   if (route === 'projects.json') {
     const { projects } = responseBody;
     return {
@@ -19,6 +19,27 @@ const transform = (route, responseBody) => {
       limit: responseBody.limit
     };
   }
+
+  if (/projects\/\w{1,}\/versions\.json/.test(route)) {
+    const { versions } = responseBody;
+    return {
+      versions: versions.map((version) => ({
+        id: version.id,
+        project: version.project,
+        name: version.name,
+        description: version.description,
+        status: version.status,
+        dueDate: version.due_date,
+        sharing: version.sharing,
+        createdOn: version.created_on,
+        updatedOn: version.updated_on,
+        wikiPageTitle: version.wiki_page_title
+      })),
+      total: responseBody.total_count,
+      offset: responseBody.offset,
+      limit: responseBody.limit
+    };
+  }
   return responseBody;
 };
 

main/transformers/projects.js

@@ -0,0 +1,47 @@
+const toExternalTimeEntry = (timeEntry) => ({
+  id: timeEntry.id,
+  project: timeEntry.project,
+  issue: timeEntry.issue,
+  user: timeEntry.user,
+  activity: timeEntry.activity,
+  hours: timeEntry.hours,
+  comments: timeEntry.comments,
+  spentOn: timeEntry.spent_on,
+  createdOn: timeEntry.created_on,
+  updatedOn: timeEntry.updated_on,
+});
+
+const transform = ({ route, method }, responseBody) => {
+  if (route === 'time_entries.json') {
+    if (method === 'GET') {
+      const { time_entries } = responseBody;
+      return {
+        timeEntries: time_entries.map((timeEntry) => toExternalTimeEntry(timeEntry)),
+        total: responseBody.total_count,
+        offset: responseBody.offset,
+        limit: responseBody.limit
+      };
+    }
+
+    if (method === 'POST') {
+      const { time_entry } = responseBody;
+      return {
+        timeEntry: toExternalTimeEntry(time_entry)
+      };
+    }
+  }
+
+  if (/time_entries\/\d{1,}\.json/.test(route)) {
+    const { time_entry } = responseBody;
+
+    return {
+      timeEntry: toExternalTimeEntry(time_entry)
+    };
+  }
+
+  return responseBody;
+};
+
+module.exports = {
+  transform
+};