diff --git a/apps/app/components/core/board-view/board-header.tsx b/apps/app/components/core/board-view/board-header.tsx index 5eaed3a45..f209ba6e2 100644 --- a/apps/app/components/core/board-view/board-header.tsx +++ b/apps/app/components/core/board-view/board-header.tsx @@ -96,17 +96,17 @@ export const BoardHeader: React.FC = ({ switch (selectedGroup) { case "state": - icon = currentState && getStateGroupIcon(currentState.group, "18", "18", bgColor); + icon = currentState && getStateGroupIcon(currentState.group, "16", "16", bgColor); break; case "priority": - icon = getPriorityIcon(groupTitle, "h-[18px] w-[18px] flex items-center"); + icon = getPriorityIcon(groupTitle, "text-lg"); break; case "labels": const labelColor = issueLabels?.find((label) => label.id === groupTitle)?.color ?? "#000000"; icon = ( ); @@ -143,7 +143,9 @@ export const BoardHeader: React.FC = ({ {getGroupTitle()} {groupedByIssues?.[groupTitle].length ?? 0} diff --git a/apps/app/components/core/list-view/all-lists.tsx b/apps/app/components/core/list-view/all-lists.tsx index 27cd92fa5..2ea40ffe4 100644 --- a/apps/app/components/core/list-view/all-lists.tsx +++ b/apps/app/components/core/list-view/all-lists.tsx @@ -36,7 +36,7 @@ export const AllLists: React.FC = ({ return ( <> {groupedByIssues && ( -
+
{Object.keys(groupedByIssues).map((singleGroup) => { const currentState = selectedGroup === "state" ? states?.find((s) => s.id === singleGroup) : null; diff --git a/apps/app/components/core/list-view/single-issue.tsx b/apps/app/components/core/list-view/single-issue.tsx index df2d1cb3a..4fa518769 100644 --- a/apps/app/components/core/list-view/single-issue.tsx +++ b/apps/app/components/core/list-view/single-issue.tsx @@ -216,149 +216,147 @@ export const SingleListIssue: React.FC = ({ -
-
{ - e.preventDefault(); - setContextMenu(true); - setContextMenuPosition({ x: e.pageX, y: e.pageY }); - }} - > - - - {properties.key && ( - - - {issue.project_detail?.identifier}-{issue.sequence_id} - - - )} - - {truncateText(issue.name, 50)} +
{ + e.preventDefault(); + setContextMenu(true); + setContextMenuPosition({ x: e.pageX, y: e.pageY }); + }} + > + + + {properties.key && ( + + + {issue.project_detail?.identifier}-{issue.sequence_id} + - - + )} + + {truncateText(issue.name, 50)} + + + -
- {properties.priority && ( - - )} - {properties.state && ( - - )} - {properties.due_date && ( - - )} - {properties.sub_issue_count && ( -
- {issue.sub_issues_count} {issue.sub_issues_count === 1 ? "sub-issue" : "sub-issues"} -
- )} - {properties.labels && issue.label_details.length > 0 ? ( -
- {issue.label_details.map((label) => ( +
+ {properties.priority && ( + + )} + {properties.state && ( + + )} + {properties.due_date && ( + + )} + {properties.sub_issue_count && ( +
+ {issue.sub_issues_count} {issue.sub_issues_count === 1 ? "sub-issue" : "sub-issues"} +
+ )} + {properties.labels && issue.label_details.length > 0 ? ( +
+ {issue.label_details.map((label) => ( + - - {label.name} - - ))} -
- ) : ( - "" - )} - {properties.assignee && ( - - )} - {properties.estimate && ( - - )} - {properties.link && ( -
- -
- - {issue.link_count} -
-
-
- )} - {properties.attachment_count && ( -
- -
- - {issue.attachment_count} -
-
-
- )} - {type && !isNotAllowed && ( - - + className="h-1.5 w-1.5 rounded-full" + style={{ + backgroundColor: label?.color && label.color !== "" ? label.color : "#000", + }} + /> + {label.name} + + ))} +
+ ) : ( + "" + )} + {properties.assignee && ( + + )} + {properties.estimate && ( + + )} + {properties.link && ( +
+ +
+ + {issue.link_count} +
+
+
+ )} + {properties.attachment_count && ( +
+ +
+ + {issue.attachment_count} +
+
+
+ )} + {type && !isNotAllowed && ( + + +
+ + Edit issue +
+
+ {type !== "issue" && removeIssue && ( +
- - Edit issue + + Remove from {type}
- {type !== "issue" && removeIssue && ( - -
- - Remove from {type} -
-
- )} - handleDeleteIssue(issue)}> -
- - Delete issue -
-
- -
- - Copy issue link -
-
-
- )} -
+ )} + handleDeleteIssue(issue)}> +
+ + Delete issue +
+
+ +
+ + Copy issue link +
+
+ + )}
diff --git a/apps/app/components/core/list-view/single-list.tsx b/apps/app/components/core/list-view/single-list.tsx index adf8a6a5f..32880a1a6 100644 --- a/apps/app/components/core/list-view/single-list.tsx +++ b/apps/app/components/core/list-view/single-list.tsx @@ -104,17 +104,17 @@ export const SingleList: React.FC = ({ switch (selectedGroup) { case "state": - icon = currentState && getStateGroupIcon(currentState.group, "18", "18", bgColor); + icon = currentState && getStateGroupIcon(currentState.group, "16", "16", bgColor); break; case "priority": - icon = getPriorityIcon(groupTitle, "h-[18px] w-[18px] flex items-center"); + icon = getPriorityIcon(groupTitle, "text-lg"); break; case "labels": const labelColor = issueLabels?.find((label) => label.id === groupTitle)?.color ?? "#000000"; icon = ( ); @@ -134,24 +134,24 @@ export const SingleList: React.FC = ({ {({ open }) => (
{selectedGroup !== null && ( - {getGroupIcon()} +
{getGroupIcon()}
)} {selectedGroup !== null ? ( -

+

{getGroupTitle()}

) : (

All Issues

)} - - {groupedByIssues[groupTitle as keyof IIssue].length} + + {groupedByIssues?.[groupTitle].length ?? 0}
diff --git a/apps/app/components/issues/view-select/assignee.tsx b/apps/app/components/issues/view-select/assignee.tsx index adfd078a6..1429555d9 100644 --- a/apps/app/components/issues/view-select/assignee.tsx +++ b/apps/app/components/issues/view-select/assignee.tsx @@ -106,7 +106,7 @@ export const ViewAssigneeSelect: React.FC = ({ } items-center gap-2 text-gray-500`} > {issue.assignees && issue.assignees.length > 0 && Array.isArray(issue.assignees) ? ( -
+
{issue.assignees.length} Assignees
diff --git a/apps/app/components/ui/datepicker.tsx b/apps/app/components/ui/datepicker.tsx index b5c992a78..cf99bcc04 100644 --- a/apps/app/components/ui/datepicker.tsx +++ b/apps/app/components/ui/datepicker.tsx @@ -34,7 +34,7 @@ export const CustomDatePicker: React.FC = ({ if (!val) onChange(null); else onChange(renderDateFormat(val)); }} - className={`${className} ${ + className={`${ renderAs === "input" ? "block border-gray-300 bg-transparent px-3 py-2 text-sm focus:outline-none" : renderAs === "button" @@ -44,7 +44,7 @@ export const CustomDatePicker: React.FC = ({ : "" } ${error ? "border-red-500 bg-red-100" : ""} ${ disabled ? "cursor-not-allowed" : "cursor-pointer" - } w-full rounded-md border bg-transparent caret-transparent`} + } w-full rounded-md border bg-transparent caret-transparent ${className}`} dateFormat="dd-MM-yyyy" isClearable={isClearable} disabled={disabled}