π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1134] fix: module link create and delete mutation (#4373)
Anmol Singh Bhatia5ef51edad71d
diff --git a/web/components/core/sidebar/links-list.tsx b/web/components/core/sidebar/links-list.tsxindex afa28375fb..bd4e1af683 100644--- a/web/components/core/sidebar/links-list.tsx+++ b/web/components/core/sidebar/links-list.tsx@@ -7,107 +7,111 @@ import { Tooltip, TOAST_TYPE, setToast } from "@plane/ui";// helpersimport { calculateTimeAgo } from "@/helpers/date-time.helper";// hooks-import { useMember } from "@/hooks/store";+import { useMember, useModule } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";// typestype Props = {- links: ILinkDetails[];+ moduleId: string;+handleDeleteLink: (linkId: string) => void;handleEditLink: (link: ILinkDetails) => void;userAuth: UserAuth;disabled?: boolean;};-export const LinksList: React.FC<Props> = observer(- ({ links, handleDeleteLink, handleEditLink, userAuth, disabled }) => {- const { getUserDetails } = useMember();- const { isMobile } = usePlatformOS();- const isNotAllowed = userAuth.isGuest || userAuth.isViewer || disabled;+export const LinksList: React.FC<Props> = observer((props) => {+ const { moduleId, handleDeleteLink, handleEditLink, userAuth, disabled } = props;+ // hooks+ const { getUserDetails } = useMember();+ const { isMobile } = usePlatformOS();+ const { getModuleById } = useModule();+ // derived values+ const currentModule = getModuleById(moduleId);+ const moduleLinks = currentModule?.link_module || undefined;+ const isNotAllowed = userAuth.isGuest || userAuth.isViewer || disabled;- const copyToClipboard = (text: string) => {- navigator.clipboard.writeText(text);- setToast({- type: TOAST_TYPE.SUCCESS,- title: "Copied to clipboard",- message: "The URL has been successfully copied to your clipboard",- });- };+ const copyToClipboard = (text: string) => {+ navigator.clipboard.writeText(text);+ setToast({+ type: TOAST_TYPE.SUCCESS,+ title: "Copied to clipboard",+ message: "The URL has been successfully copied to your clipboard",+ });+ };- return (- <>- {links.map((link) => {- const createdByDetails = getUserDetails(link.created_by);- return (- <div key={link.id} className="relative flex flex-col rounded-md bg-custom-background-90 p-2.5">- <div className="flex w-full items-start justify-between gap-2">- <div className="flex items-start gap-2 truncate">- <span className="py-1">- <LinkIcon className="h-3 w-3 flex-shrink-0" />+ if (!moduleLinks) return <></>;+ return (+ <>+ {moduleLinks.map((link) => {+ const createdByDetails = getUserDetails(link.created_by);+ return (+ <div key={link.id} className="relative flex flex-col rounded-md bg-custom-background-90 p-2.5">+ <div className="flex w-full items-start justify-between gap-2">+ <div className="flex items-start gap-2 truncate">+ <span className="py-1">+ <LinkIcon className="h-3 w-3 flex-shrink-0" />+ </span>+ <Tooltip tooltipContent={link.title && link.title !== "" ? link.title : link.url} isMobile={isMobile}>+ <span+ className="cursor-pointer truncate text-xs"+ onClick={() => copyToClipboard(link.title && link.title !== "" ? link.title : link.url)}+ >+ {link.title && link.title !== "" ? link.title : link.url}</span>- <Tooltip tooltipContent={link.title && link.title !== "" ? link.title : link.url} isMobile={isMobile}>- <span- className="cursor-pointer truncate text-xs"- onClick={() => copyToClipboard(link.title && link.title !== "" ? link.title : link.url)}- >- {link.title && link.title !== "" ? link.title : link.url}- </span>- </Tooltip>- </div>+ </Tooltip>+ </div>- {!isNotAllowed && (- <div className="z-[1] flex flex-shrink-0 items-center gap-2">- <button- type="button"- className="flex items-center justify-center p-1 hover:bg-custom-background-80"- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- handleEditLink(link);- }}- >- <Pencil className="h-3 w-3 stroke-[1.5] text-custom-text-200" />- </button>- <a- href={link.url}- target="_blank"- rel="noopener noreferrer"- className="flex items-center justify-center p-1 hover:bg-custom-background-80"- >- <ExternalLink className="h-3 w-3 stroke-[1.5] text-custom-text-200" />- </a>- <button- type="button"- className="flex items-center justify-center p-1 hover:bg-custom-background-80"- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- handleDeleteLink(link.id);- }}- >- <Trash2 className="h-3 w-3" />- </button>- </div>+ {!isNotAllowed && (+ <div className="z-[1] flex flex-shrink-0 items-center gap-2">+ <button+ type="button"+ className="flex items-center justify-center p-1 hover:bg-custom-background-80"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ handleEditLink(link);+ }}+ >+ <Pencil className="h-3 w-3 stroke-[1.5] text-custom-text-200" />+ </button>+ <a+ href={link.url}+ target="_blank"+ rel="noopener noreferrer"+ className="flex items-center justify-center p-1 hover:bg-custom-background-80"+ >+ <ExternalLink className="h-3 w-3 stroke-[1.5] text-custom-text-200" />+ </a>+ <button+ type="button"+ className="flex items-center justify-center p-1 hover:bg-custom-background-80"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ handleDeleteLink(link.id);+ }}+ >+ <Trash2 className="h-3 w-3" />+ </button>+ </div>+ )}+ </div>+ <div className="px-5">+ <p className="mt-0.5 stroke-[1.5] text-xs text-custom-text-300">+ Added {calculateTimeAgo(link.created_at)}+ <br />+ {createdByDetails && (+ <>+ by{" "}+ {createdByDetails?.is_bot ? createdByDetails?.first_name + " Bot" : createdByDetails?.display_name}+ </>)}- </div>- <div className="px-5">- <p className="mt-0.5 stroke-[1.5] text-xs text-custom-text-300">- Added {calculateTimeAgo(link.created_at)}- <br />- {createdByDetails && (- <>- by{" "}- {createdByDetails?.is_bot- ? createdByDetails?.first_name + " Bot"- : createdByDetails?.display_name}- </>- )}- </p>- </div>+ </p></div>- );- })}- </>- );- }-);+ </div>+ );+ })}+ </>+ );+});diff --git a/web/components/modules/sidebar.tsx b/web/components/modules/sidebar.tsxindex a4585956e0..6da1252864 100644--- a/web/components/modules/sidebar.tsx+++ b/web/components/modules/sidebar.tsx@@ -673,18 +673,20 @@ export const ModuleDetailsSidebar: React.FC<Props> = observer((props) => {</div>)}- <LinksList- links={moduleDetails.link_module}- handleEditLink={handleEditLink}- handleDeleteLink={handleDeleteLink}- userAuth={{- isGuest: currentProjectRole === EUserProjectRoles.GUEST,- isViewer: currentProjectRole === EUserProjectRoles.VIEWER,- isMember: currentProjectRole === EUserProjectRoles.MEMBER,- isOwner: currentProjectRole === EUserProjectRoles.ADMIN,- }}- disabled={isArchived}- />+ {moduleId && (+ <LinksList+ moduleId={moduleId}+ handleEditLink={handleEditLink}+ handleDeleteLink={handleDeleteLink}+ userAuth={{+ isGuest: currentProjectRole === EUserProjectRoles.GUEST,+ isViewer: currentProjectRole === EUserProjectRoles.VIEWER,+ isMember: currentProjectRole === EUserProjectRoles.MEMBER,+ isOwner: currentProjectRole === EUserProjectRoles.ADMIN,+ }}+ disabled={isArchived}+ />+ )}</>) : (<div className="flex items-center justify-between gap-2">diff --git a/web/store/module.store.ts b/web/store/module.store.tsindex 01ba2c4b0c..f591c5df2e 100644--- a/web/store/module.store.ts+++ b/web/store/module.store.ts@@ -1,3 +1,4 @@+import concat from "lodash/concat";import set from "lodash/set";import sortBy from "lodash/sortBy";import update from "lodash/update";@@ -372,13 +373,22 @@ export class ModulesStore implements IModuleStore {* @param data* @returns ILinkDetails*/- createModuleLink = async (workspaceSlug: string, projectId: string, moduleId: string, data: Partial<ILinkDetails>) =>- await this.moduleService.createModuleLink(workspaceSlug, projectId, moduleId, data).then((response) => {+ createModuleLink = async (+ workspaceSlug: string,+ projectId: string,+ moduleId: string,+ data: Partial<ILinkDetails>+ ) => {+ try {+ const moduleLink = await this.moduleService.createModuleLink(workspaceSlug, projectId, moduleId, data);runInAction(() => {- set(this.moduleMap, [moduleId, "link_module"], [response]);+ update(this.moduleMap, [moduleId, "link_module"], (moduleLinks = []) => concat(moduleLinks, moduleLink));});- return response;- });+ return moduleLink;+ } catch (error) {+ throw error;+ }+ };/*** @description updates module link details@@ -422,14 +432,19 @@ export class ModulesStore implements IModuleStore {* @param moduleId* @param linkId*/- deleteModuleLink = async (workspaceSlug: string, projectId: string, moduleId: string, linkId: string) =>- await this.moduleService.deleteModuleLink(workspaceSlug, projectId, moduleId, linkId).then(() => {- const moduleDetails = this.getModuleById(moduleId);- const linkModules = moduleDetails?.link_module?.filter((link) => link.id !== linkId);+ deleteModuleLink = async (workspaceSlug: string, projectId: string, moduleId: string, linkId: string) => {+ try {+ const moduleLink = await this.moduleService.deleteModuleLink(workspaceSlug, projectId, moduleId, linkId);runInAction(() => {- set(this.moduleMap, [moduleId, "link_module"], linkModules);+ update(this.moduleMap, [moduleId, "link_module"], (moduleLinks = []) =>+ moduleLinks.filter((link: ILinkDetails) => link.id !== linkId)+ );});- });+ return moduleLink;+ } catch (error) {+ throw error;+ }+ };/*** @description adds a module to favorites