a ticket must be assigned to someone when creating

typescript/frontend-marios2/src/content/dashboards/Tickets/CreateTicketModal.tsx

@@ -19,7 +19,7 @@ import {
   Typography
 } from '@mui/material';
 import AttachFileIcon from '@mui/icons-material/AttachFile';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import axiosConfig from 'src/Resources/axiosConfig';
 import {
   TicketPriority,
@@ -28,7 +28,8 @@ import {
   subCategoryLabels,
   subCategoriesByCategory,
   categoryLabels,
-  otherSubCategoryValues
+  otherSubCategoryValues,
+  AdminUser
 } from 'src/interfaces/TicketTypes';
 
 type Installation = {
@@ -65,6 +66,7 @@ interface Props {
 }
 
 function CreateTicketModal({ open, onClose, onCreated, defaultInstallationId }: Props) {
+  const intl = useIntl();
   const [subject, setSubject] = useState('');
   const [selectedProduct, setSelectedProduct] = useState<number | ''>('');
   const [selectedDevice, setSelectedDevice] = useState<number | ''>('');
@@ -73,6 +75,8 @@ function CreateTicketModal({ open, onClose, onCreated, defaultInstallationId }:
     useState<Installation | null>(null);
   const [loadingInstallations, setLoadingInstallations] = useState(false);
   const [priority, setPriority] = useState<number>(TicketPriority.Medium);
+  const [assigneeId, setAssigneeId] = useState<number | ''>('');
+  const [adminUsers, setAdminUsers] = useState<AdminUser[]>([]);
   const [category, setCategory] = useState<number>(TicketCategory.Hardware);
   const [subCategory, setSubCategory] = useState<number>(
     TicketSubCategory.Battery
@@ -189,6 +193,16 @@ function CreateTicketModal({ open, onClose, onCreated, defaultInstallationId }:
       .finally(() => setLoadingInstallations(false));
   }, [selectedProduct]);
 
+  useEffect(() => {
+    if (!open) return;
+    axiosConfig
+      .get('/GetAdminUsers')
+      .then((res) => {
+        if (Array.isArray(res.data)) setAdminUsers(res.data);
+      })
+      .catch(() => setAdminUsers([]));
+  }, [open]);
+
   useEffect(() => {
     if (defaultInstallationId == null || !open) return;
     axiosConfig
@@ -233,6 +247,7 @@ function CreateTicketModal({ open, onClose, onCreated, defaultInstallationId }:
     setAllInstallations([]);
     setSelectedInstallation(null);
     setPriority(TicketPriority.Medium);
+    setAssigneeId('');
     setCategory(TicketCategory.Hardware);
     setSubCategory(TicketSubCategory.Battery);
     setDescription('');
@@ -244,6 +259,15 @@ function CreateTicketModal({ open, onClose, onCreated, defaultInstallationId }:
 
   const handleSubmit = async () => {
     if (!subject.trim()) return;
+    if (assigneeId === '') {
+      setError(
+        intl.formatMessage({
+          id: 'assigneeRequired',
+          defaultMessage: 'Please assign this ticket to someone before creating it.'
+        })
+      );
+      return;
+    }
     setSubmitting(true);
     setError('');
 
@@ -253,6 +277,7 @@ function CreateTicketModal({ open, onClose, onCreated, defaultInstallationId }:
         description,
         installationId: selectedInstallation?.id ?? null,
         priority,
+        assigneeId,
         category,
         subCategory: isOtherCategory ? 0 : subCategory,
         customSubCategory: (isOtherSubCategory || isOtherCategory) ? customSubCategory || null : null,
@@ -390,6 +415,33 @@ function CreateTicketModal({ open, onClose, onCreated, defaultInstallationId }:
           )}
         />
 
+        <FormControl fullWidth margin="dense" required error={assigneeId === ''}>
+          <InputLabel>
+            <FormattedMessage id="assignee" defaultMessage="Assignee" />
+          </InputLabel>
+          <Select
+            value={assigneeId}
+            label="Assignee"
+            onChange={(e) =>
+              setAssigneeId(e.target.value === '' ? '' : Number(e.target.value))
+            }
+          >
+            {adminUsers
+              .filter((u) => {
+                const name = (u.name ?? '').toLowerCase();
+                return (
+                  !name.includes('inesco energy master admin') &&
+                  !name.includes('paal myhre')
+                );
+              })
+              .map((u) => (
+                <MenuItem key={u.id} value={u.id}>
+                  {u.name}
+                </MenuItem>
+              ))}
+          </Select>
+        </FormControl>
+
         <FormControl fullWidth margin="dense">
           <InputLabel>
             <FormattedMessage id="priority" defaultMessage="Priority" />

typescript/frontend-marios2/src/content/dashboards/Tickets/TicketDetail.tsx

@@ -591,11 +591,19 @@ function TicketDetailPage() {
                         />
                       </em>
                     </MenuItem>
-                    {adminUsers.map((u) => (
+                    {adminUsers
-                      <MenuItem key={u.id} value={u.id}>
+                      .filter((u) => {
-                        {u.name}
+                        const name = (u.name ?? '').toLowerCase();
-                      </MenuItem>
+                        return (
-                    ))}
+                          !name.includes('inesco energy master admin') &&
+                          !name.includes('paal myhre')
+                        );
+                      })
+                      .map((u) => (
+                        <MenuItem key={u.id} value={u.id}>
+                          {u.name}
+                        </MenuItem>
+                      ))}
                   </Select>
                 </FormControl>
 

typescript/frontend-marios2/src/lang/de.json

@@ -574,6 +574,7 @@
   "resolvedAt": "Gelöst",
   "noDescription": "Keine Beschreibung vorhanden.",
   "assignee": "Zuständig",
+  "assigneeRequired": "Bitte weisen Sie dieses Ticket jemandem zu, bevor Sie es erstellen.",
   "unassigned": "Nicht zugewiesen",
   "deleteTicket": "Löschen",
   "confirmDeleteTicket": "Ticket löschen?",

typescript/frontend-marios2/src/lang/en.json

@@ -322,6 +322,7 @@
   "resolvedAt": "Resolved",
   "noDescription": "No description provided.",
   "assignee": "Assignee",
+  "assigneeRequired": "Please assign this ticket to someone before creating it.",
   "unassigned": "Unassigned",
   "deleteTicket": "Delete",
   "confirmDeleteTicket": "Delete Ticket?",

typescript/frontend-marios2/src/lang/fr.json

@@ -574,6 +574,7 @@
   "resolvedAt": "Résolu",
   "noDescription": "Aucune description fournie.",
   "assignee": "Responsable",
+  "assigneeRequired": "Veuillez assigner ce ticket à quelqu'un avant de le créer.",
   "unassigned": "Non assigné",
   "deleteTicket": "Supprimer",
   "confirmDeleteTicket": "Supprimer le ticket ?",

typescript/frontend-marios2/src/lang/it.json

@@ -574,6 +574,7 @@
   "resolvedAt": "Risolto",
   "noDescription": "Nessuna descrizione fornita.",
   "assignee": "Assegnatario",
+  "assigneeRequired": "Assegna questo ticket a qualcuno prima di crearlo.",
   "unassigned": "Non assegnato",
   "deleteTicket": "Elimina",
   "confirmDeleteTicket": "Eliminare il ticket?",