Fix duplicated points in pending table

src/Map/Popup/mode-popup/PendingPointPopup.jsx

@@ -12,11 +12,14 @@ export const PendingPointPopup = ({ feature }) => {
   const doesMatchFilter = feature.layer.id === LAYER_IDS["initial-match"];
   const featureId = feature.properties.id;
 
-  useEffect(() => setClickedPointConfig(featureId, doesMatchFilter), [feature]);
-
   const isSelected =
-    (doesMatchFilter || selection.included.has(featureId)) &&
+    (doesMatchFilter && !selection.excluded.has(featureId)) ||
-    !selection.excluded.has(featureId);
+    selection.included.has(featureId);
+
+  useEffect(
+    () => setClickedPointConfig(featureId, isSelected),
+    [featureId, isSelected]
+  );
 
   const handleSelect = () => {
     if (isSelected) {

src/modules/Table/PendingTable/PendingTable.jsx

@@ -27,12 +27,14 @@ export const PendingTable = ({ fullWidth }) => {
     const shouldNotSelect = (id) =>
       id === clickedPoint?.id && clickedPointConfig?.shouldSelect === false;
 
-    return [
+    const result = [
       ...ids.filter((id) => {
         return !inExcludedList(id) && !shouldNotSelect(id);
       }),
       ...selection.included,
     ];
+
+    return result;
   }, [data, clickedPointConfig, selection]);
 
   const rowSelection = {

src/modules/Table/useColumns.js

@@ -8,6 +8,12 @@ export const useColumns = (fields = []) => {
 
   return useMemo(() => {
     return [
+      {
+        title: "id",
+        dataIndex: "id",
+        key: "id",
+        width: 50,
+      },
       {
         title: "Адрес",
         dataIndex: "address",

src/modules/Table/useMergeTableData.js

@@ -45,17 +45,12 @@ export const useMergeTableData = (fullData, onPageSizeChange) => {
 
     lastClickedPointId.current = clickedPointData.results[0].id;
 
-    onPageSizeChange((prevState) => prevState + 1);
+    onPageSizeChange(PAGE_SIZE + 1);
-    setMergedData((prevState) => {
+    setMergedData({
-      if (prevState) {
+      count: fullData.count + 1,
-        return {
+      results: [clickedPointData.results[0], ...fullData.results],
-          ...prevState,
-          count: prevState.count + 1,
-          results: [clickedPointData.results[0], ...prevState.results],
-        };
-      }
     });
-  }, [clickedPointData]);
+  }, [clickedPointData, fullData]);
 
   // reset data after popup disappeared
   useEffect(() => {