Rename deadline to due date, update dependencies

This commit is contained in:
Maksim Eltyshev
2019-10-05 06:12:36 +05:00
parent b64f5b7b4a
commit 5ccebfb853
31 changed files with 113 additions and 115 deletions

View File

@@ -8,7 +8,7 @@ import { Popup } from '../../lib/custom-ui';
import { useSteps } from '../../hooks';
import ProjectMembershipsStep from '../ProjectMembershipsStep';
import LabelsStep from '../LabelsStep';
import EditDeadlineStep from '../EditDeadlineStep';
import EditDueDateStep from '../EditDueDateStep';
import EditTimerStep from '../EditTimerStep';
import DeleteStep from '../DeleteStep';
@@ -17,7 +17,7 @@ import styles from './ActionsPopup.module.css';
const StepTypes = {
USERS: 'USERS',
LABELS: 'LABELS',
EDIT_DEADLINE: 'EDIT_DEADLINE',
EDIT_DUE_DATE: 'EDIT_DUE_DATE',
EDIT_TIMER: 'EDIT_TIMER',
DELETE: 'DELETE',
};
@@ -57,8 +57,8 @@ const ActionsStep = React.memo(
openStep(StepTypes.LABELS);
}, [openStep]);
const handleEditDeadlineClick = useCallback(() => {
openStep(StepTypes.EDIT_DEADLINE);
const handleEditDueDateClick = useCallback(() => {
openStep(StepTypes.EDIT_DUE_DATE);
}, [openStep]);
const handleEditTimerClick = useCallback(() => {
@@ -69,10 +69,10 @@ const ActionsStep = React.memo(
openStep(StepTypes.DELETE);
}, [openStep]);
const handleDeadlineUpdate = useCallback(
(deadline) => {
const handleDueDateUpdate = useCallback(
(dueDate) => {
onUpdate({
deadline,
dueDate,
});
},
[onUpdate],
@@ -112,11 +112,11 @@ const ActionsStep = React.memo(
onBack={handleBack}
/>
);
case StepTypes.EDIT_DEADLINE:
case StepTypes.EDIT_DUE_DATE:
return (
<EditDeadlineStep
defaultValue={card.deadline}
onUpdate={handleDeadlineUpdate}
<EditDueDateStep
defaultValue={card.dueDate}
onUpdate={handleDueDateUpdate}
onBack={handleBack}
onClose={onClose}
/>
@@ -170,8 +170,8 @@ const ActionsStep = React.memo(
context: 'title',
})}
</Menu.Item>
<Menu.Item className={styles.menuItem} onClick={handleEditDeadlineClick}>
{t('action.editDeadline', {
<Menu.Item className={styles.menuItem} onClick={handleEditDueDateClick}>
{t('action.editDueDate', {
context: 'title',
})}
</Menu.Item>

View File

@@ -11,7 +11,7 @@ import EditName from './EditName';
import ActionsPopup from './ActionsPopup';
import User from '../User';
import Label from '../Label';
import Deadline from '../Deadline';
import DueDate from '../DueDate';
import Timer from '../Timer';
import styles from './Card.module.css';
@@ -21,7 +21,7 @@ const Card = React.memo(
id,
index,
name,
deadline,
dueDate,
timer,
isPersisted,
notificationsTotal,
@@ -74,7 +74,7 @@ const Card = React.memo(
)}
<div className={styles.name}>{name}</div>
{tasks.length > 0 && <Tasks items={tasks} />}
{(deadline || timer) && (
{(dueDate || timer) && (
<span className={styles.attachments}>
{notificationsTotal > 0 && (
<span
@@ -87,9 +87,9 @@ const Card = React.memo(
{notificationsTotal}
</span>
)}
{deadline && (
{dueDate && (
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
<Deadline value={deadline} size="tiny" />
<DueDate value={dueDate} size="tiny" />
</span>
)}
{timer && (
@@ -131,7 +131,7 @@ const Card = React.memo(
card={{
id,
name,
deadline,
dueDate,
timer,
isPersisted,
}}
@@ -171,7 +171,7 @@ Card.propTypes = {
id: PropTypes.number.isRequired,
index: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
deadline: PropTypes.instanceOf(Date),
dueDate: PropTypes.instanceOf(Date),
timer: PropTypes.object, // eslint-disable-line react/forbid-prop-types
isPersisted: PropTypes.bool.isRequired,
notificationsTotal: PropTypes.number.isRequired,
@@ -194,7 +194,7 @@ Card.propTypes = {
};
Card.defaultProps = {
deadline: undefined,
dueDate: undefined,
timer: undefined,
};