Merge pull request #40 from Fgerthoffert/develop

Develop
Fgerthoffert · Sep 21, 2019 · 9b216d4 · 9b216d4
2 parents 2138d45 + e713b82
commit 9b216d4
Show file tree

Hide file tree

Showing 13 changed files with 157 additions and 84 deletions.
diff --git a/README.md b/README.md
diff --git a/cli/src/base.ts b/cli/src/base.ts
@@ -2,9 +2,8 @@ import Command, { flags } from '@oclif/command';
 import * as fs from 'fs';
 import * as fse from 'fs-extra';
 import * as jsYaml from 'js-yaml';
-import * as path from 'path';
-
 import * as loadYamlFile from 'load-yaml-file';
+import * as path from 'path';
 
 import { IConfig } from './global';
 
@@ -25,6 +24,7 @@ export default abstract class extends Command {
       host: 'https://jira.myhost.org',
       fields: {
         points: 'customfield_10114',
+        originalPoints: 'customfield_11115',
         parentInitiative: 'customfield_11112',
         parentEpic: 'customfield_10314'
       }

diff --git a/cli/src/commands/roadmap.ts b/cli/src/commands/roadmap.ts
@@ -9,11 +9,11 @@ import { IJiraIssue } from '../global';
 import fetchChildren from '../utils/data/fetchChildren';
 import fetchCompleted from '../utils/data/fetchCompleted';
 import fetchInitiatives from '../utils/data/fetchInitiatives';
+import crunchRoadmap from '../utils/roadmap/crunchRoadmap';
 import getEmptyCalendarObject from '../utils/roadmap/getEmptyCalendarObject';
 import getEmptyRoadmapObject from '../utils/roadmap/getEmptyRoadmapObject';
 import prepareInitiativesData from '../utils/roadmap/prepareInitiativesData';
 import teamClosedByWeek from '../utils/roadmap/teamClosedByWeek';
-import crunchRoadmap from '../utils/roadmap/crunchRoadmap';
 import teamVelocityFromCache from '../utils/roadmap/teamVelocityFromCache';
 
 export default class Roadmap extends Command {

diff --git a/cli/src/global.ts b/cli/src/global.ts
@@ -153,6 +153,7 @@ export interface IConfigJira {
   host: string;
   fields: {
     points: string;
+    originalPoints: string;
     parentInitiative: string;
     parentEpic: string;
   };

diff --git a/cli/src/utils/data/fetchChildren.ts b/cli/src/utils/data/fetchChildren.ts
@@ -43,6 +43,8 @@ const fetchChildren = async (
       'issuekey in childIssuesOf(' + issueKey + ')',
       'summary,status,labels,' +
         userConfig.jira.fields.points +
+        ',' +
+        userConfig.jira.fields.originalPoints +
         ',issuetype,' +
         userConfig.jira.fields.parentInitiative +
         ',' +
@@ -55,7 +57,8 @@ const fetchChildren = async (
       const updatedIssue = {
         ...issue,
         host: userConfig.jira.host,
-        jql: 'issuekey in childIssuesOf(' + issueKey + ')'
+        jql: 'issuekey in childIssuesOf(' + issueKey + ')',
+        points: returnTicketsPoints(issue, userConfig)
       };
       issueFileStream.write(JSON.stringify(updatedIssue) + '\n');
       issues.push(updatedIssue);
@@ -69,6 +72,22 @@ const fetchChildren = async (
 
 export default fetchChildren;
 
+const returnTicketsPoints = (issue: any, config: IConfig) => {
+  if (
+    issue.fields[config.jira.fields.points] !== undefined &&
+    issue.fields[config.jira.fields.points] !== null
+  ) {
+    return issue.fields[config.jira.fields.points];
+  }
+  if (
+    issue.fields[config.jira.fields.originalPoints] !== undefined &&
+    issue.fields[config.jira.fields.originalPoints] !== null
+  ) {
+    return issue.fields[config.jira.fields.originalPoints];
+  }
+  return 0;
+};
+
 //https://medium.com/@wietsevenema/node-js-using-for-await-to-read-lines-from-a-file-ead1f4dd8c6f
 const readLines = (input: any) => {
   const output = new stream.PassThrough({ objectMode: true });

diff --git a/cli/src/utils/data/fetchCompleted.ts b/cli/src/utils/data/fetchCompleted.ts
@@ -39,7 +39,10 @@ const fetchCompleted = async (
         const issuesJira = await jiraSearchIssues(
           config.jira,
           jqlQuery,
-          'labels,summary,' + config.jira.fields.points
+          'labels,summary,' +
+            config.jira.fields.points +
+            ',' +
+            config.jira.fields.originalPoints
         );
         //Note: We'd still write an empty file to cache to record the fact that no issues were completed that day
         const issueFileStream = fs.createWriteStream(issuesDayFilepath, {
@@ -54,11 +57,7 @@ const fetchCompleted = async (
               closedAt: scanDay,
               team: teamName,
               host: config.jira.host,
-              points:
-                issue.fields[config.jira.fields.points] === undefined ||
-                issue.fields[config.jira.fields.points] === null
-                  ? 0
-                  : issue.fields[config.jira.fields.points],
+              points: returnTicketsPoints(issue, config),
               jql: jqlQuery
             };
             issues.push(updatedIssue);
@@ -79,6 +78,22 @@ const fetchCompleted = async (
   return issues;
 };
 
+const returnTicketsPoints = (issue: any, config: IConfig) => {
+  if (
+    issue.fields[config.jira.fields.points] !== undefined &&
+    issue.fields[config.jira.fields.points] !== null
+  ) {
+    return issue.fields[config.jira.fields.points];
+  }
+  if (
+    issue.fields[config.jira.fields.originalPoints] !== undefined &&
+    issue.fields[config.jira.fields.originalPoints] !== null
+  ) {
+    return issue.fields[config.jira.fields.originalPoints];
+  }
+  return 0;
+};
+
 //https://medium.com/@wietsevenema/node-js-using-for-await-to-read-lines-from-a-file-ead1f4dd8c6f
 const readLines = (input: any) => {
   const output = new stream.PassThrough({ objectMode: true });

diff --git a/cli/src/utils/data/fetchInitiatives.ts b/cli/src/utils/data/fetchInitiatives.ts
@@ -42,6 +42,8 @@ const fetchInitiatives = async (
       userConfig.roadmap.jqlInitiatives,
       'summary,status,labels,' +
         userConfig.jira.fields.points +
+        ',' +
+        userConfig.jira.fields.originalPoints +
         ',issuetype,assignee'
     );
     const issueFileStream = fs.createWriteStream(initiativesCache, {
@@ -52,7 +54,8 @@ const fetchInitiatives = async (
         ...issue,
         host: userConfig.jira.host,
         jql: userConfig.roadmap.jqlInitiatives,
-        team: getTeamFromAssignee(issue, userConfig.roadmap.teams)
+        team: getTeamFromAssignee(issue, userConfig.roadmap.teams),
+        points: returnTicketsPoints(issue, userConfig)
       };
       issueFileStream.write(JSON.stringify(updatedIssue) + '\n');
       issues.push(updatedIssue);
@@ -66,6 +69,22 @@ const fetchInitiatives = async (
 
 export default fetchInitiatives;
 
+const returnTicketsPoints = (issue: any, config: IConfig) => {
+  if (
+    issue.fields[config.jira.fields.points] !== undefined &&
+    issue.fields[config.jira.fields.points] !== null
+  ) {
+    return issue.fields[config.jira.fields.points];
+  }
+  if (
+    issue.fields[config.jira.fields.originalPoints] !== undefined &&
+    issue.fields[config.jira.fields.originalPoints] !== null
+  ) {
+    return issue.fields[config.jira.fields.originalPoints];
+  }
+  return 0;
+};
+
 //https://medium.com/@wietsevenema/node-js-using-for-await-to-read-lines-from-a-file-ead1f4dd8c6f
 const readLines = (input: any) => {
   const output = new stream.PassThrough({ objectMode: true });

diff --git a/cli/src/utils/roadmap/crunchMetrics.ts b/cli/src/utils/roadmap/crunchMetrics.ts
@@ -5,34 +5,26 @@
 const crunchMetrics = (issuesTree: any, node: any) => {
   return issuesTree.treeToArray(node).reduce(
     (acc: any, item: any) => {
-      if (parseInt(item.fields.customfield_10114, 10) > 0) {
-        acc.points.total =
-          acc.points.total + parseInt(item.fields.customfield_10114, 10);
-        if (item.fields.status.statusCategory.name === "Done") {
-          acc.points.completed =
-            acc.points.completed + parseInt(item.fields.customfield_10114, 10);
+      if (item.points > 0) {
+        acc.points.total = acc.points.total + item.points;
+        if (item.fields.status.statusCategory.name === 'Done') {
+          acc.points.completed = acc.points.completed + item.points;
         } else {
-          acc.points.remaining =
-            acc.points.remaining + parseInt(item.fields.customfield_10114, 10);
+          acc.points.remaining = acc.points.remaining + item.points;
         }
       }
-      if (
-        (item.fields.customfield_10114 === undefined ||
-          item.fields.customfield_10114 === null) &&
-        issuesTree.hasChildren(node) === false
-      ) {
+      if (item.points === 0 && issuesTree.hasChildren(node) === false) {
         acc.missingPoints = true;
       }
       if (
-        (item.fields.customfield_10114 === undefined ||
-          item.fields.customfield_10114 === null) &&
+        item.points === 0 &&
         issuesTree.hasChildren(item) === false &&
-        item.fields.status.statusCategory.name !== "Done"
+        item.fields.status.statusCategory.name !== 'Done'
       ) {
         acc.points.missing++;
       }
       acc.issues.total = acc.issues.total + 1;
-      if (item.fields.status.statusCategory.name === "Done") {
+      if (item.fields.status.statusCategory.name === 'Done') {
         acc.issues.completed++;
       } else {
         acc.issues.remaining++;

diff --git a/cli/src/utils/roadmap/crunchWeeks.ts b/cli/src/utils/roadmap/crunchWeeks.ts
@@ -1,7 +1,7 @@
 // tslint:disable-next-line: file-name-casing
 
-import { IConfig, IJiraIssue } from "../../global";
-import { startOfWeek } from "../misc/dateUtils";
+import { IConfig, IJiraIssue } from '../../global';
+import { startOfWeek } from '../misc/dateUtils';
 
 const crunchWeeks = (
   issuesTree: any,
@@ -25,12 +25,22 @@ const crunchWeeks = (
         acc[firstDayWeekKey].points.count = acc[firstDayWeekKey].list
           .filter(
             (issue: IJiraIssue) =>
+              (issue.fields[userConfig.jira.fields.points] !== undefined &&
+                issue.fields[userConfig.jira.fields.points] !== null) ||
+              (issue.fields[userConfig.jira.fields.originalPoints] !==
+                undefined &&
+                issue.fields[userConfig.jira.fields.originalPoints] !== null)
+          )
+          .map((issue: IJiraIssue) => {
+            if (
               issue.fields[userConfig.jira.fields.points] !== undefined &&
               issue.fields[userConfig.jira.fields.points] !== null
-          )
-          .map(
-            (issue: IJiraIssue) => issue.fields[userConfig.jira.fields.points]
-          )
+            ) {
+              return issue.fields[userConfig.jira.fields.points];
+            } else {
+              return issue.fields[userConfig.jira.fields.originalPoints];
+            }
+          })
           .reduce((acc: number, points: number) => acc + points, 0);
       }
     }

diff --git a/cli/src/utils/roadmap/prepareInitiativesData.ts b/cli/src/utils/roadmap/prepareInitiativesData.ts
@@ -1,9 +1,9 @@
 // tslint:disable-next-line: file-name-casing
 
-import { IConfig } from "../../global";
+import { IConfig } from '../../global';
 
-import crunchMetrics from "./crunchMetrics";
-import crunchWeeks from "./crunchWeeks";
+import crunchMetrics from './crunchMetrics';
+import crunchWeeks from './crunchWeeks';
 
 const prepareInitiativesData = (
   issuesTree: any,

diff --git a/ui/src/utils/graph.ts b/ui/src/utils/graph.ts
@@ -30,7 +30,7 @@ const exploreGraph = (
       data: {
         ...childrenIssue,
         distance: distance + 1,
-        status: childrenIssue.fields.status.name,
+        status: childrenIssue.fields.status.statusCategory.name,
         type: childrenIssue.fields.issuetype.name,
         points: childrenIssue.metrics.points.total
       }

diff --git a/ui/src/views/roadmap/Details/NodesGraph.tsx b/ui/src/views/roadmap/Details/NodesGraph.tsx
@@ -156,13 +156,19 @@ class NodesGraph extends Component<connectedProps> {
       {
         selector: '[status = "Done"]',
         style: {
-          backgroundColor: '#28a745'
+          backgroundColor: '#14892c'
         }
       },
       {
-        selector: '[status != "Done"]',
+        selector: '[status = "To Do"]',
         style: {
-          backgroundColor: '#cb2431'
+          backgroundColor: '#4a6785'
+        }
+      },
+      {
+        selector: '[status = "In Progress"]',
+        style: {
+          backgroundColor: '#ffd351'
         }
       },
       {

diff --git a/ui/src/views/roadmap/Details/index.tsx b/ui/src/views/roadmap/Details/index.tsx
@@ -89,7 +89,8 @@ const Details: FC<connectedProps> = ({
               <Grid item>
                 <b>Colors:</b>
                 <br />
-                Red: Open <br />
+                Blue: Open <br />
+                Yellow: In Progress <br />
                 Green: Closed <br />
               </Grid>
               <Grid item>