thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

Merge pull request #1436 from makeplane/fix/bug_fix_and_ui_improvement

Browse Source
This commit is contained in:
guru_sainath 2023-07-03 13:57:15 +05:30 committed by GitHub
commit 54a536e268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app/components/core/issues-view-filter.tsx
View File

@ -262,9 +262,9 @@ 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") ||
(issueView === "spreadsheet" && key === "sub_issue_count")
)
return null;

8
apps/app/components/cycles/sidebar.tsx
View File

@ -408,7 +408,11 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
<div className="flex w-full flex-col gap-6 px-6 py-6">
<div className="flex w-full flex-col items-start justify-start gap-2">
<div className="flex w-full items-start justify-between gap-2">
<h4 className="text-xl font-semibold text-brand-base">{cycle.name}</h4>
<div className="max-w-[300px]">
<h4 className="text-xl font-semibold text-brand-base break-words w-full">
{cycle.name}
</h4>
</div>
<CustomMenu width="lg" ellipsis>
{!isCompleted && (
<CustomMenu.MenuItem onClick={() => setCycleDeleteModal(true)}>
@ -427,7 +431,7 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
</CustomMenu>
</div>
<span className="whitespace-normal text-sm leading-5 text-brand-secondary">
<span className="whitespace-normal text-sm leading-5 text-brand-secondary break-words w-full">
{cycle.description}
</span>
</div>

8
apps/app/components/cycles/single-cycle-list.tsx
View File

@ -172,17 +172,19 @@ export const SingleCycleList: React.FC<TSingleStatProps> = ({
: ""
}`}
/>
<div>
<div className="max-w-2xl">
<Tooltip
tooltipContent={cycle.name}
className="break-words"
position="top-left"
>
<h3 className="break-words text-base font-semibold">
<h3 className="break-words w-full text-base font-semibold">
{truncateText(cycle.name, 70)}
</h3>
</Tooltip>
<p className="mt-2 text-brand-secondary">{cycle.description}</p>
<p className="mt-2 text-brand-secondary break-words w-full">
{cycle.description}
</p>
</div>
</span>
<span className="flex items-center gap-4 capitalize">

2
apps/app/components/gantt-chart/blocks/index.tsx
View File

@ -18,7 +18,7 @@ export const GanttChartBlocks: FC<{
return (
<div
className="relative z-10 mt-[58px] h-full w-[4000px] divide-x divide-gray-300 overflow-hidden overflow-y-auto"
className="relative z-[5] mt-[58px] h-full w-[4000px] divide-x divide-gray-300 overflow-hidden overflow-y-auto"
style={{ width: `${itemsContainerWidth}px` }}
>
<div className="w-full">

3
apps/app/components/issues/view-select/label.tsx
View File

@ -118,6 +118,8 @@ export const ViewLabelSelect: React.FC<Props> = ({
</button>
);
const noResultIcon = <TagIcon className="h-3.5 w-3.5 text-brand-secondary" />;
return (
<>
{projectId && (
@ -141,6 +143,7 @@ export const ViewLabelSelect: React.FC<Props> = ({
disabled={isNotAllowed}
selfPositioned={selfPositioned}
footerOption={footerOption}
noResultIcon={noResultIcon}
dropdownWidth="w-full min-w-[12rem]"
/>
</>

8
apps/app/components/modules/sidebar.tsx
View File

@ -322,7 +322,11 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
<div className="flex w-full flex-col gap-6 px-6 py-6">
<div className="flex w-full flex-col items-start justify-start gap-2">
<div className="flex w-full items-start justify-between gap-2 ">
<h4 className="text-xl font-semibold text-brand-base">{module.name}</h4>
<div className="max-w-[300px]">
<h4 className="text-xl font-semibold break-words w-full text-brand-base">
{module.name}
</h4>
</div>
<CustomMenu width="lg" ellipsis>
<CustomMenu.MenuItem onClick={() => setModuleDeleteModal(true)}>
<span className="flex items-center justify-start gap-2">
@ -339,7 +343,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
</CustomMenu>
</div>
<span className="whitespace-normal text-sm leading-5 text-brand-secondary">
<span className="whitespace-normal text-sm leading-5 text-brand-secondary break-words w-full">
{module.description}
</span>
</div>

2
apps/app/components/pages/pages-list/recent-pages-list.tsx
View File

@ -41,7 +41,7 @@ export const RecentPagesList: React.FC<TPagesListProps> = ({ viewType }) => {
if (pages[key].length === 0) return null;
return (
<div key={key}>
<div key={key} className="h-full overflow-hidden">
<h2 className="text-xl font-semibold capitalize mb-2">
{replaceUnderscoreIfSnakeCase(key)}
</h2>

7
apps/app/components/ui/custom-search-select.tsx
View File

@ -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 = ({
</Combobox.Option>
))
) : (
<p className="text-center text-brand-secondary">No matching results</p>
<span className="flex items-center gap-2 p-1">
{noResultIcon && noResultIcon}
<p className="text-left text-brand-secondary ">No matching results</p>
</span>
)
) : (
<p className="text-center text-brand-secondary">Loading...</p>