Skip to content
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

add mr tags to review widget and prevent duplicate tags #2191

Merged
merged 1 commit into from
Nov 30, 2023
Merged

add mr tags to review widget and prevent duplicate tags #2191

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
51 changes: 40 additions & 11 deletions src/components/ReviewTaskControls/ReviewTaskControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import TaskEditControl from '../TaskPane/ActiveTaskDetails/ActiveTaskControls/Ta
import UserEditorSelector
from '../UserEditorSelector/UserEditorSelector'
import TaskConfirmationModal from '../TaskConfirmationModal/TaskConfirmationModal'
import TaskTags from '../TaskTags/TaskTags'
import messages from './Messages'
import './ReviewTaskControls.scss'
import ErrorTagComment from '../ErrorTagComment/ErrorTagComment'
Expand All @@ -32,9 +33,14 @@ import ErrorTagComment from '../ErrorTagComment/ErrorTagComment'
* @author [Kelli Rotstan](https://github.com/krotstan)
*/
export class ReviewTaskControls extends Component {
constructor(props) {
super(props);
this.onConfirm = this.onConfirm.bind(this);
}
state = {
comment: "",
tags: "",
tags: null,
reviewTags: null,
loadBy: TaskReviewLoadMethod.next,
errorTags: []
}
Expand All @@ -43,6 +49,8 @@ export class ReviewTaskControls extends Component {
setTags = tags => this.setState({tags})

onConfirm = (alternateCriteria) => {
this.props.saveTaskTags(this.props.task, this.state.tags)

const history = _cloneDeep(this.props.history)
_merge(_get(history, 'location.state', {}), alternateCriteria)

Expand All @@ -52,7 +60,7 @@ export class ReviewTaskControls extends Component {
const errorTags = this.state.errorTags?.length ? this.state.errorTags : undefined

this.props.updateTaskReviewStatus(this.props.task, this.state.reviewStatus,
this.state.comment, this.state.tags,
this.state.comment, this.state.reviewTags,
this.state.loadBy, history,
this.props.taskBundle, requestedNextTask, null, errorTags)
this.setState({ confirmingTask: false, comment: "", errorTags: [] })
Expand Down Expand Up @@ -121,9 +129,27 @@ export class ReviewTaskControls extends Component {
}

componentDidUpdate(prevProps) {
const tagsArray = _map(this.props.task.tags, (tag) => tag.name);
const filteredTagsArray = tagsArray.filter((tag) => tag !== "");
const uniqueTagsArray = filteredTagsArray.filter((value, index, self) => self.indexOf(value) === index);
const tags = uniqueTagsArray.join(',');

const reviewTagsArray = _map(this.props.task.tags?.tagType === "review" ? this.props.task.tags : [], (tag) => tag.name);
const filteredReviewTagsArray = reviewTagsArray.filter((tag) => tag !== "");
const reviewTags = filteredReviewTagsArray.join(',');

if(tags.length > 0 && this.state.tags === null) {
this.setState({tags: tags})
}

if(reviewTags.length > 0 && this.state.reviewTags === null) {
this.setState({reviewTags: reviewTags})
}

if (prevProps.task.id !== this.props.task.id) {
// Clear tags if we are on a new task
this.setState({tags: ""})
this.setState({tags: tags ?? null})
this.setState({reviewTags: reviewTags ?? null})
}
}

Expand Down Expand Up @@ -192,7 +218,6 @@ export class ReviewTaskControls extends Component {
}

const fromInbox = _get(this.props.history, 'location.state.fromInbox')
const tags = _map(this.props.task.tags, (tag) => tag.name)
const errorTags = this.props.task.errorTags;
const isMetaReview = this.props.history?.location?.pathname?.includes("meta-review")
const reviewData = this.props.task?.review;
Expand Down Expand Up @@ -233,13 +258,17 @@ export class ReviewTaskControls extends Component {
}
</div>
}
{tags.length > 0 &&
<div className="mr-text-sm mr-text-white">
<FormattedMessage
{...messages.taskTags}
/> {tags.join(', ')}
</div>
}

<TaskTags
user={this.props.user.id}
task={this.props.task}
tags={this.state.tags}
setTags={this.setTags}
onConfirm={this.onConfirm}
saveTaskTags={this.props.saveTaskTags}
taskReadOnly={this.props.taskReadOnly}
/>

{
errorTags
? <div className="mr-text-red">
Expand Down
29 changes: 26 additions & 3 deletions src/components/TaskPane/ActiveTaskDetails/ActiveTaskControls/ActiveTaskControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export class ActiveTaskControls extends Component {
osmComment: "",
comment: "",
tags: null,
reviewTags: null,
revisionLoadBy: TaskReviewLoadMethod.all,
doneLoadByFromHistory: false,
needsReview: this.props.challenge.reviewSetting === 1 ? true : undefined
Expand Down Expand Up @@ -148,11 +149,13 @@ export class ActiveTaskControls extends Component {

/** Mark the task as complete with the given status */
complete = taskStatus => {
this.props.saveTaskTags(this.props.task, this.state.tags)

const revisionSubmission = this.props.task.reviewStatus === TaskReviewStatus.rejected

if (!_isUndefined(this.state.submitRevision)) {
this.props.updateTaskReviewStatus(this.props.task, this.state.submitRevision,
this.state.comment, this.state.tags,
this.state.comment, this.state.reviewTags,
this.state.revisionLoadBy, this.props.history,
this.props.taskBundle, this.state.requestedNextTask,
taskStatus)
Expand Down Expand Up @@ -268,9 +271,28 @@ export class ActiveTaskControls extends Component {
return _isEmpty(t.name)
}
})
const tags = _map(unfilteredTags, tag => (tag.name ? tag.name : tag)).join(', ')
const tagsArray = _map(this.props.task.tags, (tag) => tag.name);
const filteredTagsArray = tagsArray.filter((tag) => tag !== "");
const uniqueTagsArray = filteredTagsArray.filter((value, index, self) => self.indexOf(value) === index);
const tags = uniqueTagsArray.join(',');

const reviewTagsArray = _map(this.props.task.tags?.tagType === "review" ? this.props.task.tags : [], (tag) => tag.name);
const filteredReviewTagsArray = reviewTagsArray.filter((tag) => tag !== "");
const reviewTags = filteredReviewTagsArray.join(',');

return this.setState({tags: tags})
if(tags.length > 0 && this.state.tags === null) {
this.setState({tags: tags})
}

if(reviewTags.length > 0 && this.state.reviewTags === null) {
this.setState({reviewTags: reviewTags})
}

if (prevProps.task.id !== this.props.task.id) {
// Clear tags if we are on a new task
this.setState({tags: tags ?? null})
this.setState({reviewTags: reviewTags ?? null})
}
}

// Let's set default revisionLoadBy to inbox if we are coming from inbox
Expand Down Expand Up @@ -395,6 +417,7 @@ export class ActiveTaskControls extends Component {
}

<TaskTags
user={this.props.user.id}
task={this.props.task}
tags={this.state.tags}
setTags={this.setTags}
Expand Down
4 changes: 2 additions & 2 deletions src/components/TaskTags/TaskTags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ export class TaskTags extends Component {
/> {this.tagList()}
</div>

{!this.props.taskReadOnly &&
{!this.props.taskReadOnly && (this.props.completedBy === this.props.user || this.props.task.reviewClaimedBy === this.props.user) ?
<div className="mr-links-green-lighter mr-flex-grow-0">
<a onClick={() => this.setState({edit: true})}>
<FormattedMessage {...messages.updateTags} />
</a>
</div>
</div> : null
}
</div>
)
Expand Down