Merge pull request KelvinTegelaar#4885 from kris6673/labels-are-cool

Display group type in labels for clarity

Author: KelvinTegelaar

src/components/CippComponents/CippUserActions.jsx

@@ -22,9 +22,9 @@ import {
 import { getCippLicenseTranslation } from "../../utils/get-cipp-license-translation";
 import { useSettings } from "/src/hooks/use-settings.js";
 import { usePermissions } from "../../hooks/use-permissions";
-import { Stack, Grid, Tooltip, Box } from "@mui/material";
+import { Tooltip, Box } from "@mui/material";
 import CippFormComponent from "./CippFormComponent";
-import { useForm, useWatch } from "react-hook-form";
+import { useWatch } from "react-hook-form";
 
 // Separate component for Out of Office form to avoid hook issues
 const OutOfOfficeForm = ({ formControl }) => {
@@ -321,7 +321,10 @@ export const useCippUserActions = () => {
           validators: { required: "Please select a group" },
           api: {
             url: "/api/ListGroups",
-            labelField: "displayName",
+            labelField: (option) =>
+              option?.calculatedGroupType
+                ? `${option.displayName} (${option.calculatedGroupType})`
+                : option?.displayName ?? "",
             valueField: "id",
             addedField: {
               groupType: "calculatedGroupType",