From 4bfbbfab50874a208c7aecf0e27a3670279a4e16 Mon Sep 17 00:00:00 2001
From: yoution <zhuyan207@gmail.com>
Date: Wed, 11 Aug 2021 21:02:07 +0800
Subject: [PATCH 1/2] fix: change table for customer view

---
 .../SimplePlan/ManageMilestones/ManageMilestones.jsx          | 4 ++--
 .../components/MilestoneHeaderRow/MilestoneHeaderRow.jsx      | 2 +-
 .../SimplePlan/components/MilestoneRow/MilestoneRow.jsx       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx b/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
index e63f2aaad..d912b3168 100644
--- a/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
+++ b/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
@@ -181,7 +181,7 @@ class ManageMilestones extends React.Component {
     const {
       isUpdatable
     } = this.props
-    if (!this.isExpandChallengeList(milestone)) {
+    if (!isUpdatable ||!this.isExpandChallengeList(milestone)) {
       return <tr />
     }
 
@@ -258,7 +258,7 @@ class ManageMilestones extends React.Component {
             <IconGnattView />
           </button>
           <div styleName="separator" /> */}
-          {canEdit ? <div styleName="unselect-bottom" onClick={this.onUnselectAll}>
+          {this.getSelectCount() > 0 ? <div styleName="unselect-bottom" onClick={this.onUnselectAll}>
             <IconUnselect /> {this.getSelectCount()} PROJECTS SELECTED
           </div>: null }
           {canEdit ? <div styleName="line"/>: null}
diff --git a/src/projects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx b/src/projects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx
index b49df0870..7e940a433 100644
--- a/src/projects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx
+++ b/src/projects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx
@@ -31,7 +31,7 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
 
   return (
     <tr styleName="milestone-row">
-      <th />
+      {isUpdatable ? <th />: null}
       <th>
         <TCFormFields.Checkbox
           name="select-all"
diff --git a/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx b/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx
index c8a2df999..ce4012c53 100644
--- a/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx
+++ b/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx
@@ -50,7 +50,7 @@ function MilestoneRow({
 
   return edit ? (
     <tr styleName="milestone-row" className="edit-milestone-row">
-      <td />
+      {isUpdatable ? <td /> : null}
       <td styleName="checkbox">
         <TCFormFields.Checkbox
           name={`select-${rowId}`}
@@ -251,7 +251,7 @@ function MilestoneRow({
     </tr>
   ) : (
     <tr styleName="milestone-row">
-      <td styleName="expand" onClick={() => onExpand(!isExpand, milestone)}>{isExpand ? <IconClose />: <IconExpand />}</td>
+      {isUpdatable ? <td styleName="expand" onClick={() => onExpand(!isExpand, milestone)}>{isExpand ? <IconClose />: <IconExpand />}</td>: null}
       <td styleName="checkbox">
         <TCFormFields.Checkbox
           name={`select-${rowId}`}

From 8ea95c7cd053375950d671eb7f1e1f2b85e368cf Mon Sep 17 00:00:00 2001
From: yoution <zhuyan207@gmail.com>
Date: Fri, 13 Aug 2021 19:24:36 +0800
Subject: [PATCH 2/2] fix: issue #4450, #4451, #4452, #4454

---
 .../ManageMilestones/ManageMilestones.jsx           | 13 +------------
 .../ConfirmMoveMilestoneDate.scss                   |  1 +
 .../MilestoneMoveDateButton.scss                    |  1 +
 .../components/MilestoneRow/MilestoneRow.scss       |  4 ++++
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx b/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
index d912b3168..b781ea3f5 100644
--- a/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
+++ b/src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
@@ -259,7 +259,7 @@ class ManageMilestones extends React.Component {
           </button>
           <div styleName="separator" /> */}
           {this.getSelectCount() > 0 ? <div styleName="unselect-bottom" onClick={this.onUnselectAll}>
-            <IconUnselect /> {this.getSelectCount()} PROJECTS SELECTED
+            <IconUnselect /> {this.getSelectCount()} PROJECT(S) SELECTED
           </div>: null }
           {canEdit ? <div styleName="line"/>: null}
           { canEdit ? <div styleName="delete-button">
@@ -284,17 +284,6 @@ class ManageMilestones extends React.Component {
         <div styleName="table-container">
           <Formsy.Form>
             <table styleName="milestones-table">
-              <colgroup>
-                <col style={{ width: '20px' }} />
-                <col style={{ width: '20px' }} />{/* CHECKBOX */}
-                <col style={{ width: '8%' }} />{/* MILESTONE */}
-                <col />{/* DESCRIPTION */}
-                <col style={{ width: '12%' }} />{/* START DATE */}
-                <col style={{ width: '11%' }} />{/* END DATE */}
-                <col style={{ width: '10%' }} />{/* STATUS */}
-                <col style={{ width: '13%' }} />{/* COPILOTS */}
-                {isUpdatable && (<col style={{ width: '64px' }} />)}{/* ACTION */}
-              </colgroup>
               <thead>
                 <MilestoneHeaderRow
                   milestones={milestones}
diff --git a/src/projects/detail/components/SimplePlan/components/ConfirmMoveMilestoneDate/ConfirmMoveMilestoneDate.scss b/src/projects/detail/components/SimplePlan/components/ConfirmMoveMilestoneDate/ConfirmMoveMilestoneDate.scss
index 2b1b94aeb..f4eee197a 100644
--- a/src/projects/detail/components/SimplePlan/components/ConfirmMoveMilestoneDate/ConfirmMoveMilestoneDate.scss
+++ b/src/projects/detail/components/SimplePlan/components/ConfirmMoveMilestoneDate/ConfirmMoveMilestoneDate.scss
@@ -26,6 +26,7 @@
     margin-bottom: 10px;
     >input {
       height: 26px;
+      line-height: 26px;
       width: 80px;
       margin: 0 10px 0 0;
     }
diff --git a/src/projects/detail/components/SimplePlan/components/MilestoneMoveDateButton/MilestoneMoveDateButton.scss b/src/projects/detail/components/SimplePlan/components/MilestoneMoveDateButton/MilestoneMoveDateButton.scss
index 4674861de..3071ee19a 100644
--- a/src/projects/detail/components/SimplePlan/components/MilestoneMoveDateButton/MilestoneMoveDateButton.scss
+++ b/src/projects/detail/components/SimplePlan/components/MilestoneMoveDateButton/MilestoneMoveDateButton.scss
@@ -3,6 +3,7 @@
   height: 14px;
   padding: 0;
   border: 0;
+  margin: 0 8px;
   cursor: pointer;
 
   svg {
diff --git a/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.scss b/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.scss
index e8499cb1d..f6a997f9c 100644
--- a/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.scss
+++ b/src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.scss
@@ -153,5 +153,9 @@
     > *:not(:last-child) {
       margin-right: 10px;
     }
+    svg {
+      width: 14px;
+      height: 14px;
+    }
   }
 }