github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
Dakshesh Jain 2022-12-08 20:35:27 +05:30
commit 9c33c3c87f
32 changed files with 939 additions and 1323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app/components/command-palette/index.tsx
View File

@ -278,15 +278,15 @@ const CommandPalette: React.FC = () => {
value={issue.id} value={issue.id}
/> />
<span <span
className={`h-1.5 w-1.5 block rounded-full`} className="flex-shrink-0 h-1.5 w-1.5 block rounded-full"
style={{ style={{
backgroundColor: issue.state_detail.color, backgroundColor: issue.state_detail.color,
}} }}
/> />
<span className="text-xs text-gray-500"> <span className="flex-shrink-0 text-xs text-gray-500">
{activeProject?.identifier}-{issue.sequence_id} {activeProject?.identifier}-{issue.sequence_id}
</span> </span>
{issue.name} <span>{issue.name}</span>
</div> </div>
{active && ( {active && (
<button <button
@ -297,10 +297,9 @@ const CommandPalette: React.FC = () => {
); );
handleCommandPaletteClose(); handleCommandPaletteClose();
}} }}
className="flex-shrink-0 text-gray-500"
> >
<span className="justify-self-end flex-none text-gray-500"> Jump to...
Jump to...
</span>
</button> </button>
)} )}
</> </>

2
apps/app/components/project/CreateProjectModal.tsx
View File

@ -44,7 +44,7 @@ const IsGuestCondition: React.FC<{
type: "error", type: "error",
message: "You don't have permission to create project.", message: "You don't have permission to create project.",
}); });
}, []); }, [setIsOpen, setToastAlert]);
return null; return null;
}; };

232
apps/app/components/project/issues/BoardView/SingleBoard.tsx
View File

@ -18,11 +18,10 @@ import {
ArrowsPointingOutIcon, ArrowsPointingOutIcon,
CalendarDaysIcon, CalendarDaysIcon,
EllipsisHorizontalIcon, EllipsisHorizontalIcon,
PencilIcon,
PlusIcon, PlusIcon,
} from "@heroicons/react/24/outline"; } from "@heroicons/react/24/outline";
import Image from "next/image"; import Image from "next/image";
import { divide } from "lodash"; import { getPriorityIcon } from "constants/global";
type Props = { type Props = {
selectedGroup: NestedKeyOf<IIssue> | null; selectedGroup: NestedKeyOf<IIssue> | null;
@ -181,133 +180,116 @@ const SingleBoard: React.FC<Props> = ({
ref={provided.innerRef} ref={provided.innerRef}
{...provided.draggableProps} {...provided.draggableProps}
> >
<div <div className="p-2 select-none" {...provided.dragHandleProps}>
className="px-2 py-3 space-y-1.5 select-none" {properties.key && (
{...provided.dragHandleProps} <div className="text-xs font-medium text-gray-500 mb-2">
> {childIssue.project_detail?.identifier}-{childIssue.sequence_id}
<span className="group-hover:text-theme text-sm break-all"> </div>
)}
<h5 className="group-hover:text-theme text-sm break-all mb-3">
{childIssue.name} {childIssue.name}
</span> </h5>
{Object.keys(properties).map( <div className="flex items-center gap-x-1 gap-y-2 text-xs flex-wrap">
(key) => {properties.priority && (
properties[key as keyof Properties] && <div
!Array.isArray(childIssue[key as keyof IIssue]) && ( className={`rounded shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 capitalize ${
<div childIssue.priority === "high"
key={key} ? "bg-red-100 text-red-600"
className={`${ : childIssue.priority === "medium"
key === "name" ? "bg-orange-100 text-orange-500"
? "text-sm mb-2" : childIssue.priority === "low"
: key === "description" ? "bg-green-100 text-green-500"
? "text-xs text-black" : "hidden"
: key === "priority" }`}
? `text-xs bg-gray-200 px-2 py-1 mt-2 flex items-center gap-x-1 rounded w-min whitespace-nowrap capitalize font-medium ${ >
childIssue.priority === "urgent" {/* {getPriorityIcon(childIssue.priority ?? "")} */}
? "bg-red-100 text-red-600" {childIssue.priority}
: childIssue.priority === "high" </div>
? "bg-orange-100 text-orange-600" )}
: childIssue.priority === "medium" {properties.state && (
? "bg-yellow-100 text-yellow-500" <div className="flex-shrink-0 flex items-center gap-1 hover:bg-gray-100 border rounded shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300">
: childIssue.priority === "low" <span
? "bg-green-100 text-green-500" className="flex-shrink-0 h-1.5 w-1.5 rounded-full"
: "hidden" style={{ backgroundColor: childIssue.state_detail.color }}
}` ></span>
: key === "target_date" {addSpaceIfCamelCase(childIssue.state_detail.name)}
? "text-xs bg-indigo-50 px-2 py-1 mt-2 flex items-center gap-x-1 rounded w-min whitespace-nowrap" </div>
: "text-sm text-gray-500" )}
} gap-1 relative {properties.start_date && (
`} <div className="flex-shrink-0 flex items-center gap-1 hover:bg-gray-100 border rounded shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300">
> <CalendarDaysIcon className="h-4 w-4" />
{key === "start_date" && childIssue.start_date !== null && ( {childIssue.start_date
<span className="text-sm"> ? renderShortNumericDateFormat(childIssue.start_date)
<CalendarDaysIcon className="h-4 w-4" /> : "N/A"}
{renderShortNumericDateFormat(childIssue.start_date)} - </div>
{childIssue.target_date )}
? renderShortNumericDateFormat(childIssue.target_date) {properties.target_date && (
: "None"} <div
</span> className={`flex-shrink-0 group flex items-center gap-1 hover:bg-gray-100 border rounded shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300 ${
)} childIssue.target_date === null
{key === "due_date" && ( ? ""
<> : childIssue.target_date < new Date().toISOString()
<span ? "text-red-600"
className={`flex items-center gap-x-1 group ${ : findHowManyDaysLeft(childIssue.target_date) <= 3 &&
childIssue.target_date === null "text-orange-400"
? "" }`}
: childIssue.target_date < new Date().toISOString() >
? "text-red-600" <CalendarDaysIcon className="h-4 w-4" />
: findHowManyDaysLeft(childIssue.target_date) <= {childIssue.target_date
3 && "text-orange-400" ? renderShortNumericDateFormat(childIssue.target_date)
: "N/A"}
{childIssue.target_date && (
<span className="absolute -top-full mb-2 left-4 border transition-opacity opacity-0 group-hover:opacity-100 bg-white rounded px-2 py-1">
{childIssue.target_date < new Date().toISOString()
? `Target date has passed by ${findHowManyDaysLeft(
childIssue.target_date
)} days`
: findHowManyDaysLeft(childIssue.target_date) <= 3
? `Target date is in ${findHowManyDaysLeft(
childIssue.target_date
)} days`
: "Target date"}
</span>
)}
</div>
)}
{properties.assignee && (
<div className="justify-end w-full flex items-center gap-1 text-xs">
{childIssue?.assignee_details?.length > 0 ? (
childIssue?.assignee_details?.map(
(assignee, index: number) => (
<div
key={index}
className={`relative z-[1] h-5 w-5 rounded-full ${
index !== 0 ? "-ml-2.5" : ""
}`} }`}
> >
<CalendarDaysIcon className="h-4 w-4" /> {assignee.avatar && assignee.avatar !== "" ? (
{childIssue.target_date <div className="h-5 w-5 border-2 bg-white border-white rounded-full">
? renderShortNumericDateFormat(childIssue.target_date) <Image
: "N/A"} src={assignee.avatar}
{childIssue.target_date && ( height="100%"
<span className="absolute -top-full mb-2 left-4 border transition-opacity opacity-0 group-hover:opacity-100 bg-white rounded px-2 py-1"> width="100%"
{childIssue.target_date < new Date().toISOString() className="rounded-full"
? `Due date has passed by ${findHowManyDaysLeft( alt={assignee.name}
childIssue.target_date />
)} days` </div>
: findHowManyDaysLeft(childIssue.target_date) <= 3 ) : (
? `Due date is in ${findHowManyDaysLeft( <div
childIssue.target_date className={`h-5 w-5 bg-gray-700 text-white border-2 border-white grid place-items-center rounded-full`}
)} days` >
: "Due date"} {assignee.first_name.charAt(0)}
</span> </div>
)} )}
</span> </div>
</> )
)} )
{key === "key" && ( ) : (
<span className="text-xs"> <span>No assignee.</span>
{childIssue.project_detail?.identifier}- )}
{childIssue.sequence_id} </div>
</span> )}
)} </div>
{key === "state" && (
<>{addSpaceIfCamelCase(childIssue["state_detail"].name)}</>
)}
{key === "priority" && <>{childIssue.priority}</>}
{/* {key === "description" && <>{childIssue.description}</>} */}
{key === "assignee" ? (
<div className="flex items-center gap-1 text-xs">
{childIssue?.assignee_details?.length > 0 ? (
childIssue?.assignee_details?.map(
(assignee, index: number) => (
<div
key={index}
className={`relative z-[1] h-5 w-5 rounded-full ${
index !== 0 ? "-ml-2.5" : ""
}`}
>
{assignee.avatar && assignee.avatar !== "" ? (
<div className="h-5 w-5 border-2 bg-white border-white rounded-full">
<Image
src={assignee.avatar}
height="100%"
width="100%"
className="rounded-full"
alt={assignee.name}
/>
</div>
) : (
<div
className={`h-5 w-5 bg-gray-700 text-white border-2 border-white grid place-items-center rounded-full`}
>
{assignee.first_name.charAt(0)}
</div>
)}
</div>
)
)
) : (
<span>No assignee.</span>
)}
</div>
) : null}
</div>
)
)}
</div> </div>
</a> </a>
</Link> </Link>

2
apps/app/components/project/issues/CreateUpdateIssueModal/SelectParentIssue.tsx
View File

