Skip to content

chore: peek overview improvement and bug fixes #2683

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

Merged
sriramveeraghanta merged 5 commits into from
Nov 7, 2023
Merged

chore: peek overview improvement and bug fixes #2683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
400236c
style: issue peek overview improvement
anmolsinghbhatia Nov 7, 2023
f58bcc0
style: peek overview improvement
anmolsinghbhatia Nov 7, 2023
e2d42c8
fix: subscribe issue from peek overview fix and validation added
anmolsinghbhatia Nov 7, 2023
43b6e99
Merge branch 'develop' of github.com:makeplane/plane into chore/issue…
anmolsinghbhatia Nov 7, 2023
0f6ef52
fix: build error
anmolsinghbhatia Nov 7, 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
22 changes: 11 additions & 11 deletions space/constants/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import {
} from "types/issue";
// icons
import {
BacklogStateIcon,
UnstartedStateIcon,
StartedStateIcon,
CompletedStateIcon,
CancelledStateIcon,
} from "components/icons";
BacklogGroupIcon,
CancelledGroupIcon,
CompletedGroupIcon,
StartedGroupIcon,
UnstartedGroupIcon,
} from "@plane/ui";

// all issue views
export const issueViews: any = {
Expand Down Expand Up @@ -92,35 +92,35 @@ export const issueGroups: IIssueGroup[] = [
title: "Backlog",
color: "#d9d9d9",
className: `text-[#d9d9d9] bg-[#d9d9d9]/10`,
icon: BacklogStateIcon,
icon: BacklogGroupIcon,
},
{
key: "unstarted",
title: "Unstarted",
color: "#3f76ff",
className: `text-[#3f76ff] bg-[#3f76ff]/10`,
icon: UnstartedStateIcon,
icon: UnstartedGroupIcon,
},
{
key: "started",
title: "Started",
color: "#f59e0b",
className: `text-[#f59e0b] bg-[#f59e0b]/10`,
icon: StartedStateIcon,
icon: StartedGroupIcon,
},
{
key: "completed",
title: "Completed",
color: "#16a34a",
className: `text-[#16a34a] bg-[#16a34a]/10`,
icon: CompletedStateIcon,
icon: CompletedGroupIcon,
},
{
key: "cancelled",
title: "Cancelled",
color: "#dc2626",
className: `text-[#dc2626] bg-[#dc2626]/10`,
icon: CancelledStateIcon,
icon: CancelledGroupIcon,
},
];

Expand Down
22 changes: 11 additions & 11 deletions web/components/issues/issue-peek-overview/properties.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
<div className="flex flex-col gap-5 py-5 w-full">
{/* state */}
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<DoubleCircleIcon className="h-4 w-4 flex-shrink-0" />
<p>State</p>
</div>
Expand All @@ -201,7 +201,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro

{/* assignee */}
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<UserGroupIcon className="h-4 w-4 flex-shrink-0" />
<p>Assignees</p>
</div>
Expand All @@ -216,7 +216,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro

{/* priority */}
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<Signal className="h-4 w-4 flex-shrink-0" />
<p>Priority</p>
</div>
Expand All @@ -231,7 +231,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro

{/* estimate */}
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<Triangle className="h-4 w-4 flex-shrink-0 " />
<p>Estimate</p>
</div>
Expand All @@ -246,7 +246,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro

{/* start date */}
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<CalendarDays className="h-4 w-4 flex-shrink-0" />
<p>Start date</p>
</div>
Expand All @@ -264,7 +264,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro

{/* due date */}
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<CalendarDays className="h-4 w-4 flex-shrink-0" />
<p>Due date</p>
</div>
Expand All @@ -282,7 +282,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro

{/* parent */}
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<User2 className="h-4 w-4 flex-shrink-0" />
<p>Parent</p>
</div>
Expand All @@ -295,8 +295,8 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
<span className="border-t border-custom-border-200" />

<div className="flex flex-col gap-5 py-5 w-full">
<div className="flex items-center gap-2 w-80">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<ContrastIcon className="h-4 w-4 flex-shrink-0" />
<p>Cycle</p>
</div>
Expand All @@ -309,8 +309,8 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
</div>
</div>

