Merge branch 'feature/stage_two_fixes' into 'dev'

points to merge count fix, add to db fix, update status dbTable fix, download...

See merge request spatial/postamates_frontend!39

src/Map/Header.jsx

@@ -1,4 +1,4 @@
-import { Logo } from "../icons/Logo";
+import { HeaderLogo } from "../icons/Logo";
 import { AddressSearch } from "./AddressSearch";
 import { twMerge } from "tailwind-merge";
 import { ModeSelector } from "../components/ModeSelector";
@@ -6,8 +6,8 @@ import { ModeSelector } from "../components/ModeSelector";
 export const Header = () => {
   return (
     <div className="absolute top-[20px] left-[19px] flex items-center z-10">
-      <div className={twMerge("flex items-center gap-x-20")}>
-        <Logo />
+      <div className={twMerge("flex items-center gap-x-[42px]")}>
+        <HeaderLogo />
         <div className="flex items-center gap-x-3">
           <ModeSelector />
         </div>

src/Map/Layers/PendingPoints.jsx

@@ -9,7 +9,7 @@ import { STATUSES } from "../../config";
 import { useRegionFilterExpression } from "./useRegionFilterExpression";
 import { LAYER_IDS } from "./constants";
 import { RANGE_FILTERS_KEYS, usePendingPointsFilters } from "../../stores/usePendingPointsFilters";
-import { fieldHasChanged } from "../../utils.js";
+import { fieldHasChanged, predictionHasChanged } from "../../utils.js";
 import { useSourceLayerName } from "../../api.js";
 import { useMode } from "../../stores/useMode.js";
 
@@ -28,7 +28,7 @@ const useFilterExpression = () => {
   const includedExpression = ["in", ["get", "id"], ["literal", includedArr]];
   const excludedExpression = ["in", ["get", "id"], ["literal", excludedArr]];
 
-  const predictionExpression = [
+  const rawPredictionExpression = [
     [">=", ["get", "prediction_current"], prediction[0]],
     ["<=", ["get", "prediction_current"], prediction[1]],
   ];
@@ -51,6 +51,7 @@ const useFilterExpression = () => {
       : true;
 
   const statusExpression = isImportMode ? true : rawStatusExpression;
+  const predictionExpression = predictionHasChanged(filters, ranges) ? rawPredictionExpression : [true];
 
   const matchFilterExpression = [
     "all",

src/Map/Layers/layers-config.js

@@ -37,7 +37,7 @@ export const PENDING_COLOR = {
   ],
 };
 
-export const CANCELLED_COLOR = "#CC2222";
+export const CANCELLED_COLOR = "#A6A6A6";
 export const APPROVE_COLOR = "#ff7d00";
 export const WORKING_COLOR = "#006e01";
 export const UNMATCHED_COLOR = "rgba(196,195,195,0.6)";
@@ -112,7 +112,14 @@ export const workingPointBackgroundLayer = {
     "circle-stroke-color": "#252525",
   },
 };
-export const cancelledPointLayer = getPointConfig(CANCELLED_COLOR);
+export const cancelledPointLayer = {
+  ...getPointConfig(CANCELLED_COLOR),
+  paint: {
+    ...getPointConfig(CANCELLED_COLOR).paint,
+    "circle-stroke-width": 1,
+    "circle-stroke-color": "#252525",
+  },
+};
 export const pvzPointLayer = getPointConfig(PVZ_COLOR);
 export const otherPostamatesLayer = getPointConfig(OTHER_POSTAMATES_COLOR);
 

src/Map/Legend.jsx

@@ -10,13 +10,13 @@ import {Logo} from "../icons/Logo.jsx";
 import {Collapse, Image} from "antd";
 import React from "react";
 
-const LegendPointItem = ({color, imageSrc, name, hideImage}) => {
+const LegendPointItem = ({color, imageSrc, name, hideImage, border}) => {
   return (
     <div className="flex gap-2 items-center">
       {imageSrc && <Image src={imageSrc} width={12} height={12} className='flex items-center' preview={false}/>}
       {color && !imageSrc && (
         <span
-          className="rounded-xl w-3 h-3 inline-block"
+          className={`rounded-xl w-3 h-3 inline-block ${border && "border-black border-[1px] border-solid"}`}
           style={{backgroundColor: color}}
         />
       )}
@@ -100,6 +100,7 @@ export function Legend({ postGroups, otherGroups }) {
               <LegendPointItem
                 name="Отмененные локации"
                 color={CANCELLED_COLOR}
+                border
               />
             </>
           )}
@@ -113,6 +114,7 @@ export function Legend({ postGroups, otherGroups }) {
               <LegendPointItem
                 name="Отмененные локации"
                 color={CANCELLED_COLOR}
+                border
               />
             </>
           )}

src/Map/Popup/Popup.jsx

@@ -50,7 +50,7 @@ const MultipleFeaturesPopup = ({ features, points }) => {
     <div className="space-y-2 p-1">
       {features.map((feature) => {
         const featureId = feature.properties.id;
-        const point = points.find(p => p.id = featureId);
+        const point = points.find(p => p.id === featureId);
         const isSelected = (doesMatchFilter(filters, ranges, feature) && !selection.excluded.has(featureId)) ||
           selection.included.has(featureId);
         const handleSelect = () => {

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

@@ -1,7 +1,7 @@
 import { CATEGORIES, STATUSES } from "../../../config";
 import {
   commonPopupConfig,
-  residentialPopupConfig,
+  residentialPopupFields,
   rivalsConfig,
   workingPointFields,
 } from "./config";
@@ -71,8 +71,8 @@ export const FeatureProperties = ({ feature, dynamicStatus, postamatId, point })
       return rivalsConfig;
     }
 
-    const config = isResidential ? residentialPopupConfig : commonPopupConfig;
-    return isWorking ? [...config, ...workingPointFields] : config;
+    const config = isWorking ? [...commonPopupConfig, ...workingPointFields] : commonPopupConfig;
+    return isResidential ? [...config, ...residentialPopupFields] : config;
   };
 
   const getValue = ({ field, render, empty, type, fallbackField }) => {

src/Map/Popup/mode-popup/config.js

@@ -41,8 +41,7 @@ export const commonPopupConfig = [
   },
 ];
 
-export const residentialPopupConfig = [
-  ...commonPopupConfig,
+export const residentialPopupFields = [
   {
     name: "Кол-во квартир",
     field: "flat_cnt",
@@ -59,8 +58,15 @@ export const residentialPopupConfig = [
     name: "Материал стен",
     field: "mat_nes",
   },
+]
+
+export const residentialPopupConfig = [
+  ...commonPopupConfig,
+  ...residentialPopupFields
 ];
 
+
+
 export const workingPointFields = [
   { name: "План", field: "plan_current" },
   { name: "Факт", field: "fact" },

src/api.js

@@ -26,7 +26,7 @@ export const useDbTableName = () => {
 
 export const useSourceLayerName = () => {
   const {isImportMode} = useMode();
-  if (isImportMode) return "public.prepoints_with_dist";
+  if (isImportMode) return "public.service_preplacementpoint";
   return "public.points_with_dist";
 }
 
@@ -100,6 +100,7 @@ export const importPoints = async (id) => {
 };
 
 export const useGetTotalInitialPointsCount = () => {
+  const { isImportMode } = useMode();
   const dbTable = useDbTableName();
   return useQuery(
     ["all-initial-count", dbTable],
@@ -107,8 +108,8 @@ export const useGetTotalInitialPointsCount = () => {
       const params = new URLSearchParams({
         page: 1,
         page_size: 1,
-        "status[]": [STATUSES.pending],
       });
+      if (!isImportMode) params.append("status[]", STATUSES.pending);
 
       return await getPoints(params, null, dbTable);
     },
@@ -118,8 +119,8 @@ export const useGetTotalInitialPointsCount = () => {
 
 export const useGetFilteredPendingPointsCount = (isMerge) => {
   const { filters, ranges } = usePendingPointsFilters();
+  const { isImportMode } = useMode();
   const {
-    prediction,
     categories,
     region,
   } = filters;
@@ -132,23 +133,28 @@ export const useGetFilteredPendingPointsCount = (isMerge) => {
     const params = new URLSearchParams({
       page: 1,
       page_size: 1,
-      "prediction_current[]": prediction,
-      "status[]": [STATUSES.pending],
       "categories[]": categories,
       "included[]": includedIds,
     });
+    if (!isImportMode) params.append("status[]", STATUSES.pending);
+
     appendFiltersInUse(params, filters, ranges);
-    if (isMerge) params.append("matching_status", "New")
 
     return params;
   }
 
+  const getMergeParams = () => {
+    return new URLSearchParams({
+      "matching_status": "New",
+    });
+  }
+
   const dbTable = useDbTableName();
 
   return useQuery(
     ["filtered-points", filters, dbTable, includedIds],
     async () => {
-      const params = getParams();
+      const params = isMerge ? getMergeParams() : getParams();
 
       return await getPoints(params, region, dbTable);
     },
@@ -156,34 +162,31 @@ export const useGetFilteredPendingPointsCount = (isMerge) => {
   );
 };
 
-export const useMergePointsToDb = () => {
-  const { filters, ranges } = usePendingPointsFilters();
-  const {
-    prediction,
-    categories,
-  } = filters;
-  const {
-    selection: { included },
-  } = usePointSelection();
-
-  const includedIds = [...included];
-  const getParams = () => {
-    const params = new URLSearchParams({
-      page: 1,
-      page_size: 1,
-      "prediction_current[]": prediction,
-      "categories[]": categories,
-      "included[]": includedIds,
+export const useGetPointsToMergeCount = () => {
+  const getMergeParams = () => {
+    return new URLSearchParams({
+      "matching_status": "New",
     });
-    appendFiltersInUse(params, filters, ranges);
-
-    return params;
   }
 
+  const dbTable = useDbTableName();
+
+  return useQuery(
+    ["filtered-points", dbTable],
+    async () => {
+      const params = getMergeParams();
+
+      return await getPoints(params, null, dbTable);
+    },
+    { select: (data) => data.count, keepPreviousData: true }
+  );
+};
+
+export const useMergePointsToDb = () => {
   return useMutation({
     mutationFn: () => {
       return api.post(
-        `/api/pre_placement_points/move_points/?${getParams().toString()}`
+        `/api/pre_placement_points/move_points/`
       );
     },
   });

src/hooks/useUpdateStatus.js

@@ -1,14 +1,15 @@
 import { useMutation } from "@tanstack/react-query";
-import { api } from "../api";
+import { api, useDbTableName } from "../api";
 import { useUpdateLayerCounter } from "../stores/useUpdateLayerCounter";
 
 export const useUpdateStatus = ({ onSuccess }) => {
   const { toggleUpdateCounter } = useUpdateLayerCounter();
+  const dbTable = useDbTableName();
 
   return useMutation({
     mutationFn: (params) => {
       return api.put(
-        `/api/placement_points/update_status/?${params.toString()}`
+        `/api/${dbTable}/update_status/?${params.toString()}`
       );
     },
     onSuccess: () => {

src/icons/Logo.jsx

@@ -21,3 +21,38 @@ export const Logo = ({ width = 40, height = 40, fill }) => {
     </svg>
   );
 };
+
+export const HeaderLogo = () => {
+  return (
+    <svg width="102" height="16" viewBox="0 0 102 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clipPath="url(#clip0_857_5233)">
+        <g clipPath="url(#clip1_857_5233)">
+          <path d="M27.8387 15.9746L41.7002 15.9746V2.11306L27.8387 2.11306V15.9746Z" fill="#E40050"/>
+          <path d="M13.922 2.11328V15.9748H0.0604095L13.922 2.11328Z" fill="#E40050"/>
+          <path d="M41.6451 2.11328V15.9748H27.7835L41.6451 2.11328Z" fill="#CE1344"/>
+          <path d="M0.0604095 2.11328V15.9748H13.922L0.0604095 2.11328Z" fill="#CE1344"/>
+          <path d="M20.8526 15.9745C24.6802 15.9745 27.7832 12.8716 27.7832 9.04389C27.7832 5.21622 24.6802 2.11328 20.8526 2.11328C17.0249 2.11328 13.922 5.21622 13.922 9.04389C13.922 12.8716 17.0249 15.9745 20.8526 15.9745Z" fill="#CE1344"/>
+          <path d="M51.9638 8.56478C51.7816 8.56478 51.6242 8.50208 51.4916 8.37604C51.3656 8.2438 51.3029 8.08641 51.3029 7.90388V4.52363L49.6506 6.61049C49.5246 6.77408 49.3515 6.85604 49.1311 6.85604C48.9107 6.85604 48.7376 6.77441 48.6119 6.61049L46.9597 4.52363V7.90388C46.9597 8.08641 46.8967 8.2438 46.7709 8.37604C46.6387 8.50208 46.4813 8.56478 46.2988 8.56478C46.1163 8.56478 45.9589 8.50208 45.8269 8.37604C45.7009 8.2438 45.6379 8.08641 45.6379 7.90388V2.61637C45.6379 2.30159 45.7858 2.09392 46.0816 1.99302C46.3775 1.88624 46.623 1.95873 46.818 2.21016L49.1311 5.13718L51.4442 2.21016C51.6392 1.96461 51.8847 1.89245 52.1812 1.99302C52.4771 2.09392 52.625 2.30159 52.625 2.61637V7.90388C52.625 8.08641 52.5616 8.2438 52.4356 8.37604C52.3037 8.50208 52.1463 8.56478 51.9634 8.56478H51.9638Z" fill="#192732"/>
+          <path d="M57.3456 8.56406C56.433 8.56406 55.6555 8.24014 55.0132 7.59165C54.3651 6.94969 54.0408 6.17222 54.0408 5.25957C54.0408 4.34692 54.3651 3.56945 55.0132 2.92749C55.6555 2.27932 56.433 1.95508 57.3456 1.95508C58.2583 1.95508 59.0358 2.27932 59.6777 2.92749C60.3262 3.56977 60.6505 4.34692 60.6505 5.25957C60.6505 6.17222 60.3262 6.94969 59.6777 7.59165C59.0358 8.24014 58.2583 8.56406 57.3456 8.56406ZM57.3456 3.27655C56.798 3.27655 56.3321 3.47181 55.9484 3.86202C55.5579 4.24602 55.3629 4.71198 55.3629 5.25924C55.3629 5.80651 55.5579 6.27279 55.9484 6.65647C56.3324 7.047 56.798 7.24194 57.3456 7.24194C57.8932 7.24194 58.3592 7.047 58.7429 6.65647C59.1331 6.27279 59.3283 5.80683 59.3283 5.25924C59.3283 4.71165 59.1331 4.24569 58.7429 3.86202C58.3589 3.47181 57.8932 3.27655 57.3456 3.27655Z" fill="#192732"/>
+          <path d="M67.9207 7.90314C67.9207 8.08567 67.8576 8.24012 67.7319 8.36584C67.5997 8.49808 67.4423 8.56404 67.2598 8.56404C67.0772 8.56404 66.9198 8.49808 66.7876 8.36584C66.6616 8.24012 66.5985 8.086 66.5985 7.90314V4.40012L63.2281 8.32796C63.0958 8.48535 62.929 8.56404 62.7275 8.56404C62.6459 8.56404 62.5701 8.5513 62.5009 8.52616C62.2116 8.41939 62.0669 8.21139 62.0669 7.90314V2.61563C62.0669 2.4331 62.1296 2.27898 62.2557 2.15294C62.3879 2.02069 62.5453 1.95473 62.7278 1.95473C62.9104 1.95473 63.0678 2.02069 63.2 2.15294C63.326 2.27898 63.3891 2.4331 63.3891 2.61563V6.11832L66.7595 2.18102C66.9545 1.95441 67.1971 1.89138 67.4864 1.99196C67.776 2.09906 67.9207 2.30673 67.9207 2.6153V7.90314ZM65.7492 0.0664062C65.9318 0.0664062 66.0888 0.129426 66.2214 0.255141C66.3471 0.387386 66.4101 0.544773 66.4101 0.727304C66.4101 0.909834 66.3471 1.06722 66.2214 1.19947C66.0892 1.32551 65.9318 1.3882 65.7492 1.3882H64.2384C64.0555 1.3882 63.8985 1.32551 63.7662 1.19947C63.6402 1.06722 63.5771 0.909834 63.5771 0.727304C63.5771 0.544773 63.6402 0.387386 63.7662 0.255141C63.8985 0.129426 64.0555 0.0664062 64.2384 0.0664062H65.7492Z" fill="#192732"/>
+          <path d="M45.6379 10.0261C45.6379 9.8436 45.7006 9.68948 45.8269 9.56344C45.9592 9.43119 46.1162 9.36523 46.2988 9.36523H50.8307C51.0136 9.36523 51.1703 9.43119 51.3029 9.56344C51.4289 9.68948 51.4916 9.8436 51.4916 10.0261V15.3136C51.4916 15.4962 51.4289 15.6506 51.3029 15.7763C51.1706 15.9086 51.0136 15.9745 50.8307 15.9745C50.6478 15.9745 50.4911 15.9086 50.3585 15.7763C50.2325 15.6506 50.1698 15.4965 50.1698 15.3136V10.687H46.9593V15.3136C46.9593 15.4962 46.8963 15.6506 46.7706 15.7763C46.6384 15.9086 46.481 15.9745 46.2985 15.9745C46.1159 15.9745 45.9585 15.9086 45.8266 15.7763C45.7006 15.6506 45.6376 15.4965 45.6376 15.3136L45.6379 10.0261Z" fill="#192732"/>
+          <path d="M56.2129 15.9742C55.3003 15.9742 54.5228 15.6503 53.8805 15.0018C53.2323 14.3598 52.9081 13.5824 52.9081 12.6697C52.9081 11.7571 53.2323 10.9796 53.8805 10.3376C54.5228 9.68948 55.3003 9.36523 56.2129 9.36523C57.1256 9.36523 57.903 9.68948 58.545 10.3376C59.1935 10.9799 59.5177 11.7571 59.5177 12.6697C59.5177 13.5824 59.1935 14.3598 58.545 15.0018C57.903 15.6503 57.1256 15.9742 56.2129 15.9742ZM56.2129 10.6867C55.6653 10.6867 55.1993 10.882 54.8157 11.2722C54.4251 11.6562 54.2302 12.1221 54.2302 12.6694C54.2302 13.2167 54.4251 13.6829 54.8157 14.0666C55.1997 14.4572 55.6653 14.6521 56.2129 14.6521C56.7605 14.6521 57.2265 14.4572 57.6101 14.0666C58.0003 13.6829 58.1956 13.217 58.1956 12.6694C58.1956 12.1218 58.0003 11.6558 57.6101 11.2722C57.2261 10.882 56.7605 10.6867 56.2129 10.6867Z" fill="#192732"/>
+          <path d="M60.5561 12.6697C60.5561 11.7571 60.8803 10.9796 61.5285 10.3376C62.1708 9.68948 62.9482 9.36523 63.8609 9.36523C64.9309 9.36523 65.7962 9.78711 66.4575 10.6302C66.5708 10.7752 66.6181 10.9355 66.5992 11.1118C66.5737 11.2944 66.4888 11.4423 66.3442 11.5556C66.1995 11.6689 66.0389 11.713 65.8625 11.6878C65.68 11.6689 65.5321 11.5873 65.4188 11.4423C65.022 10.9388 64.5029 10.687 63.8609 10.687C63.3133 10.687 62.8474 10.8823 62.4637 11.2725C62.0731 11.6565 61.8782 12.1225 61.8782 12.6697C61.8782 13.217 62.0731 13.6833 62.4637 14.0669C62.8477 14.4575 63.3133 14.6524 63.8609 14.6524C64.5029 14.6524 65.0224 14.4007 65.4188 13.8972C65.5321 13.7525 65.68 13.6705 65.8625 13.6516C66.0389 13.6265 66.1995 13.6702 66.3442 13.7838C66.4888 13.8975 66.5737 14.0451 66.5992 14.2276C66.6178 14.4039 66.5708 14.5646 66.4575 14.7092C65.7962 15.5527 64.9309 15.9742 63.8609 15.9742C62.9482 15.9742 62.1708 15.6503 61.5285 15.0018C60.8803 14.3598 60.5561 13.5824 60.5561 12.6697Z" fill="#192732"/>
+          <path d="M68.1378 10.687C67.9549 10.687 67.7979 10.6243 67.6656 10.498C67.5396 10.3657 67.4766 10.2087 67.4766 10.0261C67.4766 9.8436 67.5396 9.68621 67.6656 9.55397C67.7979 9.42826 67.9549 9.36523 68.1378 9.36523H72.67C72.8526 9.36523 73.0096 9.42826 73.1419 9.55397C73.2679 9.68621 73.3309 9.8436 73.3309 10.0261C73.3309 10.2087 73.2679 10.3661 73.1419 10.498C73.0096 10.624 72.8526 10.687 72.67 10.687H71.0648V15.3136C71.0648 15.4962 71.0018 15.6506 70.8761 15.7763C70.7438 15.9086 70.5865 15.9745 70.4039 15.9745C70.2214 15.9745 70.0669 15.9086 69.9412 15.7763C69.809 15.6506 69.743 15.4965 69.743 15.3136V10.687H68.1381H68.1378Z" fill="#192732"/>
+          <path d="M79.6382 15.0105C79.7198 15.1741 79.7326 15.3443 79.6761 15.5203C79.6193 15.6904 79.5092 15.8161 79.3453 15.898C79.2509 15.9487 79.1533 15.9735 79.0527 15.9735C78.7755 15.9735 78.5773 15.8507 78.4578 15.6055L77.9762 14.6517H74.832L74.3504 15.6055C74.2684 15.7691 74.1427 15.8791 73.9729 15.9359C73.7966 15.9927 73.6265 15.98 73.4629 15.898C73.2993 15.8164 73.1889 15.6904 73.1321 15.5203C73.0756 15.3439 73.088 15.1741 73.17 15.0105L75.8139 9.72303C75.9272 9.50262 76.1254 9.39258 76.4088 9.39258C76.6857 9.39258 76.8807 9.50262 76.994 9.72303L79.6379 15.0105H79.6382ZM77.3153 13.3299L76.4091 11.4984L75.4932 13.3299H77.3153Z" fill="#192732"/>
+          <path d="M87.314 15.973C87.1314 15.973 86.9744 15.9103 86.8418 15.7842C86.7158 15.652 86.6531 15.4946 86.6531 15.3121V11.9318L85.0005 14.0187C84.8744 14.1823 84.7014 14.2642 84.4813 14.2642C84.2612 14.2642 84.0878 14.1826 83.9621 14.0187L82.3099 11.9318V15.3121C82.3099 15.4946 82.2469 15.652 82.1208 15.7842C81.9886 15.9103 81.8312 15.973 81.6487 15.973C81.4661 15.973 81.3091 15.9103 81.1765 15.7842C81.0504 15.652 80.9878 15.4946 80.9878 15.3121V10.0246C80.9878 9.7098 81.1353 9.50212 81.4315 9.40122C81.7273 9.29445 81.9729 9.36694 82.1678 9.61837L84.481 12.5454L86.7941 9.61837C86.9891 9.37282 87.2346 9.30065 87.5308 9.40122C87.8266 9.50212 87.9745 9.7098 87.9745 10.0246V15.3121C87.9745 15.4946 87.9115 15.652 87.7855 15.7842C87.6532 15.9103 87.4958 15.973 87.3133 15.973H87.314Z" fill="#192732"/>
+          <path d="M95.793 15.0105C95.8746 15.1741 95.8874 15.3443 95.8309 15.5203C95.774 15.6904 95.664 15.8161 95.5001 15.898C95.4057 15.9487 95.3081 15.9735 95.2075 15.9735C94.9303 15.9735 94.7321 15.8507 94.6126 15.6055L94.1309 14.6517H90.9868L90.5051 15.6055C90.4232 15.7691 90.2975 15.8791 90.1277 15.9359C89.9514 15.9927 89.7812 15.98 89.6176 15.898C89.4541 15.8164 89.3437 15.6904 89.2869 15.5203C89.2304 15.3439 89.2428 15.1741 89.3247 15.0105L91.9687 9.72303C92.082 9.50262 92.2802 9.39258 92.5636 9.39258C92.8405 9.39258 93.0354 9.50262 93.1487 9.72303L95.7927 15.0105H95.793ZM93.4701 13.3299L92.5639 11.4984L91.648 13.3299H93.4701Z" fill="#192732"/>
+          <path d="M96.2932 10.687C96.1104 10.687 95.9533 10.6243 95.8211 10.498C95.695 10.3657 95.632 10.2087 95.632 10.0261C95.632 9.8436 95.695 9.68621 95.8211 9.55397C95.9533 9.42826 96.1104 9.36523 96.2932 9.36523H100.825C101.008 9.36523 101.165 9.42826 101.297 9.55397C101.423 9.68621 101.486 9.8436 101.486 10.0261C101.486 10.2087 101.423 10.3661 101.297 10.498C101.165 10.624 101.008 10.687 100.825 10.687H99.2202V15.3136C99.2202 15.4962 99.1572 15.6506 99.0315 15.7763C98.8993 15.9086 98.7419 15.9745 98.5594 15.9745C98.3768 15.9745 98.2224 15.9086 98.0967 15.7763C97.9644 15.6506 97.8984 15.4965 97.8984 15.3136V10.687H96.2932Z" fill="#192732"/>
+        </g>
+      </g>
+      <defs>
+        <clipPath id="clip0_857_5233">
+          <rect width="102" height="16" fill="white"/>
+        </clipPath>
+        <clipPath id="clip1_857_5233">
+          <rect width="101.6" height="16" fill="white"/>
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};

src/modules/ImportMode/LoadingStage.jsx

@@ -1,7 +1,8 @@
 import { useLayoutEffect, useRef, useState } from "react";
-import { uploadPointsFile } from "../../api.js";
+import { downloadImportTemplate, uploadPointsFile } from "../../api.js";
 import { Button, Upload } from "antd";
 import { UploadOutlined } from "@ant-design/icons";
+import { download } from "../../utils.js";
 
 export const LoadingStage = ({setFileId}) => {
   const ref = useRef(null);
@@ -24,6 +25,11 @@ export const LoadingStage = ({setFileId}) => {
     }
   };
 
+  const onTemplateDownload = async () => {
+    const data = await downloadImportTemplate();
+    await download('template.xlsx', data);
+  }
+
   useLayoutEffect(() => {
     if (ref && ref.current && !isClicked) {
       ref.current.click();
@@ -40,6 +46,7 @@ export const LoadingStage = ({setFileId}) => {
       >
         <Button icon={<UploadOutlined />}>Выбрать файл .xlsx</Button>
       </Upload>
+      <Button className="p-0 text-xs text-grey underline" type="text" onClick={onTemplateDownload}>Скачать шаблон</Button>
     </>
   );
 }

src/modules/ImportMode/MergePointsModal.jsx

@@ -1,6 +1,6 @@
 import { Button, Modal, Spin } from "antd";
 import { useState } from "react";
-import {useGetFilteredPendingPointsCount, useMergePointsToDb} from "../../api.js";
+import { useGetPointsToMergeCount, useMergePointsToDb } from "../../api.js";
 import { CheckCircleOutlined, InfoCircleOutlined, LoadingOutlined } from "@ant-design/icons";
 import { useMode } from "../../stores/useMode.js";
 
@@ -8,7 +8,7 @@ export const MergePointsModal = ({isOpened, onClose}) => {
   const {setImportMode} = useMode();
   const [isLoading, setIsLoading] = useState(false);
   const { data: filteredCount, isInitialLoading: isFilteredLoading } =
-    useGetFilteredPendingPointsCount(true);
+    useGetPointsToMergeCount();
   const [isSuccess, setIsSuccess] = useState(false);
   const {mutateAsync: mergePoints} = useMergePointsToDb();
 

src/modules/ImportMode/PointsFileUploadModal.jsx

@@ -1,10 +1,13 @@
 import { Button, Modal, Spin } from "antd";
 import { useState } from "react";
-import { downloadImportTemplate, importPoints } from "../../api.js";
+import { importPoints } from "../../api.js";
 import { LoadingStage } from "./LoadingStage.jsx";
 import { ReportStage } from "./ReportStage.jsx";
-import {CheckCircleOutlined, CloseCircleOutlined, LoadingOutlined} from "@ant-design/icons";
-import { download } from "../../utils.js";
+import {
+  CheckCircleOutlined,
+  CloseCircleOutlined,
+  LoadingOutlined
+} from "@ant-design/icons";
 
 export const PointsFileUploadModal = ({onClose, isOpened}) => {
   const [fileId, setFileId] = useState();
@@ -13,10 +16,6 @@ export const PointsFileUploadModal = ({onClose, isOpened}) => {
   const [isReportStage, setIsReportStage] = useState(false);
   const [isError, setIsError] = useState(false);
 
-  const onTemplateDownload = async () => {
-    const data = await downloadImportTemplate();
-    await download('template.xlsx', data);
-  }
   const onImportPoints = async () => {
     setIsImporting(true);
     try {
@@ -107,7 +106,6 @@ export const PointsFileUploadModal = ({onClose, isOpened}) => {
       footer={getFooter()}
     >
       {getContent()}
-      <Button className="p-0 text-xs text-grey underline" type="text" onClick={onTemplateDownload}>Скачать шаблон</Button>
     </Modal>
   );
 }

src/modules/Sidebar/PendingPointsFilters/PendingPointsFilters.jsx

@@ -15,6 +15,7 @@ import { ClearFiltersButton } from "../../../components/ClearFiltersButton";
 import { getDynamicActiveFilters } from "../utils";
 import { useDbTableName, useCanEdit, useGetPendingPointsRange } from "../../../api";
 import { AdvancedFiltersWrapper } from "./AdvancedFilters/AdvancedFiltersWrapper.jsx";
+import { predictionHasChanged } from "../../../utils.js";
 
 export const PendingPointsFilters = () => {
   const hasManualEdits = useHasManualEdits();
@@ -36,9 +37,7 @@ export const PendingPointsFilters = () => {
 
       if (gtChanged || ltChanged) setFilterWithKey(newRanges[key], key);
     });
-    const gtChanged = ranges.prediction[0] !== newRanges.prediction[0];
-    const ltChanged = ranges.prediction[1] !== newRanges.prediction[1];
-    if (gtChanged || ltChanged) setPrediction(newRanges.prediction);
+    if (predictionHasChanged(newRanges, ranges)) setPrediction(newRanges.prediction);
     setRanges({...ranges, ...newRanges});
   }, [data]);
 

src/modules/Table/PendingTable/usePendingTableData.js

@@ -9,7 +9,6 @@ import { useMode } from "../../../stores/useMode.js";
 export const usePendingTableData = (page, resetPage, pageSize, setPageSize, sort) => {
   const { filters, ranges } = usePendingPointsFilters();
   const {
-    prediction,
     categories,
     region,
   } = filters;
@@ -21,7 +20,6 @@ export const usePendingTableData = (page, resetPage, pageSize, setPageSize, sort
     const params = new URLSearchParams({
       page,
       page_size: pageSize,
-      "prediction_current[]": prediction,
       "categories[]": categories,
       ordering: sort,
     });

src/modules/Table/Table.jsx

@@ -67,6 +67,7 @@ export const Table = React.memo(
               showSizeChanger: false,
               position: "bottomCenter",
             }}
+            showHeader={data?.results && data.results.length > 0}
             dataSource={data?.results}
             columns={columns}
             onChange={onChange}

src/utils.js

@@ -116,6 +116,15 @@ export const appendFiltersInUse = (params, filters, ranges) => {
       params.append(`${filterKey}__lt`, filters[`${filterKey}__lt`] + 1);
     }
   });
+  if (predictionHasChanged(filters, ranges)) {
+    params.append("prediction_current[]", filters.prediction);
+  }
+}
+
+export const predictionHasChanged = (filters, ranges) => {
+  const gtChanged = ranges.prediction[0] !== filters.prediction[0];
+  const ltChanged = ranges.prediction[1] !== filters.prediction[1];
+  return gtChanged || ltChanged;
 }
 
 export const isNil = (value) =>