Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: bug fix and ui improvement #1436

Merged
merged 7 commits into from
Jul 3, 2023
Merged

fix: bug fix and ui improvement #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c07da4
fix: overflow fix
anmolsinghbhatia Jun 29, 2023
8229b12
style: recent page overflow fix
anmolsinghbhatia Jun 29, 2023
f2a4e02
fix: cycle and module sidebar overflow fix
anmolsinghbhatia Jun 29, 2023
d8eeb9e
fix: cycle list item fix
anmolsinghbhatia Jun 29, 2023
ebf877b
fix: display properties fix
anmolsinghbhatia Jun 29, 2023
32bf2ed
fix: display properties fix
anmolsinghbhatia Jun 29, 2023
fc15da8
style: label dropdown empty state
anmolsinghbhatia Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/app/components/core/issues-view-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 6 additions & 2 deletions apps/app/components/cycles/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}>
Expand All @@ -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>
Expand Down
8 changes: 5 additions & 3 deletions apps/app/components/cycles/single-cycle-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/gantt-chart/blocks/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions apps/app/components/issues/view-select/label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && (
Expand All @@ -141,6 +143,7 @@ export const ViewLabelSelect: React.FC<Props> = ({
disabled={isNotAllowed}
selfPositioned={selfPositioned}
footerOption={footerOption}
noResultIcon={noResultIcon}
dropdownWidth="w-full min-w-[12rem]"
/>
</>
Expand Down
8 changes: 6 additions & 2 deletions apps/app/components/modules/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/pages/pages-list/recent-pages-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion apps/app/components/ui/custom-search-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type CustomSearchSelectProps = {
selfPositioned?: boolean;
multiple?: boolean;
footerOption?: JSX.Element;
noResultIcon?: JSX.Element;
dropdownWidth?: string;
};
export const CustomSearchSelect = ({
Expand All @@ -47,6 +48,7 @@ export const CustomSearchSelect = ({
disabled = false,
selfPositioned = false,
multiple = false,
noResultIcon,
footerOption,
dropdownWidth,
}: CustomSearchSelectProps) => {
Expand Down Expand Up @@ -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>
Expand Down