Skip to content

Commit dff1272

Browse files
[WEB-3287]fix: label creation in global views (#6541)
* fix: label creation on enter * fix: update label creation permissions --------- Co-authored-by: sriram veeraghanta <veeraghanta.sriram@gmail.com>
1 parent 8efe692 commit dff1272

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

web/core/components/issues/issue-detail/label/select/label-select.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ export const IssueLabelSelect: React.FC<IIssueLabelSelect> = observer((props) =>
3636
const [query, setQuery] = useState("");
3737
const [submitting, setSubmitting] = useState<boolean>(false);
3838

39-
const canCreateLabel = allowPermissions([EUserProjectRoles.ADMIN], EUserPermissionsLevel.PROJECT);
39+
const canCreateLabel =
40+
projectId && allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId);
4041

4142
const projectLabels = getProjectLabels(projectId);
4243

@@ -98,7 +99,7 @@ export const IssueLabelSelect: React.FC<IIssueLabelSelect> = observer((props) =>
9899
setQuery("");
99100
}
100101

101-
if (query !== "" && e.key === "Enter") {
102+
if (query !== "" && e.key === "Enter" && canCreateLabel) {
102103
e.stopPropagation();
103104
e.preventDefault();
104105
await handleAddLabel(query);

web/core/components/issues/issue-layouts/properties/label-dropdown.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ export const LabelDropdown = (props: ILabelDropdownProps) => {
8181
const storeLabels = getProjectLabels(projectId);
8282
const { allowPermissions } = useUserPermissions();
8383

84-
const canCreateLabel = allowPermissions([EUserProjectRoles.ADMIN], EUserPermissionsLevel.PROJECT);
84+
const canCreateLabel =
85+
projectId && allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId);
8586

8687
let projectLabels: IIssueLabel[] = defaultOptions;
8788
if (storeLabels && storeLabels.length > 0) projectLabels = storeLabels;
@@ -157,7 +158,7 @@ export const LabelDropdown = (props: ILabelDropdownProps) => {
157158
setQuery("");
158159
}
159160

160-
if (query !== "" && e.key === "Enter") {
161+
if (query !== "" && e.key === "Enter" && canCreateLabel) {
161162
e.preventDefault();
162163
await handleAddLabel(query);
163164
}

0 commit comments

Comments
 (0)