From 644073f0632ce5efdbfbcb9c4a4deb0fd21e3511 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 13 Dec 2023 18:32:21 +0530 Subject: [PATCH 1/4] chore: issue detail page title and indicator improvement --- web/components/inbox/main-content.tsx | 20 ++++++++++---------- web/components/issues/description-form.tsx | 2 +- web/components/issues/main-content.tsx | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/components/inbox/main-content.tsx b/web/components/inbox/main-content.tsx index 298a33196..3a0faf248 100644 --- a/web/components/inbox/main-content.tsx +++ b/web/components/inbox/main-content.tsx @@ -165,16 +165,16 @@ export const InboxMainContent: React.FC = observer(() => { issueStatus === -2 ? "border-yellow-500 bg-yellow-500/10 text-yellow-500" : issueStatus === -1 + ? "border-red-500 bg-red-500/10 text-red-500" + : issueStatus === 0 + ? new Date(issueDetails.issue_inbox[0].snoozed_till ?? "") < new Date() ? "border-red-500 bg-red-500/10 text-red-500" - : issueStatus === 0 - ? new Date(issueDetails.issue_inbox[0].snoozed_till ?? "") < new Date() - ? "border-red-500 bg-red-500/10 text-red-500" - : "border-gray-500 bg-gray-500/10 text-custom-text-200" - : issueStatus === 1 - ? "border-green-500 bg-green-500/10 text-green-500" - : issueStatus === 2 - ? "border-gray-500 bg-gray-500/10 text-custom-text-200" - : "" + : "border-gray-500 bg-gray-500/10 text-custom-text-200" + : issueStatus === 1 + ? "border-green-500 bg-green-500/10 text-green-500" + : issueStatus === 2 + ? "border-gray-500 bg-gray-500/10 text-custom-text-200" + : "" }`} > {issueStatus === -2 ? ( @@ -225,7 +225,7 @@ export const InboxMainContent: React.FC = observer(() => { ) : null} -
+
{currentIssueState && ( = (props) => { debouncedFormSave(); }} required - className="min-h-10 block w-full resize-none overflow-hidden rounded border-none bg-transparent px-3 py-2 text-xl outline-none ring-0 focus:ring-1 focus:ring-custom-primary" + className="min-h-min block w-full resize-none overflow-hidden rounded border-none bg-transparent px-3 py-2 text-2xl font-medium outline-none ring-0 focus:ring-1 focus:ring-custom-primary" hasError={Boolean(errors?.description)} role="textbox" disabled={!isAllowed} diff --git a/web/components/issues/main-content.tsx b/web/components/issues/main-content.tsx index eee857e93..2afdeec2e 100644 --- a/web/components/issues/main-content.tsx +++ b/web/components/issues/main-content.tsx @@ -216,7 +216,7 @@ export const IssueMainContent: React.FC = observer((props) => {
) : null} -
+
{currentIssueState && ( Date: Wed, 13 Dec 2023 18:40:46 +0530 Subject: [PATCH 2/4] chore: sub issue propery permission validation --- web/components/issues/issue-layouts/properties/assignee.tsx | 2 +- web/components/issues/sub-issues/properties.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/components/issues/issue-layouts/properties/assignee.tsx b/web/components/issues/issue-layouts/properties/assignee.tsx index b53f1c215..126c984bd 100644 --- a/web/components/issues/issue-layouts/properties/assignee.tsx +++ b/web/components/issues/issue-layouts/properties/assignee.tsx @@ -100,7 +100,7 @@ export const IssuePropertyAssignee: React.FC = observer( const label = ( -
+
{value && value.length > 0 && Array.isArray(value) ? ( {value.map((assigneeId) => { diff --git a/web/components/issues/sub-issues/properties.tsx b/web/components/issues/sub-issues/properties.tsx index cba7c7aea..7e07670c0 100644 --- a/web/components/issues/sub-issues/properties.tsx +++ b/web/components/issues/sub-issues/properties.tsx @@ -78,7 +78,7 @@ export const IssueProperty: React.FC = (props) => { projectId={issue?.project_detail?.id || null} value={issue?.state || null} onChange={(data) => handleStateChange(data)} - disabled={false} + disabled={!editable} hideDropdownArrow />
@@ -89,7 +89,7 @@ export const IssueProperty: React.FC = (props) => { value={issue?.assignees || null} hideDropdownArrow onChange={(val) => handleAssigneeChange(val)} - disabled={false} + disabled={!editable} />
From a0588be40585bb111be486e96bc1eb8365609cd3 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 13 Dec 2023 18:57:50 +0530 Subject: [PATCH 3/4] chore: remove parent option added in issue sidebar and peek overview --- .../issues/sidebar-select/parent.tsx | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/web/components/issues/sidebar-select/parent.tsx b/web/components/issues/sidebar-select/parent.tsx index d7e03989d..e030e3d58 100644 --- a/web/components/issues/sidebar-select/parent.tsx +++ b/web/components/issues/sidebar-select/parent.tsx @@ -4,6 +4,8 @@ import { useRouter } from "next/router"; // components import { ParentIssuesListModal } from "components/issues"; +// icons +import { X } from "lucide-react"; // types import { IIssue, ISearchIssueResponse } from "types"; @@ -32,22 +34,33 @@ export const SidebarParentSelect: React.FC = ({ onChange, issueDetails, d issueId={issueId as string} projectId={projectId as string} /> - + {selectedParentIssue && issueDetails?.parent && ( + )} - +
); }; From e8945f244d2df6c01fe74d01ee915795b91d4f2a Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 13 Dec 2023 19:29:49 +0530 Subject: [PATCH 4/4] chore: remove parent option added in issue sidebar and peek overview --- .../issues/sidebar-select/parent.tsx | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/web/components/issues/sidebar-select/parent.tsx b/web/components/issues/sidebar-select/parent.tsx index e030e3d58..cdeb09e90 100644 --- a/web/components/issues/sidebar-select/parent.tsx +++ b/web/components/issues/sidebar-select/parent.tsx @@ -35,32 +35,30 @@ export const SidebarParentSelect: React.FC = ({ onChange, issueDetails, d projectId={projectId as string} /> -
- - {selectedParentIssue && issueDetails?.parent && ( - +
+ {issueDetails?.parent && } + ); };