<div className="flex items-center gap-2 w-80">
<div className="flex items-center gap-2 w-40 text-sm">
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-40 text-sm flex-shrink-0">
<DiceIcon className="h-4 w-4 flex-shrink-0" />
<p>Module</p>
</div>
Expand Down
38 changes: 22 additions & 16 deletions web/components/issues/issue-peek-overview/view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,11 @@ export const IssueView: FC<IIssueView> = observer((props) => {
}}
>
{/* header */}
<div className="relative flex items-center justify-between p-5 border-b border-custom-border-200">
<div
className={`relative flex items-center justify-between p-4 ${
currentMode?.key === "full-screen" ? "border-b border-custom-border-200" : ""
}`}
>
<div className="flex items-center gap-4">
<button onClick={removeRoutePeekId}>
<MoveRight className="h-4 w-4 text-custom-text-400 hover:text-custom-text-200" />
Expand Down Expand Up @@ -214,20 +218,22 @@ export const IssueView: FC<IIssueView> = observer((props) => {
</div>

<div className="flex items-center gap-4">
{!isArchived && (
<Button
size="sm"
prependIcon={<Bell className="h-3 w-3" />}
variant="outline-primary"
onClick={() =>
issueSubscription && issueSubscription.subscribed
? issueSubscriptionRemove
: issueSubscriptionCreate
}
>
{issueSubscription && issueSubscription.subscribed ? "Unsubscribe" : "Subscribe"}
</Button>
)}
{issue?.created_by !== user?.id &&
!issue?.assignees.includes(user?.id ?? "") &&
!router.pathname.includes("[archivedIssueId]") && (
<Button
size="sm"
prependIcon={<Bell className="h-3 w-3" />}
variant="outline-primary"
onClick={() =>
issueSubscription && issueSubscription.subscribed
? issueSubscriptionRemove()
: issueSubscriptionCreate()
}
>
{issueSubscription && issueSubscription.subscribed ? "Unsubscribe" : "Subscribe"}
</Button>
)}
<button onClick={handleCopyText}>
<Link2 className="h-4 w-4 text-custom-text-400 hover:text-custom-text-200 -rotate-45" />
</button>
Expand All @@ -250,7 +256,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {
issue && (
<>
{["side-peek", "modal"].includes(peekMode) ? (
<div className="flex flex-col gap-3 py-6 px-8">
<div className="flex flex-col gap-3 py-5 px-8">
<PeekOverviewIssueDetails
workspaceSlug={workspaceSlug}
issue={issue}
Expand Down
8 changes: 4 additions & 4 deletions web/components/issues/sidebar-select/cycle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ export const SidebarCycleSelect: React.FC<Props> = ({ issueDetail, handleCycleCh
<Tooltip position="left" tooltipContent={`${issueCycle ? issueCycle.cycle_detail.name : "No cycle"}`}>
<button
type="button"
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex ${
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex items-center ${
disabled ? "cursor-not-allowed" : ""
}`}
} max-w-[10rem]`}
>
<span
className={`flex items-center gap-1.5 truncate ${
issueCycle ? "text-custom-text-100" : "text-custom-text-200"
}`}
>
{issueCycle && <ContrastIcon className="h-3.5 w-3.5" />}
{issueCycle ? issueCycle.cycle_detail.name : "No cycle"}
<span className="flex-shrink-0">{issueCycle && <ContrastIcon className="h-3.5 w-3.5" />}</span>
<span className="truncate">{issueCycle ? issueCycle.cycle_detail.name : "No cycle"}</span>
</span>
</button>
</Tooltip>
Expand Down
10 changes: 6 additions & 4 deletions web/components/issues/sidebar-select/module.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,19 @@ export const SidebarModuleSelect: React.FC<Props> = ({ issueDetail, handleModule
>
<button
type="button"
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex ${
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex items-center ${
disabled ? "cursor-not-allowed" : ""
}`}
} max-w-[10rem]`}
>
<span
className={`flex items-center gap-1.5 truncate ${
issueModule ? "text-custom-text-100" : "text-custom-text-200"
}`}
>
{issueModule && <DiceIcon className="h-3.5 w-3.5" />}
{modules?.find((m) => m.id === issueModule?.module)?.name ?? "No module"}
<span className="flex-shrink-0">{issueModule && <DiceIcon className="h-3.5 w-3.5" />}</span>
<span className="truncate">
{modules?.find((m) => m.id === issueModule?.module)?.name ?? "No module"}
</span>
</span>
</button>
</Tooltip>
Expand Down