From fffa8648bb46f6e0547797eeea9d27dce563b8de Mon Sep 17 00:00:00 2001 From: rahulramesha <71900764+rahulramesha@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:32:24 +0530 Subject: [PATCH 1/7] Space app Kanban block reactions (#5272) --- .../issue-layouts/kanban/block-reactions.tsx | 45 +++++++++ .../issues/issue-layouts/kanban/block.tsx | 22 +++-- .../components/issues/peek-overview/index.ts | 2 - .../issues/peek-overview/issue-reaction.tsx | 2 +- .../core/components/issues/reactions/index.ts | 2 + .../issue-emoji-reactions.tsx | 91 ++++++++++--------- .../issue-vote-reactions.tsx | 13 ++- 7 files changed, 117 insertions(+), 60 deletions(-) create mode 100644 space/core/components/issues/issue-layouts/kanban/block-reactions.tsx create mode 100644 space/core/components/issues/reactions/index.ts rename space/core/components/issues/{peek-overview => reactions}/issue-emoji-reactions.tsx (57%) rename space/core/components/issues/{peek-overview => reactions}/issue-vote-reactions.tsx (90%) diff --git a/space/core/components/issues/issue-layouts/kanban/block-reactions.tsx b/space/core/components/issues/issue-layouts/kanban/block-reactions.tsx new file mode 100644 index 0000000000..241a087e78 --- /dev/null +++ b/space/core/components/issues/issue-layouts/kanban/block-reactions.tsx @@ -0,0 +1,45 @@ +import { observer } from "mobx-react"; +import { useParams } from "next/navigation"; +//plane +import { cn } from "@plane/editor"; +// components +import { IssueEmojiReactions, IssueVotes } from "@/components/issues/reactions"; +// hooks +import { usePublish } from "@/hooks/store"; + +type Props = { + issueId: string; +}; +export const BlockReactions = observer((props: Props) => { + const { issueId } = props; + const { anchor } = useParams(); + const { canVote, canReact } = usePublish(anchor.toString()); + + // if the user cannot vote or react then return empty + if (!canVote && !canReact) return <>; + + return ( +
+
+ {canVote && ( +
+ +
+ )} + {canReact && ( +
+ +
+ )} +
+
+ ); +}); diff --git a/space/core/components/issues/issue-layouts/kanban/block.tsx b/space/core/components/issues/issue-layouts/kanban/block.tsx index b1d0f93aa0..7c246cc339 100644 --- a/space/core/components/issues/issue-layouts/kanban/block.tsx +++ b/space/core/components/issues/issue-layouts/kanban/block.tsx @@ -14,10 +14,11 @@ import { WithDisplayPropertiesHOC } from "@/components/issues/issue-layouts/with import { queryParamGenerator } from "@/helpers/query-param-generator"; // hooks import { useIssueDetails, usePublish } from "@/hooks/store"; - +// import { IIssue } from "@/types/issue"; import { IssueProperties } from "../properties/all-properties"; import { getIssueBlockId } from "../utils"; +import { BlockReactions } from "./block-reactions"; interface IssueBlockProps { issueId: string; @@ -83,17 +84,22 @@ export const KanbanIssueBlock: React.FC = observer((props) => { return (
- - - + + + + +
); }); diff --git a/space/core/components/issues/peek-overview/index.ts b/space/core/components/issues/peek-overview/index.ts index f42253e5e7..e0142b0240 100644 --- a/space/core/components/issues/peek-overview/index.ts +++ b/space/core/components/issues/peek-overview/index.ts @@ -7,5 +7,3 @@ export * from "./issue-properties"; export * from "./layout"; export * from "./side-peek-view"; export * from "./issue-reaction"; -export * from "./issue-vote-reactions"; -export * from "./issue-emoji-reactions"; diff --git a/space/core/components/issues/peek-overview/issue-reaction.tsx b/space/core/components/issues/peek-overview/issue-reaction.tsx index 953852d05a..1345531413 100644 --- a/space/core/components/issues/peek-overview/issue-reaction.tsx +++ b/space/core/components/issues/peek-overview/issue-reaction.tsx @@ -1,5 +1,5 @@ import { observer } from "mobx-react"; -import { IssueEmojiReactions, IssueVotes } from "@/components/issues/peek-overview"; +import { IssueEmojiReactions, IssueVotes } from "@/components/issues/reactions"; // hooks import { usePublish } from "@/hooks/store"; import useIsInIframe from "@/hooks/use-is-in-iframe"; diff --git a/space/core/components/issues/reactions/index.ts b/space/core/components/issues/reactions/index.ts new file mode 100644 index 0000000000..914579fa45 --- /dev/null +++ b/space/core/components/issues/reactions/index.ts @@ -0,0 +1,2 @@ +export * from "./issue-emoji-reactions"; +export * from "./issue-vote-reactions"; diff --git a/space/core/components/issues/peek-overview/issue-emoji-reactions.tsx b/space/core/components/issues/reactions/issue-emoji-reactions.tsx similarity index 57% rename from space/core/components/issues/peek-overview/issue-emoji-reactions.tsx rename to space/core/components/issues/reactions/issue-emoji-reactions.tsx index 7a9851244a..fd78a558e1 100644 --- a/space/core/components/issues/peek-overview/issue-emoji-reactions.tsx +++ b/space/core/components/issues/reactions/issue-emoji-reactions.tsx @@ -13,10 +13,12 @@ import { useIssueDetails, useUser } from "@/hooks/store"; type IssueEmojiReactionsProps = { anchor: string; + issueIdFromProps?: string; + size?: "md" | "sm"; }; export const IssueEmojiReactions: React.FC = observer((props) => { - const { anchor } = props; + const { anchor, issueIdFromProps, size = "md" } = props; // router const router = useRouter(); const pathName = usePathname(); @@ -31,7 +33,7 @@ export const IssueEmojiReactions: React.FC = observer( const issueDetailsStore = useIssueDetails(); const { data: user } = useUser(); - const issueId = issueDetailsStore.peekId; + const issueId = issueIdFromProps ?? issueDetailsStore.peekId; const reactions = issueDetailsStore.details[issueId ?? ""]?.reaction_items ?? []; const groupedReactions = groupReactions(reactions, "reaction"); @@ -55,6 +57,7 @@ export const IssueEmojiReactions: React.FC = observer( // derived values const { queryParam } = queryParamGenerator({ peekId, board, state, priority, labels }); + const reactionDimensions = size === "sm" ? "h-6 px-2 py-1" : "h-full px-2 py-1"; return ( <> @@ -64,54 +67,52 @@ export const IssueEmojiReactions: React.FC = observer( else router.push(`/?next_path=${pathName}?${queryParam}`); }} selected={userReactions?.map((r) => r.reaction)} - size="md" + size={size} /> -
- {Object.keys(groupedReactions || {}).map((reaction) => { - const reactions = groupedReactions?.[reaction] ?? []; - const REACTIONS_LIMIT = 1000; + {Object.keys(groupedReactions || {}).map((reaction) => { + const reactions = groupedReactions?.[reaction] ?? []; + const REACTIONS_LIMIT = 1000; - if (reactions.length > 0) - return ( - - {reactions - ?.map((r) => r?.actor_details?.display_name) - ?.splice(0, REACTIONS_LIMIT) - ?.join(", ")} - {reactions.length > REACTIONS_LIMIT && " and " + (reactions.length - REACTIONS_LIMIT) + " more"} -
- } + if (reactions.length > 0) + return ( + + {reactions + ?.map((r) => r?.actor_details?.display_name) + ?.splice(0, REACTIONS_LIMIT) + ?.join(", ")} + {reactions.length > REACTIONS_LIMIT && " and " + (reactions.length - REACTIONS_LIMIT) + " more"} + + } + > + - - ); - })} - + {groupedReactions?.[reaction].length}{" "} + + + + ); + })} ); }); diff --git a/space/core/components/issues/peek-overview/issue-vote-reactions.tsx b/space/core/components/issues/reactions/issue-vote-reactions.tsx similarity index 90% rename from space/core/components/issues/peek-overview/issue-vote-reactions.tsx rename to space/core/components/issues/reactions/issue-vote-reactions.tsx index ccfe4967a2..7134c05cf9 100644 --- a/space/core/components/issues/peek-overview/issue-vote-reactions.tsx +++ b/space/core/components/issues/reactions/issue-vote-reactions.tsx @@ -13,10 +13,12 @@ import useIsInIframe from "@/hooks/use-is-in-iframe"; type TIssueVotes = { anchor: string; + issueIdFromProps?: string; + size?: "md" | "sm"; }; export const IssueVotes: React.FC = observer((props) => { - const { anchor } = props; + const { anchor, issueIdFromProps, size = "md" } = props; // states const [isSubmitting, setIsSubmitting] = useState(false); // router @@ -35,7 +37,7 @@ export const IssueVotes: React.FC = observer((props) => { const isInIframe = useIsInIframe(); - const issueId = issueDetailsStore.peekId; + const issueId = issueIdFromProps ?? issueDetailsStore.peekId; const votes = issueDetailsStore.details[issueId ?? ""]?.vote_items ?? []; @@ -66,6 +68,7 @@ export const IssueVotes: React.FC = observer((props) => { // derived values const { queryParam } = queryParamGenerator({ peekId, board, state, priority, labels }); + const votingDimensions = size === "sm" ? "px-1 h-6 min-w-9" : "px-2 h-7"; return (
@@ -96,7 +99,8 @@ export const IssueVotes: React.FC = observer((props) => { else router.push(`/?next_path=${pathName}?${queryParam}`); }} className={cn( - "flex items-center justify-center gap-x-1 overflow-hidden rounded border px-2 h-7 focus:outline-none", + "flex items-center justify-center gap-x-1 overflow-hidden rounded border focus:outline-none bg-custom-background-100", + votingDimensions, { "border-custom-primary-200 text-custom-primary-200": isUpVotedByUser, "border-custom-border-300": !isUpVotedByUser, @@ -136,7 +140,8 @@ export const IssueVotes: React.FC = observer((props) => { else router.push(`/?next_path=${pathName}?${queryParam}`); }} className={cn( - "flex items-center justify-center gap-x-1 h-7 overflow-hidden rounded border px-2 focus:outline-none", + "flex items-center justify-center gap-x-1 overflow-hidden rounded border focus:outline-none bg-custom-background-100", + votingDimensions, { "border-red-600 text-red-600": isDownVotedByUser, "border-custom-border-300": !isDownVotedByUser, From 88533933b49b26a816704a8a7142f9ff50cbad0d Mon Sep 17 00:00:00 2001 From: Akshita Goyal <36129505+gakshita@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:34:40 +0530 Subject: [PATCH 2/7] fix: duplicate label creation in project (#5271) --- web/core/components/labels/create-update-label-inline.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/core/components/labels/create-update-label-inline.tsx b/web/core/components/labels/create-update-label-inline.tsx index 54126b909a..8d06ff1544 100644 --- a/web/core/components/labels/create-update-label-inline.tsx +++ b/web/core/components/labels/create-update-label-inline.tsx @@ -66,7 +66,7 @@ export const CreateUpdateLabelInline = observer( setToast({ title: "Error!", type: TOAST_TYPE.ERROR, - message: error?.detail ?? "Something went wrong. Please try again later.", + message: error?.detail ?? error.error ?? "Something went wrong. Please try again later.", }); reset(formData); }); From 6fa45d872392592e23f65ca198d0e37288783908 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:46:16 +0530 Subject: [PATCH 3/7] fix: editor width transition duration added (#5267) --- web/core/components/pages/editor/editor-body.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/core/components/pages/editor/editor-body.tsx b/web/core/components/pages/editor/editor-body.tsx index d142800ff8..ee96252fab 100644 --- a/web/core/components/pages/editor/editor-body.tsx +++ b/web/core/components/pages/editor/editor-body.tsx @@ -101,7 +101,7 @@ export const PageEditorBody: React.FC = observer((props) => {
@@ -169,8 +169,8 @@ export const PageEditorBody: React.FC = observer((props) => {
From 889393e1d1dc7765f336265297a93334c90fcf82 Mon Sep 17 00:00:00 2001 From: rahulramesha <71900764+rahulramesha@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:51:47 +0530 Subject: [PATCH 4/7] fix empty grouping in Kanban (#5269) --- .../issues/issue-layouts/kanban/default.tsx | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/space/core/components/issues/issue-layouts/kanban/default.tsx b/space/core/components/issues/issue-layouts/kanban/default.tsx index 88b20427d0..50f7b0f713 100644 --- a/space/core/components/issues/issue-layouts/kanban/default.tsx +++ b/space/core/components/issues/issue-layouts/kanban/default.tsx @@ -64,22 +64,15 @@ export const KanBan: React.FC = observer((props) => { if (!groupList) return null; const visibilityGroupBy = (_list: IGroupByColumn): { showGroup: boolean; showIssues: boolean } => { - if (subGroupBy) { - const groupVisibility = { - showGroup: true, - showIssues: true, - }; - if (!showEmptyGroup) { - groupVisibility.showGroup = (getGroupIssueCount(_list.id, undefined, false) ?? 0) > 0; - } - return groupVisibility; - } else { - const groupVisibility = { - showGroup: true, - showIssues: true, - }; - return groupVisibility; + const groupVisibility = { + showGroup: true, + showIssues: true, + }; + + if (!showEmptyGroup) { + groupVisibility.showGroup = (getGroupIssueCount(_list.id, undefined, false) ?? 0) > 0; } + return groupVisibility; }; return ( From 0b01d3e88d6335de677f088d34042152c387fd18 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:57:57 +0530 Subject: [PATCH 5/7] fix: workspace export settings mutation (#5268) --- web/core/components/exporter/guide.tsx | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/web/core/components/exporter/guide.tsx b/web/core/components/exporter/guide.tsx index 7096555ec1..eff265a3ff 100644 --- a/web/core/components/exporter/guide.tsx +++ b/web/core/components/exporter/guide.tsx @@ -1,6 +1,6 @@ "use client"; -import { useState } from "react"; +import { useEffect, useState } from "react"; import { observer } from "mobx-react"; import Image from "next/image"; import Link from "next/link"; @@ -51,6 +51,11 @@ const IntegrationGuide = observer(() => { : null ); + const handleRefresh = () => { + setRefreshing(true); + mutate(EXPORT_SERVICES_LIST(workspaceSlug as string, `${cursor}`, `${per_page}`)).then(() => setRefreshing(false)); + }; + const handleCsvClose = () => { router.replace(`/${workspaceSlug?.toString()}/settings/exports`); }; @@ -58,6 +63,18 @@ const IntegrationGuide = observer(() => { const hasProjects = workspaceProjectIds && workspaceProjectIds.length > 0; const isAdmin = currentWorkspaceRole === EUserWorkspaceRoles.ADMIN; + useEffect(() => { + const interval = setInterval(() => { + if (exporterServices?.results?.some((service) => service.status === "processing")) { + handleRefresh(); + } else { + clearInterval(interval); + } + }, 3000); + + return () => clearInterval(interval); + }, [exporterServices]); + return ( <>
@@ -103,12 +120,7 @@ const IntegrationGuide = observer(() => {