π₯π₯π₯ 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-2381 Chore: intake refactor (#5752)
Akshita Goyal0f25f39404b5
diff --git a/packages/types/src/inbox.d.ts b/packages/types/src/inbox.d.tsindex afb744f6cd..bb60b35a21 100644--- a/packages/types/src/inbox.d.ts+++ b/packages/types/src/inbox.d.ts@@ -96,3 +96,16 @@ export type TInboxIssuePaginationInfo = TPaginationInfo & {export type TInboxIssueWithPagination = TInboxIssuePaginationInfo & {results: TInboxIssue[];};++export type TInboxForm = {+ anchor: string;+ id: string;+ is_disabled: boolean;+};++export type TInboxIssueForm = {+ name: string;+ description: string;+ username: string;+ email: string;+};diff --git a/packages/ui/src/popovers/popover.tsx b/packages/ui/src/popovers/popover.tsxindex 30a168965f..4860a25a89 100644--- a/packages/ui/src/popovers/popover.tsx+++ b/packages/ui/src/popovers/popover.tsx@@ -18,6 +18,7 @@ export const Popover = (props: TPopover) => {panelClassName = "",children,popoverButtonRef,+ buttonRefClassName = "",} = props;// statesconst [referenceElement, setReferenceElement] = useState<HTMLDivElement | null>(null);@@ -38,7 +39,7 @@ export const Popover = (props: TPopover) => {return (<HeadlessReactPopover className={cn("relative flex h-full w-full items-center justify-center", popoverClassName)}>- <div ref={setReferenceElement} className="w-full">+ <div ref={setReferenceElement} className={cn("w-full", buttonRefClassName)}><HeadlessReactPopover.Buttonref={popoverButtonRef as Ref<HTMLButtonElement>}className={cn(diff --git a/packages/ui/src/popovers/types.ts b/packages/ui/src/popovers/types.tsindex 51b1e877a5..7801e2d853 100644--- a/packages/ui/src/popovers/types.ts+++ b/packages/ui/src/popovers/types.ts@@ -5,6 +5,7 @@ export type TPopoverButtonDefaultOptions = {// button and button stylingbutton?: ReactNode;buttonClassName?: string;+ buttonRefClassName?: string;disabled?: boolean;};diff --git a/space/public/instance/intake-sent-dark.png b/space/public/instance/intake-sent-dark.pngnew file mode 100644index 0000000000..70a62730e0Binary files /dev/null and b/space/public/instance/intake-sent-dark.png differdiff --git a/space/public/instance/intake-sent-light.png b/space/public/instance/intake-sent-light.pngnew file mode 100644index 0000000000..9425c07237Binary files /dev/null and b/space/public/instance/intake-sent-light.png differdiff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/layout.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/layout.tsxindex 167823fc2b..e4cde6cbb1 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/layout.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/layout.tsx@@ -2,7 +2,7 @@// componentsimport { AppHeader, ContentWrapper } from "@/components/core";-import { ProjectInboxHeader } from "./header";+import { ProjectInboxHeader } from "@/plane-web/components/projects/settings/intake";export default function ProjectInboxIssuesLayout({ children }: { children: React.ReactNode }) {return (diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/header.tsx b/web/ce/components/projects/settings/intake/header.tsxsimilarity index 100%rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/header.tsxrename to web/ce/components/projects/settings/intake/header.tsxdiff --git a/web/ce/components/projects/settings/intake/index.ts b/web/ce/components/projects/settings/intake/index.tsnew file mode 100644index 0000000000..49ac70fe21--- /dev/null+++ b/web/ce/components/projects/settings/intake/index.ts@@ -0,0 +1 @@+export * from "./header";diff --git a/web/ce/constants/project/settings/features.tsx b/web/ce/constants/project/settings/features.tsxindex 3fdccc9794..b9b39700d6 100644--- a/web/ce/constants/project/settings/features.tsx+++ b/web/ce/constants/project/settings/features.tsx@@ -1,16 +1,23 @@import { ReactNode } from "react";import { FileText, Layers, Timer } from "lucide-react";+import { IProject } from "@plane/types";import { ContrastIcon, DiceIcon, Intake } from "@plane/ui";+export type TProperties = {+ property: string;+ title: string;+ description: string;+ icon: ReactNode;+ isPro: boolean;+ isEnabled: boolean;+ renderChildren?: (+ currentProjectDetails: IProject,+ isAdmin: boolean,+ handleSubmit: (featureKey: string, featureProperty: string) => Promise<void>+ ) => ReactNode;+};export type TFeatureList = {- [key: string]: {- property: string;- title: string;- description: string;- icon: ReactNode;- isPro: boolean;- isEnabled: boolean;- };+ [key: string]: TProperties;};export type TProjectFeatures = {diff --git a/web/core/components/project/settings/features-list.tsx b/web/core/components/project/settings/features-list.tsxindex 91eb188024..f1f17f2d59 100644--- a/web/core/components/project/settings/features-list.tsx+++ b/web/core/components/project/settings/features-list.tsx@@ -70,31 +70,40 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {return (<divkey={featureItemKey}- className="flex items-center justify-between gap-x-8 gap-y-2 border-b border-custom-border-100 bg-custom-background-100 pb-2 pt-4 last:border-b-0"+ className="gap-x-8 gap-y-2 border-b border-custom-border-100 bg-custom-background-100 pb-2 pt-4">- <div className="flex items-start gap-3">- <div className="flex items-center justify-center rounded bg-custom-background-90 p-3">- {featureItem.icon}- </div>- <div>- <div className="flex items-center gap-2">- <h4 className="text-sm font-medium leading-5">{featureItem.title}</h4>- {featureItem.isPro && (- <Tooltip tooltipContent="Pro feature" position="top">- <UpgradeBadge />- </Tooltip>- )}+ <div key={featureItemKey} className="flex items-center justify-between">+ <div className="flex items-start gap-3">+ <div className="flex items-center justify-center rounded bg-custom-background-90 p-3">+ {featureItem.icon}+ </div>+ <div>+ <div className="flex items-center gap-2">+ <h4 className="text-sm font-medium leading-5">{featureItem.title}</h4>+ {featureItem.isPro && (+ <Tooltip tooltipContent="Pro feature" position="top">+ <UpgradeBadge />+ </Tooltip>+ )}+ </div>+ <p className="text-sm leading-5 tracking-tight text-custom-text-300">+ {featureItem.description}+ </p></div>- <p className="text-sm leading-5 tracking-tight text-custom-text-300">{featureItem.description}</p></div>- </div>- <ToggleSwitch- value={Boolean(currentProjectDetails?.[featureItem.property as keyof IProject])}- onChange={() => handleSubmit(featureItemKey, featureItem.property)}- disabled={!featureItem.isEnabled || !isAdmin}- size="sm"- />+ <ToggleSwitch+ value={Boolean(currentProjectDetails?.[featureItem.property as keyof IProject])}+ onChange={() => handleSubmit(featureItemKey, featureItem.property)}+ disabled={!featureItem.isEnabled || !isAdmin}+ size="sm"+ />+ </div>+ <div className="pl-14">+ {currentProjectDetails?.[featureItem.property as keyof IProject] &&+ featureItem.renderChildren &&+ featureItem.renderChildren(currentProjectDetails, isAdmin, handleSubmit)}+ </div></div>);})}diff --git a/web/core/services/inbox/inbox-issue.service.ts b/web/core/services/inbox/inbox-issue.service.tsindex f8fcf72c4e..61aaeb8490 100644--- a/web/core/services/inbox/inbox-issue.service.ts+++ b/web/core/services/inbox/inbox-issue.service.ts@@ -1,5 +1,5 @@// types-import type { TInboxIssue, TIssue, TInboxIssueWithPagination } from "@plane/types";+import type { TInboxIssue, TIssue, TInboxIssueWithPagination, TInboxForm } from "@plane/types";import { API_BASE_URL } from "@/helpers/common.helper";import { APIService } from "@/services/api.service";// helpers@@ -75,4 +75,30 @@ export class InboxIssueService extends APIService {throw error?.response?.data;});}++ async retrievePublishForm(workspaceSlug: string, projectId: string): Promise<TInboxForm> {+ return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/publish-intake/`)+ .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,+ })+ .then((response) => response?.data)+ .catch((error) => {+ throw error?.response?.data;+ });+ }++ async regeneratePublishForm(workspaceSlug: string, projectId: string): Promise<TInboxIssue> {+ return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/publish-intake-regenerate/`)+ .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.tsindex 2897825397..f6953debf8 100644--- a/web/core/store/inbox/project-inbox.store.ts+++ b/web/core/store/inbox/project-inbox.store.ts@@ -12,6 +12,7 @@ import {TInboxIssueSorting,TInboxIssuePaginationInfo,TInboxIssueSortingOrderByQueryParam,+ TInboxForm,} from "@plane/types";// helpersimport { EInboxIssueCurrentTab, EInboxIssueStatus, EPastDurationFilters, getCustomDates } from "@/helpers/inbox.helper";@@ -39,6 +40,7 @@ export interface IProjectInboxStore {inboxIssuePaginationInfo: TInboxIssuePaginationInfo | undefined;inboxIssues: Record<string, IInboxIssueStore>; // issue_id -> IInboxIssueStoreinboxIssueIds: string[];+ intakeForms: Record<string, TInboxForm>;// computedinboxFilters: Partial<TInboxIssueFilter>; // computed project inbox filtersinboxSorting: Partial<TInboxIssueSorting>; // computed project inbox sorting@@ -68,6 +70,9 @@ export interface IProjectInboxStore {) => Promise<void>;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>;+ regenerateIntakeForms: (workspaceSlug: string, projectId: string) => Promise<void>;createInboxIssue: (workspaceSlug: string,projectId: string,@@ -89,6 +94,7 @@ export class ProjectInboxStore implements IProjectInboxStore {inboxIssuePaginationInfo: TInboxIssuePaginationInfo | undefined = undefined;inboxIssues: Record<string, IInboxIssueStore> = {};inboxIssueIds: string[] = [];+ intakeForms: Record<string, TInboxForm> = {};// servicesinboxIssueService;@@ -103,6 +109,7 @@ export class ProjectInboxStore implements IProjectInboxStore {inboxIssuePaginationInfo: observable,inboxIssues: observable,inboxIssueIds: observable,+ intakeForms: observable,// computedinboxFilters: computed,inboxSorting: computed,@@ -310,6 +317,45 @@ export class ProjectInboxStore implements IProjectInboxStore {}};+ fetchIntakeForms = async (workspaceSlug: string, projectId: string) => {+ try {+ const intakeForms = await this.inboxIssueService.retrievePublishForm(workspaceSlug, projectId);+ if (intakeForms)+ runInAction(() => {+ set(this.intakeForms, projectId, intakeForms);+ });+ } catch {+ console.error("Error fetching the publish forms");+ }+ };++ toggleIntakeForms = async (workspaceSlug: string, projectId: string, isDisabled: boolean) => {+ try {+ runInAction(() => {+ set(this.intakeForms, projectId, { ...this.intakeForms[projectId], is_disabled: isDisabled });+ });+ 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 });+ });+ }+ };++ regenerateIntakeForms = async (workspaceSlug: string, projectId: string) => {+ try {+ const form = await this.inboxIssueService.regeneratePublishForm(workspaceSlug, projectId);+ if (form) {+ runInAction(() => {+ set(this.intakeForms, projectId, form);+ });+ }+ } catch {+ console.error("Error fetching the publish forms");+ }+ };+/*** @description fetch intake issues with paginated data* @param workspaceSlugdiff --git a/web/ee/components/projects/settings/intake/index.ts b/web/ee/components/projects/settings/intake/index.tsnew file mode 100644index 0000000000..4ffe826389--- /dev/null+++ b/web/ee/components/projects/settings/intake/index.ts@@ -0,0 +1 @@+export * from "ce/components/projects/settings/intake";