fix: merge conflicts resolved
This commit is contained in:
commit
473dfc7a5b
41 changed files with 317 additions and 219 deletions
|
|
@ -1,12 +1,13 @@
|
|||
import differenceInCalendarDays from "date-fns/differenceInCalendarDays";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
// helpers
|
||||
import { getDate } from "helpers/date-time.helper";
|
||||
import { orderArrayBy } from "helpers/array.helper";
|
||||
// types
|
||||
import { IGanttBlock } from "components/gantt-chart";
|
||||
// constants
|
||||
import { ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "constants/issue";
|
||||
import { STATE_GROUPS } from "constants/state";
|
||||
import { orderArrayBy } from "helpers/array.helper";
|
||||
import {
|
||||
TIssue,
|
||||
TIssueGroupByOptions,
|
||||
|
|
@ -157,7 +158,9 @@ export const shouldHighlightIssueDueDate = (
|
|||
// if the issue is completed or cancelled, don't highlight the due date
|
||||
if ([STATE_GROUPS.completed.key, STATE_GROUPS.cancelled.key].includes(stateGroup)) return false;
|
||||
|
||||
const parsedDate = new Date(date);
|
||||
const parsedDate = getDate(date);
|
||||
if (!parsedDate) return false;
|
||||
|
||||
const targetDateDistance = differenceInCalendarDays(parsedDate, new Date());
|
||||
|
||||
// if the issue is overdue, highlight the due date
|
||||
|
|
@ -168,8 +171,8 @@ export const renderIssueBlocksStructure = (blocks: TIssue[]): IGanttBlock[] =>
|
|||
data: block,
|
||||
id: block.id,
|
||||
sort_order: block.sort_order,
|
||||
start_date: block.start_date ? new Date(block.start_date) : null,
|
||||
target_date: block.target_date ? new Date(block.target_date) : null,
|
||||
start_date: getDate(block.start_date),
|
||||
target_date: getDate(block.target_date),
|
||||
}));
|
||||
|
||||
export function getChangedIssuefields(formData: Partial<TIssue>, dirtyFields: { [key: string]: boolean | undefined }) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue