親子タスクの不具合を解消 (#98)

yhzz · web-flow · commit ba492d0efd2c · 2022-10-08T19:59:49.000+09:00
* 親子タスクの不具合を解消

* fix test
diff --git a/public/index.html b/public/index.html
@@ -11,15 +11,5 @@
   <body>
     <noscript>Lamact React Issue Gantt Chart</noscript>
     <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
 </html>
diff --git a/src/components/Gantt/Gantt.js b/src/components/Gantt/Gantt.js
@@ -24,7 +24,6 @@ const Gantt = (props) => {
     try {
       gantt.clearAll();
       if (isValidVariable(props.issue) && props.issue.length != 0) {
-        gantt.clearAll();
         props.issue.map((issue) => {
           gantt.addTask(issue);
           if ('links' in issue) {
@@ -34,6 +33,11 @@ const Gantt = (props) => {
             });
           }
         });
+        props.issue.map((issue) => {
+          if (issue._parent !== "#0") {
+            gantt.setParent(gantt.getTask(issue.id), issue._parent);
+          }
+        });
         gantt.sort('due_date', false);
       }
     } catch (err) {
diff --git a/src/components/Gantt/GanttAttachEvent.js b/src/components/Gantt/GanttAttachEvent.js
@@ -15,10 +15,6 @@ export const attachEvent = (gantt, props) => {
   });
 
   gantt.attachEvent('onAfterTaskUpdate', (id, gantt_task) => {
-    updateParentTaskDate(gantt, gantt_task);
-    gantt.getChildren(gantt_task.id).map((child_gantt_task_id) => {
-      updateChildTaskDate(gantt, gantt_task, child_gantt_task_id);
-    });
     props.updateIssueByAPI(gantt_task, gantt);
   });
 
@@ -27,12 +23,8 @@ export const attachEvent = (gantt, props) => {
 
   gantt.attachEvent('onAfterTaskMove', (id, parent) => {
     let gantt_task = gantt.getTask(id);
-    if ('parent' in gantt_task) {
-      if (gantt_task.parent !== 0) {
-        gantt_task.parent = parent;
-        props.updateIssueByAPI(gantt_task, gantt);
-      }
-    }
+    // gantt_task._parent = parent;
+    props.updateIssueByAPI(gantt_task, gantt);
   });
 
   gantt.attachEvent("onAfterLinkAdd", function (id, item) {
@@ -86,7 +78,6 @@ export const attachEvent = (gantt, props) => {
   // Custom QuickInfo
   // https://docs.dhtmlx.com/gantt/desktop__quick_info.html
   gantt.attachEvent('onQuickInfo', (id) => {
-    console.log("onQuickInfo")
     let gantt_task = gantt.getTask(id);
     gantt.locale.labels.detail_button = 'DETAIL';
     gantt.$click.buttons.detail_button = (gantt_task_id) => {
@@ -138,46 +129,3 @@ export const attachEvent = (gantt, props) => {
     }
   });
 };
-
-export const updateParentTaskDate = (gantt, gantt_task) => {
-  if (!'parent' in gantt_task) {
-    return null;
-  }
-  if (gantt_task.parent === 0) {
-    return null;
-  }
-  let parent_gantt_task = gantt.getTask(gantt_task.parent).valueOf();
-  if (
-    parent_gantt_task.start_date.getTime() > gantt_task.start_date.getTime()
-  ) {
-    parent_gantt_task.start_date = gantt_task.start_date;
-    gantt.updateTask(parent_gantt_task.id, parent_gantt_task);
-    gantt.render();
-  }
-  if (parent_gantt_task.end_date.getTime() < gantt_task.end_date.getTime()) {
-    parent_gantt_task.end_date = gantt_task.end_date;
-    gantt.updateTask(parent_gantt_task.id, parent_gantt_task);
-    gantt.render();
-  }
-};
-
-export const updateChildTaskDate = (gantt, gantt_task, child_gantt_task_id) => {
-  let child_gantt_task = gantt.getTask(child_gantt_task_id).valueOf();
-  const date_duration = child_gantt_task.duration.valueOf();
-  if (child_gantt_task.start_date.getTime() < gantt_task.start_date.getTime()) {
-    child_gantt_task.start_date = gantt_task.start_date;
-    child_gantt_task.end_date = new Date(
-      calculateDueDate(gantt_task.start_date, date_duration)
-    );
-    gantt.updateTask(child_gantt_task.id, child_gantt_task);
-    gantt.render();
-  }
-  if (child_gantt_task.end_date.getTime() > gantt_task.end_date.getTime()) {
-    child_gantt_task.start_date = new Date(
-      calculateStartDate(gantt_task.end_date, date_duration)
-    );
-    child_gantt_task.end_date = gantt_task.end_date;
-    gantt.updateTask(child_gantt_task.id, child_gantt_task);
-    gantt.render();
-  }
-};
diff --git a/src/components/PageHeader/PageHeader.js b/src/components/PageHeader/PageHeader.js
@@ -7,7 +7,6 @@ const PageHeader = (props) => {
                 <meta charSet="utf-8" />
                 <title>{props.title}</title>
             </Helmet>
-            ...
         </div>
     );
 };
diff --git a/src/functions/Common/CommonHelper.js b/src/functions/Common/CommonHelper.js
@@ -133,3 +133,47 @@ export const getGanttDuration = (start_date, due_date, created_at) => {
   }
   return duration;
 };
+
+export const ArrangeGanttTaskToGeneratedGanttTaskForCompare = (issue_info) => {
+  let arrangelink = [];
+  issue_info.links.map((list) => {
+    arrangelink.push({ type: list.type, target: list.target, source: list.source });
+  });
+  var _parent
+  if (issue_info.parent == 0)
+    _parent = "#0";
+  else {
+    _parent = issue_info.parent;
+  }
+
+  const arrange = {
+    id: issue_info.id,
+    text: issue_info.text,
+    start_date: adjustDateString(issue_info.start_date),
+    due_date: issue_info.due_date,
+    duration: issue_info.duration,
+    progress: issue_info.progress,
+    assignee: issue_info.assignee,
+    description: issue_info.description,
+    update: issue_info.update,
+    links: arrangelink,
+    _parent: _parent,
+  }
+  return arrange;
+};
+
+export const isEqualGanntTask = (GanntTaskA, GanntTaskB) => {
+  return (
+    GanntTaskA.id == GanntTaskB.id &&
+    GanntTaskA.text == GanntTaskB.text &&
+    GanntTaskA.start_date == GanntTaskB.start_date &&
+    GanntTaskA.due_date == GanntTaskB.due_date.toString() &&
+    GanntTaskA.duration == GanntTaskB.duration &&
+    GanntTaskA.progress == GanntTaskB.progress &&
+    GanntTaskA.assignee == GanntTaskB.assignee &&
+    // GanntTaskA.description == GanntTaskB.description &&
+    GanntTaskA.update == GanntTaskB.update &&
+    GanntTaskA._parent == GanntTaskB._parent &&
+    JSON.stringify(GanntTaskA.links) == JSON.stringify(GanntTaskB.links)
+  );
+};
diff --git a/src/functions/Common/IssueAPI.js b/src/functions/Common/IssueAPI.js
@@ -30,11 +30,13 @@ export const getIssuesFromAPI = async (
   if (!isValidURL(git_url)) {
     return Promise.resolve();
   } else if (isGitHubURL(git_url)) {
-    return getGitHubIssuesFromAPI(git_url, token, selected_labels, selected_assignee);
-  } else if (
-    isGitLabURL(git_url) ||
-    getSelfHostingGitLabDomain(git_url) !== null
-  ) {
+    return getGitHubIssuesFromAPI(
+      git_url,
+      token,
+      selected_labels,
+      selected_assignee
+    );
+  } else if (isGitLabURL(git_url) || getSelfHostingGitLabDomain(git_url) !== null) {
     return getGitLabIssuesFromAPI(
       git_url,
       token,
diff --git a/src/functions/Common/Parser.js b/src/functions/Common/Parser.js
@@ -3,6 +3,9 @@ import yaml from 'js-yaml';
 import { gantt } from 'dhtmlx-gantt';
 
 export const removeFirstSharp = (id_str) => {
+  if(!isValidVariable(id_str)){
+    return null;
+  }
   if (id_str.length > 1 && /^#/.test(id_str)) {
     id_str = id_str.substring(1);
   }
diff --git a/src/functions/GitHub/GitHubAPI.js b/src/functions/GitHub/GitHubAPI.js
@@ -10,10 +10,13 @@ import {
 import {
   generateGanttTaskFromGitHub,
   updateGitHubDescriptionStringFromGanttTask,
-  Arrangegantt,
-  contentcheck,
 } from './GitHubHelper.js';
-import { date2string, isValidVariable } from '../Common/CommonHelper.js';
+import {
+  date2string,
+  isValidVariable,
+  isEqualGanntTask,
+  ArrangeGanttTaskToGeneratedGanttTaskForCompare,
+} from '../Common/CommonHelper.js';
 import {
   removeFirstSharp,
   replacePropertyInDescriptionString,
@@ -123,8 +126,10 @@ export const updateGitHubIssueFromGanttTask = (
         });
       } else {
         // Update if different from existing parameters
-        if (!contentcheck(Arrangegantt(gantt_task),
-          generateGanttTaskFromGitHub(issue_info.body, issue_info))) {
+        if (!isEqualGanntTask(
+          ArrangeGanttTaskToGeneratedGanttTaskForCompare(gantt_task),
+          generateGanttTaskFromGitHub(issue_info.body, issue_info)
+        )) {
           axios
             .post(
               url,
diff --git a/src/functions/GitHub/GitHubHelper.js b/src/functions/GitHub/GitHubHelper.js
@@ -36,6 +36,7 @@ export const generateGanttTaskFromGitHub = (description, issue_info) => {
     progress: getNumberFromDescriptionYaml(description, 'progress'),
     assignee: getGitHubAssignee(issue_info),
     parent: '#' + getNumberFromDescriptionYaml(description, 'parent'),
+    _parent: '#' + getNumberFromDescriptionYaml(description, 'parent'),
     description: description,
     update: getGanttUpdateDate(issue_info.created_at, issue_info.updated_at),
   };
@@ -89,55 +90,10 @@ export const updateGitHubDescriptionStringFromGanttTask = (
     due_date: due_date_str,
     progress: orgRound(gantt_task.progress, 0.01),
   };
-  if ('parent' in gantt_task) {
-    task.parent = parseInt(removeFirstSharp(gantt_task.parent));
-  }
+  task.parent = parseInt(removeFirstSharp(gantt_task.parent));
   if ('dependon' in gantt_task) {
     task.dependon = gantt_task.dependon;
   }
   description = replacePropertyInDescriptionString(description, task);
   return description;
 };
-
-export const Arrangegantt = (issue_info) => {
-  let arrangelink = [];
-  issue_info.links.map((list) => {
-    let prearrangelink = [];
-    prearrangelink.type = list.type;
-    prearrangelink.target = list.target;
-    prearrangelink.source = list.source
-    arrangelink.push(prearrangelink);
-  });
-
-  const arrange = {
-    id: issue_info.id,
-    text: issue_info.text,
-    start_date: adjustDateString(issue_info.start_date),
-    due_date: issue_info.due_date,
-    duration: issue_info.duration,
-    progress: issue_info.progress,
-    assignee: issue_info.assignee,
-    description: issue_info.description,
-    update: issue_info.update,
-    links: arrangelink,
-    parent: '#' + issue_info.parent,
-  }
-
-  return arrange;
-};
-
-export const contentcheck = (Arrange, generate) => {
-  return (
-    Arrange.id == generate.id &&
-    Arrange.text == generate.text &&
-    Arrange.start_date == generate.start_date &&
-    Arrange.due_date == generate.due_date.toString() &&
-    Arrange.duration == generate.duration &&
-    Arrange.progress == generate.progress &&
-    Arrange.assignee == generate.assignee &&
-    // Arrange.description == generate.description &&
-    Arrange.update == generate.update &&
-    Arrange.parent == generate.parent &&
-    JSON.stringify(Arrange.links) == JSON.stringify(generate.links)
-  );
-};
diff --git a/src/functions/GitHub/GitHubHelper.test.js b/src/functions/GitHub/GitHubHelper.test.js
@@ -31,6 +31,7 @@ const gantt_task = {
   progress: 0.5,
   assignee: 'satoshi',
   parent: '#5',
+  _parent: '#5',
   description: description,
   update:'2021/2/5',
   links: [],
diff --git a/src/functions/GitLab/GitLabAPI.js b/src/functions/GitLab/GitLabAPI.js
@@ -10,13 +10,13 @@ import {
 import {
   generateGanttTaskFromGitLab,
   updateGitLabDescriptionStringFromGanttTask,
-  Arrangegantt,
-  contentcheck,
 } from './GitLabHelper.js';
 import {
   adjustDateString,
+  ArrangeGanttTaskToGeneratedGanttTaskForCompare,
   calculateDueDate,
   date2string,
+  isEqualGanntTask,
 } from '../Common/CommonHelper.js';
 import {
   removeFirstSharp,
@@ -34,9 +34,7 @@ export const getGitLabIssuesFromAPI = async (
     .then((res) => {
       let data = [];
       res.data.map((issue_info) => {
-        const gantt_task = generateGanttTaskFromGitLab(issue_info);
-
-        data.push(gantt_task);
+        data.push(generateGanttTaskFromGitLab(issue_info));
       });
       return data;
     })
@@ -97,9 +95,10 @@ export const updateGitLabIssueFromGanttTask = (
     .then((res) => {
       const issue_info = res.data;
       // Update if different from existing parameters
-      if (!contentcheck(
-        Arrangegantt(gantt_task),
-        generateGanttTaskFromGitLab(issue_info))) {
+      if (!isEqualGanntTask(
+        ArrangeGanttTaskToGeneratedGanttTaskForCompare(gantt_task),
+        generateGanttTaskFromGitLab(issue_info)
+      )) {
         if (
           parseInt(issue_info.iid) === parseInt(removeFirstSharp(gantt_task.id))
         ) {
diff --git a/src/functions/GitLab/GitLabHelper.js b/src/functions/GitLab/GitLabHelper.js
diff --git a/src/functions/GitLab/GitLabHelper.test.js b/src/functions/GitLab/GitLabHelper.test.js

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@ import yaml from 'js-yaml';`
`3`	`3`	`import { gantt } from 'dhtmlx-gantt';`
`4`	`4`
`5`	`5`	`export const removeFirstSharp = (id_str) => {`
	`6`	`+ if(!isValidVariable(id_str)){`
	`7`	`+ return null;`
	`8`	`+ }`
`6`	`9`	`if (id_str.length > 1 && /^#/.test(id_str)) {`
`7`	`10`	`id_str = id_str.substring(1);`
`8`	`11`	`}`