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.

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

refactors milestones to functional component #5601

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
91 changes: 40 additions & 51 deletions app/assets/javascripts/components/overview/milestones.jsx
Original file line number Diff line number Diff line change
@@ -1,67 +1,56 @@
import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import { filter } from 'lodash-es';

import CourseDateUtils from '../../utils/course_date_utils';

const md = require('../../utils/markdown_it.js').default();

const Milestones = createReactClass({
displayName: I18n.t('blocks.milestones.title'),

propTypes: {
timelineStart: PropTypes.string.isRequired,
weeks: PropTypes.array.isRequired,
allWeeks: PropTypes.array.isRequired,
course: PropTypes.object.isRequired
},

milestoneBlockType: 2,
const Milestones = ({ timelineStart, allWeeks, course }) => {
const currentWeek = CourseDateUtils.currentWeekOrder(timelineStart);
const weekNumberOffset = CourseDateUtils.weeksBeforeTimeline(course);

weekIsCompleted(week, currentWeek) {
const weekIsCompleted = (week) => {
return week.weekNumber < currentWeek;
},

render() {
const currentWeek = CourseDateUtils.currentWeekOrder(this.props.timelineStart);
const weekNumberOffset = CourseDateUtils.weeksBeforeTimeline(this.props.course);
const blocks = [];

this.props.allWeeks.map((week) => {
if (week.empty) return null;

const milestoneBlocks = filter(week.blocks, block => block.kind === this.milestoneBlockType);
return milestoneBlocks.map((block) => {
let classNames = 'module__data';
if (this.weekIsCompleted(week, currentWeek)) { classNames += ' completed'; }
const rawHtml = md.render(block.content || '');
const completionNote = this.weekIsCompleted(week, currentWeek) ? '- Complete' : undefined;
return blocks.push(
<div key={block.id} className="section-header">
<div className={classNames}>
<p>Week {week.weekNumber + weekNumberOffset} {completionNote}</p>
<div className="markdown" dangerouslySetInnerHTML={{ __html: rawHtml }} />
<hr />
</div>
};

const blocks = allWeeks.flatMap((week) => {
if (week.empty) return [];
const milestoneBlocks = filter(week.blocks, block => block.kind === 2);
return milestoneBlocks.map((block) => {
let classNames = 'module__data';
if (weekIsCompleted(week)) { classNames += ' completed'; }
const rawHtml = md.render(block.content || '');
const completionNote = weekIsCompleted(week) ? '- Complete' : undefined;
return (
<div key={block.id} className="section-header">
<div className={classNames}>
<p>Week {week.weekNumber + weekNumberOffset} {completionNote}</p>
<div className="markdown" dangerouslySetInnerHTML={{ __html: rawHtml }} />
<hr />
</div>
);
});
</div>
);
});
});

if (!blocks.length) {
return null;
}
if (!blocks.length) {
return null;
}

return (
<div className="module milestones">
<div className="section-header">
<h3>{I18n.t('blocks.milestones.title')}</h3>
</div>
{blocks}
return (
<div className="module milestones">
<div className="section-header">
<h3>{I18n.t('blocks.milestones.title')}</h3>
</div>
);
}
});
{blocks}
</div>
);
};

Milestones.propTypes = {
timelineStart: PropTypes.string.isRequired,
allWeeks: PropTypes.array.isRequired,
course: PropTypes.object.isRequired
};

export default Milestones;