Merge pull request #1311 from jcardus/master

Sort device categories and attributes
traccar · Feb 27, 2025 · 4fb086b · 4fb086b
2 parents f999aaf + 4da6c59
commit 4fb086b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/settings/DevicePage.jsx b/src/settings/DevicePage.jsx
@@ -119,7 +119,7 @@ const DevicePage = () => {
                 data={deviceCategories.map((category) => ({
                   id: category,
                   name: t(`category${category.replace(/^\w/, (c) => c.toUpperCase())}`),
-                }))}
+                })).sort((a, b) => a.name.localeCompare(b.name))}
                 label={t('deviceCategory')}
               />
               <SelectField

diff --git a/src/settings/components/AddAttributeDialog.jsx b/src/settings/components/AddAttributeDialog.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import {
   Button, Dialog, DialogActions, DialogContent, FormControl, InputLabel, MenuItem, Select, TextField, Autocomplete,
 } from '@mui/material';
@@ -25,11 +25,11 @@ const AddAttributeDialog = ({ open, onResult, definitions }) => {
     stringify: (option) => option.name,
   });
 
-  const options = Object.entries(definitions).map(([key, value]) => ({
+  const options = useMemo(() => Object.entries(definitions).map(([key, value]) => ({
     key,
     name: value.name,
     type: value.type,
-  }));
+  })).sort((a, b) => a.name.localeCompare(b.name)), [definitions]);
 
   const [key, setKey] = useState();
   const [type, setType] = useState('string');