Skip to content

Commit e7ccb67

Browse files
committed
fix: hide checkbox when edit and new row
1 parent 8ea95c7 commit e7ccb67

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ class ManageMilestones extends React.Component {
247247
isUpdatable,
248248
} = this.props
249249

250+
const isEditingMilestone = !!_.find(milestones, m => m.edit)
250251
const canEdit = isUpdatable && this.getSelectCount() > 0
251252
return (
252253
<div>
@@ -286,6 +287,7 @@ class ManageMilestones extends React.Component {
286287
<table styleName="milestones-table">
287288
<thead>
288289
<MilestoneHeaderRow
290+
isEditingMilestone={isEditingMilestone}
289291
milestones={milestones}
290292
onChangeMilestones={onChangeMilestones}
291293
isUpdatable={isUpdatable}
@@ -295,6 +297,7 @@ class ManageMilestones extends React.Component {
295297
{milestones.map((milestone) => (
296298
[
297299
<MilestoneRow
300+
isEditingMilestone={isEditingMilestone}
298301
milestone={milestone}
299302
key={milestone.id}
300303
rowId={`${milestone.id}`}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import './MilestoneHeaderRow.scss'
99

1010
const TCFormFields = FormsyForm.Fields
1111

12-
function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
12+
function MilestoneHeaderRow ({ isEditingMilestone, milestones, onChangeMilestones, isUpdatable }) {
1313
const checked = milestones.reduce(
1414
(selected, milestone) => selected = selected && milestone.selected,
1515
milestones.length > 0
@@ -32,15 +32,15 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
3232
return (
3333
<tr styleName="milestone-row">
3434
{isUpdatable ? <th />: null}
35-
<th>
35+
{isEditingMilestone? <th /> :<th>
3636
<TCFormFields.Checkbox
3737
name="select-all"
3838
value={checked}
3939
onChange={(_, value) => {
4040
value ? selectAll() : unselectAll()
4141
}}
4242
/>
43-
</th>
43+
</th>}
4444
<th>MILESTONE</th>
4545
<th>DESCRIPTION</th>
4646
<th>START DATE</th>
@@ -54,6 +54,7 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
5454

5555
MilestoneHeaderRow.propTypes = {
5656
onChangeMilestones: PT.func,
57+
isEditingMilestone: PT.bool,
5758
}
5859

5960
export default MilestoneHeaderRow

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const TCFormFields = FormsyForm.Fields
2626

2727
function MilestoneRow({
2828
isExpand,
29+
isEditingMilestone,
2930
milestone,
3031
rowId,
3132
onExpand,
@@ -51,15 +52,15 @@ function MilestoneRow({
5152
return edit ? (
5253
<tr styleName="milestone-row" className="edit-milestone-row">
5354
{isUpdatable ? <td /> : null}
54-
<td styleName="checkbox">
55+
{isEditingMilestone ? <td/ >: <td styleName="checkbox">
5556
<TCFormFields.Checkbox
5657
name={`select-${rowId}`}
5758
value={milestone.selected}
5859
onChange={(_, value) => {
5960
onChange({ ...milestone, selected: value })
6061
}}
6162
/>
62-
</td>
63+
</td>}
6364
<td styleName="milestone">
6465
<TCFormFields.TextInput
6566
validations={{
@@ -252,15 +253,15 @@ function MilestoneRow({
252253
) : (
253254
<tr styleName="milestone-row">
254255
{isUpdatable ? <td styleName="expand" onClick={() => onExpand(!isExpand, milestone)}>{isExpand ? <IconClose />: <IconExpand />}</td>: null}
255-
<td styleName="checkbox">
256+
{isEditingMilestone ? <td/> : <td styleName="checkbox">
256257
<TCFormFields.Checkbox
257258
name={`select-${rowId}`}
258259
value={milestone.selected}
259260
onChange={(_, value) => {
260261
onChange({ ...milestone, selected: value })
261262
}}
262263
/>
263-
</td>
264+
</td>}
264265
<td styleName="milestone">
265266
{milestone.name}
266267
</td>
@@ -309,6 +310,7 @@ function MilestoneRow({
309310

310311
MilestoneRow.propTypes = {
311312
milestone: PT.shape(),
313+
isEditingMilestone: PT.bool,
312314
rowId: PT.string,
313315
onChange: PT.func,
314316
onSave: PT.func,

0 commit comments

Comments
 (0)