From 71c5dfe153705bc6ee1931920f7713e73284115f Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 4 Jun 2022 09:13:49 -0700
Subject: Filtering and sorting (fix #952)

---
 modern/src/main/DevicesList.js | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'modern/src/main/DevicesList.js')

diff --git a/modern/src/main/DevicesList.js b/modern/src/main/DevicesList.js
index 108c3397..baf18dd8 100644
--- a/modern/src/main/DevicesList.js
+++ b/modern/src/main/DevicesList.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import makeStyles from '@mui/styles/makeStyles';
 import { IconButton, Tooltip } from '@mui/material';
@@ -142,23 +142,11 @@ const DeviceRow = ({ data, index, style }) => {
   );
 };
 
-const DevicesList = ({ filter }) => {
+const DevicesList = ({ devices }) => {
   const classes = useStyles();
   const dispatch = useDispatch();
   const listInnerEl = useRef(null);
 
-  const items = useSelector((state) => state.devices.items);
-  const [filteredItems, setFilteredItems] = useState(null);
-
-  useEffect(() => {
-    const array = Object.values(items);
-    setFilteredItems(
-      filter.trim().length > 0
-        ? array.filter((item) => `${item.name} ${item.uniqueId}`.toLowerCase().includes(filter?.toLowerCase()))
-        : array,
-    );
-  }, [filter, items]);
-
   if (listInnerEl.current) {
     listInnerEl.current.className = classes.listInner;
   }
@@ -179,8 +167,8 @@ const DevicesList = ({ filter }) => {
           <FixedSizeList
             width={width}
             height={height}
-            itemCount={filteredItems.length}
-            itemData={{ items: filteredItems }}
+            itemCount={devices.length}
+            itemData={{ items: devices }}
             itemSize={72}
             overscanCount={10}
             innerRef={listInnerEl}
-- 
cgit v1.2.3