{error}
} - - ); -}; - -export default TextareaField; diff --git a/src/components/general/TimeField.tsx b/src/components/general/TimeField.tsx deleted file mode 100644 index 7b7a9fea..00000000 --- a/src/components/general/TimeField.tsx +++ /dev/null @@ -1,85 +0,0 @@ -import { faAsterisk } from "@fortawesome/free-solid-svg-icons"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import clsx from "clsx"; -import { ChangeEventHandler, useId } from "react"; -import Flatpickr, { DateTimePickerProps } from "react-flatpickr"; - -interface PropTypes extends Omit{error}
} -+ {issue.tracker.name} #{issue.id} +
+{issue.subject}
+| {formatMessage({ id: "issues.issue.field.status" })}: | +{issue.status.name} | +
|---|---|
| {formatMessage({ id: "issues.issue.field.priority" })}: | +{issue.priority.name} | +
| {formatMessage({ id: "issues.issue.field.assignee" })}: | +{issue.assigned_to.name} | +
| {formatMessage({ id: "issues.issue.field.category" })}: | +{issue.category.name} | +
| {formatMessage({ id: "issues.issue.field.version" })}: | +{issue.fixed_version.name} | +
| {formatMessage({ id: "issues.issue.field.start-date" })}: | +{formatDate(parseISO(issue.start_date))} | +
| {formatMessage({ id: "issues.issue.field.due-date" })}: | +{formatDate(parseISO(issue.due_date))} | +
| {formatMessage({ id: "issues.issue.field.estimated-hours" })}: | +{formatHours(issue.estimated_hours)} | +
| {formatMessage({ id: "issues.issue.field.spent-time" })}: | +{formatHours(issue.spent_hours)} | +
| {field.name}: | +{value} | +
{formatMessage({ id: "issues.issue-tooltip.open-in-redmine" })}
+ + ); +}; diff --git a/src/components/issue/IssueSearch.tsx b/src/components/issue/IssueSearch.tsx new file mode 100644 index 00000000..640fe354 --- /dev/null +++ b/src/components/issue/IssueSearch.tsx @@ -0,0 +1,336 @@ +/* eslint-disable react/no-children-prop */ +import useRedmineIssuesSearch from "@/api/redmine/hooks/useRedmineIssuesSearch"; +import { Skeleton } from "@/components/ui/skeleton"; +import { useAppForm } from "@/hooks/useAppForm"; +import { useSuspenseStorage } from "@/hooks/useStorage"; +import { clsxm } from "@/utils/clsxm"; +import { ChevronRightIcon, CloudIcon, ListTreeIcon, MoreHorizontalIcon, SearchIcon, XIcon } from "lucide-react"; +import { createContext, PropsWithChildren, use, useEffect, useRef, useState } from "react"; +import { useIntl } from "react-intl"; +import { z } from "zod"; +import { TIssue, TReference } from "../../api/redmine/types"; +import useDebounce from "../../hooks/useDebounce"; +import useHotKey from "../../hooks/useHotkey"; +import { useSettings } from "../../provider/SettingsProvider"; +import { Badge } from "../ui/badge"; +import { Button } from "../ui/button"; +import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "../ui/dropdown-menu"; +import { FieldGroup, FieldLabel, FieldSet } from "../ui/field"; +import { Form, FormGrid } from "../ui/form"; +import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "../ui/input-group"; +import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover"; +import { Separator } from "../ui/separator"; + +const searchSettingsSchema = z.object({ + mode: z.enum(["local", "remote"]), + remoteSearchOptions: z.object({ + titlesOnly: z.boolean(), + openIssuesOnly: z.boolean(), + assignedToMe: z.boolean(), + }), +}); + +type SearchSettingsSchema = z.infer{project.name}
+ {project.description &&{project.description}
} +| {formatMessage({ id: "issues.project.field.identifier" })}: | +{project.identifier} | +
|---|---|
| {formatMessage({ id: "issues.project.field.homepage" })}: | +{project.homepage} | +
| {formatMessage({ id: "issues.project.field.is-public" })}: | +{project.is_public ? formatMessage({ id: "general.yes" }) : formatMessage({ id: "general.no" })} | +
| {field.name}: | +{value} | +
{formatMessage({ id: "issues.project-tooltip.open-in-redmine" })}
+ + ); +}; diff --git a/src/components/issues/SpentVsEstimatedTime.tsx b/src/components/issue/SpentVsEstimatedTime.tsx similarity index 95% rename from src/components/issues/SpentVsEstimatedTime.tsx rename to src/components/issue/SpentVsEstimatedTime.tsx index 696d89e2..7e61c026 100644 --- a/src/components/issues/SpentVsEstimatedTime.tsx +++ b/src/components/issue/SpentVsEstimatedTime.tsx @@ -1,6 +1,6 @@ import clsx from "clsx"; +import { TIssue } from "../../api/redmine/types"; import useFormatHours from "../../hooks/useFormatHours"; -import { TIssue } from "../../types/redmine"; import { roundHours } from "../../utils/date"; interface PropTypes extends React.ComponentProps<"span"> { diff --git a/src/components/issue/VersionTooltip.tsx b/src/components/issue/VersionTooltip.tsx new file mode 100644 index 00000000..b7e74233 --- /dev/null +++ b/src/components/issue/VersionTooltip.tsx @@ -0,0 +1,62 @@ +import { differenceInDays, parseISO, startOfDay } from "date-fns"; +import { ReactElement } from "react"; +import { useIntl } from "react-intl"; +import { TVersion } from "../../api/redmine/types"; +import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip"; + +type PropTypes = { + version: TVersion; +}; + +export const VersionTooltip = ({ children, ...props }: PropTypes & { children: ReactElement }) => { + return ( ++ {version.name} {version.due_date && <>({formatRelativeTime(differenceInDays(parseISO(version.due_date), startOfDay(new Date())), "days")})} +
+ {version.description &&{version.description}
} +| {formatMessage({ id: "issues.version.field.status" })}: | +{version.status} | +
|---|---|
| {formatMessage({ id: "issues.version.field.due-date" })}: | +{formatDate(parseISO(version.due_date))} | +
| {field.name}: | +{value} | +
{formatMessage({ id: "issues.version-tooltip.open-in-redmine" })}
+ + ); +}; diff --git a/src/components/issue/form/IssueForm.tsx b/src/components/issue/form/IssueForm.tsx new file mode 100644 index 00000000..d4bc3a5b --- /dev/null +++ b/src/components/issue/form/IssueForm.tsx @@ -0,0 +1,304 @@ +/* eslint-disable react/no-children-prop */ +import { useRedmineCurrentUser } from "@/api/redmine/hooks/useRedmineCurrentUser"; +import { useRedmineIssueAllowedStatuses } from "@/api/redmine/hooks/useRedmineIssueAllowedStatuses"; +import { useRedmineProject } from "@/api/redmine/hooks/useRedmineProject"; +import { DialogFooter } from "@/components/ui/dialog"; +import { Form, FormGrid } from "@/components/ui/form"; +import { parseISO } from "date-fns"; +import { useIntl } from "react-intl"; +import { z } from "zod"; +import { useRedmineIssuePriorities } from "../../../api/redmine/hooks/useRedmineIssuePriorities"; +import { useRedmineProjectIssueTrackers } from "../../../api/redmine/hooks/useRedmineProjectIssueTrackers"; +import { TIssue } from "../../../api/redmine/types"; +import { useAppForm } from "../../../hooks/useAppForm"; +import DismissibleWarning from "../../general/DismissableWarning"; +import AssigneeField from "./fields/AssigneeField"; +import CategoryField from "./fields/CategoryField"; +import DoneRatioField from "./fields/DoneRatioField"; +import PriorityField from "./fields/PriorityField"; +import VersionField from "./fields/VersionField"; + +type PropTypes = + | { + action: "create"; + projectId: number; + onSubmit: (data: TCreateOrEditIssueForm) => Promise{state.value}%
+{value}%
-
-
- {issue.tracker.name} #{issue.id} -
{issue.subject}
- -|
- |
- {issue.status.name} | -
|---|---|
|
- |
- {issue.priority.name} | -
|
- |
- {issue.assigned_to.name} | -
|
- |
- {issue.category.name} | -
|
- |
- {issue.fixed_version.name} | -
|
- |
- {formatDate(parseISO(issue.start_date))} | -
|
- |
- {formatDate(parseISO(issue.due_date))} | -
|
- |
- {formatHours(issue.estimated_hours)} | -
|
- |
- {formatHours(issue.spent_hours)} | -
-
-
-
- {version.name} {version.due_date && <>({formatRelativeTime(differenceInDays(parseISO(version.due_date), startOfDay(new Date())), "days")})} - {version.description &&
{version.description}
} - -|
- |
- {version.status} | -
|---|---|
|
- |
- {formatDate(parseISO(version.due_date))} | -
-
{formatHours(previewHours)}
+{formatHours(entry.hours)}
+ {entry.comments &&{entry.comments}
} +| {formatMessage({ id: "time.time-entry.field.project" })}: | +{entry.project.name} | +
|---|---|
| {formatMessage({ id: "time.time-entry.field.issue" })}: | +#{entry.issue.id} | +
| {formatMessage({ id: "time.time-entry.field.activity" })}: | +{entry.activity.name} | +
| {formatMessage({ id: "time.time-entry.field.hours" })}: | +{formatHours(entry.hours)} | +
| {field.name}: | +{value} | +
{formatHours(previewHours)}
-- {formatHours(entry.hours)} - {entry.comments &&
{entry.comments}
} - -|
- |
- {entry.project.name} | -
|---|---|
|
- |
- #{entry.issue.id} | -
|
- |
- {entry.activity.name} | -
|
- |
- {formatHours(entry.hours)} | -