Merge pull request #4437 from appirio-tech/hotfix/issue-4428-4432

[PROD][HOTFIX]Fix whitespace and Hide Milestones with Draft status from customer view

Author: RishiRajSahu

src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx

@@ -105,7 +105,7 @@ class ManageMilestones extends React.Component {
                 <col style={{ width: '11%' }} />{/* END DATE */}
                 <col style={{ width: '10%' }} />{/* STATUS */}
                 <col style={{ width: '12%' }} />{/* BUDGET */}
-                <col style={{ width: '13%' }} />{/* COPILOTS */}
+                {/* <col style={{ width: '13%' }} /> */}{/* COPILOTS */}
                 {isUpdatable && (<col style={{ width: '80px' }} />)}{/* ACTION */}
               </colgroup>
               <thead>

src/projects/detail/containers/DashboardContainer.jsx

@@ -304,9 +304,10 @@ class DashboardContainer extends React.Component {
                 </div>
               ) : (
                 <div styleName="simple-plan">
-                  {((!hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN) && (!visiblePhases || visiblePhases.length === 0))
+                  {/* check if visiblePhases/phases is non-null and empty */}
+                  {((!hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN) && (visiblePhases && visiblePhases.length === 0))
                     || (hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN) &&
-                      (!phases || phases.length === 0) &&
+                      (phases && phases.length === 0) &&
                       (!this.state.createGameplanPhases || this.state.createGameplanPhases.length === 0))
                   ) && (
                     <div styleName="welcome-message">
@@ -332,7 +333,7 @@ class DashboardContainer extends React.Component {
                         isCustomer={!hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN)}
                         project={project}
                         phases={phases}
-                        milestones={this.state.createGameplanPhases || phases}
+                        milestones={this.state.createGameplanPhases || visiblePhases || []}
                         onChangeMilestones={(milestones) => {
                           this.setState({createGameplanPhases: milestones})
                         }}