diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/issue-types/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/issue-types/page.tsx
index ec8fd3236a..860c562378 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/issue-types/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/issue-types/page.tsx
@@ -2,26 +2,30 @@
import { observer } from "mobx-react";
// components
+import { NotAuthorizedView } from "@/components/auth-screens";
import { PageHead } from "@/components/core";
// hooks
-import { EUserProjectRoles } from "@/constants/project";
import { useProject, useUser } from "@/hooks/store";
import { IssueTypesRoot } from "@/plane-web/components/issue-types";
const IssueTypesSettingsPage = observer(() => {
// store hooks
const {
+ canPerformProjectAdminActions,
membership: { currentProjectRole },
} = useUser();
const { currentProjectDetails } = useProject();
// derived values
- const isAdmin = currentProjectRole === EUserProjectRoles.ADMIN;
const pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Issue Types` : undefined;
+ if (currentProjectRole && !canPerformProjectAdminActions) {
+ return ;
+ }
+
return (
<>
-
+
>
diff --git a/web/ee/components/issue-types/properties/attributes/options/option.tsx b/web/ee/components/issue-types/properties/attributes/options/option.tsx
index 49a36f3cb6..52f7473ef6 100644
--- a/web/ee/components/issue-types/properties/attributes/options/option.tsx
+++ b/web/ee/components/issue-types/properties/attributes/options/option.tsx
@@ -1,4 +1,5 @@
import { FC, useEffect, useState } from "react";
+import isEqual from "lodash/isEqual";
import { observer } from "mobx-react";
import { Info } from "lucide-react";
// ui
@@ -45,12 +46,17 @@ export const IssuePropertyOptionItem: FC
= observer((p
// handle create/ update operation
const handleCreateUpdate = async () => {
+ // return if no change in data
+ if (isEqual(propertyOptionCreateData.name, optionData.name)) return;
+ // trim option name
+ const optionDataToUpdate = { ...optionData, name: optionData.name?.trim() };
+ setOptionData(optionDataToUpdate);
// return if option name is same as previous or empty
- if (!optionData.name) return;
+ if (!optionDataToUpdate.name) return;
// check for duplicate option name
- if (checkForDuplicate({ identifier: optionData.id ?? key, value: optionData.name })) return;
+ if (checkForDuplicate({ identifier: optionDataToUpdate.id ?? key, value: optionDataToUpdate.name })) return;
// handle option data update
- updateOptionData({ key, ...optionData });
+ updateOptionData({ key, ...optionDataToUpdate });
};
// handle changes in option local data
diff --git a/web/ee/components/issue-types/properties/attributes/text.tsx b/web/ee/components/issue-types/properties/attributes/text.tsx
index 432c65b3bb..fce7eb1f4e 100644
--- a/web/ee/components/issue-types/properties/attributes/text.tsx
+++ b/web/ee/components/issue-types/properties/attributes/text.tsx
@@ -39,6 +39,9 @@ export const TextAttributes = observer((props: TTextAttributesProps) => {
onChange={(value) => {
onTextDetailChange("settings", value as TIssueProperty["settings"]);
onTextDetailChange("default_value", []);
+ if (value?.display_format === "readonly") {
+ onTextDetailChange("is_required", false);
+ }
}}
isDisabled={!configurations.allowedEditingModes.includes(currentOperationMode) && isAnyIssueAttached}
/>
diff --git a/web/ee/components/issue-types/properties/delete-confirmation-modal.tsx b/web/ee/components/issue-types/properties/delete-confirmation-modal.tsx
index 30570b0acc..d9f9ede8bf 100644
--- a/web/ee/components/issue-types/properties/delete-confirmation-modal.tsx
+++ b/web/ee/components/issue-types/properties/delete-confirmation-modal.tsx
@@ -8,13 +8,14 @@ import { cn } from "@/helpers/common.helper";
type TProps = {
isOpen: boolean;
+ isDisabledAlready: boolean;
onClose: () => void;
onDisable: () => Promise;
onDelete: () => Promise;
};
export const DeleteConfirmationModal: React.FC = observer((props) => {
- const { isOpen, onClose, onDisable, onDelete } = props;
+ const { isOpen, isDisabledAlready, onClose, onDisable, onDelete } = props;
// states
const [isSubmitting, setIsSubmitting] = useState(false);
@@ -50,7 +51,7 @@ export const DeleteConfirmationModal: React.FC = observer((props) => {
Delete this property
Deletion of properties may lead to loss of existing data.
-
Do you want to disable the property instead?
+ {!isDisabledAlready &&
Do you want to disable the property instead?
}
@@ -59,15 +60,17 @@ export const DeleteConfirmationModal: React.FC = observer((props) => {
Cancel
-
+ {!isDisabledAlready && (
+
+ )}
diff --git a/web/ee/components/issue-types/properties/dropdowns/property-title.tsx b/web/ee/components/issue-types/properties/dropdowns/property-title.tsx
index b26c86e7de..aae6888ac9 100644
--- a/web/ee/components/issue-types/properties/dropdowns/property-title.tsx
+++ b/web/ee/components/issue-types/properties/dropdowns/property-title.tsx
@@ -39,7 +39,7 @@ export const PropertyTitleDropdown = observer((props: TPropertyTitleDropdownProp
{propertyDetail.display_name ?? ""}
{propertyDetail.description && (
-
+
)}
@@ -58,8 +58,8 @@ export const PropertyTitleDropdown = observer((props: TPropertyTitleDropdownProp
)}
ref={setReferenceElement}
>
- {propertyDetail.display_name ?? ""}
-
+ {propertyDetail.display_name ?? ""}
+
{createPortal(
diff --git a/web/ee/components/issue-types/properties/property-list-item.tsx b/web/ee/components/issue-types/properties/property-list-item.tsx
index 7141917e32..cb4bd4cad5 100644
--- a/web/ee/components/issue-types/properties/property-list-item.tsx
+++ b/web/ee/components/issue-types/properties/property-list-item.tsx
@@ -419,6 +419,7 @@ export const IssuePropertyListItem = observer((props: TIssuePropertyListItem) =>
Promise;
onDiscard: () => void;
@@ -23,6 +24,7 @@ type TIssuePropertyQuickActions = {
export const IssuePropertyQuickActions = observer((props: TIssuePropertyQuickActions) => {
const {
currentOperationMode,
+ isPropertyDisabled,
isSubmitting,
onCreateUpdate,
onDiscard,
@@ -37,6 +39,7 @@ export const IssuePropertyQuickActions = observer((props: TIssuePropertyQuickAct
<>
setIsDeleteModalOpen(false)}
onDisable={onDisable}
onDelete={onDelete}
diff --git a/web/ee/components/issues/issue-details/issue-properties-activity/boolean.tsx b/web/ee/components/issues/issue-details/issue-properties-activity/boolean.tsx
index fdc8b06666..fd75377baa 100644
--- a/web/ee/components/issues/issue-details/issue-properties-activity/boolean.tsx
+++ b/web/ee/components/issues/issue-details/issue-properties-activity/boolean.tsx
@@ -12,14 +12,15 @@ export const IssueBooleanPropertyActivity: FC>;
return (
<>
{activityDetail.new_value && (
<>
- {activityDetail.action === "created" ? "set" : "updated"} {propertyName} to{" "}
+ {activityDetail.action === "created" ? "set " : "updated "}
+ {propertyName} to{" "}
{activityDetail?.new_value === "true" ? "True" : "False"}.
diff --git a/web/ee/components/issues/issue-details/issue-properties-activity/date.tsx b/web/ee/components/issues/issue-details/issue-properties-activity/date.tsx
index a204cd8feb..b88dc9b2d2 100644
--- a/web/ee/components/issues/issue-details/issue-properties-activity/date.tsx
+++ b/web/ee/components/issues/issue-details/issue-properties-activity/date.tsx
@@ -14,25 +14,29 @@ export const IssueDatePropertyActivity: FC>;
return (
<>
{activityDetail.action === "created" && (
<>
- set the {propertyName} to{" "}
+ set {propertyName} to{" "}
{renderFormattedDate(activityDetail.new_value)}.
>
)}
{activityDetail.action === "updated" && (
<>
- updated the {propertyName} from{" "}
- {renderFormattedDate(activityDetail.old_value)} to{" "}
- {renderFormattedDate(activityDetail.new_value)}.{" "}
+ changed {propertyName} to{" "}
+ {renderFormattedDate(activityDetail.new_value)} from{" "}
+ {renderFormattedDate(activityDetail.old_value)}.{" "}
+ >
+ )}
+ {activityDetail.action === "deleted" && (
+ <>
+ removed {propertyName}.
>
)}
- {activityDetail.action === "deleted" && <>removed the {propertyName}.>}
>
);
});
diff --git a/web/ee/components/issues/issue-details/issue-properties-activity/dropdown.tsx b/web/ee/components/issues/issue-details/issue-properties-activity/dropdown.tsx
index e7c3bd5f64..f60c33fd49 100644
--- a/web/ee/components/issues/issue-details/issue-properties-activity/dropdown.tsx
+++ b/web/ee/components/issues/issue-details/issue-properties-activity/dropdown.tsx
@@ -13,41 +13,42 @@ export const IssueDropdownPropertyActivity: FC>;
return (
<>
{activityDetail.action === "created" && activityDetail.new_value ? (
<>
- added{" "}
+ selected{" "}
{issueProperty?.getPropertyOptionById(activityDetail?.new_value)?.name}
{" "}
- to {propertyName}.
+ as value(s) for {propertyName}.
>
) : (
activityDetail.action === "deleted" &&
activityDetail.old_value && (
<>
- removed{" "}
+ deselected{" "}
{issueProperty?.getPropertyOptionById(activityDetail?.old_value)?.name}
{" "}
- from {propertyName}.
+ from the previous selection in {propertyName}.
>
)
)}
{activityDetail.action === "updated" && activityDetail.old_value && activityDetail.new_value && (
<>
- updated {propertyName} from{" "}
+ changed{" "}
{issueProperty?.getPropertyOptionById(activityDetail?.old_value)?.name}
{" "}
to{" "}
- {issueProperty?.getPropertyOptionById(activityDetail?.new_value)?.name}.
-
+ {issueProperty?.getPropertyOptionById(activityDetail?.new_value)?.name}
+ {" "}
+ in {propertyName}.
>
)}
>
diff --git a/web/ee/components/issues/issue-details/issue-properties-activity/member.tsx b/web/ee/components/issues/issue-details/issue-properties-activity/member.tsx
index 76f0666370..5697e68cb8 100644
--- a/web/ee/components/issues/issue-details/issue-properties-activity/member.tsx
+++ b/web/ee/components/issues/issue-details/issue-properties-activity/member.tsx
@@ -21,7 +21,7 @@ export const IssueMemberPropertyActivity: FC {
@@ -43,20 +43,22 @@ export const IssueMemberPropertyActivity: FC
{activityDetail.action === "created" && activityDetail.new_value ? (
<>
- added a new {propertyName} .
+ selected as member(s) for{" "}
+ {propertyName}.
>
) : (
activityDetail.action === "deleted" &&
activityDetail.old_value && (
<>
- removed the {propertyName} .
+ deselected from the previous selection in{" "}
+ {propertyName}.
>
)
)}
{activityDetail.action === "updated" && activityDetail.old_value && activityDetail.new_value && (
<>
- updated {propertyName} from to{" "}
- .
+ changed to in{" "}
+ {propertyName}.
>
)}
>
diff --git a/web/ee/components/issues/issue-details/issue-properties-activity/number.tsx b/web/ee/components/issues/issue-details/issue-properties-activity/number.tsx
index 25770dec55..59576c7482 100644
--- a/web/ee/components/issues/issue-details/issue-properties-activity/number.tsx
+++ b/web/ee/components/issues/issue-details/issue-properties-activity/number.tsx
@@ -12,24 +12,30 @@ export const IssueNumberPropertyActivity: FC>;
return (
<>
{activityDetail.action === "created" && (
<>
- set {propertyName} to {activityDetail?.new_value}.
+ set {propertyName} to{" "}
+ {activityDetail?.new_value}.
>
)}
{activityDetail.action === "updated" && (
<>
- updated {propertyName} from{" "}
- {activityDetail?.old_value} to{" "}
- {activityDetail?.new_value}.
+ changed {activityDetail?.old_value} to{" "}
+ {activityDetail?.new_value} in{" "}
+ {propertyName}.
+ >
+ )}
+ {activityDetail.action === "deleted" && (
+ <>
+ removed {activityDetail?.old_value} from{" "}
+ {propertyName}.
>
)}
- {activityDetail.action === "deleted" && <>removed {propertyName}.>}
>
);
});
diff --git a/web/ee/components/issues/issue-details/issue-properties-activity/text.tsx b/web/ee/components/issues/issue-details/issue-properties-activity/text.tsx
index 59e22d45a3..b38324285a 100644
--- a/web/ee/components/issues/issue-details/issue-properties-activity/text.tsx
+++ b/web/ee/components/issues/issue-details/issue-properties-activity/text.tsx
@@ -12,18 +12,21 @@ export const IssueTextPropertyActivity: FC>;
return (
<>
{activityDetail.new_value ? (
<>
- {activityDetail.action === "created" ? "set " : "updated "}
- {propertyName} to {activityDetail?.new_value}.
+ {activityDetail.action === "created" ? "set " : "changed "}
+ {propertyName} to{" "}
+ {`"${activityDetail?.new_value}"`}.
>
) : (
- <>removed {propertyName}.>
+ <>
+ cleared the previous text in {propertyName}.
+ >
)}
>
);
diff --git a/web/ee/components/issues/worklog/activity/root.tsx b/web/ee/components/issues/worklog/activity/root.tsx
index 014dcb2dc6..7fc1b5491e 100644
--- a/web/ee/components/issues/worklog/activity/root.tsx
+++ b/web/ee/components/issues/worklog/activity/root.tsx
@@ -64,7 +64,9 @@ export const IssueActivityWorklog: FC = observer((props)
];
return (
-
+
{currentUser?.member?.avatar && currentUser?.member?.avatar !== "" ? (
@@ -83,34 +85,32 @@ export const IssueActivityWorklog: FC
= observer((props)
>
)}
-
+
-
-
-
-
-
- {currentUser?.member?.display_name}
-
- {` logged `}
- {`${convertMinutesToHoursMinutesString(worklog?.duration || 0)}.`}
-
- {worklog.created_at && (
-
-
- {`${calculateTimeAgo(worklog.created_at)}`}
-
-
- )}
+
+
+
+
+ {currentUser?.member?.display_name}
+
+ {` logged `}
+ {`${convertMinutesToHoursMinutesString(worklog?.duration || 0)}.`}
+ {worklog.created_at && (
+
+
+ {`${calculateTimeAgo(worklog.created_at)}`}
+
+
+ )}
diff --git a/web/ee/constants/project/settings/tabs.ts b/web/ee/constants/project/settings/tabs.ts
index 767dd38754..e670cc3f47 100644
--- a/web/ee/constants/project/settings/tabs.ts
+++ b/web/ee/constants/project/settings/tabs.ts
@@ -13,7 +13,7 @@ export const PROJECT_SETTINGS = {
key: "issue-types",
label: "Issue Types",
href: `/settings/issue-types/`,
- access: EUserProjectRoles.MEMBER,
+ access: EUserProjectRoles.ADMIN,
highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/issue-types/`,
Icon: SettingIcon,
},