From 3c07da433ab09b69d8a2aee965e7736f67b06c6c Mon Sep 17 00:00:00 2001 From: anmolsinghbhatia Date: Thu, 29 Jun 2023 18:16:01 +0530 Subject: [PATCH 1/7] fix: overflow fix --- apps/app/components/gantt-chart/blocks/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/components/gantt-chart/blocks/index.tsx b/apps/app/components/gantt-chart/blocks/index.tsx index d5eadf2a0..31e7839cc 100644 --- a/apps/app/components/gantt-chart/blocks/index.tsx +++ b/apps/app/components/gantt-chart/blocks/index.tsx @@ -18,7 +18,7 @@ export const GanttChartBlocks: FC<{ return (
From 8229b12c9cecd2ba7919d5b35671a1db2c89a00f Mon Sep 17 00:00:00 2001 From: anmolsinghbhatia Date: Thu, 29 Jun 2023 18:17:52 +0530 Subject: [PATCH 2/7] style: recent page overflow fix --- apps/app/components/pages/pages-list/recent-pages-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/components/pages/pages-list/recent-pages-list.tsx b/apps/app/components/pages/pages-list/recent-pages-list.tsx index 44225aee5..ce66a6ce1 100644 --- a/apps/app/components/pages/pages-list/recent-pages-list.tsx +++ b/apps/app/components/pages/pages-list/recent-pages-list.tsx @@ -41,7 +41,7 @@ export const RecentPagesList: React.FC = ({ viewType }) => { if (pages[key].length === 0) return null; return ( -
+

{replaceUnderscoreIfSnakeCase(key)}

From f2a4e026a5f0b114cfa98be1bb70c910251e20fa Mon Sep 17 00:00:00 2001 From: anmolsinghbhatia Date: Thu, 29 Jun 2023 18:19:38 +0530 Subject: [PATCH 3/7] fix: cycle and module sidebar overflow fix --- apps/app/components/cycles/sidebar.tsx | 8 ++++++-- apps/app/components/modules/sidebar.tsx | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/app/components/cycles/sidebar.tsx b/apps/app/components/cycles/sidebar.tsx index d61bd1943..e4b48869f 100644 --- a/apps/app/components/cycles/sidebar.tsx +++ b/apps/app/components/cycles/sidebar.tsx @@ -408,7 +408,11 @@ export const CycleDetailsSidebar: React.FC = ({
-

{cycle.name}

+
+

+ {cycle.name} +

+
{!isCompleted && ( setCycleDeleteModal(true)}> @@ -427,7 +431,7 @@ export const CycleDetailsSidebar: React.FC = ({
- + {cycle.description}
diff --git a/apps/app/components/modules/sidebar.tsx b/apps/app/components/modules/sidebar.tsx index de8714968..4c7feacbd 100644 --- a/apps/app/components/modules/sidebar.tsx +++ b/apps/app/components/modules/sidebar.tsx @@ -322,7 +322,11 @@ export const ModuleDetailsSidebar: React.FC = ({ module, isOpen, moduleIs
-

{module.name}

+
+

+ {module.name} +

+
setModuleDeleteModal(true)}> @@ -339,7 +343,7 @@ export const ModuleDetailsSidebar: React.FC = ({ module, isOpen, moduleIs
- + {module.description}
From d8eeb9e17ac944e61da354742074dc333222121f Mon Sep 17 00:00:00 2001 From: anmolsinghbhatia Date: Thu, 29 Jun 2023 18:20:22 +0530 Subject: [PATCH 4/7] fix: cycle list item fix --- apps/app/components/cycles/single-cycle-list.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/app/components/cycles/single-cycle-list.tsx b/apps/app/components/cycles/single-cycle-list.tsx index fa725b83a..423580383 100644 --- a/apps/app/components/cycles/single-cycle-list.tsx +++ b/apps/app/components/cycles/single-cycle-list.tsx @@ -172,17 +172,19 @@ export const SingleCycleList: React.FC = ({ : "" }`} /> -
+
-

+

{truncateText(cycle.name, 70)}

-

{cycle.description}

+

+ {cycle.description} +

From ebf877b7fa2b7ce315b222a99ac1924ffd47e0f2 Mon Sep 17 00:00:00 2001 From: anmolsinghbhatia Date: Thu, 29 Jun 2023 18:33:44 +0530 Subject: [PATCH 5/7] fix: display properties fix --- apps/app/components/core/issues-view-filter.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/app/components/core/issues-view-filter.tsx b/apps/app/components/core/issues-view-filter.tsx index 679f6adc3..112862e8a 100644 --- a/apps/app/components/core/issues-view-filter.tsx +++ b/apps/app/components/core/issues-view-filter.tsx @@ -262,9 +262,8 @@ export const IssuesFilterView: React.FC = () => { if (key === "estimate" && !isEstimateActive) return null; if ( - (issueView === "spreadsheet" && key === "sub_issue_count") || - key === "attachment_count" || - key === "link" + (issueView === "spreadsheet" && key === "attachment_count") || + (issueView === "spreadsheet" && key === "link") ) return null; From 32bf2ed56a7b2fcd212b994007147cb9ec2fbe3b Mon Sep 17 00:00:00 2001 From: anmolsinghbhatia Date: Thu, 29 Jun 2023 18:37:19 +0530 Subject: [PATCH 6/7] fix: display properties fix --- apps/app/components/core/issues-view-filter.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/app/components/core/issues-view-filter.tsx b/apps/app/components/core/issues-view-filter.tsx index 112862e8a..a6996793c 100644 --- a/apps/app/components/core/issues-view-filter.tsx +++ b/apps/app/components/core/issues-view-filter.tsx @@ -263,7 +263,8 @@ export const IssuesFilterView: React.FC = () => { if ( (issueView === "spreadsheet" && key === "attachment_count") || - (issueView === "spreadsheet" && key === "link") + (issueView === "spreadsheet" && key === "link") || + (issueView === "spreadsheet" && key === "sub_issue_count") ) return null; From fc15da826befb1f11ff04fdb2a6a989f04dd04c9 Mon Sep 17 00:00:00 2001 From: anmolsinghbhatia Date: Fri, 30 Jun 2023 18:28:12 +0530 Subject: [PATCH 7/7] style: label dropdown empty state --- apps/app/components/issues/view-select/label.tsx | 3 +++ apps/app/components/ui/custom-search-select.tsx | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/app/components/issues/view-select/label.tsx b/apps/app/components/issues/view-select/label.tsx index 53dca9382..b82b02a0f 100644 --- a/apps/app/components/issues/view-select/label.tsx +++ b/apps/app/components/issues/view-select/label.tsx @@ -118,6 +118,8 @@ export const ViewLabelSelect: React.FC = ({ ); + const noResultIcon = ; + return ( <> {projectId && ( @@ -141,6 +143,7 @@ export const ViewLabelSelect: React.FC = ({ disabled={isNotAllowed} selfPositioned={selfPositioned} footerOption={footerOption} + noResultIcon={noResultIcon} dropdownWidth="w-full min-w-[12rem]" /> diff --git a/apps/app/components/ui/custom-search-select.tsx b/apps/app/components/ui/custom-search-select.tsx index fb1c0a88c..f9ea3daa1 100644 --- a/apps/app/components/ui/custom-search-select.tsx +++ b/apps/app/components/ui/custom-search-select.tsx @@ -29,6 +29,7 @@ type CustomSearchSelectProps = { selfPositioned?: boolean; multiple?: boolean; footerOption?: JSX.Element; + noResultIcon?: JSX.Element; dropdownWidth?: string; }; export const CustomSearchSelect = ({ @@ -47,6 +48,7 @@ export const CustomSearchSelect = ({ disabled = false, selfPositioned = false, multiple = false, + noResultIcon, footerOption, dropdownWidth, }: CustomSearchSelectProps) => { @@ -171,7 +173,10 @@ export const CustomSearchSelect = ({ )) ) : ( -

No matching results

+ + {noResultIcon && noResultIcon} +

No matching results

+
) ) : (

Loading...