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.

[WEB-3482] refactor: platform components and mobx stores (#6713)

Prateek Shourya6d216f2607b7
diff --git a/packages/constants/src/issue/index.ts b/packages/constants/src/issue/index.ts
index 6332032234..c5cf790815 100644
--- a/packages/constants/src/issue/index.ts
+++ b/packages/constants/src/issue/index.ts
@@ -1,3 +1,4 @@
export * from "./common";
export * from "./filter";
export * from "./layout";
+export * from "./modal";
diff --git a/packages/constants/src/issue/modal.ts b/packages/constants/src/issue/modal.ts
new file mode 100644
index 0000000000..c2697ca9dd
--- /dev/null
+++ b/packages/constants/src/issue/modal.ts
@@ -0,0 +1,19 @@
+// plane imports
+import { TIssue } from "@plane/types";
+
+export const DEFAULT_WORK_ITEM_FORM_VALUES: Partial<TIssue> = {
+ project_id: "",
+ type_id: null,
+ name: "",
+ description_html: "",
+ estimate_point: null,
+ state_id: "",
+ parent_id: null,
+ priority: "none",
+ assignee_ids: [],
+ label_ids: [],
+ cycle_id: null,
+ module_ids: null,
+ start_date: null,
+ target_date: null,
+};
diff --git a/packages/types/src/index.d.ts b/packages/types/src/index.d.ts
index 9ec3846b7c..bd4e593cc2 100644
--- a/packages/types/src/index.d.ts
+++ b/packages/types/src/index.d.ts
@@ -40,3 +40,4 @@ export * from "./epics";
export * from "./charts";
export * from "./home";
export * from "./stickies";
+export * from "./utils";
diff --git a/packages/types/src/utils.d.ts b/packages/types/src/utils.d.ts
new file mode 100644
index 0000000000..aae5fd90ce
--- /dev/null
+++ b/packages/types/src/utils.d.ts
@@ -0,0 +1,5 @@
+export type PartialDeep<K> = {
+ [attr in keyof K]?: K[attr] extends object ? PartialDeep<K[attr]> : K[attr];
+};
+
+export type CompleteOrEmpty<T> = T | Record<string, never>;
diff --git a/packages/utils/src/common.ts b/packages/utils/src/common.ts
index fb47656d3b..fff5d9d8ef 100644
--- a/packages/utils/src/common.ts
+++ b/packages/utils/src/common.ts
@@ -5,3 +5,37 @@ import { twMerge } from "tailwind-merge";
export const getSupportEmail = (defaultEmail: string = ""): string => defaultEmail;
export const cn = (...inputs: ClassValue[]) => twMerge(clsx(inputs));
+
+/**
+ * Extracts IDs from an array of objects with ID property
+ */
+export const extractIds = <T extends { id: string }>(items: T[]): string[] => items.map((item) => item.id);
+
+/**
+ * Checks if an ID exists and is valid within the provided list
+ */
+export const isValidId = (id: string | null | undefined, validIds: string[]): boolean => !!id && validIds.includes(id);
+
+/**
+ * Filters an array to only include valid IDs
+ */
+export const filterValidIds = (ids: string[], validIds: string[]): string[] =>
+ ids.filter((id) => validIds.includes(id));
+
+/**
+ * Filters an array to include only valid IDs, returning both valid and invalid IDs
+ */
+export const partitionValidIds = (ids: string[], validIds: string[]): { valid: string[]; invalid: string[] } => {
+ const valid: string[] = [];
+ const invalid: string[] = [];
+
+ ids.forEach((id) => {
+ if (validIds.includes(id)) {
+ valid.push(id);
+ } else {
+ invalid.push(id);
+ }
+ });
+
+ return { valid, invalid };
+};
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 7ae2693187..57f10c5d42 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -11,3 +11,4 @@ export * from "./state";
export * from "./string";
export * from "./theme";
export * from "./workspace";
+export * from "./work-item";
diff --git a/packages/utils/src/work-item/index.ts b/packages/utils/src/work-item/index.ts
new file mode 100644
index 0000000000..031608e25f
--- /dev/null
+++ b/packages/utils/src/work-item/index.ts
@@ -0,0 +1 @@
+export * from "./modal";
diff --git a/packages/utils/src/work-item/modal.ts b/packages/utils/src/work-item/modal.ts
new file mode 100644
index 0000000000..c70d7591fb
--- /dev/null
+++ b/packages/utils/src/work-item/modal.ts
@@ -0,0 +1,33 @@
+// plane imports
+import { DEFAULT_WORK_ITEM_FORM_VALUES } from "@plane/constants";
+import { IPartialProject, ISearchIssueResponse, IState, TIssue } from "@plane/types";
+
+export const getUpdateFormDataForReset = (projectId: string | null | undefined, formData: Partial<TIssue>) => ({
+ ...DEFAULT_WORK_ITEM_FORM_VALUES,
+ project_id: projectId,
+ name: formData.name,
+ description_html: formData.description_html,
+ priority: formData.priority,
+ start_date: formData.start_date,
+ target_date: formData.target_date,
+});
+
+export const convertWorkItemDataToSearchResponse = (
+ workspaceSlug: string,
+ workItem: TIssue,
+ project: IPartialProject | undefined,
+ state: IState | undefined
+): ISearchIssueResponse => ({
+ id: workItem.id,
+ name: workItem.name,
+ project_id: workItem.project_id ?? "",
+ project__identifier: project?.identifier ?? "",
+ project__name: project?.name ?? "",
+ sequence_id: workItem.sequence_id,
+ type_id: workItem.type_id ?? "",
+ state__color: state?.color ?? "",
+ start_date: workItem.start_date,
+ state__group: state?.group ?? "backlog",
+ state__name: state?.name ?? "",
+ workspace__slug: workspaceSlug,
+});
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/automations/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/automations/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/automations/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/automations/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/estimates/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/estimates/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/estimates/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/estimates/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/features/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/features/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/features/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/features/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/labels/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/labels/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/labels/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/labels/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/layout.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/layout.tsx
similarity index 95%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/layout.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/layout.tsx
index e532e743af..221ecf4428 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/layout.tsx
@@ -4,7 +4,7 @@ import { FC, ReactNode } from "react";
// components
import { AppHeader } from "@/components/core";
// local components
-import { ProjectSettingHeader } from "./header";
+import { ProjectSettingHeader } from "../header";
import { ProjectSettingsSidebar } from "./sidebar";
export interface IProjectSettingLayout {
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/members/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/members/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/members/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/members/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/sidebar.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/sidebar.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/states/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/states/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/states/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/(with-sidebar)/states/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/api-tokens/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/api-tokens/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/api-tokens/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/api-tokens/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/billing/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/billing/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/billing/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/billing/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/exports/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/exports/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/exports/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/exports/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/imports/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/imports/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/imports/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/imports/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/integrations/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/integrations/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/integrations/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/integrations/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/layout.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/layout.tsx
similarity index 97%
rename from web/app/[workspaceSlug]/(projects)/settings/layout.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/layout.tsx
index 788ca02ae8..6dfe44ed66 100644
--- a/web/app/[workspaceSlug]/(projects)/settings/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/layout.tsx
@@ -10,7 +10,7 @@ import { AppHeader } from "@/components/core";
import { useUserPermissions } from "@/hooks/store";
// plane web constants
// local components
-import { WorkspaceSettingHeader } from "./header";
+import { WorkspaceSettingHeader } from "../header";
import { MobileWorkspaceSettingsTabs } from "./mobile-header-tabs";
import { WorkspaceSettingsSidebar } from "./sidebar";
diff --git a/web/app/[workspaceSlug]/(projects)/settings/members/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/members/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/members/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/members/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/mobile-header-tabs.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/mobile-header-tabs.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/mobile-header-tabs.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/mobile-header-tabs.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/sidebar.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/sidebar.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/sidebar.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/webhooks/[webhookId]/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/webhooks/[webhookId]/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/webhooks/[webhookId]/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/webhooks/[webhookId]/page.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/settings/webhooks/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/webhooks/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/settings/webhooks/page.tsx
rename to web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/webhooks/page.tsx
diff --git a/web/ce/components/issues/issue-modal/index.ts b/web/ce/components/issues/issue-modal/index.ts
index f2c8494163..b35c5de10d 100644
--- a/web/ce/components/issues/issue-modal/index.ts
+++ b/web/ce/components/issues/issue-modal/index.ts
@@ -1,3 +1,5 @@
export * from "./provider";
export * from "./issue-type-select";
export * from "./additional-properties";
+export * from "./template-select";
+
diff --git a/web/ce/components/issues/issue-modal/issue-type-select.tsx b/web/ce/components/issues/issue-modal/issue-type-select.tsx
index 9514cb78f5..b7b6e0898c 100644
--- a/web/ce/components/issues/issue-modal/issue-type-select.tsx
+++ b/web/ce/components/issues/issue-modal/issue-type-select.tsx
@@ -1,4 +1,6 @@
import { Control } from "react-hook-form";
+// plane imports
+import { EditorRefApi } from "@plane/editor";
// types
import { TBulkIssueProperties, TIssue } from "@plane/types";
@@ -9,6 +11,7 @@ export type TIssueTypeDropdownVariant = "xs" | "sm";
export type TIssueTypeSelectProps<T extends Partial<TIssueFields>> = {
control: Control<T>;
projectId: string | null;
+ editorRef?: React.MutableRefObject<EditorRefApi | null>;
disabled?: boolean;
variant?: TIssueTypeDropdownVariant;
placeholder?: string;
diff --git a/web/ce/components/issues/issue-modal/provider.tsx b/web/ce/components/issues/issue-modal/provider.tsx
index f387feb5a8..9ea1ad8f63 100644
--- a/web/ce/components/issues/issue-modal/provider.tsx
+++ b/web/ce/components/issues/issue-modal/provider.tsx
@@ -1,17 +1,29 @@
-import React from "react";
+import React, { useState } from "react";
import { observer } from "mobx-react-lite";
+// plane imports
+import { ISearchIssueResponse } from "@plane/types";
// components
import { IssueModalContext } from "@/components/issues";
-type TIssueModalProviderProps = {
+export type TIssueModalProviderProps = {
+ templateId?: string;
children: React.ReactNode;
};
export const IssueModalProvider = observer((props: TIssueModalProviderProps) => {
const { children } = props;
+ // states
+ const [selectedParentIssue, setSelectedParentIssue] = useState<ISearchIssueResponse | null>(null);
+
return (
<IssueModalContext.Provider
value={{
+ workItemTemplateId: null,
+ setWorkItemTemplateId: () => {},
+ isApplyingTemplate: false,
+ setIsApplyingTemplate: () => {},
+ selectedParentIssue,
+ setSelectedParentIssue,
issuePropertyValues: {},
setIssuePropertyValues: () => {},
issuePropertyValueErrors: {},
@@ -20,6 +32,9 @@ export const IssueModalProvider = observer((props: TIssueModalProviderProps) =>
getActiveAdditionalPropertiesLength: () => 0,
handlePropertyValuesValidation: () => true,
handleCreateUpdatePropertyValues: () => Promise.resolve(),
+ handleParentWorkItemDetails: () => Promise.resolve(undefined),
+ handleProjectEntitiesFetch: () => Promise.resolve(),
+ handleTemplateChange: () => Promise.resolve(),
}}
>
{children}
diff --git a/web/ce/components/issues/issue-modal/template-select.tsx b/web/ce/components/issues/issue-modal/template-select.tsx
new file mode 100644
index 0000000000..679e9419de
--- /dev/null
+++ b/web/ce/components/issues/issue-modal/template-select.tsx
@@ -0,0 +1,15 @@
+export type TWorkItemTemplateDropdownSize = "xs" | "sm";
+
+export type TWorkItemTemplateSelect = {
+ projectId: string | null;
+ typeId: string | null;
+ disabled?: boolean;
+ size?: TWorkItemTemplateDropdownSize;
+ placeholder?: string;
+ renderChevron?: boolean;
+ dropDownContainerClassName?: string;
+ handleFormChange?: () => void;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const WorkItemTemplateSelect = (props: TWorkItemTemplateSelect) => <></>;
diff --git a/web/core/components/command-palette/actions/issue-actions/change-assignee.tsx b/web/core/components/command-palette/actions/issue-actions/change-assignee.tsx
index 4e43ef8876..ca953adcd3 100644
--- a/web/core/components/command-palette/actions/issue-actions/change-assignee.tsx
+++ b/web/core/components/command-palette/actions/issue-actions/change-assignee.tsx
@@ -26,7 +26,7 @@ export const ChangeIssueAssignee: React.FC<Props> = observer((props) => {
} = useMember();
// derived values
const projectId = issue?.project_id ?? "";
- const projectMemberIds = getProjectMemberIds(projectId);
+ const projectMemberIds = getProjectMemberIds(projectId, false);
const options =
projectMemberIds
diff --git a/web/core/components/dropdowns/member/member-options.tsx b/web/core/components/dropdowns/member/member-options.tsx
index 085aa8324c..28f84553f8 100644
--- a/web/core/components/dropdowns/member/member-options.tsx
+++ b/web/core/components/dropdowns/member/member-options.tsx
@@ -68,7 +68,11 @@ export const MemberOptions: React.FC<Props> = observer((props: Props) => {
}
}, [isOpen, isMobile]);
- const memberIds = propsMemberIds ? propsMemberIds : projectId ? getProjectMemberIds(projectId) : workspaceMemberIds;
+ const memberIds = propsMemberIds
+ ? propsMemberIds
+ : projectId
+ ? getProjectMemberIds(projectId, true)
+ : workspaceMemberIds;
const onOpen = () => {
if (!memberIds && workspaceSlug && projectId) fetchProjectMembers(workspaceSlug.toString(), projectId);
};
diff --git a/web/core/components/empty-state/detailed-empty-state-root.tsx b/web/core/components/empty-state/detailed-empty-state-root.tsx
index b90503682a..4ae97e839c 100644
--- a/web/core/components/empty-state/detailed-empty-state-root.tsx
+++ b/web/core/components/empty-state/detailed-empty-state-root.tsx
@@ -27,6 +27,7 @@ type Props = {
secondaryButton?: ButtonConfig;
customPrimaryButton?: React.ReactNode;
customSecondaryButton?: React.ReactNode;
+ className?: string;
};
const sizeClasses = {
@@ -66,12 +67,18 @@ export const DetailedEmptyState: React.FC<Props> = observer((props) => {
customPrimaryButton,
customSecondaryButton,
assetPath,
+ className,
} = props;
const hasButtons = primaryButton || secondaryButton || customPrimaryButton || customSecondaryButton;
return (
- <div className="flex items-center justify-center min-h-full min-w-full overflow-y-auto py-10 md:px-20 px-5">
+ <div
+ className={cn(
+ "flex items-center justify-center min-h-full min-w-full overflow-y-auto py-10 md:px-20 px-5",
+ className
+ )}
+ >
<div className={cn("flex flex-col gap-5", sizeClasses[size])}>
<div className="flex flex-col gap-1.5 flex-shrink">
<h3 className={cn("text-xl font-semibold", { "font-medium": !description })}>{title}</h3>
diff --git a/web/core/components/issues/issue-modal/components/title-input.tsx b/web/core/components/issues/issue-modal/components/title-input.tsx
index 124899e9e9..aec9391495 100644
--- a/web/core/components/issues/issue-modal/components/title-input.tsx
+++ b/web/core/components/issues/issue-modal/components/title-input.tsx
@@ -2,7 +2,7 @@
import React from "react";
import { observer } from "mobx-react";
-import { Control, Controller, FieldErrors } from "react-hook-form";
+import { Control, Controller, FormState } from "react-hook-form";
// plane imports
import { ETabIndices } from "@plane/constants";
// types
@@ -18,12 +18,17 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
type TIssueTitleInputProps = {
control: Control<TIssue>;
issueTitleRef: React.MutableRefObject<HTMLInputElement | null>;
- errors: FieldErrors<TIssue>;
+ formState: FormState<TIssue>;
handleFormChange: () => void;
};
export const IssueTitleInput: React.FC<TIssueTitleInputProps> = observer((props) => {
- const { control, issueTitleRef, errors, handleFormChange } = props;
+ const {
+ control,
+ issueTitleRef,
+ formState: { errors },
+ handleFormChange,
+ } = props;
// store hooks
const { isMobile } = usePlatformOS();
const { t } = useTranslation();
diff --git a/web/core/components/issues/issue-modal/context/issue-modal-context.tsx b/web/core/components/issues/issue-modal/context/issue-modal-context.tsx
index 8181445a45..64f5f49b33 100644
--- a/web/core/components/issues/issue-modal/context/issue-modal-context.tsx
+++ b/web/core/components/issues/issue-modal/context/issue-modal-context.tsx
@@ -1,20 +1,23 @@
-import React, { createContext } from "react";
-import { UseFormWatch } from "react-hook-form";
-// types
-import { TIssue } from "@plane/types";
-// plane web types
-import { TIssuePropertyValueErrors, TIssuePropertyValues } from "@/plane-web/types";
+import { createContext } from "react";
+// ce imports
+import { TIssueFields } from "ce/components/issues";
+// react-hook-form
+import { UseFormReset, UseFormWatch } from "react-hook-form";
+// plane imports
+import { EditorRefApi } from "@plane/editor";
+import { ISearchIssueResponse, TIssue } from "@plane/types";
+import { TIssuePropertyValues, TIssuePropertyValueErrors } from "@/plane-web/types/issue-types";
export type TPropertyValuesValidationProps = {
projectId: string | null;
workspaceSlug: string;
- watch: UseFormWatch<TIssue>;
+ watch: UseFormWatch<TIssueFields>;
};
export type TActiveAdditionalPropertiesProps = {
projectId: string | null;
workspaceSlug: string;
- watch: UseFormWatch<TIssue>;
+ watch: UseFormWatch<TIssueFields>;
};
export type TCreateUpdatePropertyValuesProps = {
@@ -25,7 +28,31 @@ export type TCreateUpdatePropertyValuesProps = {
isDraft?: boolean;
};
+export type THandleTemplateChangeProps = {
+ workspaceSlug: string;
+ reset: UseFormReset<TIssue>;
+ editorRef: React.MutableRefObject<EditorRefApi | null>;
+};
+
+export type THandleProjectEntitiesFetchProps = {
+ workspaceSlug: string;
+ templateId: string;
+};
+
+export type THandleParentWorkItemDetailsProps = {
+ workspaceSlug: string;
+ parentId: string | undefined;
+ parentProjectId: string | undefined;
+ isParentEpic: boolean;
+};
+
export type TIssueModalContext = {
+ workItemTemplateId: string | null;
+ setWorkItemTemplateId: React.Dispatch<React.SetStateAction<string | null>>;
+ isApplyingTemplate: boolean;
+ setIsApplyingTemplate: React.Dispatch<React.SetStateAction<boolean>>;
+ selectedParentIssue: ISearchIssueResponse | null;
+ setSelectedParentIssue: React.Dispatch<React.SetStateAction<ISearchIssueResponse | null>>;
issuePropertyValues: TIssuePropertyValues;
setIssuePropertyValues: React.Dispatch<React.SetStateAction<TIssuePropertyValues>>;
issuePropertyValueErrors: TIssuePropertyValueErrors;
@@ -34,6 +61,9 @@ export type TIssueModalContext = {
getActiveAdditionalPropertiesLength: (props: TActiveAdditionalPropertiesProps) => number;
handlePropertyValuesValidation: (props: TPropertyValuesValidationProps) => boolean;
handleCreateUpdatePropertyValues: (props: TCreateUpdatePropertyValuesProps) => Promise<void>;
+ handleParentWorkItemDetails: (props: THandleParentWorkItemDetailsProps) => Promise<ISearchIssueResponse | undefined>;
+ handleProjectEntitiesFetch: (props: THandleProjectEntitiesFetchProps) => Promise<void>;
+ handleTemplateChange: (props: THandleTemplateChangeProps) => Promise<void>;
};
export const IssueModalContext = createContext<TIssueModalContext | undefined>(undefined);
diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsx
index 7471853cb9..c278540e5c 100644
--- a/web/core/components/issues/issue-modal/form.tsx
+++ b/web/core/components/issues/issue-modal/form.tsx
@@ -3,17 +3,18 @@
import React, { FC, useState, useRef, useEffect } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
-import { useForm } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
// editor
-import { ETabIndices, EIssuesStoreType } from "@plane/constants";
+import { ETabIndices, EIssuesStoreType, DEFAULT_WORK_ITEM_FORM_VALUES } from "@plane/constants";
import { EditorRefApi } from "@plane/editor";
// i18n
import { useTranslation } from "@plane/i18n";
// types
-import type { TIssue, ISearchIssueResponse, TWorkspaceDraftIssue } from "@plane/types";
+import type { TIssue, TWorkspaceDraftIssue } from "@plane/types";
// hooks
import { Button, ToggleSwitch, TOAST_TYPE, setToast } from "@plane/ui";
// components
+import { convertWorkItemDataToSearchResponse, getUpdateFormDataForReset } from "@plane/utils";
import {
IssueDefaultProperties,
IssueDescriptionEditor,
@@ -25,35 +26,22 @@ import { CreateLabelModal } from "@/components/labels";
// helpers
import { cn } from "@/helpers/common.helper";
import { getTextContent } from "@/helpers/editor.helper";
-import { getChangedIssuefields } from "@/helpers/issue.helper";
+import { getChangedIssuefields } from "@/helpers/issue-modal.helper";
import { getTabIndex } from "@/helpers/tab-indices.helper";
// hooks
import { useIssueModal } from "@/hooks/context/use-issue-modal";
import { useIssueDetail, useProject, useProjectState, useWorkspaceDraftIssues } from "@/hooks/store";
import { usePlatformOS } from "@/hooks/use-platform-os";
import { useProjectIssueProperties } from "@/hooks/use-project-issue-properties";
-// plane web components
+// plane web imports
import { DeDupeButtonRoot, DuplicateModalRoot } from "@/plane-web/components/de-dupe";
-import { IssueAdditionalProperties, IssueTypeSelect } from "@/plane-web/components/issues/issue-modal";
+import {
+ IssueAdditionalProperties,
+ IssueTypeSelect,
+ WorkItemTemplateSelect,
+} from "@/plane-web/components/issues/issue-modal";
import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
-const defaultValues: Partial<TIssue> = {
- project_id: "",
- type_id: null,
- name: "",
- description_html: "",
- estimate_point: null,
- state_id: "",
- parent_id: null,
- priority: "none",
- assignee_ids: [],
- label_ids: [],
- cycle_id: null,
- module_ids: null,
- start_date: null,
- target_date: null,
-};
-
export interface IssueFormProps {
data?: Partial<TIssue>;
issueTitleRef: React.MutableRefObject<HTMLInputElement | null>;
@@ -104,7 +92,6 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
// states
const [labelModal, setLabelModal] = useState(false);
- const [selectedParentIssue, setSelectedParentIssue] = useState<ISearchIssueResponse | null>(null);
const [gptAssistantModal, setGptAssistantModal] = useState(false);
const [isMoving, setIsMoving] = useState<boolean>(false);
@@ -120,10 +107,16 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
// store hooks
const { getProjectById } = useProject();
const {
+ workItemTemplateId,
+ isApplyingTemplate,
+ selectedParentIssue,
+ setWorkItemTemplateId,
+ setSelectedParentIssue,
getIssueTypeIdOnProjectChange,
getActiveAdditionalPropertiesLength,
handlePropertyValuesValidation,
handleCreateUpdatePropertyValues,
+ handleTemplateChange,
} = useIssueModal();
const { isMobile } = usePlatformOS();
const { moveIssue } = useWorkspaceDraftIssues();
@@ -135,18 +128,20 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
const { getStateById } = useProjectState();
// form info
+ const methods = useForm<TIssue>({
+ defaultValues: { ...DEFAULT_WORK_ITEM_FORM_VALUES, project_id: defaultProjectId, ...data },
+ reValidateMode: "onChange",
+ });
const {
- formState: { errors, isDirty, isSubmitting, dirtyFields },
+ formState,
+ formState: { isDirty, isSubmitting, dirtyFields },
handleSubmit,
reset,
watch,
control,
getValues,
setValue,
- } = useForm<TIssue>({
- defaultValues: { ...defaultValues, project_id: defaultProjectId, ...data },
- reValidateMode: "onChange",
- });
+ } = methods;
const projectId = watch("project_id");
const activeAdditionalPropertiesLength = getActiveAdditionalPropertiesLength({
@@ -157,24 +152,21 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
// derived values
const projectDetails = projectId ? getProjectById(projectId) : undefined;
+ const isDisabled = isSubmitting || isApplyingTemplate;
const { getIndex } = getTabIndex(ETabIndices.ISSUE_FORM, isMobile);
//reset few fields on projectId change
useEffect(() => {
if (isDirty) {
- const formData = getValues();
-
- reset({
- ...defaultValues,
- project_id: projectId,
- name: formData.name,
- description_html: formData.description_html,
- priority: formData.priority,
- start_date: formData.start_date,
- target_date: formData.target_date,
- parent_id: formData.parent_id,
- });
+ if (workItemTemplateId) {
+ // reset work item template id
+ setWorkItemTemplateId(null);
+ reset({ ...DEFAULT_WORK_ITEM_FORM_VALUES, project_id: projectId });
+ editorRef.current?.clearEditor();
+ } else {
+ reset(getUpdateFormDataForReset(projectId, getValues()));
+ }
}
if (projectId && routeProjectId !== projectId) fetchCycles(workspaceSlug?.toString(), projectId);
@@ -195,6 +187,17 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [data, projectId]);
+ useEffect(() => {
+ if (workItemTemplateId && editorRef.current) {
+ handleTemplateChange({
+ workspaceSlug: workspaceSlug?.toString(),
+ reset,
+ editorRef,
+ });
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [workItemTemplateId]);
+
const handleFormSubmit = async (formData: Partial<TIssue>, is_draft_issue = false) => {
// Check if the editor is ready to discard
if (!editorRef.current?.isEditorReadyToDiscard()) {
@@ -233,7 +236,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
.then(() => {
setGptAssistantModal(false);
reset({
- ...defaultValues,
+ ...DEFAULT_WORK_ITEM_FORM_VALUES,
...(isCreateMoreToggleEnabled ? { ...data } : {}),
project_id: getValues<"project_id">("project_id"),
type_id: getValues<"type_id">("type_id"),
@@ -262,7 +265,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
...data,
...getValues(),
} as TWorkspaceDraftIssue);
- } catch (error) {
+ } catch {
setToast({
type: TOAST_TYPE.ERROR,
title: "Error!",
@@ -308,16 +311,9 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
const stateDetails = getStateById(issue.state_id);
- setSelectedParentIssue({
- id: issue.id,
- name: issue.name,
- project_id: issue.project_id,
- project__identifier: projectDetails.identifier,
- project__name: projectDetails.name,
- sequence_id: issue.sequence_id,
- type_id: issue.type_id,
- state__color: stateDetails?.color,
- } as ISearchIssueResponse);
+ setSelectedParentIssue(
+ convertWorkItemDataToSearchResponse(workspaceSlug?.toString(), issue, projectDetails, stateDetails)
+ );
}, [watch, getIssueById, getProjectById, selectedParentIssue, getStateById]);
// executing this useEffect when isDirty changes
@@ -351,7 +347,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
const shouldRenderDuplicateModal = isDuplicateModalOpen && duplicateIssues?.length > 0;
return (
- <>
+ <FormProvider {...methods}>
{projectId && (
<CreateLabelModal
isOpen={labelModal}
@@ -383,11 +379,20 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
<IssueTypeSelect
control={control}
projectId={projectId}
+ editorRef={editorRef}
disabled={!!data?.sourceIssueId}
handleFormChange={handleFormChange}
renderChevron
/>
)}
+ {projectId && !data?.id && !data?.sourceIssueId && (
+ <WorkItemTemplateSelect
+ projectId={projectId}
+ typeId={watch("type_id")}
+ handleFormChange={handleFormChange}
+ renderChevron
+ />
+ )}
</div>
{duplicateIssues.length > 0 && (
<DeDupeButtonRoot
@@ -416,7 +421,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
<IssueTitleInput
control={control}
issueTitleRef={issueTitleRef}
- errors={errors}
+ formState={formState}
handleFormChange={handleFormChange}
/>
</div>
@@ -526,6 +531,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
size="sm"
ref={submitBtnRef}
loading={isSubmitting}
+ disabled={isDisabled}
>
{isSubmitting ? primaryButtonText.loading : primaryButtonText.default}
</Button>
@@ -562,6 +568,6 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
</div>
)}
</div>
- </>
+ </FormProvider>
);
});
diff --git a/web/core/components/issues/issue-modal/modal.tsx b/web/core/components/issues/issue-modal/modal.tsx
index 56569bef8c..0d7681388b 100644
--- a/web/core/components/issues/issue-modal/modal.tsx
+++ b/web/core/components/issues/issue-modal/modal.tsx
@@ -2,13 +2,12 @@
import React from "react";
import { observer } from "mobx-react";
-// types
+// plane imports
import { EIssuesStoreType } from "@plane/constants";
import type { TIssue } from "@plane/types";
// components
import { CreateUpdateIssueModalBase } from "@/components/issues";
-// constants
-// plane web providers
+// plane web imports
import { IssueModalProvider } from "@/plane-web/components/issues";
export interface IssuesModalProps {
@@ -28,12 +27,13 @@ export interface IssuesModalProps {
loading: string;
};
isProjectSelectionDisabled?: boolean;
+ templateId?: string;
}
export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer(
(props) =>
props.isOpen && (
- <IssueModalProvider>
+ <IssueModalProvider templateId={props.templateId}>
<CreateUpdateIssueModalBase {...props} />
</IssueModalProvider>
)
diff --git a/web/core/components/issues/select/label.tsx b/web/core/components/issues/select/label.tsx
index 2dc21e7f41..149ca0f771 100644
--- a/web/core/components/issues/select/label.tsx
+++ b/web/core/components/issues/select/label.tsx
@@ -1,4 +1,5 @@
import React, { Fragment, useEffect, useRef, useState } from "react";
+import { Placement } from "@popperjs/core";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { usePopper } from "react-popper";
@@ -24,7 +25,9 @@ type Props = {
disabled?: boolean;
tabIndex?: number;
createLabelEnabled?: boolean;
+ buttonContainerClassName?: string;
buttonClassName?: string;
+ placement?: Placement;
};
export const IssueLabelSelect: React.FC<Props> = observer((props) => {
@@ -37,7 +40,9 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
disabled = false,
tabIndex,
createLabelEnabled = false,
+ buttonContainerClassName,
buttonClassName,
+ placement,
} = props;
const { t } = useTranslation();
// router
@@ -55,7 +60,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
const inputRef = useRef<HTMLInputElement | null>(null);
// popper
const { styles, attributes } = usePopper(referenceElement, popperElement, {
- placement: "bottom-start",
+ placement: placement ?? "bottom-start",
});
const projectLabels = getProjectLabels(projectId);
@@ -115,13 +120,16 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
<button
type="button"
ref={setReferenceElement}
- className={cn("h-full flex cursor-pointer items-center gap-2 text-xs text-custom-text-200", buttonClassName)}
+ className={cn(
+ "h-full flex cursor-pointer items-center gap-2 text-xs text-custom-text-200",
+ buttonContainerClassName
+ )}
onClick={handleOnClick}
>
{label ? (
label
) : value && value.length > 0 ? (
- <span className="flex items-center justify-center gap-2 text-xs h-full">
+ <span className={cn("flex items-center justify-center gap-2 text-xs h-full", buttonClassName)}>
<IssueLabelsList
labels={value.map((v) => projectLabels?.find((l) => l.id === v)) ?? []}
length={3}
@@ -129,7 +137,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
/>
</span>
) : (
- <div className="h-full flex items-center justify-center gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1 text-xs hover:bg-custom-background-80">
+ <div className={cn("h-full flex items-center justify-center gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1 text-xs hover:bg-custom-background-80", buttonClassName)}>
<Tag className="h-3 w-3 flex-shrink-0" />
<span>{t("labels")}</span>
</div>
diff --git a/web/core/components/labels/create-label-modal.tsx b/web/core/components/labels/create-label-modal.tsx
index 57af83c802..6fcbfb6a20 100644
--- a/web/core/components/labels/create-label-modal.tsx
+++ b/web/core/components/labels/create-label-modal.tsx
@@ -115,7 +115,13 @@ export const CreateLabelModal: React.FC<Props> = observer((props) => {
leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
>
<Dialog.Panel className="relative transform rounded-lg bg-custom-background-100 px-4 pb-4 pt-5 text-left shadow-custom-shadow-md transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
- <form onSubmit={handleSubmit(onSubmit)}>
+ <form
+ onSubmit={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ handleSubmit(onSubmit)(e);
+ }}
+ >
<div>
<Dialog.Title as="h3" className="text-lg font-medium leading-6 text-custom-text-100">
Create Label
diff --git a/web/core/store/label.store.ts b/web/core/store/label.store.ts
index 03a4c2fb4c..c220593618 100644
--- a/web/core/store/label.store.ts
+++ b/web/core/store/label.store.ts
@@ -23,6 +23,7 @@ export interface ILabelStore {
workspaceLabels: IIssueLabel[] | undefined;
//computed actions
getProjectLabels: (projectId: string | undefined | null) => IIssueLabel[] | undefined;
+ getProjectLabelIds: (projectId: string | undefined | null) => string[] | undefined;
getLabelById: (labelId: string) => IIssueLabel | null;
// fetch actions
fetchWorkspaceLabels: (workspaceSlug: string) => Promise<IIssueLabel[]>;
@@ -120,6 +121,18 @@ export class LabelStore implements ILabelStore {
);
});
+ /**
+ * Returns the label ids for a specific project
+ * @param projectId
+ * @returns string[]
+ */
+ getProjectLabelIds = computedFn((projectId: string | undefined | null) => {
+ const workspaceSlug = this.rootStore.router.workspaceSlug;
+ if (!workspaceSlug || !projectId || !(this.fetchedMap[projectId] || this.fetchedMap[workspaceSlug]))
+ return undefined;
+ return this.getProjectLabels(projectId)?.map((label) => label.id) ?? [];
+ });
+
/**
* get label info from the map of labels in the store using label id
* @param labelId
diff --git a/web/core/store/member/index.ts b/web/core/store/member/index.ts
index 36f3972f7c..12ede5b17e 100644
--- a/web/core/store/member/index.ts
+++ b/web/core/store/member/index.ts
@@ -11,6 +11,7 @@ export interface IMemberRootStore {
// observables
memberMap: Record<string, IUserLite>;
// computed actions
+ getMemberIds: () => string[];
getUserDetails: (userId: string) => IUserLite | undefined;
// sub-stores
workspace: IWorkspaceMemberStore;
@@ -35,7 +36,12 @@ export class MemberRootStore implements IMemberRootStore {
}
/**
- * @description get user details rom userId
+ * @description get all member ids
+ */
+ getMemberIds = computedFn(() => Object.keys(this.memberMap));
+
+ /**
+ * @description get user details from userId
* @param userId
*/
getUserDetails = computedFn((userId: string): IUserLite | undefined => this.memberMap?.[userId] ?? undefined);
diff --git a/web/core/store/member/project-member.store.ts b/web/core/store/member/project-member.store.ts
index 2e5bbe8637..5c67f61b1b 100644
--- a/web/core/store/member/project-member.store.ts
+++ b/web/core/store/member/project-member.store.ts
@@ -26,14 +26,18 @@ export interface IProjectMemberDetails {
export interface IProjectMemberStore {
// observables
+ projectMemberFetchStatusMap: {
+ [projectId: string]: boolean;
+ };
projectMemberMap: {
[projectId: string]: Record<string, IProjectMembership>;
};
// computed
projectMemberIds: string[] | null;
// computed actions
+ getProjectMemberFetchStatus: (projectId: string) => boolean;
getProjectMemberDetails: (userId: string, projectId: string) => IProjectMemberDetails | null;
- getProjectMemberIds: (projectId: string) => string[] | null;
+ getProjectMemberIds: (projectId: string, includeGuestUsers: boolean) => string[] | null;
// fetch actions
fetchProjectMembers: (workspaceSlug: string, projectId: string) => Promise<IProjectMembership[]>;
// bulk operation actions
@@ -54,6 +58,9 @@ export interface IProjectMemberStore {
export class ProjectMemberStore implements IProjectMemberStore {
// observables
+ projectMemberFetchStatusMap: {
+ [projectId: string]: boolean;
+ } = {};
projectMemberMap: {
[projectId: string]: Record<string, IProjectMembership>;
} = {};
@@ -102,6 +109,12 @@ export class ProjectMemberStore implements IProjectMemberStore {
return memberIds;
}
+ /**
+ * @description get the fetch status of a project member
+ * @param projectId
+ */
+ getProjectMemberFetchStatus = computedFn((projectId: string) => this.projectMemberFetchStatusMap?.[projectId]);
+
/**
* @description get the details of a project member
* @param userId
@@ -109,7 +122,6 @@ export class ProjectMemberStore implements IProjectMemberStore {
getProjectMemberDetails = computedFn((userId: string, projectId: string) => {
const projectMember = this.projectMemberMap?.[projectId]?.[userId];
if (!projectMember) return null;
- console.log({ projectMember });
const memberDetails: IProjectMemberDetails = {
id: projectMember.id,
role: projectMember.role,
@@ -122,9 +134,12 @@ export class ProjectMemberStore implements IProjectMemberStore {
* @description get the list of all the user ids of all the members of a project using projectId
* @param projectId
*/
- getProjectMemberIds = computedFn((projectId: string): string[] | null => {
+ getProjectMemberIds = computedFn((projectId: string, includeGuestUsers: boolean): string[] | null => {
if (!this.projectMemberMap?.[projectId]) return null;
let members = Object.values(this.projectMemberMap?.[projectId]);
+ if (includeGuestUsers === false) {
+ members = members.filter((m) => m.role !== EUserPermissions.GUEST);
+ }
members = sortBy(members, [
(m) => m.member !== this.userStore.data?.id,
(m) => this.memberRoot?.memberMap?.[m.member]?.display_name?.toLowerCase(),
@@ -144,6 +159,7 @@ export class ProjectMemberStore implements IProjectMemberStore {
response.forEach((member) => {
set(this.projectMemberMap, [projectId, member.member], member);
});
+ set(this.projectMemberFetchStatusMap, [projectId], true);
});
return response;
});
diff --git a/web/core/store/module.store.ts b/web/core/store/module.store.ts
index 1ed3bf3454..5e4c0b294c 100644
--- a/web/core/store/module.store.ts
+++ b/web/core/store/module.store.ts
@@ -28,6 +28,7 @@ export interface IModuleStore {
projectModuleIds: string[] | null;
projectArchivedModuleIds: string[] | null;
// computed actions
+ getModulesFetchStatusByProjectId: (projectId: string) => boolean;
getFilteredModuleIds: (projectId: string) => string[] | null;
getFilteredArchivedModuleIds: (projectId: string) => string[] | null;
getModuleById: (moduleId: string) => IModule | null;
@@ -152,6 +153,13 @@ export class ModulesStore implements IModuleStore {
return projectModuleIds || null;
}
+ /**
+ * Returns the fetch status for a specific project
+ * @param projectId
+ * @returns boolean
+ */
+ getModulesFetchStatusByProjectId = computedFn((projectId: string) => this.fetchedMap[projectId] ?? false);
+
/**
* @description returns filtered module ids based on display filters and filters
* @param {TModuleDisplayFilters} displayFilters
diff --git a/web/core/store/state.store.ts b/web/core/store/state.store.ts
index 18c7c0df36..e1be39d364 100644
--- a/web/core/store/state.store.ts
+++ b/web/core/store/state.store.ts
@@ -24,6 +24,8 @@ export interface IStateStore {
// computed actions
getStateById: (stateId: string | null | undefined) => IState | undefined;
getProjectStates: (projectId: string | null | undefined) => IState[] | undefined;
+ getProjectStateIds: (projectId: string | null | undefined) => string[] | undefined;
+ getProjectDefaultStateId: (projectId: string | null | undefined) => string | undefined;
// fetch actions
fetchProjectStates: (workspaceSlug: string, projectId: string) => Promise<IState[]>;
fetchWorkspaceStates: (workspaceSlug: string) => Promise<IState[]>;
@@ -136,6 +138,29 @@ export class StateStore implements IStateStore {
return sortStates(Object.values(this.stateMap).filter((state) => state.project_id === projectId));
});
+ /**
+ * Returns the state ids for a project by projectId
+ * @param projectId
+ * @returns string[]
+ */
+ getProjectStateIds = computedFn((projectId: string | null | undefined) => {
+ const workspaceSlug = this.router.workspaceSlug;
+ if (!workspaceSlug || !projectId || !(this.fetchedMap[projectId] || this.fetchedMap[workspaceSlug]))
+ return undefined;
+ const projectStates = this.getProjectStates(projectId);
+ return projectStates?.map((state) => state.id) ?? [];
+ });
+
+ /**
+ * Returns the default state id for a project
+ * @param projectId
+ * @returns string | undefined
+ */
+ getProjectDefaultStateId = computedFn((projectId: string | null | undefined) => {
+ const projectStates = this.getProjectStates(projectId);
+ return projectStates?.find((state) => state.default)?.id;
+ });
+
/**
* fetches the stateMap of a project
* @param workspaceSlug
diff --git a/web/helpers/editor.helper.ts b/web/helpers/editor.helper.ts
index 90a431190f..17e170493a 100644
--- a/web/helpers/editor.helper.ts
+++ b/web/helpers/editor.helper.ts
@@ -29,3 +29,9 @@ export const getTextContent = (jsx: JSX.Element | React.ReactNode | null | undef
div.innerHTML = jsx.toString();
return div.textContent?.trim() ?? "";
};
+
+export const isEditorEmpty = (description: string | undefined): boolean =>
+ !description ||
+ description === "<p></p>" ||
+ description === `<p class="editor-paragraph-block"></p>` ||
+ description.trim() === "";
diff --git a/web/helpers/issue-modal.helper.ts b/web/helpers/issue-modal.helper.ts
new file mode 100644
index 0000000000..11322652e4
--- /dev/null
+++ b/web/helpers/issue-modal.helper.ts
@@ -0,0 +1,16 @@
+import set from "lodash/set";
+// types
+import type { TIssue } from "@plane/types";
+
+export function getChangedIssuefields(formData: Partial<TIssue>, dirtyFields: { [key: string]: boolean | undefined }) {
+ const changedFields = {};
+
+ const dirtyFieldKeys = Object.keys(dirtyFields) as (keyof TIssue)[];
+ for (const dirtyField of dirtyFieldKeys) {
+ if (!!dirtyFields[dirtyField]) {
+ set(changedFields, [dirtyField], formData[dirtyField]);
+ }
+ }
+
+ return changedFields as Partial<TIssue>;
+}
diff --git a/web/helpers/issue.helper.ts b/web/helpers/issue.helper.ts
index f7e6334dd6..7c73cb5994 100644
--- a/web/helpers/issue.helper.ts
+++ b/web/helpers/issue.helper.ts
@@ -1,6 +1,5 @@
import { differenceInCalendarDays } from "date-fns/differenceInCalendarDays";
import isEmpty from "lodash/isEmpty";
-import set from "lodash/set";
import { v4 as uuidv4 } from "uuid";
// plane constants
import { EIssueLayoutTypes, ISSUE_DISPLAY_FILTERS_BY_PAGE, STATE_GROUPS } from "@plane/constants";
@@ -21,6 +20,7 @@ import { IGanttBlock } from "@/components/gantt-chart";
// helpers
import { orderArrayBy } from "@/helpers/array.helper";
import { getDate } from "@/helpers/date-time.helper";
+import { isEditorEmpty } from "@/helpers/editor.helper";
type THandleIssuesMutation = (
formData: Partial<TIssue>,
@@ -180,19 +180,6 @@ export const getIssueBlocksStructure = (block: TIssue): IGanttBlock => ({
target_date: block?.target_date ?? undefined,
});
-export function getChangedIssuefields(formData: Partial<TIssue>, dirtyFields: { [key: string]: boolean | undefined }) {
- const changedFields: Partial<TIssue> = {};
-
- const dirtyFieldKeys = Object.keys(dirtyFields) as (keyof TIssue)[];
- for (const dirtyField of dirtyFieldKeys) {
- if (!!dirtyFields[dirtyField]) {
- set(changedFields, [dirtyField], formData[dirtyField]);
- }
- }
-
- return changedFields;
-}
-
export const formatTextList = (TextArray: string[]): string => {
const count = TextArray.length;
switch (count) {
@@ -212,7 +199,7 @@ export const formatTextList = (TextArray: string[]): string => {
};
export const getDescriptionPlaceholderI18n = (isFocused: boolean, description: string | undefined): string => {
- const isDescriptionEmpty = !description || description === "<p></p>" || description.trim() === "";
+ const isDescriptionEmpty = isEditorEmpty(description);
if (!isDescriptionEmpty || isFocused) return "common.press_for_commands";
else return "common.click_to_add_description";
};