Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-02-24 04:00:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #194 from makeplane/sync/ce-ee

Browse Source 
sync: merge conflicts need to be resolved
This commit is contained in:
sriram veeraghanta
2024-05-02 18:29:23 +05:30
committed by GitHub
parent dc59f60ab7 4c78cd7c7e
commit 22a25c5d61
21 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/editor/lite-text-editor/src/ui/index.tsx
View File

@@ -33,6 +33,7 @@ export interface ILiteTextEditor {
};
tabIndex?: number;
placeholder?: string | ((isFocused: boolean, value: string) => string);
id?: string;
}
const LiteTextEditor = (props: ILiteTextEditor) => {
@@ -48,12 +49,14 @@ const LiteTextEditor = (props: ILiteTextEditor) => {
tabIndex,
mentionHandler,
placeholder = "Add comment...",
id = "",
} = props;
const editor = useEditor({
onChange,
initialValue,
value,
id,
editorClassName,
restoreFile: fileHandler.restore,
uploadFile: fileHandler.upload,

2
web/components/core/modals/existing-issues-list-modal.tsx
View File

@@ -85,7 +85,7 @@ export const ExistingIssuesListModal: React.FC<Props> = (props) => {
setIsSearching(false);
setIsLoading(false);
});
}, [debouncedSearchTerm, isOpen, isWorkspaceLevel, projectId, searchParams, workspaceSlug]);
}, [debouncedSearchTerm, isOpen, isWorkspaceLevel, projectId, workspaceSlug]);
return (
<>

1
web/components/cycles/quick-actions.tsx
View File

@@ -180,6 +180,7 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

42
web/components/issues/attachment/attachment-detail.tsx
View File

@@ -2,19 +2,19 @@ import { FC } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { AlertCircle, X } from "lucide-react";
// ui
import { Tooltip } from "@plane/ui";
import { getFileIcon } from "@/components/icons/attachment";
// icons
import { getFileIcon } from "@/components/icons";
// components
import { IssueAttachmentDeleteModal } from "@/components/issues";
// helpers
import { convertBytesToSize, getFileExtension, getFileName } from "@/helpers/attachment.helper";
import { renderFormattedDate } from "@/helpers/date-time.helper";
import { truncateText } from "@/helpers/string.helper";
// hooks
import { useIssueDetail, useMember } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
// hooks
// ui
// components
// icons
// helper
import { IssueAttachmentDeleteModal } from "./delete-attachment-confirmation-modal";
// types
import { TAttachmentOperations } from "./root";
@@ -36,24 +36,24 @@ export const IssueAttachmentsDetail: FC<TIssueAttachmentsDetail> = observer((pro
isDeleteAttachmentModalOpen,
toggleDeleteAttachmentModal,
} = useIssueDetail();
// states
// derived values
const attachment = attachmentId ? getAttachmentById(attachmentId) : undefined;
// hooks
const { isMobile } = usePlatformOS();
const attachment = attachmentId && getAttachmentById(attachmentId);
if (!attachment) return <></>;
return (
<>
<IssueAttachmentDeleteModal
isOpen={isDeleteAttachmentModalOpen}
setIsOpen={() => toggleDeleteAttachmentModal(false)}
handleAttachmentOperations={handleAttachmentOperations}
data={attachment}
/>
<div
key={attachmentId}
className="flex h-[60px] items-center justify-between gap-1 rounded-md border-[2px] border-custom-border-200 bg-custom-background-100 px-4 py-2 text-sm"
>
{isDeleteAttachmentModalOpen === attachment.id && (
<IssueAttachmentDeleteModal
isOpen={!!isDeleteAttachmentModalOpen}
onClose={() => toggleDeleteAttachmentModal(null)}
handleAttachmentOperations={handleAttachmentOperations}
data={attachment}
/>
)}
<div className="flex h-[60px] items-center justify-between gap-1 rounded-md border-[2px] border-custom-border-200 bg-custom-background-100 px-4 py-2 text-sm">
<Link href={attachment.asset} target="_blank" rel="noopener noreferrer">
<div className="flex items-center gap-3">
<div className="h-7 w-7">{getFileIcon(getFileExtension(attachment.asset))}</div>
@@ -83,7 +83,7 @@ export const IssueAttachmentsDetail: FC<TIssueAttachmentsDetail> = observer((pro
</Link>
{!disabled && (
<button onClick={() => toggleDeleteAttachmentModal(true)}>
<button type="button" onClick={() => toggleDeleteAttachmentModal(attachment.id)}>
<X className="h-4 w-4 text-custom-text-200 hover:text-custom-text-100" />
</button>
)}

10
web/components/issues/attachment/delete-attachment-confirmation-modal.tsx → web/components/issues/attachment/delete-attachment-modal.tsx
View File

@@ -1,4 +1,4 @@
import { FC, Fragment, Dispatch, SetStateAction, useState } from "react";
import { FC, Fragment, useState } from "react";
import { AlertTriangle } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
import type { TIssueAttachment } from "@plane/types";
@@ -14,18 +14,18 @@ export type TAttachmentOperationsRemoveModal = Exclude<TAttachmentOperations, "c
type Props = {
isOpen: boolean;
setIsOpen: Dispatch<SetStateAction<boolean>>;
onClose: () => void;
data: TIssueAttachment;
handleAttachmentOperations: TAttachmentOperationsRemoveModal;
};
export const IssueAttachmentDeleteModal: FC<Props> = (props) => {
const { isOpen, setIsOpen, data, handleAttachmentOperations } = props;
// state
const { isOpen, onClose, data, handleAttachmentOperations } = props;
// states
const [loader, setLoader] = useState(false);
const handleClose = () => {
setIsOpen(false);
onClose();
setLoader(false);
};

10
web/components/issues/attachment/index.ts
View File

@@ -1,7 +1,5 @@
export * from "./root";
export * from "./attachment-upload";
export * from "./delete-attachment-confirmation-modal";
export * from "./attachments-list";
export * from "./attachment-detail";
export * from "./attachment-upload";
export * from "./attachments-list";
export * from "./delete-attachment-modal";
export * from "./root";

5
web/components/issues/issue-detail/issue-activity/comments/comment-create.tsx
View File

@@ -18,10 +18,11 @@ type TIssueCommentCreate = {
workspaceSlug: string;
activityOperations: TActivityOperations;
showAccessSpecifier?: boolean;
issueId: string;
};
export const IssueCommentCreate: FC<TIssueCommentCreate> = (props) => {
const { workspaceSlug, projectId, activityOperations, showAccessSpecifier = false } = props;
const { workspaceSlug, projectId, issueId, activityOperations, showAccessSpecifier = false } = props;
// refs
const editorRef = useRef<any>(null);
// store hooks
@@ -72,6 +73,8 @@ export const IssueCommentCreate: FC<TIssueCommentCreate> = (props) => {
render={({ field: { value, onChange } }) => (
<LiteTextEditor
workspaceId={workspaceId}
id={"add_comment_" + issueId}
value={"<p></p>"}
projectId={projectId}
workspaceSlug={workspaceSlug}
onEnterKeyPress={(e) => {

2
web/components/issues/issue-detail/issue-activity/root.tsx
View File

@@ -146,6 +146,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
/>
{!disabled && (
<IssueCommentCreate
issueId={issueId}
projectId={projectId}
workspaceSlug={workspaceSlug}
activityOperations={activityOperations}
@@ -165,6 +166,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
/>
{!disabled && (
<IssueCommentCreate
issueId={issueId}
projectId={projectId}
workspaceSlug={workspaceSlug}
activityOperations={activityOperations}

1
web/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx
View File

@@ -181,6 +181,7 @@ export const AllIssueQuickActions: React.FC<IQuickActionProps> = observer((props
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/issues/issue-layouts/quick-action-dropdowns/archived-issue.tsx
View File

@@ -143,6 +143,7 @@ export const ArchivedIssueQuickActions: React.FC<IQuickActionProps> = observer((
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/issues/issue-layouts/quick-action-dropdowns/cycle-issue.tsx
View File

@@ -201,6 +201,7 @@ export const CycleIssueQuickActions: React.FC<IQuickActionProps> = observer((pro
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/issues/issue-layouts/quick-action-dropdowns/draft-issue.tsx
View File

@@ -127,6 +127,7 @@ export const DraftIssueQuickActions: React.FC<IQuickActionProps> = observer((pro
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/issues/issue-layouts/quick-action-dropdowns/module-issue.tsx
View File

@@ -198,6 +198,7 @@ export const ModuleIssueQuickActions: React.FC<IQuickActionProps> = observer((pr
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/issues/issue-layouts/quick-action-dropdowns/project-issue.tsx
View File

@@ -191,6 +191,7 @@ export const ProjectIssueQuickActions: React.FC<IQuickActionProps> = observer((p
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/modules/quick-actions.tsx
View File

@@ -176,6 +176,7 @@ export const ModuleQuickActions: React.FC<Props> = observer((props) => {
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/pages/dropdowns/quick-actions.tsx
View File

@@ -104,6 +104,7 @@ export const PageQuickActions: React.FC<Props> = observer((props) => {
item.action();
}}
className="flex items-center gap-2"
disabled={item.disabled}
>
{item.icon && <item.icon className="h-3 w-3" />}
{item.title}

4
web/components/project/card.tsx
View File

@@ -123,14 +123,14 @@ export const ProjectCard: React.FC<Props> = observer((props) => {
action: handleOpenInNewTab,
title: "Open in new tab",
icon: ExternalLink,
shouldRender: project.is_member,
shouldRender: project.is_member && !isArchived,
},
{
key: "copy-link",
action: handleCopyText,
title: "Copy link",
icon: LinkIcon,
shouldRender: true,
shouldRender: !isArchived,
},
{
key: "restore",

1
web/components/views/quick-actions.tsx
View File

@@ -103,6 +103,7 @@ export const ViewQuickActions: React.FC<Props> = observer((props) => {
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/workspace/views/default-view-quick-action.tsx
View File

@@ -104,6 +104,7 @@ export const DefaultWorkspaceViewQuickActions: React.FC<Props> = observer((props
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

1
web/components/workspace/views/quick-action.tsx
View File

@@ -132,6 +132,7 @@ export const WorkspaceViewQuickActions: React.FC<Props> = observer((props) => {
},
item.className
)}
disabled={item.disabled}
>
{item.icon && <item.icon className={cn("h-3 w-3", item.iconClassName)} />}
<div>

10
web/store/issue/issue-details/root.store.ts
View File

@@ -51,7 +51,7 @@ export interface IIssueDetail
isArchiveIssueModalOpen: boolean;
isRelationModalOpen: TIssueRelationTypes | null;
isSubIssuesModalOpen: boolean;
isDeleteAttachmentModalOpen: boolean;
isDeleteAttachmentModalOpen: string | null;
// computed
isAnyModalOpen: boolean;
// helper actions
@@ -65,7 +65,7 @@ export interface IIssueDetail
toggleArchiveIssueModal: (value: boolean) => void;
toggleRelationModal: (relationType: TIssueRelationTypes | null) => void;
toggleSubIssuesModal: (value: boolean) => void;
toggleDeleteAttachmentModal: (value: boolean) => void;
toggleDeleteAttachmentModal: (attachmentId: string | null) => void;
// store
rootIssueStore: IIssueRootStore;
issue: IIssueStore;
@@ -90,7 +90,7 @@ export class IssueDetail implements IIssueDetail {
isArchiveIssueModalOpen: boolean = false;
isRelationModalOpen: TIssueRelationTypes | null = null;
isSubIssuesModalOpen: boolean = false;
isDeleteAttachmentModalOpen: boolean = false;
isDeleteAttachmentModalOpen: string | null = null;
// store
rootIssueStore: IIssueRootStore;
issue: IIssueStore;
@@ -154,7 +154,7 @@ export class IssueDetail implements IIssueDetail {
this.isArchiveIssueModalOpen ||
!!this.isRelationModalOpen ||
this.isSubIssuesModalOpen ||
this.isDeleteAttachmentModalOpen
!!this.isDeleteAttachmentModalOpen
);
}
@@ -170,7 +170,7 @@ export class IssueDetail implements IIssueDetail {
toggleArchiveIssueModal = (value: boolean) => (this.isArchiveIssueModalOpen = value);
toggleRelationModal = (relationType: TIssueRelationTypes | null) => (this.isRelationModalOpen = relationType);
toggleSubIssuesModal = (value: boolean) => (this.isSubIssuesModalOpen = value);
toggleDeleteAttachmentModal = (value: boolean) => (this.isDeleteAttachmentModalOpen = value);
toggleDeleteAttachmentModal = (attachmentId: string | null) => (this.isDeleteAttachmentModalOpen = attachmentId);
// issue
fetchIssue = async (