@ -14,7 +14,7 @@ type Props = {
control: Control<IIssue, any>; control: Control<IIssue, any>;
isOpen: boolean; isOpen: boolean;
setIsOpen: React.Dispatch<React.SetStateAction<boolean>>; setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
issues: IssueResponse | undefined; issues: IIssue[];
}; };
const SelectParent: React.FC<Props> = ({ control, isOpen, setIsOpen, issues }) => { const SelectParent: React.FC<Props> = ({ control, isOpen, setIsOpen, issues }) => {

22
apps/app/components/project/issues/CreateUpdateIssueModal/index.tsx
View File

@ -392,16 +392,16 @@ const CreateUpdateIssuesModal: React.FC<Props> = ({
/> */} /> */}
</div> </div>
<div> <div>
<Input {/* <Input
id="target_date" id="target_date"
label="Due Date" label="Target Date"
name="target_date" name="target_date"
type="date" type="date"
placeholder="Enter name" placeholder="Enter name"
autoComplete="off" autoComplete="off"
error={errors.target_date} error={errors.target_date}
register={register} register={register}
/> /> */}
</div> </div>
<div className="flex items-center flex-wrap gap-2"> <div className="flex items-center flex-wrap gap-2">
<SelectState control={control} setIsOpen={setIsStateModalOpen} /> <SelectState control={control} setIsOpen={setIsStateModalOpen} />
@ -409,11 +409,25 @@ const CreateUpdateIssuesModal: React.FC<Props> = ({
<SelectPriority control={control} /> <SelectPriority control={control} />
<SelectAssignee control={control} /> <SelectAssignee control={control} />
<SelectLabels control={control} /> <SelectLabels control={control} />
<Controller
control={control}
name="target_date"
render={({ field: { value, onChange } }) => (
<input
type="date"
value={value ?? ""}
onChange={(e: any) => {
onChange(e.target.value);
}}
className="hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300"
/>
)}
/>
<SelectParent <SelectParent
control={control} control={control}
isOpen={parentIssueListModalOpen} isOpen={parentIssueListModalOpen}
setIsOpen={setParentIssueListModalOpen} setIsOpen={setParentIssueListModalOpen}
issues={issues} issues={issues?.results ?? []}
/> />
<Menu as="div" className="relative inline-block"> <Menu as="div" className="relative inline-block">
<Menu.Button className="grid place-items-center p-1 hover:bg-gray-100 border rounded-md shadow-sm cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm duration-300"> <Menu.Button className="grid place-items-center p-1 hover:bg-gray-100 border rounded-md shadow-sm cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm duration-300">

77
apps/app/components/project/issues/IssuesListModal.tsx
View File

@ -2,35 +2,49 @@
import React, { useState } from "react"; import React, { useState } from "react";
// headless ui // headless ui
import { Combobox, Dialog, Transition } from "@headlessui/react"; import { Combobox, Dialog, Transition } from "@headlessui/react";
// ui
import { Button } from "ui";
// icons // icons
import { MagnifyingGlassIcon, RectangleStackIcon } from "@heroicons/react/24/outline"; import { MagnifyingGlassIcon, RectangleStackIcon } from "@heroicons/react/24/outline";
// types // types
import { IIssue, IssueResponse } from "types"; import { IIssue } from "types";
import { classNames } from "constants/common"; import { classNames } from "constants/common";
import useUser from "lib/hooks/useUser"; import useUser from "lib/hooks/useUser";
type Props = { type Props = {
isOpen: boolean; isOpen: boolean;
handleClose: () => void; handleClose: () => void;
value?: any;
onChange: (...event: any[]) => void; onChange: (...event: any[]) => void;
issues: IssueResponse | undefined; issues: IIssue[];
title?: string;
multiple?: boolean;
}; };
const IssuesListModal: React.FC<Props> = ({ isOpen, handleClose: onClose, onChange, issues }) => { const IssuesListModal: React.FC<Props> = ({
isOpen,
handleClose: onClose,
value,
onChange,
issues,
title = "Issues",
multiple = false,
}) => {
const [query, setQuery] = useState(""); const [query, setQuery] = useState("");
const [values, setValues] = useState<string[]>([]);
const { activeProject } = useUser(); const { activeProject } = useUser();
const handleClose = () => { const handleClose = () => {
onClose(); onClose();
setQuery(""); setQuery("");
setValues([]);
}; };
const filteredIssues: IIssue[] = const filteredIssues: IIssue[] =
query === "" query === ""
? issues?.results ?? [] ? issues ?? []
: issues?.results.filter((issue) => issue.name.toLowerCase().includes(query.toLowerCase())) ?? : issues?.filter((issue) => issue.name.toLowerCase().includes(query.toLowerCase())) ?? [];
[];
return ( return (
<> <>
@ -59,7 +73,14 @@ const IssuesListModal: React.FC<Props> = ({ isOpen, handleClose: onClose, onChan
leaveTo="opacity-0 scale-95" leaveTo="opacity-0 scale-95"
> >
<Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-white bg-opacity-80 shadow-2xl ring-1 ring-black ring-opacity-5 backdrop-blur backdrop-filter transition-all"> <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-white bg-opacity-80 shadow-2xl ring-1 ring-black ring-opacity-5 backdrop-blur backdrop-filter transition-all">
<Combobox onChange={onChange}> <Combobox
value={value}
onChange={(val) => {
if (multiple) setValues(val);
else onChange(val);
}}
// multiple={multiple}
>
<div className="relative m-1"> <div className="relative m-1">
<MagnifyingGlassIcon <MagnifyingGlassIcon
className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-gray-900 text-opacity-40" className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-gray-900 text-opacity-40"
@ -80,7 +101,7 @@ const IssuesListModal: React.FC<Props> = ({ isOpen, handleClose: onClose, onChan
<li className="p-2"> <li className="p-2">
{query === "" && ( {query === "" && (
<h2 className="mt-4 mb-2 px-3 text-xs font-semibold text-gray-900"> <h2 className="mt-4 mb-2 px-3 text-xs font-semibold text-gray-900">
Issues {title}
</h2> </h2>
)} )}
<ul className="text-sm text-gray-700"> <ul className="text-sm text-gray-700">
@ -95,20 +116,26 @@ const IssuesListModal: React.FC<Props> = ({ isOpen, handleClose: onClose, onChan
) )
} }
onClick={() => { onClick={() => {
// setIssueIdFromList(issue.id); if (!multiple) handleClose();
handleClose();
}} }}
> >
<span {({ selected }) => (
className={`h-1.5 w-1.5 block rounded-full`} <>
style={{ {multiple ? (
backgroundColor: issue.state_detail.color, <input type="checkbox" checked={selected} readOnly />
}} ) : null}
/> <span
<span className="text-xs text-gray-500"> className="flex-shrink-0 h-1.5 w-1.5 block rounded-full"
{activeProject?.identifier}-{issue.sequence_id} style={{
</span>{" "} backgroundColor: issue.state_detail.color,
{issue.name} }}
/>
<span className="flex-shrink-0 text-xs text-gray-500">
{activeProject?.identifier}-{issue.sequence_id}
</span>{" "}
{issue.name}
</>
)}
</Combobox.Option> </Combobox.Option>
))} ))}
</ul> </ul>
@ -128,6 +155,16 @@ const IssuesListModal: React.FC<Props> = ({ isOpen, handleClose: onClose, onChan
</div> </div>
)} )}
</Combobox> </Combobox>
{multiple ? (
<div className="flex justify-end items-center gap-2 p-3">
<Button type="button" theme="danger" size="sm" onClick={handleClose}>
Cancel
</Button>
<Button type="button" size="sm" onClick={() => onChange(values)}>
Add to Cycle
</Button>
</div>
) : null}
</Dialog.Panel> </Dialog.Panel>
</Transition.Child> </Transition.Child>
</div> </div>

691
apps/app/components/project/issues/ListView/index.tsx
View File

@ -1,5 +1,5 @@
// react // react
import React, { useEffect, useState } from "react"; import React, { useState } from "react";
// next // next
import Link from "next/link"; import Link from "next/link";
import Image from "next/image"; import Image from "next/image";
@ -10,7 +10,7 @@ import { Listbox, Transition } from "@headlessui/react";
// icons // icons
import { PencilIcon, TrashIcon } from "@heroicons/react/24/outline"; import { PencilIcon, TrashIcon } from "@heroicons/react/24/outline";
// types // types
import { IIssue, IssueResponse, IState, NestedKeyOf, Properties, WorkspaceMember } from "types"; import { IIssue, IssueResponse, NestedKeyOf, Properties, WorkspaceMember } from "types";
// hooks // hooks
import useUser from "lib/hooks/useUser"; import useUser from "lib/hooks/useUser";
// fetch keys // fetch keys
@ -20,13 +20,7 @@ import { PROJECT_ISSUES_LIST, WORKSPACE_MEMBERS } from "constants/fetch-keys";
import issuesServices from "lib/services/issues.services"; import issuesServices from "lib/services/issues.services";
import workspaceService from "lib/services/workspace.service"; import workspaceService from "lib/services/workspace.service";
// constants // constants
import { import { addSpaceIfCamelCase, classNames, renderShortNumericDateFormat } from "constants/common";
addSpaceIfCamelCase,
classNames,
renderShortNumericDateFormat,
replaceUnderscoreIfSnakeCase,
} from "constants/common";
import IssuePreviewModal from "../PreviewModal";
// types // types
type Props = { type Props = {
@ -44,9 +38,6 @@ const ListView: React.FC<Props> = ({
setSelectedIssue, setSelectedIssue,
handleDeleteIssue, handleDeleteIssue,
}) => { }) => {
const [issuePreviewModal, setIssuePreviewModal] = useState(false);
const [previewModalIssueId, setPreviewModalIssueId] = useState<string | null>(null);
const { activeWorkspace, activeProject, states } = useUser(); const { activeWorkspace, activeProject, states } = useUser();
const partialUpdateIssue = (formData: Partial<IIssue>, issueId: string) => { const partialUpdateIssue = (formData: Partial<IIssue>, issueId: string) => {
@ -74,368 +65,348 @@ const ListView: React.FC<Props> = ({
activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
); );
const handleHover = (issueId: string) => {
document.addEventListener("keydown", (e) => {
// if (e.code === "Space") {
// e.preventDefault();
// setPreviewModalIssueId(issueId);
// setIssuePreviewModal(true);
// }
});
};
return ( return (
<div className="mt-4 flex flex-col"> <div className="mt-4 flex flex-col space-y-5">
<IssuePreviewModal {Object.keys(groupedByIssues).map((singleGroup) => (
isOpen={issuePreviewModal} <div key={singleGroup} className="overflow-x-auto">
setIsOpen={setIssuePreviewModal} <div className="inline-block min-w-full p-0.5 align-middle">
issueId={previewModalIssueId} <div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
/> <table className="min-w-full">
<div className="overflow-x-auto"> {selectedGroup !== null ? (
<div className="inline-block min-w-full p-0.5 align-middle"> <thead className="bg-gray-100">
<div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg"> <tr>
<table className="min-w-full"> <th
<thead className="bg-gray-100"> colSpan={14}
<tr> scope="col"
<th className="px-3 py-3.5 text-left uppercase text-sm font-semibold text-gray-900"
scope="col" >
className="px-3 py-3.5 text-left uppercase text-sm font-semibold text-gray-900" <div className="flex items-center gap-2">
> {selectedGroup === "state_detail.name" ? (
NAME <span
</th> className="flex-shrink-0 h-1.5 w-1.5 block rounded-full"
{Object.keys(properties).map( style={{
(key) => backgroundColor: states?.find((s) => s.name === singleGroup)?.color,
properties[key as keyof Properties] && ( }}
<th ></span>
key={key} ) : null}
scope="col"
className="px-3 py-3.5 text-left uppercase text-sm font-semibold text-gray-900"
>
{replaceUnderscoreIfSnakeCase(key)}
</th>
)
)}
<th
scope="col"
className="px-3 py-3.5 text-right text-sm font-semibold text-gray-900"
>
ACTIONS
</th>
</tr>
</thead>
<tbody className="bg-white">
{Object.keys(groupedByIssues).map((singleGroup) => (
<React.Fragment key={singleGroup}>
{selectedGroup !== null ? (
<tr className="border-t border-gray-200">
<th
colSpan={14}
scope="colgroup"
className="bg-gray-50 px-4 py-2 text-left font-medium text-gray-900 capitalize"
>
{singleGroup === null || singleGroup === "null" {singleGroup === null || singleGroup === "null"
? selectedGroup === "priority" && "No priority" ? selectedGroup === "priority" && "No priority"
: addSpaceIfCamelCase(singleGroup)} : addSpaceIfCamelCase(singleGroup)}
<span className="ml-2 text-gray-500 font-normal text-sm"> <span className="ml-2 text-gray-500 font-normal text-sm">
{groupedByIssues[singleGroup as keyof IIssue].length} {groupedByIssues[singleGroup as keyof IIssue].length}
</span> </span>
</th> </div>
</tr> </th>
) : null} </tr>
{groupedByIssues[singleGroup].length > 0 </thead>
? groupedByIssues[singleGroup].map((issue: IIssue, index: number) => { ) : (
const assignees = [ <thead className="bg-gray-100">
...(issue?.assignees_list ?? []), <tr>
...(issue?.assignees ?? []), <th
]?.map( colSpan={14}
(assignee) => scope="col"
people?.find((p) => p.member.id === assignee)?.member.email className="px-3 py-3.5 text-left uppercase text-sm font-semibold text-gray-900"
); >
ALL ISSUES
<span className="ml-2 text-gray-500 font-normal text-sm">
{groupedByIssues[singleGroup as keyof IIssue].length}
</span>
</th>
</tr>
</thead>
)}
<tbody className="bg-white">
{groupedByIssues[singleGroup].length > 0
? groupedByIssues[singleGroup].map((issue: IIssue, index: number) => {
const assignees = [
...(issue?.assignees_list ?? []),
...(issue?.assignees ?? []),
]?.map(
(assignee) => people?.find((p) => p.member.id === assignee)?.member.email
);
return ( return (
<tr <tr
key={issue.id} key={issue.id}
className={classNames( className={classNames(
index === 0 ? "border-gray-300" : "border-gray-200", index === 0 ? "border-gray-300" : "border-gray-200",
"border-t" "border-t"
)} )}
onMouseEnter={() => handleHover(issue.id)} >
> <td className="px-3 py-4 text-sm font-medium text-gray-900 w-[15rem]">
<td className="px-3 py-4 text-sm font-medium text-gray-900 w-[15rem]"> <Link href={`/projects/${issue.project}/issues/${issue.id}`}>
<Link href={`/projects/${issue.project}/issues/${issue.id}`}> <a className="hover:text-theme duration-300">{issue.name}</a>
<a className="hover:text-theme duration-300">{issue.name}</a> </Link>
</Link> </td>
</td> {Object.keys(properties).map(
{Object.keys(properties).map( (key) =>
(key) => properties[key as keyof Properties] && (
properties[key as keyof Properties] && ( <React.Fragment key={key}>
<React.Fragment key={key}> {(key as keyof Properties) === "key" ? (
{(key as keyof Properties) === "key" ? ( <td className="px-3 py-4 font-medium text-gray-900 text-xs whitespace-nowrap">
<td className="px-3 py-4 font-medium text-gray-900 text-xs whitespace-nowrap"> {activeProject?.identifier}-{issue.sequence_id}
{activeProject?.identifier}-{issue.sequence_id} </td>
</td> ) : (key as keyof Properties) === "priority" ? (
) : (key as keyof Properties) === "priority" ? ( <td className="px-3 py-4 text-sm font-medium text-gray-900 relative">
<td className="px-3 py-4 text-sm font-medium text-gray-900 relative"> <Listbox
<Listbox as="div"
as="div" value={issue.priority}
value={issue.priority} onChange={(data: string) => {
onChange={(data: string) => { partialUpdateIssue({ priority: data }, issue.id);
partialUpdateIssue({ priority: data }, issue.id); }}
}} className="flex-shrink-0"
className="flex-shrink-0" >
> {({ open }) => (
{({ open }) => ( <>
<> <div className="">
<div className=""> <Listbox.Button className="inline-flex items-center whitespace-nowrap rounded-full bg-gray-50 py-1 px-0.5 text-xs font-medium text-gray-500 hover:bg-gray-100 border">
<Listbox.Button className="inline-flex items-center whitespace-nowrap rounded-full bg-gray-50 py-1 px-0.5 text-xs font-medium text-gray-500 hover:bg-gray-100 border"> <span
<span className={classNames(
className={classNames( issue.priority ? "" : "text-gray-900",
issue.priority ? "" : "text-gray-900", "hidden truncate capitalize sm:block w-16"
"hidden truncate capitalize sm:block w-16" )}
)}
>
{issue.priority ?? "None"}
</span>
</Listbox.Button>
<Transition
show={open}
as={React.Fragment}
leave="transition ease-in duration-100"
leaveFrom="opacity-100"
leaveTo="opacity-0"
> >
<Listbox.Options className="absolute z-10 mt-1 bg-white shadow-lg max-h-28 rounded-md py-1 text-xs ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none"> {issue.priority ?? "None"}
{PRIORITIES?.map((priority) => ( </span>
<Listbox.Option </Listbox.Button>
key={priority}
className={({ active }) => <Transition
classNames( show={open}
active ? "bg-indigo-50" : "bg-white", as={React.Fragment}
"cursor-pointer capitalize select-none px-3 py-2" leave="transition ease-in duration-100"
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<Listbox.Options className="absolute z-10 mt-1 bg-white shadow-lg max-h-28 rounded-md py-1 text-xs ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none">
{PRIORITIES?.map((priority) => (
<Listbox.Option
key={priority}
className={({ active }) =>
classNames(
active ? "bg-indigo-50" : "bg-white",
"cursor-pointer capitalize select-none px-3 py-2"
)
}
value={priority}
>
{priority}
</Listbox.Option>
))}
</Listbox.Options>
</Transition>
</div>
</>
)}
</Listbox>
</td>
) : (key as keyof Properties) === "assignee" ? (
<td className="px-3 py-4 text-sm font-medium text-gray-900 relative">
<Listbox
as="div"
value={issue.assignees}
onChange={(data: any) => {
const newData = issue.assignees ?? [];
if (newData.includes(data)) {
newData.splice(newData.indexOf(data), 1);
} else {
newData.push(data);
}
partialUpdateIssue(
{ assignees_list: newData },
issue.id
);
}}
className="flex-shrink-0"
>
{({ open }) => (
<>
<div>
<Listbox.Button className="rounded-full bg-gray-50 px-5 py-1 text-xs text-gray-500 hover:bg-gray-100 border">
{() => {
if (assignees.length > 0)
return (
<>
{assignees.map((assignee, index) => (
<div
key={index}
className={
"hidden truncate sm:block text-left"
}
>
{assignee}
</div>
))}
</>
);
else return <span>None</span>;
}}
</Listbox.Button>
<Transition
show={open}
as={React.Fragment}
leave="transition ease-in duration-100"
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<Listbox.Options className="absolute z-10 mt-1 bg-white shadow-lg max-h-28 rounded-md py-1 text-xs ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none">
{people?.map((person) => (
<Listbox.Option
key={person.id}
className={({ active }) =>
classNames(
active ? "bg-indigo-50" : "bg-white",
"cursor-pointer select-none px-3 py-2"
)
}
value={person.member.id}
>
<div
className={`flex items-center gap-x-1 ${
assignees.includes(
person.member.first_name
) )
} ? "font-medium"
value={priority} : "font-normal"
}`}
> >
{priority} {person.member.avatar &&
</Listbox.Option> person.member.avatar !== "" ? (
))} <div className="relative w-4 h-4">
</Listbox.Options> <Image
</Transition> src={person.member.avatar}
</div> alt="avatar"
</> className="rounded-full"
)} layout="fill"
</Listbox> objectFit="cover"
</td> />
) : (key as keyof Properties) === "assignee" ? ( </div>
<td className="px-3 py-4 text-sm font-medium text-gray-900 relative"> ) : (
<Listbox <p>
as="div" {person.member.first_name.charAt(0)}
value={issue.assignees} </p>
onChange={(data: any) => { )}
const newData = issue.assignees ?? []; <p>{person.member.first_name}</p>
if (newData.includes(data)) { </div>
newData.splice(newData.indexOf(data), 1); </Listbox.Option>
} else { ))}
newData.push(data); </Listbox.Options>
} </Transition>
partialUpdateIssue( </div>
{ assignees_list: newData }, </>
issue.id )}
); </Listbox>
}} </td>
className="flex-shrink-0" ) : (key as keyof Properties) === "state" ? (
> <td className="px-3 py-4 text-sm font-medium text-gray-900 relative">
{({ open }) => ( <Listbox
<> as="div"
<div> value={issue.state}
<Listbox.Button className="rounded-full bg-gray-50 px-5 py-1 text-xs text-gray-500 hover:bg-gray-100 border"> onChange={(data: string) => {
{() => { partialUpdateIssue({ state: data }, issue.id);
if (assignees.length > 0) }}
return ( className="flex-shrink-0"
<> >
{assignees.map((assignee, index) => ( {({ open }) => (
<div <>
key={index} <div>
className={ <Listbox.Button
"hidden truncate sm:block text-left" className="inline-flex items-center whitespace-nowrap rounded-full px-2 py-1 text-xs font-medium text-gray-500 hover:bg-gray-100 border"
} style={{
> border: `2px solid ${issue.state_detail.color}`,
{assignee} backgroundColor: `${issue.state_detail.color}20`,
</div> }}
))} >
</> <span
); className={classNames(
else return <span>None</span>; issue.state ? "" : "text-gray-900",
}} "hidden capitalize sm:block w-16"
</Listbox.Button> )}
>
{addSpaceIfCamelCase(issue.state_detail.name)}
</span>
</Listbox.Button>
<Transition <Transition
show={open} show={open}
as={React.Fragment} as={React.Fragment}
leave="transition ease-in duration-100" leave="transition ease-in duration-100"
leaveFrom="opacity-100" leaveFrom="opacity-100"
leaveTo="opacity-0" leaveTo="opacity-0"
> >
<Listbox.Options className="absolute z-10 mt-1 bg-white shadow-lg max-h-28 rounded-md py-1 text-xs ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none"> <Listbox.Options className="absolute z-10 mt-1 bg-white shadow-lg max-h-28 rounded-md py-1 text-xs ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none">
{people?.map((person) => ( {states?.map((state) => (
<Listbox.Option <Listbox.Option
key={person.id} key={state.id}
className={({ active }) => className={({ active }) =>
classNames( classNames(
active ? "bg-indigo-50" : "bg-white", active ? "bg-indigo-50" : "bg-white",
"cursor-pointer select-none px-3 py-2" "cursor-pointer select-none px-3 py-2"
) )
} }
value={person.member.id} value={state.id}
> >
<div {addSpaceIfCamelCase(state.name)}
className={`flex items-center gap-x-1 ${ </Listbox.Option>
assignees.includes( ))}
person.member.first_name </Listbox.Options>
) </Transition>
? "font-medium" </div>
: "font-normal" </>
}`} )}
> </Listbox>
{person.member.avatar && </td>
person.member.avatar !== "" ? ( ) : (key as keyof Properties) === "target_date" ? (
<div className="relative w-4 h-4"> <td className="px-3 py-4 text-sm font-medium text-gray-900 whitespace-nowrap">
<Image {issue.target_date
src={person.member.avatar} ? renderShortNumericDateFormat(issue.target_date)
alt="avatar" : "-"}
className="rounded-full" </td>
layout="fill" ) : (
objectFit="cover" <td className="px-3 py-4 text-sm font-medium text-gray-900 relative capitalize">
/> {issue[key as keyof IIssue] ??
</div> (issue[key as keyof IIssue] as any)?.name ??
) : ( "None"}
<p> </td>
{person.member.first_name.charAt(0)} )}
</p> </React.Fragment>
)} )
<p>{person.member.first_name}</p> )}
</div> <td className="px-3">
</Listbox.Option> <div className="flex justify-end items-center gap-2">
))} <button
</Listbox.Options> type="button"
</Transition> className="flex items-center bg-blue-100 text-blue-600 hover:bg-blue-200 duration-300 font-medium px-2 py-1 rounded-md text-sm outline-none"
</div> onClick={() => {
</> setSelectedIssue({
)} ...issue,
</Listbox> actionType: "edit",
</td> });
) : (key as keyof Properties) === "state" ? ( }}
<td className="px-3 py-4 text-sm font-medium text-gray-900 relative"> >
<Listbox <PencilIcon className="h-3 w-3" />
as="div" </button>
value={issue.state} <button
onChange={(data: string) => { type="button"
partialUpdateIssue({ state: data }, issue.id); className="flex items-center bg-red-100 text-red-600 hover:bg-red-200 duration-300 font-medium px-2 py-1 rounded-md text-sm outline-none"
}} onClick={() => {
className="flex-shrink-0" handleDeleteIssue(issue.id);
> }}
{({ open }) => ( >
<> <TrashIcon className="h-3 w-3" />
<div> </button>
<Listbox.Button </div>
className="inline-flex items-center whitespace-nowrap rounded-full px-2 py-1 text-xs font-medium text-gray-500 hover:bg-gray-100 border" </td>
style={{ </tr>
border: `2px solid ${issue.state_detail.color}`, );
backgroundColor: `${issue.state_detail.color}20`, })
}} : null}
> </tbody>
<span </table>
className={classNames( </div>
issue.state ? "" : "text-gray-900",
"hidden capitalize sm:block w-16"
)}
>
{addSpaceIfCamelCase(issue.state_detail.name)}
</span>
</Listbox.Button>
<Transition
show={open}
as={React.Fragment}
leave="transition ease-in duration-100"
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<Listbox.Options className="absolute z-10 mt-1 bg-white shadow-lg max-h-28 rounded-md py-1 text-xs ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none">
{states?.map((state) => (
<Listbox.Option
key={state.id}
className={({ active }) =>
classNames(
active ? "bg-indigo-50" : "bg-white",
"cursor-pointer select-none px-3 py-2"
)
}
value={state.id}
>
{addSpaceIfCamelCase(state.name)}
</Listbox.Option>
))}
</Listbox.Options>
</Transition>
</div>
</>
)}
</Listbox>
</td>
) : (key as keyof Properties) === "due_date" ? (
<td className="px-3 py-4 text-sm font-medium text-gray-900 whitespace-nowrap">
{issue.target_date
? renderShortNumericDateFormat(issue.target_date)
: "-"}
</td>
) : (
<td className="px-3 py-4 text-sm font-medium text-gray-900 relative capitalize">
{issue[key as keyof IIssue] ??
(issue[key as keyof IIssue] as any)?.name ??
"None"}
</td>
)}
</React.Fragment>
)
)}
<td className="px-3">
<div className="flex justify-end items-center gap-2">
<button
type="button"
className="flex items-center bg-blue-100 text-blue-600 hover:bg-blue-200 duration-300 font-medium px-2 py-1 rounded-md text-sm outline-none"
onClick={() => {
setSelectedIssue({
...issue,
actionType: "edit",
});
}}
>
<PencilIcon className="h-3 w-3" />
</button>
<button
type="button"
className="flex items-center bg-red-100 text-red-600 hover:bg-red-200 duration-300 font-medium px-2 py-1 rounded-md text-sm outline-none"
onClick={() => {
handleDeleteIssue(issue.id);
}}
>
<TrashIcon className="h-3 w-3" />
</button>
</div>
</td>
</tr>
);
})
: null}
</React.Fragment>
))}
</tbody>
</table>
</div> </div>
</div> </div>
</div> ))}
</div> </div>
); );
}; };

138
apps/app/components/project/issues/PreviewModal/index.tsx
View File

@ -1,138 +0,0 @@
// next
import { useRouter } from "next/router";
// react
import { Fragment } from "react";
// headless ui
import { Dialog, Transition } from "@headlessui/react";
// hooks
import useUser from "lib/hooks/useUser";
// services
import issuesServices from "lib/services/issues.services";
import projectService from "lib/services/project.service";
// swr
import useSWR from "swr";
// types
import { IIssue, ProjectMember } from "types";
// constants
import { PROJECT_ISSUES_DETAILS, PROJECT_MEMBERS } from "constants/fetch-keys";
import { Button } from "ui";
import { ChartBarIcon, Squares2X2Icon, TagIcon, UserIcon } from "@heroicons/react/24/outline";
type Props = {
isOpen: boolean;
setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
issueId: string | null;
};
const IssuePreviewModal = ({ isOpen, setIsOpen, issueId }: Props) => {
const closeModal = () => {
setIsOpen(false);
};
const { activeWorkspace, activeProject } = useUser();
const router = useRouter();
const { data: issueDetails } = useSWR<IIssue | null>(
activeWorkspace && activeProject && issueId ? PROJECT_ISSUES_DETAILS(issueId) : null,
activeWorkspace && activeProject && issueId
? () => issuesServices.getIssue(activeWorkspace.slug, activeProject.id, issueId)
: null
);
const { data: users } = useSWR<ProjectMember[] | null>(
activeWorkspace && activeProject ? PROJECT_MEMBERS(activeProject.id) : null,
activeWorkspace && activeProject
? () => projectService.projectMembers(activeWorkspace.slug, activeProject.id)
: null
);
return (
<>
<Transition.Root appear show={isOpen} as={Fragment}>
<Dialog as="div" className="relative z-10" onClose={closeModal}>
<Transition.Child
as={Fragment}
enter="ease-out duration-300"
enterFrom="opacity-0"
enterTo="opacity-100"
leave="ease-in duration-200"
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<div className="fixed inset-0 bg-black bg-opacity-25" />
</Transition.Child>
<div className="fixed inset-0 overflow-y-auto">
<div className="flex min-h-full items-center justify-center p-4 text-center">
<Transition.Child
as={Fragment}
enter="ease-out duration-300"
enterFrom="opacity-0 scale-95"
enterTo="opacity-100 scale-100"
leave="ease-in duration-200"
leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"
>
<Dialog.Panel className="w-full max-w-3xl transform overflow-hidden rounded-2xl bg-white p-6 text-left align-middle shadow-xl transition-all">
<Dialog.Title
as="h3"
className="text-xl flex flex-col gap-1 font-medium leading-6 text-gray-900"
>
{issueDetails?.project_detail.identifier}-{issueDetails?.sequence_id}{" "}
{issueDetails?.name}
<span className="text-sm text-gray-500 font-normal">
Created by{" "}
{users?.find((u) => u.id === issueDetails?.created_by)?.member.first_name}
</span>
</Dialog.Title>
<div className="mt-4">
<p className="text-sm text-gray-500">{issueDetails?.description}</p>
</div>
<div className="mt-4 flex flex-wrap gap-2">
<span className="flex items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 sm:text-sm">
<Squares2X2Icon className="h-3 w-3" />
{issueDetails?.state_detail.name}
</span>
<span className="flex items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 capitalize sm:text-sm">
<ChartBarIcon className="h-3 w-3" />
{issueDetails?.priority}
</span>
<span className="flex items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 capitalize sm:text-sm">
<TagIcon className="h-3 w-3" />
{issueDetails?.label_details && issueDetails.label_details.length > 0
? issueDetails.label_details.map((label) => (
<span key={label.id}>{label.name}</span>
))
: "None"}
</span>
<span className="flex items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 capitalize sm:text-sm">
<UserIcon className="h-3 w-3" />
{issueDetails?.assignee_details && issueDetails.assignee_details.length > 0
? issueDetails.assignee_details.map((assignee) => (
<span key={assignee.id}>{assignee.first_name}</span>
))
: "None"}
</span>
</div>
<div className="mt-4 flex gap-3 justify-end">
<Button
onClick={() =>
router.push(`/projects/${activeProject?.id}/issues/${issueId}`)
}
>
View in Detail
</Button>
<Button onClick={closeModal}>Close</Button>
</div>
</Dialog.Panel>
</Transition.Child>
</div>
</div>
</Dialog>
</Transition.Root>
</>
);
};
export default IssuePreviewModal;

174
apps/app/components/project/issues/issue-detail/IssueDetailSidebar.tsx
View File

@ -4,13 +4,14 @@ import useSWR from "swr";
// headless ui // headless ui
import { Listbox, Transition } from "@headlessui/react"; import { Listbox, Transition } from "@headlessui/react";
// react hook form // react hook form
import { useForm, Controller } from "react-hook-form"; import { useForm, Controller, UseFormWatch } from "react-hook-form";
// services // services
import stateServices from "lib/services/state.services"; import stateServices from "lib/services/state.services";
import issuesServices from "lib/services/issues.services"; import issuesServices from "lib/services/issues.services";
import workspaceService from "lib/services/workspace.service"; import workspaceService from "lib/services/workspace.service";
// hooks // hooks
import useUser from "lib/hooks/useUser"; import useUser from "lib/hooks/useUser";
import useToast from "lib/hooks/useToast";
// fetching keys // fetching keys
import { import {
PROJECT_ISSUES_LIST, PROJECT_ISSUES_LIST,
@ -20,6 +21,7 @@ import {
} from "constants/fetch-keys"; } from "constants/fetch-keys";
// commons // commons
import { classNames, copyTextToClipboard } from "constants/common"; import { classNames, copyTextToClipboard } from "constants/common";
import { PRIORITIES } from "constants/";
// ui // ui
import { Input, Button, Spinner } from "ui"; import { Input, Button, Spinner } from "ui";
import { Popover } from "@headlessui/react"; import { Popover } from "@headlessui/react";
@ -38,25 +40,40 @@ import {
} from "@heroicons/react/24/outline"; } from "@heroicons/react/24/outline";
// types // types
import type { Control } from "react-hook-form"; import type { Control } from "react-hook-form";
import type { IIssue, IIssueLabels, IssueResponse, IState, WorkspaceMember } from "types"; import type {
IIssue,
IIssueLabels,
IssueResponse,
IState,
NestedKeyOf,
WorkspaceMember,
} from "types";
import { TwitterPicker } from "react-color"; import { TwitterPicker } from "react-color";
import useToast from "lib/hooks/useToast"; import IssuesListModal from "components/project/issues/IssuesListModal";
type Props = { type Props = {
control: Control<IIssue, any>; control: Control<IIssue, any>;
submitChanges: (formData: Partial<IIssue>) => void; submitChanges: (formData: Partial<IIssue>) => void;
issueDetail: IIssue | undefined; issueDetail: IIssue | undefined;
watch: UseFormWatch<IIssue>;
}; };
const PRIORITIES = ["high", "medium", "low"];
const defaultValues: Partial<IIssueLabels> = { const defaultValues: Partial<IIssueLabels> = {
name: "", name: "",
colour: "#ff0000", colour: "#ff0000",
}; };
const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDetail }) => { const IssueDetailSidebar: React.FC<Props> = ({
const { activeWorkspace, activeProject, cycles } = useUser(); control,
watch: watchIssue,
submitChanges,
issueDetail,
}) => {
const [isBlockerModalOpen, setIsBlockerModalOpen] = useState(false);
const [isBlockedModalOpen, setIsBlockedModalOpen] = useState(false);
const [isParentModalOpen, setIsParentModalOpen] = useState(false);
const { activeWorkspace, activeProject, cycles, issues } = useUser();
const { setToastAlert } = useToast(); const { setToastAlert } = useToast();
@ -72,15 +89,6 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
); );
const { data: projectIssues } = useSWR<IssueResponse>(
activeProject && activeWorkspace
? PROJECT_ISSUES_LIST(activeWorkspace.slug, activeProject.id)
: null,
activeProject && activeWorkspace
? () => issuesServices.getIssues(activeWorkspace.slug, activeProject.id)
: null
);
const { data: issueLabels, mutate: issueLabelMutate } = useSWR<IIssueLabels[]>( const { data: issueLabels, mutate: issueLabelMutate } = useSWR<IIssueLabels[]>(
activeProject && activeWorkspace ? PROJECT_ISSUE_LABELS(activeProject.id) : null, activeProject && activeWorkspace ? PROJECT_ISSUE_LABELS(activeProject.id) : null,
activeProject && activeWorkspace activeProject && activeWorkspace
@ -110,7 +118,19 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
}); });
}; };
const sidebarSections = [ const sidebarSections: Array<
Array<{
label: string;
name: NestedKeyOf<IIssue>;
canSelectMultipleOptions: boolean;
icon: (props: any) => JSX.Element;
options?: Array<{ label: string; value: any }>;
modal: boolean;
issuesList?: Array<IIssue>;
isOpen?: boolean;
setIsOpen?: (arg: boolean) => void;
}>
> = [
[ [
{ {
label: "Status", label: "Status",
@ -121,6 +141,7 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
label: state.name, label: state.name,
value: state.id, value: state.id,
})), })),
modal: false,
}, },
{ {
label: "Assignees", label: "Assignees",
@ -131,6 +152,7 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
label: person.member.first_name, label: person.member.first_name,
value: person.member.id, value: person.member.id,
})), })),
modal: false,
}, },
{ {
label: "Priority", label: "Priority",
@ -141,34 +163,52 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
label: property, label: property,
value: property, value: property,
})), })),
modal: false,
}, },
], ],
[ [
{ {
label: "Blocker", label: "Parent",
name: "blockers_list", name: "parent",
canSelectMultipleOptions: true, canSelectMultipleOptions: false,
icon: UserIcon, icon: UserIcon,
options: projectIssues?.results?.map((issue) => ({ issuesList:
label: issue.name, issues?.results.filter(
value: issue.id, (i) =>
})), i.id !== issueDetail?.id &&
i.id !== issueDetail?.parent &&
i.parent !== issueDetail?.id
) ?? [],
modal: true,
isOpen: isParentModalOpen,
setIsOpen: setIsParentModalOpen,
}, },
// {
// label: "Blocker",
// name: "blockers_list",
// canSelectMultipleOptions: true,
// icon: UserIcon,
// issuesList: issues?.results.filter((i) => i.id !== issueDetail?.id) ?? [],
// modal: true,
// isOpen: isBlockerModalOpen,
// setIsOpen: setIsBlockerModalOpen,
// },
// {
// label: "Blocked",
// name: "blocked_list",
// canSelectMultipleOptions: true,
// icon: UserIcon,
// issuesList: issues?.results.filter((i) => i.id !== issueDetail?.id) ?? [],
// modal: true,
// isOpen: isBlockedModalOpen,
// setIsOpen: setIsBlockedModalOpen,
// },
{ {
label: "Blocked", label: "Target Date",
name: "blocked_list",
canSelectMultipleOptions: true,
icon: UserIcon,
options: projectIssues?.results?.map((issue) => ({
label: issue.name,
value: issue.id,
})),
},
{
label: "Due Date",
name: "target_date", name: "target_date",
canSelectMultipleOptions: true, canSelectMultipleOptions: true,
icon: CalendarDaysIcon, icon: CalendarDaysIcon,
modal: false,
}, },
], ],
[ [
@ -181,6 +221,7 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
label: cycle.name, label: cycle.name,
value: cycle.id, value: cycle.id,
})), })),
modal: false,
}, },
], ],
]; ];
@ -249,12 +290,12 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
{sidebarSections.map((section, index) => ( {sidebarSections.map((section, index) => (
<div key={index} className="py-1"> <div key={index} className="py-1">
{section.map((item) => ( {section.map((item) => (
<div key={item.label} className="flex justify-between items-center gap-x-2 py-2"> <div key={item.label} className="flex items-center py-2 flex-wrap">
<div className="flex items-center gap-x-2 text-sm"> <div className="flex items-center gap-x-2 text-sm sm:basis-1/2">
<item.icon className="h-4 w-4" /> <item.icon className="flex-shrink-0 h-4 w-4" />
<p>{item.label}</p> <p>{item.label}</p>
</div> </div>
<div> <div className="sm:basis-1/2">
{item.name === "target_date" ? ( {item.name === "target_date" ? (
<Controller <Controller
control={control} control={control}
@ -262,15 +303,52 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
render={({ field: { value, onChange } }) => ( render={({ field: { value, onChange } }) => (
<input <input
type="date" type="date"
value={""} value={value ?? ""}
onChange={(e: any) => { onChange={(e: any) => {
submitChanges({ target_date: e.target.value }); submitChanges({ target_date: e.target.value });
onChange(e.target.value); onChange(e.target.value);
}} }}
className="hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300" className="hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300 w-full"
/> />
)} )}
/> />
) : item.modal ? (
<Controller
control={control}
name={item.name as keyof IIssue}
render={({ field: { value, onChange } }) => (
<>
<IssuesListModal
isOpen={Boolean(item?.isOpen)}
handleClose={() => item.setIsOpen && item.setIsOpen(false)}
onChange={(val) => {
console.log(val);
// submitChanges({ [item.name]: val });
onChange(val);
}}
issues={item?.issuesList ?? []}
title={`Select ${item.label}`}
multiple={item.canSelectMultipleOptions}
value={value}
/>
<button
type="button"
className="flex justify-between items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300 w-full"
onClick={() => item.setIsOpen && item.setIsOpen(true)}
>
{watchIssue(`${item.name as keyof IIssue}`) &&
watchIssue(`${item.name as keyof IIssue}`) !== ""
? `${activeProject?.identifier}-
${
issues?.results.find(
(i) => i.id === watchIssue(`${item.name as keyof IIssue}`)
)?.sequence_id
}`
: `Select ${item.label}`}
</button>
</>
)}
/>
) : ( ) : (
<Controller <Controller
control={control} control={control}
@ -288,11 +366,11 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
> >
{({ open }) => ( {({ open }) => (
<div className="relative"> <div className="relative">
<Listbox.Button className="relative flex justify-between items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-sm duration-300"> <Listbox.Button className="flex justify-between items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 w-full py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300">
<span <span
className={classNames( className={classNames(
value ? "" : "text-gray-900", value ? "" : "text-gray-900",
"hidden truncate sm:block w-16 text-left", "hidden truncate sm:block text-left",
item.label === "Priority" ? "capitalize" : "" item.label === "Priority" ? "capitalize" : ""
)} )}
> >
@ -419,12 +497,12 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
+ +
</Button> </Button>
</form> </form>
<div className="flex justify-between items-center gap-x-2"> <div className="flex justify-between items-center">
<div className="flex items-center gap-x-2 text-sm"> <div className="flex items-center gap-x-2 text-sm basis-1/2">
<TagIcon className="w-4 h-4" /> <TagIcon className="w-4 h-4" />
<p>Label</p> <p>Label</p>
</div> </div>
<div> <div className="basis-1/2">
<Controller <Controller
control={control} control={control}
name="labels_list" name="labels_list"
@ -440,11 +518,11 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
<> <>
<Listbox.Label className="sr-only">Label</Listbox.Label> <Listbox.Label className="sr-only">Label</Listbox.Label>
<div className="relative"> <div className="relative">
<Listbox.Button className="relative flex justify-between items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-sm duration-300"> <Listbox.Button className="flex justify-between items-center gap-1 hover:bg-gray-100 border rounded-md shadow-sm px-2 w-full py-1 cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 text-xs duration-300">
<span <span
className={classNames( className={classNames(
value ? "" : "text-gray-900", value ? "" : "text-gray-900",
"hidden truncate capitalize sm:block w-16 text-left" "hidden truncate capitalize sm:block text-left"
)} )}
> >
{value && value.length > 0 {value && value.length > 0

18
apps/app/components/project/issues/issue-detail/comment/IssueCommentCard.tsx
View File

@ -64,14 +64,14 @@ const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentDeletion
<div key={comment.id}> <div key={comment.id}>
<div className="w-full h-full flex justify-between"> <div className="w-full h-full flex justify-between">
<div className="flex gap-x-2 w-full"> <div className="flex gap-x-2 w-full">
<div className="flex-shrink-0 -ml-1.5"> <div className="flex-shrink-0">
{comment.actor_detail.avatar && comment.actor_detail.avatar !== "" ? ( {comment.actor_detail.avatar && comment.actor_detail.avatar !== "" ? (
<Image <Image
src={comment.actor_detail.avatar} src={comment.actor_detail.avatar}
alt={comment.actor_detail.name} alt={comment.actor_detail.name}
height={30} height={30}
width={30} width={30}
className="rounded-full" className="rounded"
/> />
) : ( ) : (
<div <div
@ -82,11 +82,7 @@ const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentDeletion
)} )}
</div> </div>
<div className="w-full"> <div className="w-full">
<p> <div>
{comment.actor_detail.first_name} {comment.actor_detail.last_name}
</p>
<p className="text-xs text-gray-500">{timeAgo(comment.created_at)}</p>
<div className="w-full mt-2">
{isEditing ? ( {isEditing ? (
<form className="flex flex-col gap-2" onSubmit={handleSubmit(onEnter)}> <form className="flex flex-col gap-2" onSubmit={handleSubmit(onEnter)}>
<TextArea <TextArea
@ -120,13 +116,19 @@ const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentDeletion
) : ( ) : (
<> <>
{comment.comment.split("\n").map((item, index) => ( {comment.comment.split("\n").map((item, index) => (
<p key={index} className="text-sm text-gray-600"> <p key={index} className="text-sm">
{item} {item}
</p> </p>
))} ))}
</> </>
)} )}
</div> </div>
<p className="text-xs text-gray-500 flex items-center gap-2 mt-1">
<span>
{comment.actor_detail.first_name} {comment.actor_detail.last_name}
</span>
<span>{timeAgo(comment.created_at)}</span>
</p>
</div> </div>
</div> </div>
{user?.id === comment.actor && ( {user?.id === comment.actor && (

2
apps/app/components/project/issues/issue-detail/comment/IssueCommentSection.tsx
View File

@ -72,7 +72,7 @@ const IssueCommentSection: React.FC<Props> = ({ comments, issueId, projectId, wo
return ( return (
<div className="space-y-5"> <div className="space-y-5">
<form onSubmit={handleSubmit(onSubmit)}> <form onSubmit={handleSubmit(onSubmit)}>
<div className="p-2 bg-indigo-50 rounded-md"> <div className="bg-gray-100 rounded-md">
<div className="w-full"> <div className="w-full">
<TextArea <TextArea
id="comment" id="comment"

10
apps/app/components/project/settings/GeneralSettings.tsx
View File

@ -7,7 +7,7 @@ import projectServices from "lib/services/project.service";
// hooks // hooks
import useUser from "lib/hooks/useUser"; import useUser from "lib/hooks/useUser";
// ui // ui
import { Input, Select, TextArea } from "ui"; import { Button, Input, Select, TextArea } from "ui";
// types // types
import { IProject } from "types"; import { IProject } from "types";
// constants // constants
@ -17,11 +17,12 @@ type Props = {
register: UseFormRegister<IProject>; register: UseFormRegister<IProject>;
errors: any; errors: any;
setError: UseFormSetError<IProject>; setError: UseFormSetError<IProject>;
isSubmitting: boolean;
}; };
const NETWORK_CHOICES = { "0": "Secret", "2": "Public" }; const NETWORK_CHOICES = { "0": "Secret", "2": "Public" };
const GeneralSettings: React.FC<Props> = ({ register, errors, setError }) => { const GeneralSettings: React.FC<Props> = ({ register, errors, setError, isSubmitting }) => {
const { activeWorkspace } = useUser(); const { activeWorkspace } = useUser();
const checkIdentifier = (slug: string, value: string) => { const checkIdentifier = (slug: string, value: string) => {
@ -111,6 +112,11 @@ const GeneralSettings: React.FC<Props> = ({ register, errors, setError }) => {
}} }}
/> />
</div> </div>
<div className="flex justify-end">
<Button type="submit" disabled={isSubmitting}>
{isSubmitting ? "Updating Project..." : "Update Project"}
</Button>
</div>
</section> </section>
</> </>
); );

35
apps/app/components/project/settings/LabelsSettings.tsx
View File

@ -47,6 +47,7 @@ const LabelsSettings: React.FC = () => {
setValue, setValue,
formState: { errors, isSubmitting }, formState: { errors, isSubmitting },
watch, watch,
setError,
} = useForm<IIssueLabels>({ defaultValues }); } = useForm<IIssueLabels>({ defaultValues });
const { data: issueLabels, mutate } = useSWR<IIssueLabels[]>( const { data: issueLabels, mutate } = useSWR<IIssueLabels[]>(
@ -163,23 +164,33 @@ const LabelsSettings: React.FC = () => {
)} )}
</Popover> </Popover>
</div> </div>
<Input <div className="w-full flex flex-col justify-center">
type="text" <Input
id="labelName" type="text"
name="name" id="labelName"
register={register} name="name"
placeholder="Lable title" register={register}
/> placeholder="Lable title"
validations={{
required: "Label title is required",
}}
error={errors.name}
/>
</div>
<Button type="button" theme="secondary" onClick={() => setNewLabelForm(false)}> <Button type="button" theme="secondary" onClick={() => setNewLabelForm(false)}>
Cancel Cancel
</Button> </Button>
{isUpdating ? ( {isUpdating ? (
<Button type="button" onClick={handleSubmit(handleLabelUpdate)}> <Button
Update type="button"
onClick={handleSubmit(handleLabelUpdate)}
disabled={isSubmitting}
>
{isSubmitting ? "Updating" : "Update"}
</Button> </Button>
) : ( ) : (
<Button type="button" onClick={handleSubmit(handleNewLabel)}> <Button type="button" onClick={handleSubmit(handleNewLabel)} disabled={isSubmitting}>
Add {isSubmitting ? "Adding" : "Add"}
</Button> </Button>
)} )}
</form> </form>
@ -193,7 +204,7 @@ const LabelsSettings: React.FC = () => {
<div className="bg-white p-2 flex items-center justify-between text-gray-900 rounded-md"> <div className="bg-white p-2 flex items-center justify-between text-gray-900 rounded-md">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span <span
className={`h-1.5 w-1.5 rounded-full`} className="flex-shrink-0 h-1.5 w-1.5 rounded-full"
style={{ style={{
backgroundColor: label.colour, backgroundColor: label.colour,
}} }}

12
apps/app/constants/global.tsx Normal file
View File

@ -0,0 +1,12 @@
export const getPriorityIcon = (priority: string) => {
switch (priority) {
case "urgent":
return <span className="material-symbols-rounded">signal_cellular_alt</span>;
case "high":
return <span className="material-symbols-rounded">signal_cellular_alt_2_bar</span>;
case "medium":
return <span className="material-symbols-rounded">signal_cellular_alt_1_bar</span>;
default:
return <span>N/A</span>;
}
};

12
apps/app/layouts/AdminLayout.tsx → apps/app/layouts/AppLayout.tsx
View File

@ -12,7 +12,7 @@ import CreateProjectModal from "components/project/CreateProjectModal";
// types // types
import type { Props } from "./types"; import type { Props } from "./types";
const AdminLayout: React.FC<Props> = ({ meta, children }) => { const AppLayout: React.FC<Props> = ({ meta, children, noPadding = false, bg = "primary" }) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const router = useRouter(); const router = useRouter();
@ -28,10 +28,16 @@ const AdminLayout: React.FC<Props> = ({ meta, children }) => {
<CreateProjectModal isOpen={isOpen} setIsOpen={setIsOpen} /> <CreateProjectModal isOpen={isOpen} setIsOpen={setIsOpen} />
<div className="h-screen w-full flex overflow-x-hidden"> <div className="h-screen w-full flex overflow-x-hidden">
<Sidebar /> <Sidebar />
<main className="h-full w-full min-w-0 p-5 bg-primary overflow-y-auto">{children}</main> <main
className={`h-full w-full min-w-0 overflow-y-auto ${noPadding ? "" : "p-5"} ${
bg === "primary" ? "bg-primary" : bg === "secondary" ? "bg-secondary" : "bg-primary"
}`}
>
{children}
</main>
</div> </div>
</Container> </Container>
); );
}; };
export default AdminLayout; export default AppLayout;

2
apps/app/layouts/types.d.ts vendored
View File

@ -8,4 +8,6 @@ export type Meta = {
export type Props = { export type Props = {
meta?: Meta; meta?: Meta;
children: React.ReactNode; children: React.ReactNode;
noPadding?: boolean;
bg?: "primary" | "secondary";
}; };

2
apps/app/lib/hooks/useIssuesProperties.tsx
View File

@ -16,7 +16,7 @@ const initialValues: Properties = {
assignee: true, assignee: true,
priority: false, priority: false,
start_date: false, start_date: false,
due_date: false, target_date: false,
cycle: false, cycle: false,
}; };

6
apps/app/pages/me/my-issues.tsx
View File

@ -5,7 +5,7 @@ import type { NextPage } from "next";
// swr // swr
import useSWR from "swr"; import useSWR from "swr";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// hooks // hooks
import useUser from "lib/hooks/useUser"; import useUser from "lib/hooks/useUser";
// ui // ui
@ -76,7 +76,7 @@ const MyIssues: NextPage = () => {
}; };
return ( return (
<AdminLayout> <AppLayout>
<div className="w-full h-full flex flex-col space-y-5"> <div className="w-full h-full flex flex-col space-y-5">
{myIssues ? ( {myIssues ? (
<> <>
@ -276,7 +276,7 @@ const MyIssues: NextPage = () => {
</div> </div>
)} )}
</div> </div>
</AdminLayout> </AppLayout>
); );
}; };

6
apps/app/pages/me/profile.tsx
View File

@ -11,7 +11,7 @@ import useUser from "lib/hooks/useUser";
// hoc // hoc
import withAuth from "lib/hoc/withAuthWrapper"; import withAuth from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// services // services
import userService from "lib/services/user.service"; import userService from "lib/services/user.service";
import fileServices from "lib/services/file.services"; import fileServices from "lib/services/file.services";
@ -114,7 +114,7 @@ const Profile: NextPage = () => {
]; ];
return ( return (
<AdminLayout <AppLayout
meta={{ meta={{
title: "Plane - My Profile", title: "Plane - My Profile",
}} }}
@ -305,7 +305,7 @@ const Profile: NextPage = () => {
</div> </div>
)} )}
</div> </div>
</AdminLayout> </AppLayout>
); );
}; };

6
apps/app/pages/me/workspace-invites.tsx
View File

@ -10,7 +10,7 @@ import useUser from "lib/hooks/useUser";
// hoc // hoc
import withAuthWrapper from "lib/hoc/withAuthWrapper"; import withAuthWrapper from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// ui // ui
import { Button } from "ui"; import { Button } from "ui";
// swr // swr
@ -52,7 +52,7 @@ const MyWorkspacesInvites: NextPage = () => {
}; };
return ( return (
<AdminLayout <AppLayout
meta={{ meta={{
title: "Plane - My Workspace Invites", title: "Plane - My Workspace Invites",
}} }}
@ -147,7 +147,7 @@ const MyWorkspacesInvites: NextPage = () => {
)} )}
</div> </div>
</div> </div>
</AdminLayout> </AppLayout>
); );
}; };

6
apps/app/pages/projects/[projectId]/cycles.tsx
View File

@ -14,7 +14,7 @@ import { CYCLE_ISSUES, CYCLE_LIST } from "constants/fetch-keys";
// hoc // hoc
import withAuth from "lib/hoc/withAuthWrapper"; import withAuth from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// components // components
import CycleView from "components/project/cycles/CycleView"; import CycleView from "components/project/cycles/CycleView";
import ConfirmIssueDeletion from "components/project/issues/ConfirmIssueDeletion"; import ConfirmIssueDeletion from "components/project/issues/ConfirmIssueDeletion";
@ -167,7 +167,7 @@ const ProjectSprints: NextPage = () => {
}, [selectedIssues]); }, [selectedIssues]);
return ( return (
<AdminLayout <AppLayout
meta={{ meta={{
title: "Plane - Cycles", title: "Plane - Cycles",
}} }}
@ -256,7 +256,7 @@ const ProjectSprints: NextPage = () => {
<Spinner /> <Spinner />
</div> </div>
)} )}
</AdminLayout> </AppLayout>
); );
}; };

102
apps/app/pages/projects/[projectId]/issues/[issueId].tsx
View File

@ -12,7 +12,6 @@ import { Controller, useForm } from "react-hook-form";
import { Disclosure, Menu, Tab, Transition } from "@headlessui/react"; import { Disclosure, Menu, Tab, Transition } from "@headlessui/react";
// services // services
import issuesServices from "lib/services/issues.services"; import issuesServices from "lib/services/issues.services";
import stateServices from "lib/services/state.services";
// fetch keys // fetch keys
import { import {
PROJECT_ISSUES_ACTIVITY, PROJECT_ISSUES_ACTIVITY,
@ -25,7 +24,7 @@ import useUser from "lib/hooks/useUser";
// hoc // hoc
import withAuth from "lib/hoc/withAuthWrapper"; import withAuth from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// components // components
import CreateUpdateIssuesModal from "components/project/issues/CreateUpdateIssueModal"; import CreateUpdateIssuesModal from "components/project/issues/CreateUpdateIssueModal";
import IssueCommentSection from "components/project/issues/issue-detail/comment/IssueCommentSection"; import IssueCommentSection from "components/project/issues/issue-detail/comment/IssueCommentSection";
@ -40,7 +39,7 @@ import { Spinner, TextArea } from "ui";
import HeaderButton from "ui/HeaderButton"; import HeaderButton from "ui/HeaderButton";
import { BreadcrumbItem, Breadcrumbs } from "ui/Breadcrumbs"; import { BreadcrumbItem, Breadcrumbs } from "ui/Breadcrumbs";
// types // types
import { IIssue, IIssueComment, IssueResponse, IState } from "types"; import { IIssue, IIssueComment, IssueResponse } from "types";
// icons // icons
import { import {
ChevronLeftIcon, ChevronLeftIcon,
@ -210,7 +209,7 @@ const IssueDetail: NextPage = () => {
}; };
return ( return (
<AdminLayout> <AppLayout noPadding={true} bg="secondary">
<CreateUpdateIssuesModal <CreateUpdateIssuesModal
isOpen={isOpen} isOpen={isOpen}
setIsOpen={setIsOpen} setIsOpen={setIsOpen}
@ -224,46 +223,23 @@ const IssueDetail: NextPage = () => {
setIsOpen={setIsAddAsSubIssueOpen} setIsOpen={setIsAddAsSubIssueOpen}
parent={issueDetail} parent={issueDetail}
/> />
<div className="flex items-center justify-between w-full mb-5">
<Breadcrumbs>
<BreadcrumbItem
title={`${activeProject?.name ?? "Project"} Issues`}
link={`/projects/${activeProject?.id}/issues`}
/>
<BreadcrumbItem
title={`Issue ${activeProject?.identifier ?? "Project"}-${
issueDetail?.sequence_id ?? "..."
} Details`}
/>
</Breadcrumbs>
<div className="flex items-center gap-x-3">
<HeaderButton
Icon={ChevronLeftIcon}
label="Previous"
className={`${!prevIssue ? "cursor-not-allowed opacity-70" : ""}`}
onClick={() => {
if (!prevIssue) return;
router.push(`/projects/${prevIssue.project}/issues/${prevIssue.id}`);
}}
/>
<HeaderButton
Icon={ChevronRightIcon}
disabled={!nextIssue}
label="Next"
className={`${!nextIssue ? "cursor-not-allowed opacity-70" : ""}`}
onClick={() => {
if (!nextIssue) return;
router.push(`/projects/${nextIssue.project}/issues/${nextIssue?.id}`);
}}
position="reverse"
/>
</div>
</div>
{issueDetail && activeProject ? ( {issueDetail && activeProject ? (
<div className="grid grid-cols-4 gap-5"> <div className="flex gap-5">
<div className="col-span-3 space-y-5"> <div className="basis-3/4 space-y-5 p-5">
<div className="bg-secondary rounded-lg p-4"> <div className="mb-5">
<Breadcrumbs>
<BreadcrumbItem
title={`${activeProject?.name ?? "Project"} Issues`}
link={`/projects/${activeProject?.id}/issues`}
/>
<BreadcrumbItem
title={`Issue ${activeProject?.identifier ?? "Project"}-${
issueDetail?.sequence_id ?? "..."
} Details`}
/>
</Breadcrumbs>
</div>
<div className="rounded-lg">
{issueDetail.parent !== null && issueDetail.parent !== "" ? ( {issueDetail.parent !== null && issueDetail.parent !== "" ? (
<div className="bg-gray-100 flex items-center gap-2 p-2 text-xs rounded mb-5 w-min whitespace-nowrap"> <div className="bg-gray-100 flex items-center gap-2 p-2 text-xs rounded mb-5 w-min whitespace-nowrap">
<Link href={`/projects/${activeProject.id}/issues/${issueDetail.parent}`}> <Link href={`/projects/${activeProject.id}/issues/${issueDetail.parent}`}>
@ -275,7 +251,8 @@ const IssueDetail: NextPage = () => {
}} }}
/> />
<span className="flex-shrink-0 text-gray-600"> <span className="flex-shrink-0 text-gray-600">
{activeProject.identifier}-{issueDetail.sequence_id} {activeProject.identifier}-
{issues?.results.find((i) => i.id === issueDetail.parent)?.sequence_id}
</span> </span>
<span className="font-medium truncate"> <span className="font-medium truncate">
{issues?.results {issues?.results
@ -367,7 +344,7 @@ const IssueDetail: NextPage = () => {
</div> </div>
<div className="mt-2"> <div className="mt-2">
{subIssues && subIssues.length > 0 ? ( {subIssues && subIssues.length > 0 ? (
<Disclosure> <Disclosure defaultOpen={true}>
{({ open }) => ( {({ open }) => (
<> <>
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
@ -439,7 +416,7 @@ const IssueDetail: NextPage = () => {
{subIssues.map((subIssue) => ( {subIssues.map((subIssue) => (
<div <div
key={subIssue.id} key={subIssue.id}
className="flex justify-between items-center gap-2 p-2 hover:bg-gray-100" className="group flex justify-between items-center gap-2 rounded p-2 hover:bg-gray-100"
> >
<Link href={`/projects/${activeProject.id}/issues/${subIssue.id}`}> <Link href={`/projects/${activeProject.id}/issues/${subIssue.id}`}>
<a className="flex items-center gap-2 rounded text-xs"> <a className="flex items-center gap-2 rounded text-xs">
@ -457,9 +434,9 @@ const IssueDetail: NextPage = () => {
</span> </span>
</a> </a>
</Link> </Link>
<div> <div className="opacity-0 group-hover:opacity-100">
<Menu as="div" className="relative inline-block"> <Menu as="div" className="relative inline-block">
<Menu.Button className="grid relative place-items-center focus:outline-none"> <Menu.Button className="grid relative place-items-center hover:bg-gray-200 p-1 focus:outline-none">
<EllipsisHorizontalIcon className="h-4 w-4" /> <EllipsisHorizontalIcon className="h-4 w-4" />
</Menu.Button> </Menu.Button>
@ -555,7 +532,7 @@ const IssueDetail: NextPage = () => {
)} )}
</div> </div>
</div> </div>
<div className="bg-secondary rounded-lg p-4 space-y-5"> <div className="bg-secondary rounded-lg space-y-5">
<Tab.Group> <Tab.Group>
<Tab.List className="flex gap-x-3"> <Tab.List className="flex gap-x-3">
{["Comments", "Activity"].map((item) => ( {["Comments", "Activity"].map((item) => (
@ -591,11 +568,34 @@ const IssueDetail: NextPage = () => {
</Tab.Group> </Tab.Group>
</div> </div>
</div> </div>
<div className="sticky top-0 h-min bg-secondary p-4 rounded-lg"> <div className="basis-1/4 rounded-lg space-y-5 p-5 border-l">
<div className="flex justify-end items-center gap-x-3 mb-5">
<HeaderButton
Icon={ChevronLeftIcon}
label="Previous"
className={`${!prevIssue ? "cursor-not-allowed opacity-70" : ""}`}
onClick={() => {
if (!prevIssue) return;
router.push(`/projects/${prevIssue.project}/issues/${prevIssue.id}`);
}}
/>
<HeaderButton
Icon={ChevronRightIcon}
disabled={!nextIssue}
label="Next"
className={`${!nextIssue ? "cursor-not-allowed opacity-70" : ""}`}
onClick={() => {
if (!nextIssue) return;
router.push(`/projects/${nextIssue.project}/issues/${nextIssue?.id}`);
}}
position="reverse"
/>
</div>
<IssueDetailSidebar <IssueDetailSidebar
control={control} control={control}
issueDetail={issueDetail} issueDetail={issueDetail}
submitChanges={submitChanges} submitChanges={submitChanges}
watch={watch}
/> />
</div> </div>
</div> </div>
@ -604,7 +604,7 @@ const IssueDetail: NextPage = () => {
<Spinner /> <Spinner />
</div> </div>
)} )}
</AdminLayout> </AppLayout>
); );
}; };

152
apps/app/pages/projects/[projectId]/issues/index.tsx
View File

@ -18,7 +18,7 @@ import projectService from "lib/services/project.service";
// commons // commons
import { classNames, replaceUnderscoreIfSnakeCase } from "constants/common"; import { classNames, replaceUnderscoreIfSnakeCase } from "constants/common";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// hooks // hooks
import useIssuesFilter from "lib/hooks/useIssuesFilter"; import useIssuesFilter from "lib/hooks/useIssuesFilter";
// components // components
@ -123,7 +123,7 @@ const ProjectIssues: NextPage = () => {
}, [isOpen]); }, [isOpen]);
return ( return (
<AdminLayout> <AppLayout>
<CreateUpdateIssuesModal <CreateUpdateIssuesModal
isOpen={isOpen && selectedIssue?.actionType !== "delete"} isOpen={isOpen && selectedIssue?.actionType !== "delete"}
setIsOpen={setIsOpen} setIsOpen={setIsOpen}
@ -203,85 +203,83 @@ const ProjectIssues: NextPage = () => {
leaveFrom="opacity-100 translate-y-0" leaveFrom="opacity-100 translate-y-0"
leaveTo="opacity-0 translate-y-1" leaveTo="opacity-0 translate-y-1"
> >
<Popover.Panel className="absolute mr-5 right-1/2 z-10 mt-3 w-screen max-w-xs translate-x-1/2 transform px-2 sm:px-0 bg-white rounded-lg shadow-lg overflow-hidden"> <Popover.Panel className="absolute mr-5 right-1/2 z-10 mt-1 w-screen max-w-xs translate-x-1/2 transform p-4 bg-white rounded-lg shadow-lg overflow-hidden">
<div className="overflow-hidden py-8 px-4"> <div className="relative flex flex-col gap-1 gap-y-4">
<div className="relative flex flex-col gap-1 gap-y-4"> <div className="flex justify-between">
<div className="flex justify-between"> <h4 className="text-base text-gray-600">Group by</h4>
<h4 className="text-base text-gray-600">Group by</h4> <CustomMenu
<CustomMenu label={
label={ groupByOptions.find((option) => option.key === groupByProperty)
groupByOptions.find((option) => option.key === groupByProperty) ?.name ?? "Select"
?.name ?? "Select" }
} >
> {groupByOptions.map((option) => (
{groupByOptions.map((option) => ( <CustomMenu.MenuItem
key={option.key}
onClick={() => setGroupByProperty(option.key)}
>
{option.name}
</CustomMenu.MenuItem>
))}
</CustomMenu>
</div>
<div className="flex justify-between">
<h4 className="text-base text-gray-600">Order by</h4>
<CustomMenu
label={
orderByOptions.find((option) => option.key === orderBy)?.name ??
"Select"
}
>
{orderByOptions.map((option) =>
groupByProperty === "priority" &&
option.key === "priority" ? null : (
<CustomMenu.MenuItem <CustomMenu.MenuItem
key={option.key} key={option.key}
onClick={() => setGroupByProperty(option.key)} onClick={() => setOrderBy(option.key)}
> >
{option.name} {option.name}
</CustomMenu.MenuItem> </CustomMenu.MenuItem>
))} )
</CustomMenu> )}
</div> </CustomMenu>
<div className="flex justify-between"> </div>
<h4 className="text-base text-gray-600">Order by</h4> <div className="flex justify-between">
<CustomMenu <h4 className="text-base text-gray-600">Issue type</h4>
label={ <CustomMenu
orderByOptions.find((option) => option.key === orderBy)?.name ?? label={
"Select" filterIssueOptions.find((option) => option.key === filterIssue)
} ?.name ?? "Select"
> }
{orderByOptions.map((option) => >
groupByProperty === "priority" && {filterIssueOptions.map((option) => (
option.key === "priority" ? null : ( <CustomMenu.MenuItem
<CustomMenu.MenuItem key={option.key}
key={option.key} onClick={() => setFilterIssue(option.key)}
onClick={() => setOrderBy(option.key)} >
> {option.name}
{option.name} </CustomMenu.MenuItem>
</CustomMenu.MenuItem> ))}
) </CustomMenu>
)} </div>
</CustomMenu> <div className="border-b-2"></div>
</div> <div className="relative flex flex-col gap-1">
<div className="flex justify-between"> <h4 className="text-base text-gray-600">Properties</h4>
<h4 className="text-base text-gray-600">Issue type</h4> <div>
<CustomMenu {Object.keys(properties).map((key) => (
label={ <button
filterIssueOptions.find((option) => option.key === filterIssue) key={key}
?.name ?? "Select" type="button"
} className={`px-2 py-1 inline capitalize rounded border border-indigo-600 text-sm m-1 ${
> properties[key as keyof Properties]
{filterIssueOptions.map((option) => ( ? "border-indigo-600 bg-indigo-600 text-white"
<CustomMenu.MenuItem : ""
key={option.key} }`}
onClick={() => setFilterIssue(option.key)} onClick={() => setProperties(key as keyof Properties)}
> >
{option.name} {replaceUnderscoreIfSnakeCase(key)}
</CustomMenu.MenuItem> </button>
))} ))}
</CustomMenu>
</div>
<div className="border-b-2"></div>
<div className="relative flex flex-col gap-1">
<h4 className="text-base text-gray-600">Properties</h4>
<div>
{Object.keys(properties).map((key) => (
<button
key={key}
type="button"
className={`px-2 py-1 inline capitalize rounded border border-indigo-600 text-sm m-1 ${
properties[key as keyof Properties]
? "border-indigo-600 bg-indigo-600 text-white"
: ""
}`}
onClick={() => setProperties(key as keyof Properties)}
>
{replaceUnderscoreIfSnakeCase(key)}
</button>
))}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -344,7 +342,7 @@ const ProjectIssues: NextPage = () => {
</EmptySpace> </EmptySpace>
</div> </div>
)} )}
</AdminLayout> </AppLayout>
); );
}; };

6
apps/app/pages/projects/[projectId]/members.tsx
View File

@ -17,7 +17,7 @@ import { PROJECT_MEMBERS, PROJECT_INVITATIONS } from "constants/fetch-keys";
// hoc // hoc
import withAuth from "lib/hoc/withAuthWrapper"; import withAuth from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// components // components
import SendProjectInvitationModal from "components/project/SendProjectInvitationModal"; import SendProjectInvitationModal from "components/project/SendProjectInvitationModal";
import ConfirmProjectMemberRemove from "components/project/ConfirmProjectMemberRemove"; import ConfirmProjectMemberRemove from "components/project/ConfirmProjectMemberRemove";
@ -92,7 +92,7 @@ const ProjectMembers: NextPage = () => {
]; ];
return ( return (
<AdminLayout> <AppLayout>
<ConfirmProjectMemberRemove <ConfirmProjectMemberRemove
isOpen={Boolean(selectedRemoveMember) || Boolean(selectedInviteRemoveMember)} isOpen={Boolean(selectedRemoveMember) || Boolean(selectedInviteRemoveMember)}
onClose={() => { onClose={() => {
@ -311,7 +311,7 @@ const ProjectMembers: NextPage = () => {
)} )}
</div> </div>
)} )}
</AdminLayout> </AppLayout>
); );
}; };

496
apps/app/pages/projects/[projectId]/settings.tsx
View File

@ -1,54 +1,60 @@
import React, { useEffect, useCallback, useState } from "react"; import React, { useEffect, useState } from "react";
// next // next
import type { NextPage } from "next"; import type { NextPage } from "next";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import dynamic from "next/dynamic";
// swr // swr
import { mutate } from "swr"; import useSWR, { mutate } from "swr";
// swr
import useSWR from "swr";
// react hook form // react hook form
import { useForm, Controller } from "react-hook-form"; import { useForm } from "react-hook-form";
// headless ui // headless ui
import { Listbox, Tab, Transition } from "@headlessui/react"; import { Tab } from "@headlessui/react";
// hoc // hoc
import withAuth from "lib/hoc/withAuthWrapper"; import withAuth from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// service // service
import projectServices from "lib/services/project.service"; import projectServices from "lib/services/project.service";
import workspaceService from "lib/services/workspace.service";
// hooks // hooks
import useUser from "lib/hooks/useUser"; import useUser from "lib/hooks/useUser";
import useToast from "lib/hooks/useToast"; import useToast from "lib/hooks/useToast";
// fetch keys // fetch keys
import { PROJECT_DETAILS, PROJECTS_LIST, WORKSPACE_MEMBERS } from "constants/fetch-keys"; import { PROJECT_DETAILS, PROJECTS_LIST } from "constants/fetch-keys";
// constants
import { NETWORK_CHOICES } from "constants/";
// commons
import { addSpaceIfCamelCase, debounce } from "constants/common";
// components
import CreateUpdateStateModal from "components/project/issues/BoardView/state/CreateUpdateStateModal";
// ui // ui
import { Spinner, Button, Input, TextArea, Select } from "ui"; import { Spinner } from "ui";
import { Breadcrumbs, BreadcrumbItem } from "ui/Breadcrumbs"; import { Breadcrumbs, BreadcrumbItem } from "ui/Breadcrumbs";
// icons
import {
ChevronDownIcon,
CheckIcon,
PlusIcon,
PencilSquareIcon,
RectangleGroupIcon,
PencilIcon,
} from "@heroicons/react/24/outline";
// types // types
import type { IProject, IWorkspace, WorkspaceMember } from "types"; import type { IProject, IWorkspace } from "types";
const defaultValues: Partial<IProject> = { const defaultValues: Partial<IProject> = {
name: "", name: "",
description: "", description: "",
identifier: "",
network: 0,
}; };
const ProjectSettings: NextPage = () => { const ProjectSettings: NextPage = () => {
// FIXME: instead of using dynamic import inside component use it outside
const GeneralSettings = dynamic(() => import("components/project/settings/GeneralSettings"), {
loading: () => <p>Loading...</p>,
ssr: false,
});
const ControlSettings = dynamic(() => import("components/project/settings/ControlSettings"), {
loading: () => <p>Loading...</p>,
ssr: false,
});
const StatesSettings = dynamic(() => import("components/project/settings/StatesSettings"), {
loading: () => <p>Loading...</p>,
ssr: false,
});
const LabelsSettings = dynamic(() => import("components/project/settings/LabelsSettings"), {
loading: () => <p>Loading...</p>,
ssr: false,
});
const { const {
register, register,
handleSubmit, handleSubmit,
@ -60,15 +66,11 @@ const ProjectSettings: NextPage = () => {
defaultValues, defaultValues,
}); });
const [isCreateStateModalOpen, setIsCreateStateModalOpen] = useState(false);
const [selectedState, setSelectedState] = useState<string | undefined>();
const [newGroupForm, setNewGroupForm] = useState(false);
const router = useRouter(); const router = useRouter();
const { projectId } = router.query; const { projectId } = router.query;
const { activeWorkspace, activeProject, states } = useUser(); const { activeWorkspace, activeProject } = useUser();
const { setToastAlert } = useToast(); const { setToastAlert } = useToast();
@ -79,17 +81,6 @@ const ProjectSettings: NextPage = () => {
: null : null
); );
const { data: people } = useSWR<WorkspaceMember[]>(
activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null,
{
onErrorRetry(err, _, __, revalidate, revalidateOpts) {
if (err?.status === 403) return;
setTimeout(() => revalidate(revalidateOpts), 5000);
},
}
);
useEffect(() => { useEffect(() => {
projectDetails && projectDetails &&
reset({ reset({
@ -142,28 +133,9 @@ const ProjectSettings: NextPage = () => {
}); });
}; };
const checkIdentifier = (slug: string, value: string) => {
projectServices.checkProjectIdentifierAvailability(slug, value).then((response) => {
console.log(response);
if (response.exists) setError("identifier", { message: "Identifier already exists" });
});
};
// eslint-disable-next-line react-hooks/exhaustive-deps
const checkIdentifierAvailability = useCallback(debounce(checkIdentifier, 1500), []);
return ( return (
<AdminLayout> <AppLayout>
<div className="space-y-5 mb-5"> <div className="space-y-5 mb-5">
<CreateUpdateStateModal
isOpen={isCreateStateModalOpen || Boolean(selectedState)}
handleClose={() => {
setSelectedState(undefined);
setIsCreateStateModalOpen(false);
}}
projectId={projectId as string}
data={selectedState ? states?.find((state) => state.id === selectedState) : undefined}
/>
<Breadcrumbs> <Breadcrumbs>
<BreadcrumbItem title="Projects" link="/projects" /> <BreadcrumbItem title="Projects" link="/projects" />
<BreadcrumbItem title={`${activeProject?.name ?? "Project"} Settings`} /> <BreadcrumbItem title={`${activeProject?.name ?? "Project"} Settings`} />
@ -171,382 +143,50 @@ const ProjectSettings: NextPage = () => {
</div> </div>
{projectDetails ? ( {projectDetails ? (
<div className="space-y-3"> <div className="space-y-3">
<form onSubmit={handleSubmit(onSubmit)} className="mt-3"> <Tab.Group>
<Tab.Group> <Tab.List className="flex items-center gap-x-4 gap-y-2 flex-wrap mb-8">
<Tab.List className="flex items-center gap-x-4 gap-y-2 flex-wrap"> {["General", "Control", "States", "Labels"].map((tab, index) => (
{["General", "Control", "States", "Labels"].map((tab, index) => ( <Tab
<Tab key={index}
key={index} className={({ selected }) =>
className={({ selected }) => `px-6 py-2 border-2 border-theme hover:bg-theme hover:text-white text-xs font-medium rounded-md outline-none duration-300 ${
`px-6 py-2 border-2 border-theme hover:bg-theme hover:text-white text-xs font-medium rounded-md duration-300 ${ selected ? "bg-theme text-white" : ""
selected ? "bg-theme text-white" : "" }`
}` }
} >
> {tab}
{tab} </Tab>
</Tab> ))}
))} </Tab.List>
</Tab.List> <Tab.Panels>
<Tab.Panels className="mt-8"> <form onSubmit={handleSubmit(onSubmit)}>
<Tab.Panel> <Tab.Panel>
<section className="space-y-5"> <GeneralSettings
<div> register={register}
<h3 className="text-lg font-medium leading-6 text-gray-900">General</h3> errors={errors}
<p className="mt-1 text-sm text-gray-500"> setError={setError}
This information will be displayed to every member of the project. isSubmitting={isSubmitting}
</p> />
</div>
<div className="grid grid-cols-4 gap-3">
<div className="col-span-2">
<Input
id="name"
name="name"
error={errors.name}
register={register}
placeholder="Project Name"
label="Name"
validations={{
required: "Name is required",
}}
/>
</div>
<div>
<Select
name="network"
id="network"
options={Object.keys(NETWORK_CHOICES).map((key) => ({
value: key,
label: NETWORK_CHOICES[key as keyof typeof NETWORK_CHOICES],
}))}
label="Network"
register={register}
validations={{
required: "Network is required",
}}
/>
</div>
<div>
<Input
id="identifier"
name="identifier"
error={errors.identifier}
register={register}
placeholder="Enter identifier"
label="Identifier"
onChange={(e: any) => {
if (!activeWorkspace || !e.target.value) return;
checkIdentifierAvailability(activeWorkspace.slug, e.target.value);
}}
validations={{
required: "Identifier is required",
minLength: {
value: 1,
message: "Identifier must at least be of 1 character",
},
maxLength: {
value: 9,
message: "Identifier must at most be of 9 characters",
},
}}
/>
</div>
</div>
<div>
<TextArea
id="description"
name="description"
error={errors.description}
register={register}
label="Description"
placeholder="Enter project description"
/>
</div>
<div className="flex justify-end">
<Button type="submit" disabled={isSubmitting}>
{isSubmitting ? "Updating Project..." : "Update Project"}
</Button>
</div>
</section>
</Tab.Panel> </Tab.Panel>
<Tab.Panel> <Tab.Panel>
<section className="space-y-5"> <ControlSettings control={control} isSubmitting={isSubmitting} />
<div>
<h3 className="text-lg font-medium leading-6 text-gray-900">Control</h3>
<p className="mt-1 text-sm text-gray-500">Set the control for the project.</p>
</div>
<div className="flex justify-between gap-3">
<div className="w-full md:w-1/2">
<Controller
control={control}
name="project_lead"
render={({ field: { onChange, value } }) => (
<Listbox value={value} onChange={onChange}>
{({ open }) => (
<>
<Listbox.Label>
<div className="text-gray-500 mb-2">Project Lead</div>
</Listbox.Label>
<div className="relative">
<Listbox.Button className="bg-white relative w-full border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
<span className="block truncate">
{people?.find((person) => person.member.id === value)
?.member.first_name ?? "Select Lead"}
</span>
<span className="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
<ChevronDownIcon
className="h-5 w-5 text-gray-400"
aria-hidden="true"
/>
</span>
</Listbox.Button>
<Transition
show={open}
as={React.Fragment}
leave="transition ease-in duration-100"
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<Listbox.Options className="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
{people?.map((person) => (
<Listbox.Option
key={person.id}
className={({ active }) =>
`${
active ? "text-white bg-theme" : "text-gray-900"
} cursor-default select-none relative py-2 pl-3 pr-9`
}
value={person.member.id}
>
{({ selected, active }) => (
<>
<span
className={`${
selected ? "font-semibold" : "font-normal"
} block truncate`}
>
{person.member.first_name}
</span>
{selected ? (
<span
className={`absolute inset-y-0 right-0 flex items-center pr-4 ${
active ? "text-white" : "text-indigo-600"
}`}
>
<CheckIcon
className="h-5 w-5"
aria-hidden="true"
/>
</span>
) : null}
</>
)}
</Listbox.Option>
))}
</Listbox.Options>
</Transition>
</div>
</>
)}
</Listbox>
)}
/>
</div>
<div className="w-full md:w-1/2">
<Controller
control={control}
name="default_assignee"
render={({ field: { value, onChange } }) => (
<Listbox value={value} onChange={onChange}>
{({ open }) => (
<>
<Listbox.Label>
<div className="text-gray-500 mb-2">Default Assignee</div>
</Listbox.Label>
<div className="relative">
<Listbox.Button className="bg-white relative w-full border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
<span className="block truncate">
{people?.find((p) => p.member.id === value)?.member
.first_name ?? "Select Default Assignee"}
</span>
<span className="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
<ChevronDownIcon
className="h-5 w-5 text-gray-400"
aria-hidden="true"
/>
</span>
</Listbox.Button>
<Transition
show={open}
as={React.Fragment}
leave="transition ease-in duration-100"
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<Listbox.Options className="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
{people?.map((person) => (
<Listbox.Option
key={person.id}
className={({ active }) =>
`${
active ? "text-white bg-theme" : "text-gray-900"
} cursor-default select-none relative py-2 pl-3 pr-9`
}
value={person.member.id}
>
{({ selected, active }) => (
<>
<span
className={`${
selected ? "font-semibold" : "font-normal"
} block truncate`}
>
{person.member.first_name}
</span>
{selected ? (
<span
className={`absolute inset-y-0 right-0 flex items-center pr-4 ${
active ? "text-white" : "text-indigo-600"
}`}
>
<CheckIcon
className="h-5 w-5"
aria-hidden="true"
/>
</span>
) : null}
</>
)}
</Listbox.Option>
))}
</Listbox.Options>
</Transition>
</div>
</>
)}
</Listbox>
)}
/>
</div>
</div>
<div className="flex justify-end">
<Button type="submit" disabled={isSubmitting}>
{isSubmitting ? "Updating Project..." : "Update Project"}
</Button>
</div>
</section>
</Tab.Panel> </Tab.Panel>
<Tab.Panel> </form>
<section className="space-y-5"> <Tab.Panel>
<div> <StatesSettings projectId={projectId} />
<h3 className="text-lg font-medium leading-6 text-gray-900">State</h3> </Tab.Panel>
<p className="mt-1 text-sm text-gray-500"> <Tab.Panel>
Manage the state of this project. <LabelsSettings />
</p> </Tab.Panel>
</div> </Tab.Panels>
<div className="flex justify-between gap-3"> </Tab.Group>
<div className="w-full space-y-5">
{states?.map((state) => (
<div
key={state.id}
className="bg-white px-4 py-2 rounded flex justify-between items-center"
>
<div className="flex items-center gap-x-2">
<div
className="w-3 h-3 rounded-full"
style={{
backgroundColor: state.color,
}}
></div>
<h4>{addSpaceIfCamelCase(state.name)}</h4>
</div>
<div>
<button type="button" onClick={() => setSelectedState(state.id)}>
<PencilSquareIcon className="h-5 w-5 text-gray-400" />
</button>
</div>
</div>
))}
<Button
type="button"
className="flex items-center gap-x-1"
onClick={() => setIsCreateStateModalOpen(true)}
>
<PlusIcon className="h-4 w-4" />
<span>Add State</span>
</Button>
</div>
</div>
</section>
</Tab.Panel>
<Tab.Panel>
<section className="space-y-5">
<div className="flex items-center justify-between">
<div>
<h3 className="text-lg font-medium leading-6 text-gray-900">Labels</h3>
<p className="mt-1 text-sm text-gray-500">
Manage the labels of this project.
</p>
</div>
<Button
className="flex items-center gap-x-1"
onClick={() => setNewGroupForm(true)}
>
<PlusIcon className="h-4 w-4" />
New group
</Button>
</div>
<div className="space-y-5">
<div
className={`bg-white px-4 py-2 flex items-center gap-2 ${
newGroupForm ? "" : "hidden"
}`}
>
<Input type="text" name="groupName" />
<Button
type="button"
theme="secondary"
onClick={() => setNewGroupForm(false)}
>
Cancel
</Button>
<Button type="button">Save</Button>
</div>
{["", ""].map((group, index) => (
<div key={index} className="bg-white p-4 text-gray-900 rounded-md">
<h3 className="font-medium leading-5 flex items-center gap-2">
<RectangleGroupIcon className="h-5 w-5" />
This is the label group title
</h3>
<div className="pl-5 mt-4">
<div className="group text-sm flex justify-between items-center p-2 hover:bg-gray-100 rounded">
<h5 className="flex items-center gap-2">
<div className="w-2 h-2 bg-red-600 rounded-full"></div>
This is the label title
</h5>
<div className="hidden group-hover:block">
<PencilIcon className="h-3 w-3" />
</div>
</div>
</div>
</div>
))}
</div>
</section>
</Tab.Panel>
</Tab.Panels>
</Tab.Group>
</form>
</div> </div>
) : ( ) : (
<div className="h-full w-full flex justify-center items-center"> <div className="h-full w-full flex justify-center items-center">
<Spinner /> <Spinner />
</div> </div>
)} )}
</AdminLayout> </AppLayout>
); );
}; };

6
apps/app/pages/projects/index.tsx
View File

@ -6,7 +6,7 @@ import useUser from "lib/hooks/useUser";
// hoc // hoc
import withAuth from "lib/hoc/withAuthWrapper"; import withAuth from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// components // components
import CreateProjectModal from "components/project/CreateProjectModal"; import CreateProjectModal from "components/project/CreateProjectModal";
import ConfirmProjectDeletion from "components/project/ConfirmProjectDeletion"; import ConfirmProjectDeletion from "components/project/ConfirmProjectDeletion";
@ -63,7 +63,7 @@ const Projects: NextPage = () => {
}, [isOpen]); }, [isOpen]);
return ( return (
<AdminLayout> <AppLayout>
<CreateProjectModal isOpen={isOpen && !deleteProject} setIsOpen={setIsOpen} /> <CreateProjectModal isOpen={isOpen && !deleteProject} setIsOpen={setIsOpen} />
<ConfirmProjectDeletion <ConfirmProjectDeletion
isOpen={isOpen && !!deleteProject} isOpen={isOpen && !!deleteProject}
@ -127,7 +127,7 @@ const Projects: NextPage = () => {
<Spinner /> <Spinner />
</div> </div>
)} )}
</AdminLayout> </AppLayout>
); );
}; };

6
apps/app/pages/workspace/index.tsx
View File

@ -4,7 +4,7 @@ import Link from "next/link";
// react // react
import React from "react"; import React from "react";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// swr // swr
import useSWR from "swr"; import useSWR from "swr";
// hooks // hooks
@ -46,7 +46,7 @@ const Workspace: NextPage = () => {
const hours = new Date().getHours(); const hours = new Date().getHours();
return ( return (
<AdminLayout> <AppLayout>
<div className="h-full w-full space-y-5"> <div className="h-full w-full space-y-5">
{user ? ( {user ? (
<div className="font-medium text-2xl"> <div className="font-medium text-2xl">
@ -167,7 +167,7 @@ const Workspace: NextPage = () => {
</div> </div>
</div> </div>
</div> </div>
</AdminLayout> </AppLayout>
); );
}; };

8
apps/app/pages/workspace/members.tsx
View File

@ -17,7 +17,7 @@ import { WORKSPACE_INVITATIONS, WORKSPACE_MEMBERS } from "constants/fetch-keys";
// hoc // hoc
import withAuthWrapper from "lib/hoc/withAuthWrapper"; import withAuthWrapper from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// components // components
import SendWorkspaceInvitationModal from "components/workspace/SendWorkspaceInvitationModal"; import SendWorkspaceInvitationModal from "components/workspace/SendWorkspaceInvitationModal";
import ConfirmWorkspaceMemberRemove from "components/workspace/ConfirmWorkspaceMemberRemove"; import ConfirmWorkspaceMemberRemove from "components/workspace/ConfirmWorkspaceMemberRemove";
@ -71,7 +71,7 @@ const WorkspaceInvite: NextPage = () => {
]; ];
return ( return (
<AdminLayout <AppLayout
meta={{ meta={{
title: "Plane - Workspace Invite", title: "Plane - Workspace Invite",
}} }}
@ -299,8 +299,8 @@ const WorkspaceInvite: NextPage = () => {
)} )}
</div> </div>
)} )}
</AdminLayout> </AppLayout>
); );
}; };
export default withAuthWrapper(WorkspaceInvite); export default withAuthWrapper(WorkspaceInvite);

7
apps/app/pages/workspace/settings.tsx
View File

@ -11,7 +11,8 @@ import fileServices from "lib/services/file.services";
// hoc // hoc
import withAuth from "lib/hoc/withAuthWrapper"; import withAuth from "lib/hoc/withAuthWrapper";
// layouts // layouts
import AdminLayout from "layouts/AdminLayout"; import AppLayout from "layouts/AppLayout";
// hooks // hooks
import useUser from "lib/hooks/useUser"; import useUser from "lib/hooks/useUser";
import useToast from "lib/hooks/useToast"; import useToast from "lib/hooks/useToast";
@ -84,7 +85,7 @@ const WorkspaceSettings = () => {
}; };
return ( return (
<AdminLayout <AppLayout
meta={{ meta={{
title: "Plane - Workspace Settings", title: "Plane - Workspace Settings",
}} }}
@ -229,7 +230,7 @@ const WorkspaceSettings = () => {
</div> </div>
)} )}
</div> </div>
</AdminLayout> </AppLayout>
); );
}; };

2
apps/app/styles/globals.css
View File

@ -1,5 +1,5 @@
@import url("https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@48,400,0,0");
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;

4
apps/app/types/issues.d.ts vendored
View File

@ -27,7 +27,7 @@ export interface IIssue {
name: string; name: string;
description: string; description: string;
priority: string | null; priority: string | null;
start_date: null; start_date: string | null;
target_date: string | null; target_date: string | null;
sequence_id: number; sequence_id: number;
attachments: any[]; attachments: any[];
@ -102,7 +102,7 @@ export type Properties = {
assignee: boolean; assignee: boolean;
priority: boolean; priority: boolean;
start_date: boolean; start_date: boolean;
due_date: boolean; target_date: boolean;
cycle: boolean; cycle: boolean;
}; };

7
apps/app/ui/EmptySpace/index.tsx
View File

@ -9,12 +9,7 @@ type EmptySpaceProps = {
title: string; title: string;
description: string; description: string;
children: any; children: any;
Icon?: ( Icon?: (props: any) => JSX.Element;
props: React.SVGProps<SVGSVGElement> & {
title?: string | undefined;
titleId?: string | undefined;
}
) => JSX.Element;
link?: { text: string; href: string }; link?: { text: string; href: string };
}; };