Skip to content

fix: hide checkbox when edit and new row #4457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elkhawajah merged 1 commit into from
Aug 16, 2021
Merged

fix: hide checkbox when edit and new row #4457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ class ManageMilestones extends React.Component {
isUpdatable,
} = this.props

const isEditingMilestone = !!_.find(milestones, m => m.edit)
const canEdit = isUpdatable && this.getSelectCount() > 0
return (
<div>
Expand Down Expand Up @@ -286,6 +287,7 @@ class ManageMilestones extends React.Component {
<table styleName="milestones-table">
<thead>
<MilestoneHeaderRow
isEditingMilestone={isEditingMilestone}
milestones={milestones}
onChangeMilestones={onChangeMilestones}
isUpdatable={isUpdatable}
Expand All @@ -295,6 +297,7 @@ class ManageMilestones extends React.Component {
{milestones.map((milestone) => (
[
<MilestoneRow
isEditingMilestone={isEditingMilestone}
milestone={milestone}
key={milestone.id}
rowId={`${milestone.id}`}
Expand Down
7 changes: 4 additions & 3 deletions ...rojects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import './MilestoneHeaderRow.scss'

const TCFormFields = FormsyForm.Fields

function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
function MilestoneHeaderRow ({ isEditingMilestone, milestones, onChangeMilestones, isUpdatable }) {
const checked = milestones.reduce(
(selected, milestone) => selected = selected && milestone.selected,
milestones.length > 0
Expand All @@ -32,15 +32,15 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {
return (
<tr styleName="milestone-row">
{isUpdatable ? <th />: null}
<th>
{isEditingMilestone? <th /> :<th>
<TCFormFields.Checkbox
name="select-all"
value={checked}
onChange={(_, value) => {
value ? selectAll() : unselectAll()
}}
/>
</th>
</th>}
<th>MILESTONE</th>
<th>DESCRIPTION</th>
<th>START DATE</th>
Expand All @@ -54,6 +54,7 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {

MilestoneHeaderRow.propTypes = {
onChangeMilestones: PT.func,
isEditingMilestone: PT.bool,
}

export default MilestoneHeaderRow
10 changes: 6 additions & 4 deletions src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const TCFormFields = FormsyForm.Fields

function MilestoneRow({
isExpand,
isEditingMilestone,
milestone,
rowId,
onExpand,
Expand All @@ -51,15 +52,15 @@ function MilestoneRow({
return edit ? (
<tr styleName="milestone-row" className="edit-milestone-row">
{isUpdatable ? <td /> : null}
<td styleName="checkbox">
{isEditingMilestone ? <td/ >: <td styleName="checkbox">
<TCFormFields.Checkbox
name={`select-${rowId}`}
value={milestone.selected}
onChange={(_, value) => {
onChange({ ...milestone, selected: value })
}}
/>
</td>
</td>}
<td styleName="milestone">
<TCFormFields.TextInput
validations={{
Expand Down Expand Up @@ -252,15 +253,15 @@ function MilestoneRow({
) : (
<tr styleName="milestone-row">
{isUpdatable ? <td styleName="expand" onClick={() => onExpand(!isExpand, milestone)}>{isExpand ? <IconClose />: <IconExpand />}</td>: null}
<td styleName="checkbox">
{isEditingMilestone ? <td/> : <td styleName="checkbox">
<TCFormFields.Checkbox
name={`select-${rowId}`}
value={milestone.selected}
onChange={(_, value) => {
onChange({ ...milestone, selected: value })
}}
/>
</td>
</td>}
<td styleName="milestone">
{milestone.name}
</td>
Expand Down Expand Up @@ -309,6 +310,7 @@ function MilestoneRow({

MilestoneRow.propTypes = {
milestone: PT.shape(),
isEditingMilestone: PT.bool,
rowId: PT.string,
onChange: PT.func,
onSave: PT.func,
Expand Down