diff --git a/src/Map/Popup.jsx b/src/Map/Popup.jsx
index 3dcf19a..2da1a8f 100644
--- a/src/Map/Popup.jsx
+++ b/src/Map/Popup.jsx
@@ -3,8 +3,9 @@ import { Button, Col, Row } from "antd";
import { twMerge } from "tailwind-merge";
import { usePointSelection } from "../stores/usePointSelection";
import { useEffect, useState } from "react";
-import { CATEGORIES } from "../config";
+import { CATEGORIES, MODES } from "../config";
import { useClickedPointConfig } from "../stores/useClickedPointConfig";
+import { useMode } from "../stores/useMode";
const popupConfig = [
{
@@ -109,6 +110,7 @@ const PopupWrapper = ({ lat, lng, onClose, children }) => {
const SingleFeaturePopup = ({ feature }) => {
const { include, selection, exclude } = usePointSelection();
const { setClickedPointConfig } = useClickedPointConfig();
+ const { mode } = useMode();
const doesMatchFilter = feature.layer.id === "match-points";
const featureId = feature.properties.location_id;
@@ -144,9 +146,16 @@ const SingleFeaturePopup = ({ feature }) => {
);
})}
-
+ {mode === MODES.INITIAL && (
+
+ )}
>
);
};
diff --git a/src/modules/Sidebar/CategoriesSelect.jsx b/src/modules/Sidebar/InitialSidebar/CategoriesSelect.jsx
similarity index 90%
rename from src/modules/Sidebar/CategoriesSelect.jsx
rename to src/modules/Sidebar/InitialSidebar/CategoriesSelect.jsx
index 822807f..29e8452 100644
--- a/src/modules/Sidebar/CategoriesSelect.jsx
+++ b/src/modules/Sidebar/InitialSidebar/CategoriesSelect.jsx
@@ -1,8 +1,8 @@
import { Button } from "antd";
import { twMerge } from "tailwind-merge";
-import { Title } from "../../components/Title";
-import { useFilters } from "../../stores/useFilters";
-import { CATEGORIES } from "../../config";
+import { Title } from "../../../components/Title";
+import { useFilters } from "../../../stores/useFilters";
+import { CATEGORIES } from "../../../config";
const SelectItem = ({ name, isActive, onClick, disabled }) => {
return (
diff --git a/src/modules/Sidebar/Filters.jsx b/src/modules/Sidebar/InitialSidebar/Filters.jsx
similarity index 69%
rename from src/modules/Sidebar/Filters.jsx
rename to src/modules/Sidebar/InitialSidebar/Filters.jsx
index c92cb9e..06504b8 100644
--- a/src/modules/Sidebar/Filters.jsx
+++ b/src/modules/Sidebar/InitialSidebar/Filters.jsx
@@ -1,12 +1,14 @@
-import { RegionSelect } from "./RegionSelect";
+import { RegionSelect } from "../RegionSelect";
import { CategoriesSelect } from "./CategoriesSelect";
import { PredictionSlider } from "./PredictionSlider";
import { useEffect, useState } from "react";
import { Tooltip } from "antd";
-import { DISABLED_FILTER_TEXT } from "../../config";
+import { DISABLED_FILTER_TEXT, MODES } from "../../../config";
+import { useMode } from "../../../stores/useMode";
export const Filters = ({ disabled }) => {
const [hover, setHover] = useState(false);
+ const { mode } = useMode();
useEffect(() => {
const timer = setTimeout(() => setHover(false), 1500);
@@ -31,8 +33,12 @@ export const Filters = ({ disabled }) => {
>
-
-
+ {mode === MODES.INITIAL && (
+ <>
+
+
+ >
+ )}
);
diff --git a/src/modules/Sidebar/PredictionSlider.jsx b/src/modules/Sidebar/InitialSidebar/PredictionSlider.jsx
similarity index 83%
rename from src/modules/Sidebar/PredictionSlider.jsx
rename to src/modules/Sidebar/InitialSidebar/PredictionSlider.jsx
index 805a504..7b8a72d 100644
--- a/src/modules/Sidebar/PredictionSlider.jsx
+++ b/src/modules/Sidebar/InitialSidebar/PredictionSlider.jsx
@@ -1,7 +1,7 @@
-import { SliderComponent as Slider } from "../../components/SliderComponent";
-import { useFilters } from "../../stores/useFilters";
+import { SliderComponent as Slider } from "../../../components/SliderComponent";
+import { useFilters } from "../../../stores/useFilters";
import { useQuery } from "@tanstack/react-query";
-import { api } from "../../api";
+import { api } from "../../../api";
import { useEffect } from "react";
export const PredictionSlider = ({ disabled }) => {
diff --git a/src/modules/Sidebar/TakeToWorkButton.jsx b/src/modules/Sidebar/InitialSidebar/TakeToWorkButton.jsx
similarity index 86%
rename from src/modules/Sidebar/TakeToWorkButton.jsx
rename to src/modules/Sidebar/InitialSidebar/TakeToWorkButton.jsx
index 51778b7..6ec034e 100644
--- a/src/modules/Sidebar/TakeToWorkButton.jsx
+++ b/src/modules/Sidebar/InitialSidebar/TakeToWorkButton.jsx
@@ -1,10 +1,10 @@
import { Alert, Button, Modal } from "antd";
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { api } from "../../api";
-import { useFilters } from "../../stores/useFilters";
-import { usePointSelection } from "../../stores/usePointSelection";
-import { STATUSES } from "../../config";
-import { useUpdateLayerCounter } from "../../stores/useUpdateLayerCounter";
+import { api } from "../../../api";
+import { useFilters } from "../../../stores/useFilters";
+import { usePointSelection } from "../../../stores/usePointSelection";
+import { STATUSES } from "../../../config";
+import { useUpdateLayerCounter } from "../../../stores/useUpdateLayerCounter";
import { useState } from "react";
export const TakeToWorkButton = () => {
diff --git a/src/modules/Sidebar/LayersVisibility.jsx b/src/modules/Sidebar/LayersVisibility.jsx
index 419f387..86bc8e6 100644
--- a/src/modules/Sidebar/LayersVisibility.jsx
+++ b/src/modules/Sidebar/LayersVisibility.jsx
@@ -1,20 +1,26 @@
import { Title } from "../../components/Title";
import { Checkbox } from "antd";
import { useLayersVisibility } from "../../stores/useLayersVisibility";
+import { useMode } from "../../stores/useMode";
+import { MODES } from "../../config";
export const LayersVisibility = () => {
const { toggleVisibility, isVisible } = useLayersVisibility();
+ const { mode } = useMode();
return (
-
toggleVisibility("points")}
- checked={isVisible.points}
- >
- Локации к рассмотрению
-
+ {mode === MODES.INITIAL && (
+
toggleVisibility("points")}
+ checked={isVisible.points}
+ >
+ Локации к рассмотрению
+
+ )}
+
toggleVisibility("atd")}
diff --git a/src/modules/Sidebar/Sidebar.jsx b/src/modules/Sidebar/Sidebar.jsx
index b5e1fae..668a6f1 100644
--- a/src/modules/Sidebar/Sidebar.jsx
+++ b/src/modules/Sidebar/Sidebar.jsx
@@ -4,14 +4,17 @@ import {
useHasManualEdits,
usePointSelection,
} from "../../stores/usePointSelection";
-import { TakeToWorkButton } from "./TakeToWorkButton";
-import { Filters } from "./Filters";
+import { TakeToWorkButton } from "./InitialSidebar/TakeToWorkButton";
+import { Filters } from "./InitialSidebar/Filters";
import { ExportButton } from "./ExportButton";
import { Header } from "./Header";
+import { useMode } from "../../stores/useMode";
+import { MODES } from "../../config";
export const Sidebar = () => {
const hasManualEdits = useHasManualEdits();
const { reset: resetSelection } = usePointSelection();
+ const { mode } = useMode();
return (
@@ -19,10 +22,12 @@ export const Sidebar = () => {
+
-
- {hasManualEdits ? (
+ {mode === MODES.INITIAL &&
}
+
+ {mode === MODES.INITIAL && hasManualEdits ? (