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-3287]fix: label creation in global views (#6541)

Vamsi Krishnadff12729c05a
diff --git a/web/core/components/issues/issue-detail/label/select/label-select.tsx b/web/core/components/issues/issue-detail/label/select/label-select.tsx
index 05f9956efa..78607561c4 100644
--- a/web/core/components/issues/issue-detail/label/select/label-select.tsx
+++ b/web/core/components/issues/issue-detail/label/select/label-select.tsx
@@ -36,7 +36,8 @@ export const IssueLabelSelect: React.FC<IIssueLabelSelect> = observer((props) =>
const [query, setQuery] = useState("");
const [submitting, setSubmitting] = useState<boolean>(false);
- const canCreateLabel = allowPermissions([EUserProjectRoles.ADMIN], EUserPermissionsLevel.PROJECT);
+ const canCreateLabel =
+ projectId && allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId);
const projectLabels = getProjectLabels(projectId);
@@ -98,7 +99,7 @@ export const IssueLabelSelect: React.FC<IIssueLabelSelect> = observer((props) =>
setQuery("");
}
- if (query !== "" && e.key === "Enter") {
+ if (query !== "" && e.key === "Enter" && canCreateLabel) {
e.stopPropagation();
e.preventDefault();
await handleAddLabel(query);
diff --git a/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx b/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx
index 68fe34ebf6..b5b2ac03c8 100644
--- a/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx
+++ b/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx
@@ -81,7 +81,8 @@ export const LabelDropdown = (props: ILabelDropdownProps) => {
const storeLabels = getProjectLabels(projectId);
const { allowPermissions } = useUserPermissions();
- const canCreateLabel = allowPermissions([EUserProjectRoles.ADMIN], EUserPermissionsLevel.PROJECT);
+ const canCreateLabel =
+ projectId && allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId);
let projectLabels: IIssueLabel[] = defaultOptions;
if (storeLabels && storeLabels.length > 0) projectLabels = storeLabels;
@@ -157,7 +158,7 @@ export const LabelDropdown = (props: ILabelDropdownProps) => {
setQuery("");
}
- if (query !== "" && e.key === "Enter") {
+ if (query !== "" && e.key === "Enter" && canCreateLabel) {
e.preventDefault();
await handleAddLabel(query);
}