Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Allow team admins and team maintainers to manage labels (#27063)

Browse source 
For #27037 

# Checklist for submitter

- [ ] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files)
for more information.

## Details

This PR updates the UI to allow team admins and maintainers to create
labels, and to edit or delete labels that they created. They will not be
able to edit or delete labels created by other team admins or
maintainers, or by global admins. Global admins will still be able to
edit or delete any label.

## Testing

1. Log in a global user and create a new label
1. Create a team admin user
1. Verify that the team admin user can create a label
2. Verify that the team admin user can edit their own label
2. Verify that the team admin user can delete their own label
2. Verify that the team admin user cannot edit or delete the label
created by the global user
3. Create a team maintainer user
1. Verify that the team maintainer user can create a label
2. Verify that the team maintainer user can edit their own label
2. Verify that the team maintainer user can delete their own label
2. Verify that the team maintainer user cannot edit or delete the label
created by the global user
2. Verify that the team maintainer user cannot edit or delete the label
created by the team admin user
3. Verify that the team admin user cannot edit or delete the label
created by the team maintainer user
This commit is contained in:
Scott Gress 2025-03-19 09:38:53 -05:00 committed by GitHub
parent 6b7d232522
commit f3835e6d49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/interfaces/label.ts
View file

@ -48,6 +48,7 @@ export interface ILabel extends ILabelSummary {
slug?: string; // e.g., "labels/13" | "online"
target_type?: string; // e.g., "labels"
platform: string;
author_id?: number;
}
// corresponding to fleet>server>fleet>labels.go>LabelSpec

4
frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
View file

@ -294,7 +294,9 @@ const ManageHostsPage = ({
const canEnrollHosts =
isGlobalAdmin || isGlobalMaintainer || isTeamAdmin || isTeamMaintainer;
const canEnrollGlobalHosts = isGlobalAdmin || isGlobalMaintainer;
const canAddNewLabels = (isGlobalAdmin || isGlobalMaintainer) ?? false;
const canAddNewLabels =
(isGlobalAdmin || isGlobalMaintainer || isTeamAdmin || isTeamMaintainer) ??
false;
const { data: labels, refetch: refetchLabels } = useQuery<
ILabelsResponse,

27
frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx
View file

@ -1,6 +1,7 @@
import React from "react";
import React, { useContext } from "react";
import { invert } from "lodash";
import { AppContext } from "context/app";
import { ILabel } from "interfaces/label";
import {
formatOperatingSystemDisplayName,
@ -140,6 +141,8 @@ const HostsFilterBlock = ({
onClickEditLabel,
onClickDeleteLabel,
}: IHostsFilterBlockProps) => {
const { currentUser, isOnGlobalTeam } = useContext(AppContext);
const renderLabelFilterPill = () => {
if (selectedLabel) {
const { description, display_text, label_type } = selectedLabel;
@ -165,16 +168,18 @@ const HostsFilterBlock = ({
tooltipDescription={description}
onClear={handleClearRouteParam}
/>
{label_type !== "builtin" && !isOnlyObserver && (
<>
<Button onClick={onClickEditLabel} variant="small-icon">
<Icon name="pencil" size="small" />
</Button>
<Button onClick={onClickDeleteLabel} variant="small-icon">
<Icon name="trash" size="small" />
</Button>
</>
)}
{label_type !== "builtin" &&
!isOnlyObserver &&
(isOnGlobalTeam || currentUser?.id === selectedLabel.author_id) && (
<>
<Button onClick={onClickEditLabel} variant="small-icon">
<Icon name="pencil" size="small" />
</Button>
<Button onClick={onClickDeleteLabel} variant="small-icon">
<Icon name="trash" size="small" />
</Button>
</>
)}
</>
);
}