-
{issueActivities.map((activityItem, index) => {
// determines what type of action is performed
- const message = activityItem.field
- ? activityDetails[activityItem.field as keyof typeof activityDetails]?.message(
- activityItem
- )
- : "created the issue.";
+ const message = activityItem.field ? (
+
-
- - {activities.length > 1 && activityIdx !== activities.length - 1 ? ( - - ) : null} -- <> ---+ ); +}; From 2cd431b4a45f7767834a1bda96319c0fb90c67dd Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Tue, 1 Aug 2023 18:40:04 +0530 Subject: [PATCH 06/10] fix: my issues mutation (#1753) * fix: my issues mutation * fix: activity message and icon return value --- apps/app/components/core/activity.tsx | 4 ++-- apps/app/components/issues/modal.tsx | 4 ++++ .../profile/profile-issues-view.tsx | 19 +++++++++++++++---- apps/app/hooks/my-issues/use-my-issues.tsx | 12 ++++++++++-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/apps/app/components/core/activity.tsx b/apps/app/components/core/activity.tsx index 078941b02a5..f7622baa6d2 100644 --- a/apps/app/components/core/activity.tsx +++ b/apps/app/components/core/activity.tsx @@ -481,7 +481,7 @@ const activityDetails: { }; export const ActivityIcon = ({ activity }: { activity: IIssueActivity }) => ( - <>{activityDetails[activity.field as keyof typeof activityDetails].icon} + <>{activityDetails[activity.field as keyof typeof activityDetails]?.icon} ); export const ActivityMessage = ({ @@ -492,6 +492,6 @@ export const ActivityMessage = ({ showIssue?: boolean; }) => ( <> - {activityDetails[activity.field as keyof typeof activityDetails].message(activity, showIssue)} + {activityDetails[activity.field as keyof typeof activityDetails]?.message(activity, showIssue)} ); diff --git a/apps/app/components/issues/modal.tsx b/apps/app/components/issues/modal.tsx index c738dbf07ae..be3b556a122 100644 --- a/apps/app/components/issues/modal.tsx +++ b/apps/app/components/issues/modal.tsx @@ -18,6 +18,7 @@ import useToast from "hooks/use-toast"; import useInboxView from "hooks/use-inbox-view"; import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view"; import useProjects from "hooks/use-projects"; +import useMyIssues from "hooks/my-issues/use-my-issues"; // components import { IssueForm } from "components/issues"; // types @@ -85,6 +86,8 @@ export const CreateUpdateIssueModal: React.FC--); + + ); + } + })} + +- {activity.field ? ( - activityDetails[activity.field as keyof typeof activityDetails]?.icon - ) : activity.actor_detail.avatar && - activity.actor_detail.avatar !== "" ? ( -- - ); - } - })} - -
- ) : ( -
- {activity.actor_detail.first_name.charAt(0)} -- )} + if ("field" in activity && activity.field !== "updated_by") { + return ( +- +
+ {activities.length > 1 && activityIdx !== activities.length - 1 ? ( + + ) : null} +-+ <> +-+-+++ {activity.field ? ( + activityDetails[activity.field as keyof typeof activityDetails] + ?.icon + ) : activity.actor_detail.avatar && + activity.actor_detail.avatar !== "" ? ( ++ {activity.actor_detail.first_name.charAt(0)} ++ )} +-- {activity.field === "archived_at" && activity.new_value !== "restore" ? ( - Plane - ) : ( - - {activity.actor_detail.first_name} - {activity.actor_detail.is_bot - ? " Bot" - : " " + activity.actor_detail.last_name} - - )} - {action} - {activity.field !== "archived_at" && ( - - {" "} - {value}{" "} - - )} - {timeAgo(activity.created_at)} +- + ++-+ {activity.field === "archived_at" && activity.new_value !== "restore" ? ( + Plane + ) : ( + + {activity.actor_detail.first_name} + {activity.actor_detail.is_bot + ? " Bot" + : " " + activity.actor_detail.last_name} + + )} + {action} + {activity.field !== "archived_at" && ( + + {" "} + {value}{" "} + + )} + {timeAgo(activity.created_at)} += ({ const { user } = useUser(); const { projects } = useProjects(); + const { groupedIssues, mutateMyIssues } = useMyIssues(workspaceSlug?.toString()); + const { setToastAlert } = useToast(); if (cycleId) prePopulateData = { ...prePopulateData, cycle: cycleId as string }; @@ -243,6 +246,7 @@ export const CreateUpdateIssueModal: React.FC = ({ if (issueView === "calendar") mutate(calendarFetchKey); if (issueView === "gantt_chart") mutate(ganttFetchKey); if (issueView === "spreadsheet") mutate(spreadsheetFetchKey); + if (groupedIssues) mutateMyIssues(); setToastAlert({ type: "success", diff --git a/apps/app/components/profile/profile-issues-view.tsx b/apps/app/components/profile/profile-issues-view.tsx index 64632f0b989..401ac22d377 100644 --- a/apps/app/components/profile/profile-issues-view.tsx +++ b/apps/app/components/profile/profile-issues-view.tsx @@ -8,6 +8,7 @@ import useSWR from "swr"; import { DropResult } from "react-beautiful-dnd"; // services import issuesService from "services/issues.service"; +import userService from "services/user.service"; // hooks import useProfileIssues from "hooks/use-profile-issues"; import useUser from "hooks/use-user"; @@ -19,7 +20,7 @@ import { orderArrayBy } from "helpers/array.helper"; // types import { IIssue, IIssueFilterOptions } from "types"; // fetch-keys -import { WORKSPACE_LABELS } from "constants/fetch-keys"; +import { USER_PROFILE_PROJECT_SEGREGATION, WORKSPACE_LABELS } from "constants/fetch-keys"; export const ProfileIssuesView = () => { // create issue modal @@ -60,6 +61,16 @@ export const ProfileIssuesView = () => { params, } = useProfileIssues(workspaceSlug?.toString(), userId?.toString()); + const { data: profileData } = useSWR( + workspaceSlug && userId + ? USER_PROFILE_PROJECT_SEGREGATION(workspaceSlug.toString(), userId.toString()) + : null, + workspaceSlug && userId + ? () => + userService.getUserProfileProjectsSegregation(workspaceSlug.toString(), userId.toString()) + : null + ); + const { data: labels } = useSWR( workspaceSlug && (filters?.labels ?? []).length > 0 ? WORKSPACE_LABELS(workspaceSlug.toString()) @@ -268,10 +279,10 @@ export const ProfileIssuesView = () => { dragDisabled={groupByProperty !== "priority"} emptyState={{ title: router.pathname.includes("assigned") - ? `Issues assigned to ${user?.first_name} ${user?.last_name} will appear here` + ? `Issues assigned to ${profileData?.user_data.first_name} ${profileData?.user_data.last_name} will appear here` : router.pathname.includes("created") - ? `Issues created by ${user?.first_name} ${user?.last_name} will appear here` - : `Issues subscribed by ${user?.first_name} ${user?.last_name} will appear here`, + ? `Issues created by ${profileData?.user_data.first_name} ${profileData?.user_data.last_name} will appear here` + : `Issues subscribed by ${profileData?.user_data.first_name} ${profileData?.user_data.last_name} will appear here`, }} handleOnDragEnd={handleOnDragEnd} handleIssueAction={handleIssueAction} diff --git a/apps/app/hooks/my-issues/use-my-issues.tsx b/apps/app/hooks/my-issues/use-my-issues.tsx index 164fad4d431..f9063b4de0c 100644 --- a/apps/app/hooks/my-issues/use-my-issues.tsx +++ b/apps/app/hooks/my-issues/use-my-issues.tsx @@ -1,5 +1,7 @@ import { useMemo } from "react"; +import { useRouter } from "next/router"; + import useSWR from "swr"; // services @@ -12,6 +14,8 @@ import { IIssue } from "types"; import { USER_ISSUES } from "constants/fetch-keys"; const useMyIssues = (workspaceSlug: string | undefined) => { + const router = useRouter(); + const { filters, groupBy, orderBy } = useMyIssuesFilters(workspaceSlug); const params: any = { @@ -27,8 +31,12 @@ const useMyIssues = (workspaceSlug: string | undefined) => { }; const { data: myIssues, mutate: mutateMyIssues } = useSWR( - workspaceSlug ? USER_ISSUES(workspaceSlug.toString(), params) : null, - workspaceSlug ? () => userService.userIssues(workspaceSlug.toString(), params) : null + workspaceSlug && router.pathname.includes("my-issues") + ? USER_ISSUES(workspaceSlug.toString(), params) + : null, + workspaceSlug && router.pathname.includes("my-issues") + ? () => userService.userIssues(workspaceSlug.toString(), params) + : null ); const groupedIssues: From d83a76a3aa2b00aeff5d622f2c1dfda4fd402915 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Tue, 1 Aug 2023 19:04:53 +0530 Subject: [PATCH 07/10] style: my issue and profile page view dropdown (#1754) --- .../my-issues/my-issues-view-options.tsx | 155 ++++++++--------- .../profile/profile-issues-view-options.tsx | 157 +++++++++--------- 2 files changed, 159 insertions(+), 153 deletions(-) diff --git a/apps/app/components/issues/my-issues/my-issues-view-options.tsx b/apps/app/components/issues/my-issues/my-issues-view-options.tsx index 24d59fa0391..35ed2295ccc 100644 --- a/apps/app/components/issues/my-issues/my-issues-view-options.tsx +++ b/apps/app/components/issues/my-issues/my-issues-view-options.tsx @@ -146,105 +146,108 @@ export const MyIssuesViewOptions: React.FC = () => { <> Group by
-option.key === groupBy)?.name ?? - "Select" - } - > - {GROUP_BY_OPTIONS.map((option) => { - if (issueView === "kanban" && option.key === null) return null; - if (option.key === "state" || option.key === "created_by") - return null; + +option.key === groupBy) + ?.name ?? "Select" + } + className="!w-full" + buttonClassName="w-full" + > + {GROUP_BY_OPTIONS.map((option) => { + if (issueView === "kanban" && option.key === null) return null; + if (option.key === "state" || option.key === "created_by") + return null; - return ( - + return ( +setGroupBy(option.key)} - > - {option.name} - - ); - })} -setGroupBy(option.key)} + > + {option.name} + + ); + })} + +)}Order by
-option.key === orderBy)?.name ?? - "Select" - } - > - {ORDER_BY_OPTIONS.map((option) => { - if (groupBy === "priority" && option.key === "priority") return null; - if (option.key === "sort_order") return null; + +option.key === orderBy)?.name ?? + "Select" + } + className="!w-full" + buttonClassName="w-full" + > + {ORDER_BY_OPTIONS.map((option) => { + if (groupBy === "priority" && option.key === "priority") + return null; + if (option.key === "sort_order") return null; - return ( - + return ( +{ - setOrderBy(option.key); - }} - > - {option.name} - - ); - })} -{ + setOrderBy(option.key); + }} + > + {option.name} + + ); + })} + +{issueView !== "calendar" && issueView !== "spreadsheet" && ( <>Issue type
-option.key === filters?.type) - ?.name ?? "Select" - } - > - {FILTER_ISSUE_OPTIONS.map((option) => ( - +- setFilters({ - type: option.key, - }) - } - > - {option.name} - - ))} -+option.key === filters?.type) + ?.name ?? "Select" + } + className="!w-full" + buttonClassName="w-full" + > + {FILTER_ISSUE_OPTIONS.map((option) => ( + ++ setFilters({ + type: option.key, + }) + } + > + {option.name} + + ))} +- {/*Show empty states
-+ ++ - - -*/} )}Display Properties
-+{Object.keys(properties).map((key) => { if (key === "estimate" && !isEstimateActive) return null; diff --git a/apps/app/components/profile/profile-issues-view-options.tsx b/apps/app/components/profile/profile-issues-view-options.tsx index 0441987eb30..94ba6ef176f 100644 --- a/apps/app/components/profile/profile-issues-view-options.tsx +++ b/apps/app/components/profile/profile-issues-view-options.tsx @@ -172,106 +172,109 @@ export const ProfileIssuesViewOptions: React.FC = () => { <>Group by
-option.key === groupByProperty) - ?.name ?? "Select" - } - > - {GROUP_BY_OPTIONS.map((option) => { - if (issueView === "kanban" && option.key === null) return null; - if (option.key === "state" || option.key === "created_by") - return null; + +option.key === groupByProperty + )?.name ?? "Select" + } + className="!w-full" + buttonClassName="w-full" + > + {GROUP_BY_OPTIONS.map((option) => { + if (issueView === "kanban" && option.key === null) return null; + if (option.key === "state" || option.key === "created_by") + return null; - return ( - + return ( +setGroupByProperty(option.key)} - > - {option.name} - - ); - })} -setGroupByProperty(option.key)} + > + {option.name} + + ); + })} + +)}Order by
-option.key === orderBy)?.name ?? - "Select" - } - > - {ORDER_BY_OPTIONS.map((option) => { - if (groupByProperty === "priority" && option.key === "priority") - return null; - if (option.key === "sort_order") return null; + +option.key === orderBy)?.name ?? + "Select" + } + className="!w-full" + buttonClassName="w-full" + > + {ORDER_BY_OPTIONS.map((option) => { + if (groupByProperty === "priority" && option.key === "priority") + return null; + if (option.key === "sort_order") return null; - return ( - + return ( +{ - setOrderBy(option.key); - }} - > - {option.name} - - ); - })} -{ + setOrderBy(option.key); + }} + > + {option.name} + + ); + })} + +{issueView !== "calendar" && issueView !== "spreadsheet" && ( <>Issue type
-option.key === filters?.type) - ?.name ?? "Select" - } - > - {FILTER_ISSUE_OPTIONS.map((option) => ( - +- setFilters({ - type: option.key, - }) - } - > - {option.name} - - ))} -+option.key === filters?.type) + ?.name ?? "Select" + } + className="!w-full" + buttonClassName="w-full" + > + {FILTER_ISSUE_OPTIONS.map((option) => ( + ++ setFilters({ + type: option.key, + }) + } + > + {option.name} + + ))} +- {/*Show empty states
-+ ++ - - -*/} )}Display Properties
-+{Object.keys(properties).map((key) => { if (key === "estimate" && !isEstimateActive) return null; From f3bd1691ce5d1ff9ef130e3e82542a82f48fac3a Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Tue, 1 Aug 2023 19:11:09 +0530 Subject: [PATCH 08/10] style: sidebar project list styling (#1756) --- apps/app/components/project/single-sidebar-project.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/components/project/single-sidebar-project.tsx b/apps/app/components/project/single-sidebar-project.tsx index 64227b7a348..acc1f493e62 100644 --- a/apps/app/components/project/single-sidebar-project.tsx +++ b/apps/app/components/project/single-sidebar-project.tsx @@ -137,7 +137,7 @@ export const SingleSidebarProject: React.FC= ({ {({ open }) => ( <> From 11525f26d00b646d3e45413fc35dfd3a1e0c0d94 Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Tue, 1 Aug 2023 19:11:32 +0530 Subject: [PATCH 09/10] fix: project identifier migration (#1755) --- ...40_projectmember_preferences_user_cover_image_and_more.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py b/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py index b7ca6550078..7a321f2c836 100644 --- a/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py +++ b/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py @@ -67,5 +67,10 @@ class Migration(migrations.Migration): 'ordering': ('-created_at',), 'unique_together': {('comment', 'actor', 'reaction')}, }, + ), + migrations.AlterField( + model_name='project', + name='identifier', + field=models.CharField(max_length=12, verbose_name='Project Identifier'), ), ] From 6ea15ced0259d0f6a58510ee4f1f79dac3f82aa8 Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Tue, 1 Aug 2023 19:25:04 +0530 Subject: [PATCH 10/10] fix: project identifier length (#1757) --- ...40_projectmember_preferences_user_cover_image_and_more.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py b/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py index 7a321f2c836..5662ef666af 100644 --- a/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py +++ b/apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py @@ -73,4 +73,9 @@ class Migration(migrations.Migration): name='identifier', field=models.CharField(max_length=12, verbose_name='Project Identifier'), ), + migrations.AlterField( + model_name='projectidentifier', + name='name', + field=models.CharField(max_length=12), + ), ] - +
-
-
- {activities.map((activity: any, activityIdx: number) => {
- // determines what type of action is performed
- let action = activityDetails[activity.field as keyof typeof activityDetails]?.message;
- if (activity.field === "labels") {
- action = activity.new_value !== "" ? "added a new label" : "removed the label";
- } else if (activity.field === "blocking") {
- action =
- activity.new_value !== ""
- ? "marked this issue is blocking"
- : "removed the issue from blocking";
- } else if (activity.field === "blocks") {
- action =
- activity.new_value !== "" ? "marked this issue being blocked by" : "removed blocker";
- } else if (activity.field === "target_date") {
- action =
- activity.new_value && activity.new_value !== ""
- ? "set the due date to"
- : "removed the due date";
- } else if (activity.field === "parent") {
- action =
- activity.new_value && activity.new_value !== ""
- ? "set the parent to"
- : "removed the parent";
- } else if (activity.field === "priority") {
- action =
- activity.new_value && activity.new_value !== ""
- ? "set the priority to"
- : "removed the priority";
- } else if (activity.field === "description") {
- action = "updated the";
- } else if (activity.field === "attachment") {
- action = `${activity.verb} the`;
- } else if (activity.field === "link") {
- action = `${activity.verb} the`;
- } else if (activity.field === "archived_at") {
- action =
- activity.new_value && activity.new_value === "restore"
- ? "restored the issue"
- : "archived the issue";
- }
- // for values that are after the action clause
- let value: any = activity.new_value ? activity.new_value : activity.old_value;
- if (
- activity.verb === "created" &&
- activity.field !== "cycles" &&
- activity.field !== "modules" &&
- activity.field !== "attachment" &&
- activity.field !== "link" &&
- activity.field !== "estimate"
- ) {
- const { workspace_detail, project, issue } = activity;
- value = (
-
- created{" "}
-
-
- this issue.
+
-
+ {activities.map((activity: any, activityIdx: number) => {
+ // determines what type of action is performed
+ let action = activityDetails[activity.field as keyof typeof activityDetails]?.message;
+ if (activity.field === "labels") {
+ action = activity.new_value !== "" ? "added a new label" : "removed the label";
+ } else if (activity.field === "blocking") {
+ action =
+ activity.new_value !== ""
+ ? "marked this issue is blocking"
+ : "removed the issue from blocking";
+ } else if (activity.field === "blocks") {
+ action =
+ activity.new_value !== "" ? "marked this issue being blocked by" : "removed blocker";
+ } else if (activity.field === "target_date") {
+ action =
+ activity.new_value && activity.new_value !== ""
+ ? "set the due date to"
+ : "removed the due date";
+ } else if (activity.field === "parent") {
+ action =
+ activity.new_value && activity.new_value !== ""
+ ? "set the parent to"
+ : "removed the parent";
+ } else if (activity.field === "priority") {
+ action =
+ activity.new_value && activity.new_value !== ""
+ ? "set the priority to"
+ : "removed the priority";
+ } else if (activity.field === "description") {
+ action = "updated the";
+ } else if (activity.field === "attachment") {
+ action = `${activity.verb} the`;
+ } else if (activity.field === "link") {
+ action = `${activity.verb} the`;
+ } else if (activity.field === "archived_at") {
+ action =
+ activity.new_value && activity.new_value === "restore"
+ ? "restored the issue"
+ : "archived the issue";
}
+ // for values that are after the action clause
+ let value: any = activity.new_value ? activity.new_value : activity.old_value;
+ if (
+ activity.verb === "created" &&
+ activity.field !== "cycles" &&
+ activity.field !== "modules" &&
+ activity.field !== "attachment" &&
+ activity.field !== "link" &&
+ activity.field !== "estimate"
+ ) {
+ const { project, issue } = activity;
+ value = (
+
+ created{" "}
+
+
+ this issue.
-
-
- {activity.field ? (
- activity.new_value === "restore" ? (
-
+
+
- );
- }
+ );
+ }
- if ("field" in activity && activity.field !== "updated_by") {
- return (
-
+ {activity.field ? (
+ activity.new_value === "restore" ? (
+
-
- {activity.actor_detail.first_name.charAt(0)}
-
- )}
+
+ {activity.actor_detail.first_name.charAt(0)}
+
+ )}
-
-
-
-
-
-
-
-
- {activity.actor_detail.first_name}
- {activity.actor_detail.is_bot ? "Bot" : " " + activity.actor_detail.last_name}
-
- - Commented {timeAgo(activity.created_at)} -
+ + +
-
+
+
+
+ {activity.actor_detail.first_name}
+ {activity.actor_detail.is_bot
+ ? "Bot"
+ : " " + activity.actor_detail.last_name}
+
+ + Commented {timeAgo(activity.created_at)} +
+
+