From f3be2faa8f38b9b36c0c3ba09efcc5475c37e535 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Tue, 27 Jun 2023 17:12:21 +0530 Subject: [PATCH 1/5] fix: resolve z-index issue with quick action menu and disable it for completed cycles (#1405) --- apps/app/components/core/spreadsheet-view/single-issue.tsx | 6 ++++-- .../components/core/spreadsheet-view/spreadsheet-issues.tsx | 4 ++++ .../components/core/spreadsheet-view/spreadsheet-view.tsx | 3 ++- apps/app/layouts/app-layout/app-header.tsx | 2 +- apps/app/styles/globals.css | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/app/components/core/spreadsheet-view/single-issue.tsx b/apps/app/components/core/spreadsheet-view/single-issue.tsx index 2aabbef93..762de2453 100644 --- a/apps/app/components/core/spreadsheet-view/single-issue.tsx +++ b/apps/app/components/core/spreadsheet-view/single-issue.tsx @@ -49,6 +49,7 @@ type Props = { handleEditIssue: (issue: IIssue) => void; handleDeleteIssue: (issue: IIssue) => void; gridTemplateColumns: string; + isCompleted?: boolean; user: ICurrentUserResponse | undefined; userAuth: UserAuth; nestingLevel: number; @@ -62,6 +63,7 @@ export const SingleSpreadsheetIssue: React.FC = ({ handleEditIssue, handleDeleteIssue, gridTemplateColumns, + isCompleted = false, user, userAuth, nestingLevel, @@ -170,7 +172,7 @@ export const SingleSpreadsheetIssue: React.FC = ({ className="relative group grid auto-rows-[minmax(44px,1fr)] hover:rounded-sm hover:bg-brand-surface-2 border-b border-brand-base w-full min-w-max" style={{ gridTemplateColumns }} > -
+
{properties.key && ( @@ -178,7 +180,7 @@ export const SingleSpreadsheetIssue: React.FC = ({ {issue.project_detail?.identifier}-{issue.sequence_id} )} - {!isNotAllowed && ( + {!isNotAllowed && !isCompleted && (
void; handleDeleteIssue: (issue: IIssue) => void; gridTemplateColumns: string; + isCompleted?: boolean; user: ICurrentUserResponse | undefined; userAuth: UserAuth; nestingLevel?: number; @@ -30,6 +31,7 @@ export const SpreadsheetIssues: React.FC = ({ properties, handleEditIssue, handleDeleteIssue, + isCompleted = false, user, userAuth, nestingLevel = 0, @@ -61,6 +63,7 @@ export const SpreadsheetIssues: React.FC = ({ properties={properties} handleEditIssue={handleEditIssue} handleDeleteIssue={handleDeleteIssue} + isCompleted={isCompleted} user={user} userAuth={userAuth} nestingLevel={nestingLevel} @@ -80,6 +83,7 @@ export const SpreadsheetIssues: React.FC = ({ properties={properties} handleEditIssue={handleEditIssue} handleDeleteIssue={handleDeleteIssue} + isCompleted={isCompleted} user={user} userAuth={userAuth} nestingLevel={nestingLevel + 1} diff --git a/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx b/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx index 5655d11de..15034a633 100644 --- a/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx +++ b/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx @@ -62,7 +62,7 @@ export const SpreadsheetView: React.FC = ({ return (
-
+
{spreadsheetIssues ? ( @@ -77,6 +77,7 @@ export const SpreadsheetView: React.FC = ({ properties={properties} handleEditIssue={handleEditIssue} handleDeleteIssue={handleDeleteIssue} + isCompleted={isCompleted} user={user} userAuth={userAuth} /> diff --git a/apps/app/layouts/app-layout/app-header.tsx b/apps/app/layouts/app-layout/app-header.tsx index 1f99e044e..ea7d5558c 100644 --- a/apps/app/layouts/app-layout/app-header.tsx +++ b/apps/app/layouts/app-layout/app-header.tsx @@ -11,7 +11,7 @@ type Props = { const Header: React.FC = ({ breadcrumbs, left, right, setToggleSidebar, noHeader }) => (
diff --git a/apps/app/styles/globals.css b/apps/app/styles/globals.css index 2e997caea..ccfda2248 100644 --- a/apps/app/styles/globals.css +++ b/apps/app/styles/globals.css @@ -228,5 +228,5 @@ body { /* popover2 styling */ .bp4-popover2-transition-container { - z-index: 20 !important; + z-index: 1 !important; } From b0cdcfd91eecea273265787cd0e0c57241f98198 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:01:42 +0530 Subject: [PATCH 2/5] fixL inbox status colors (#1408) --- .../components/inbox/inbox-main-content.tsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/app/components/inbox/inbox-main-content.tsx b/apps/app/components/inbox/inbox-main-content.tsx index a75c00317..a05239a95 100644 --- a/apps/app/components/inbox/inbox-main-content.tsx +++ b/apps/app/components/inbox/inbox-main-content.tsx @@ -38,8 +38,6 @@ import { renderShortNumericDateFormat } from "helpers/date-time.helper"; import type { IInboxIssue, IIssue } from "types"; // fetch-keys import { INBOX_ISSUES, INBOX_ISSUE_DETAILS, PROJECT_ISSUES_ACTIVITY } from "constants/fetch-keys"; -// constants -import { INBOX_STATUS } from "constants/inbox"; const defaultValues = { name: "", @@ -192,7 +190,6 @@ export const InboxMainContent: React.FC = () => { }, [issueDetails, reset, inboxIssueId]); const issueStatus = issueDetails?.issue_inbox[0].status; - const inboxStatusDetails = INBOX_STATUS.find((s) => s.value === issueStatus); if (!inboxIssueId) return ( @@ -224,11 +221,18 @@ export const InboxMainContent: React.FC = () => {
From 7f1def2041a3bb3cf6992811318019eeab1433f8 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:01:57 +0530 Subject: [PATCH 3/5] fix: priority none filter (#1407) --- apps/app/components/core/filters-list.tsx | 2 +- apps/app/components/inbox/filters-dropdown.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/app/components/core/filters-list.tsx b/apps/app/components/core/filters-list.tsx index 70f980aae..e080c8e9a 100644 --- a/apps/app/components/core/filters-list.tsx +++ b/apps/app/components/core/filters-list.tsx @@ -135,7 +135,7 @@ export const FilterList: React.FC = ({ filters, setFilters }) => { }`} > {getPriorityIcon(priority)} - {priority ? priority : "None"} + {priority === "null" ? "None" : priority} diff --git a/apps/app/components/inbox/filters-dropdown.tsx b/apps/app/components/inbox/filters-dropdown.tsx index 1b6af608c..c12fcb8d2 100644 --- a/apps/app/components/inbox/filters-dropdown.tsx +++ b/apps/app/components/inbox/filters-dropdown.tsx @@ -39,7 +39,7 @@ export const FiltersDropdown: React.FC = () => { value: PRIORITIES, children: [ ...PRIORITIES.map((priority) => ({ - id: priority ?? "none", + id: priority === null ? "null" : priority, label: (
{getPriorityIcon(priority)} {priority ?? "None"} @@ -47,9 +47,9 @@ export const FiltersDropdown: React.FC = () => { ), value: { key: "priority", - value: priority, + value: priority === null ? "null" : priority, }, - selected: filters?.priority?.includes(priority ?? "none"), + selected: filters?.priority?.includes(priority === null ? "null" : priority), })), ], }, From 7fbf0e635833b38b7dcbe149f36151ac1c110616 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:08:37 +0530 Subject: [PATCH 4/5] fix: progress chart x-axis values (#1409) * fix: x-axis dates value in the progress chart * chore: loader for active cycle --- apps/app/components/core/sidebar/progress-chart.tsx | 2 +- apps/app/components/cycles/active-cycle-details.tsx | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/app/components/core/sidebar/progress-chart.tsx b/apps/app/components/core/sidebar/progress-chart.tsx index e4a1ce4fb..5fa25e863 100644 --- a/apps/app/components/core/sidebar/progress-chart.tsx +++ b/apps/app/components/core/sidebar/progress-chart.tsx @@ -52,7 +52,7 @@ const ProgressChart: React.FC = ({ distribution, startDate, endDate, tota const maxDates = 4; const totalDates = dates.length; - if (totalDates <= maxDates) return dates; + if (totalDates <= maxDates) return dates.map((d) => renderShortNumericDateFormat(d)); else { const interval = Math.ceil(totalDates / maxDates); const limitedDates = []; diff --git a/apps/app/components/cycles/active-cycle-details.tsx b/apps/app/components/cycles/active-cycle-details.tsx index b15dbd3ca..e7a1990e9 100644 --- a/apps/app/components/cycles/active-cycle-details.tsx +++ b/apps/app/components/cycles/active-cycle-details.tsx @@ -101,6 +101,13 @@ export const ActiveCycleDetails: React.FC = () => { : null ) as { data: IIssue[] | undefined }; + if (!currentCycle) + return ( + + + + ); + if (!cycle) return (
From df0b7d78e6da98caae98e00ed1f8efaf2155485e Mon Sep 17 00:00:00 2001 From: Rhea Jain <65884341+rhea0110@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:57:28 +0530 Subject: [PATCH 5/5] Update README.md (#1411) Edited the security email. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cf0af7fe2..7e9422f18 100644 --- a/README.md +++ b/README.md @@ -165,4 +165,4 @@ Our [Code of Conduct](https://github.com/makeplane/plane/blob/master/CODE_OF_CON ## ⛓️ Security -If you believe you have found a security vulnerability in Plane, we encourage you to responsibly disclose this and not open a public issue. We will investigate all legitimate reports. Email security@plane.so to disclose any security vulnerabilities. +If you believe you have found a security vulnerability in Plane, we encourage you to responsibly disclose this and not open a public issue. We will investigate all legitimate reports. Email engineering@plane.so to disclose any security vulnerabilities.