Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: added workspaceslug in renderChildren of project settings (#5951)

Akshita Goyaleed2ca77ef2a
diff --git a/packages/types/src/inbox.d.ts b/packages/types/src/inbox.d.ts
index bb60b35a21..5ae6c160e8 100644
--- a/packages/types/src/inbox.d.ts
+++ b/packages/types/src/inbox.d.ts
@@ -100,7 +100,8 @@ export type TInboxIssueWithPagination = TInboxIssuePaginationInfo & {
export type TInboxForm = {
anchor: string;
id: string;
- is_disabled: boolean;
+ is_in_app_enabled: boolean;
+ is_form_enabled: boolean;
};
export type TInboxIssueForm = {
diff --git a/space/core/components/editor/rich-text-editor.tsx b/space/core/components/editor/rich-text-editor.tsx
new file mode 100644
index 0000000000..af4cf97136
--- /dev/null
+++ b/space/core/components/editor/rich-text-editor.tsx
@@ -0,0 +1,41 @@
+import React, { forwardRef } from "react";
+// editor
+import { EditorRefApi, IMentionHighlight, IRichTextEditor, RichTextEditorWithRef } from "@plane/editor";
+// types
+// helpers
+import { cn } from "@/helpers/common.helper";
+import { getEditorFileHandlers } from "@/helpers/editor.helper";
+
+interface RichTextEditorWrapperProps extends Omit<IRichTextEditor, "fileHandler" | "mentionHandler"> {
+ uploadFile: (file: File) => Promise<string>;
+}
+
+export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperProps>((props, ref) => {
+ const { containerClassName, uploadFile, ...rest } = props;
+ // store hooks
+
+ // use-mention
+
+ // file size
+
+ return (
+ <RichTextEditorWithRef
+ mentionHandler={{
+ highlights: function (): Promise<IMentionHighlight[]> {
+ throw new Error("Function not implemented.");
+ },
+ suggestions: undefined,
+ }}
+ ref={ref}
+ fileHandler={getEditorFileHandlers({
+ uploadFile,
+ workspaceId: "",
+ anchor: "",
+ })}
+ {...rest}
+ containerClassName={cn("relative pl-3 pb-3", containerClassName)}
+ />
+ );
+});
+
+RichTextEditor.displayName = "RichTextEditor";
diff --git a/space/core/store/issue-detail.store.ts b/space/core/store/issue-detail.store.ts
index ee8a3031ed..31058f790f 100644
--- a/space/core/store/issue-detail.store.ts
+++ b/space/core/store/issue-detail.store.ts
@@ -36,6 +36,7 @@ export interface IIssueDetailStore {
updateIssueComment: (anchor: string, issueID: string, commentID: string, data: any) => Promise<any>;
deleteIssueComment: (anchor: string, issueID: string, commentID: string) => void;
uploadCommentAsset: (file: File, anchor: string, commentID?: string) => Promise<TFileSignedURLResponse>;
+ uploadIssueAsset: (file: File, anchor: string, commentID?: string) => Promise<TFileSignedURLResponse>;
addCommentReaction: (anchor: string, issueID: string, commentID: string, reactionHex: string) => void;
removeCommentReaction: (anchor: string, issueID: string, commentID: string, reactionHex: string) => void;
// reaction actions
@@ -79,6 +80,7 @@ export class IssueDetailStore implements IIssueDetailStore {
updateIssueComment: action,
deleteIssueComment: action,
uploadCommentAsset: action,
+ uploadIssueAsset: action,
addCommentReaction: action,
removeCommentReaction: action,
// reaction actions
@@ -245,6 +247,23 @@ export class IssueDetailStore implements IIssueDetailStore {
}
};
+ uploadIssueAsset = async (file: File, anchor: string, commentID?: string) => {
+ try {
+ const res = await this.fileService.uploadAsset(
+ anchor,
+ {
+ entity_identifier: commentID ?? "",
+ entity_type: EFileAssetType.ISSUE_ATTACHMENT,
+ },
+ file
+ );
+ return res;
+ } catch (error) {
+ console.log("Error in uploading comment asset:", error);
+ throw new Error("Asset upload failed. Please try again later.");
+ }
+ };
+
addCommentReaction = async (anchor: string, issueID: string, commentID: string, reactionHex: string) => {
const newReaction = {
id: uuidv4(),
diff --git a/space/core/types/intake.d.ts b/space/core/types/intake.d.ts
new file mode 100644
index 0000000000..9cf2934f63
--- /dev/null
+++ b/space/core/types/intake.d.ts
@@ -0,0 +1,6 @@
+export type TIntakeIssueForm = {
+ name: string;
+ email: string;
+ username: string;
+ description_html: string;
+};
diff --git a/web/ce/constants/project/settings/features.tsx b/web/ce/constants/project/settings/features.tsx
index b9b39700d6..b3601e27b1 100644
--- a/web/ce/constants/project/settings/features.tsx
+++ b/web/ce/constants/project/settings/features.tsx
@@ -13,7 +13,8 @@ export type TProperties = {
renderChildren?: (
currentProjectDetails: IProject,
isAdmin: boolean,
- handleSubmit: (featureKey: string, featureProperty: string) => Promise<void>
+ handleSubmit: (featureKey: string, featureProperty: string) => Promise<void>,
+ workspaceSlug: string
) => ReactNode;
};
export type TFeatureList = {
diff --git a/web/core/components/inbox/sidebar/inbox-list-item.tsx b/web/core/components/inbox/sidebar/inbox-list-item.tsx
index c1574fe29e..6762c25280 100644
--- a/web/core/components/inbox/sidebar/inbox-list-item.tsx
+++ b/web/core/components/inbox/sidebar/inbox-list-item.tsx
@@ -4,7 +4,7 @@ import { FC, MouseEvent } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
-import { Tooltip, PriorityIcon, Row } from "@plane/ui";
+import { Tooltip, PriorityIcon, Row, Avatar } from "@plane/ui";
// components
import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
import { InboxIssueStatus } from "@/components/inbox";
@@ -12,6 +12,7 @@ import { InboxIssueStatus } from "@/components/inbox";
import { cn } from "@/helpers/common.helper";
import { renderFormattedDate } from "@/helpers/date-time.helper";
// hooks
+import { getFileURL } from "@/helpers/file.helper";
import { useLabel, useMember, useProjectInbox } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -116,7 +117,11 @@ export const InboxIssueListItem: FC<InboxIssueListItemProps> = observer((props)
)}
</div>
{/* created by */}
- {createdByDetails && <ButtonAvatars showTooltip={false} userIds={createdByDetails?.id} />}
+ {createdByDetails && createdByDetails.email?.includes("[email protected]") ? (
+ <Avatar src={getFileURL("")} name={"Plane"} size="md" showTooltip />
+ ) : createdByDetails ? (
+ <ButtonAvatars showTooltip={false} userIds={createdByDetails?.id} />
+ ) : null}
</div>
</Row>
</Link>
diff --git a/web/core/components/project/settings/features-list.tsx b/web/core/components/project/settings/features-list.tsx
index f1f17f2d59..7bd0a15e6d 100644
--- a/web/core/components/project/settings/features-list.tsx
+++ b/web/core/components/project/settings/features-list.tsx
@@ -102,7 +102,7 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {
<div className="pl-14">
{currentProjectDetails?.[featureItem.property as keyof IProject] &&
featureItem.renderChildren &&
- featureItem.renderChildren(currentProjectDetails, isAdmin, handleSubmit)}
+ featureItem.renderChildren(currentProjectDetails, isAdmin, handleSubmit, workspaceSlug)}
</div>
</div>
);
diff --git a/web/core/services/inbox/inbox-issue.service.ts b/web/core/services/inbox/inbox-issue.service.ts
index 61aaeb8490..b1bf74999f 100644
--- a/web/core/services/inbox/inbox-issue.service.ts
+++ b/web/core/services/inbox/inbox-issue.service.ts
@@ -77,17 +77,15 @@ export class InboxIssueService extends APIService {
}
async retrievePublishForm(workspaceSlug: string, projectId: string): Promise<TInboxForm> {
- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/publish-intake/`)
+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/intake-settings/`)
.then((response) => response?.data)
.catch((error) => {
throw error?.response?.data;
});
}
- async updatePublishForm(workspaceSlug: string, projectId: string, is_disabled: boolean): Promise<TInboxIssue> {
- return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/publish-intake/`, {
- is_disabled,
- })
+ async updatePublishForm(workspaceSlug: string, projectId: string, data: Partial<TInboxForm>): Promise<TInboxForm> {
+ return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/intake-settings/`, data)
.then((response) => response?.data)
.catch((error) => {
throw error?.response?.data;
diff --git a/web/core/store/inbox/project-inbox.store.ts b/web/core/store/inbox/project-inbox.store.ts
index f6953debf8..9960faa154 100644
--- a/web/core/store/inbox/project-inbox.store.ts
+++ b/web/core/store/inbox/project-inbox.store.ts
@@ -71,7 +71,7 @@ export interface IProjectInboxStore {
fetchInboxPaginationIssues: (workspaceSlug: string, projectId: string) => Promise<void>;
fetchInboxIssueById: (workspaceSlug: string, projectId: string, inboxIssueId: string) => Promise<TInboxIssue>;
fetchIntakeForms: (workspaceSlug: string, projectId: string) => Promise<void>;
- toggleIntakeForms: (workspaceSlug: string, projectId: string, isDisabled: boolean) => Promise<void>;
+ toggleIntakeForms: (workspaceSlug: string, projectId: string, data: Partial<TInboxForm>) => Promise<void>;
regenerateIntakeForms: (workspaceSlug: string, projectId: string) => Promise<void>;
createInboxIssue: (
workspaceSlug: string,
@@ -329,20 +329,23 @@ export class ProjectInboxStore implements IProjectInboxStore {
}
};
- toggleIntakeForms = async (workspaceSlug: string, projectId: string, isDisabled: boolean) => {
+ toggleIntakeForms = async (workspaceSlug: string, projectId: string, data: Partial<TInboxForm>) => {
+ const initialData = this.intakeForms[projectId];
try {
runInAction(() => {
- set(this.intakeForms, projectId, { ...this.intakeForms[projectId], is_disabled: isDisabled });
+ set(this.intakeForms, projectId, { ...this.intakeForms[projectId], ...data });
+ });
+ const result = await this.inboxIssueService.updatePublishForm(workspaceSlug, projectId, data);
+ runInAction(() => {
+ set(this.intakeForms, projectId, { ...this.intakeForms[projectId], anchor: result?.anchor });
});
- await this.inboxIssueService.updatePublishForm(workspaceSlug, projectId, isDisabled);
} catch {
console.error("Error fetching the publish forms");
runInAction(() => {
- set(this.intakeForms, projectId, { ...this.intakeForms[projectId], is_disabled: !isDisabled });
+ set(this.intakeForms, projectId, initialData);
});
}
};
-
regenerateIntakeForms = async (workspaceSlug: string, projectId: string) => {
try {
const form = await this.inboxIssueService.regeneratePublishForm(workspaceSlug, projectId);