Merge branch 'fixes_2' into 'dev'

Fixes 2

See merge request spatial/postamates_frontend!20

src/App.jsx

@@ -23,7 +23,7 @@ if (import.meta.env.MODE === "development") {
   mountStoreDevtool("PointSelection", usePointSelection);
 }
 
-const version = '0.0.2';
+const version = '0.0.3';
 
 function App() {
 

src/Map/LayersControl/LayersVisibility.jsx

@@ -29,6 +29,7 @@ export const LayersVisibility = ({ postGroups, otherGroups }) => {
         </>
       )}
       {postGroups && postGroups.map((item) => {
+        console.log(LAYER_IDS.pvz_category + item.id, isVisible[LAYER_IDS.pvz_category + item.id])
         return (
           <Checkbox
             key={item.id}

src/Map/MapComponent.jsx

@@ -35,6 +35,7 @@ export const MapComponent = () => {
   const { setLayersVisibility } = useLayersVisibility();
   const { mode } = useMode();
   const { tableState, openTable } = useTable();
+  const { toggleVisibility } = useLayersVisibility();
 
   const { ranges, setRanges } = usePendingPointsFilters();
   const { data: fullRange, isInitialLoading } = useGetPendingPointsRange();
@@ -51,6 +52,7 @@ export const MapComponent = () => {
     return postamatesAndPvzGroups
       .filter((category) => category.visible)
       .map((category) => {
+        toggleVisibility(LAYER_IDS.pvz_category + category.id)
         return {
           ...category,
           groups: [...category.groups.filter((group) => group.visible)],

src/api.js

@@ -190,6 +190,9 @@ export const useGetPendingPointsRange = () => {
         return {
           prediction: data.prediction_current,
           doors: data.doors,
+          flat_cnt: data.flat_cnt,
+          flats_cnt: data.flats_cnt,
+          target_post_cnt: data.target_post_cnt
         };
       },
     }

src/modules/Sidebar/PendingPointsFilters/AdvancedFilters/AdvancedFilters.jsx

@@ -36,7 +36,8 @@ export const AdvancedFilters = () => {
           filterRange={[filters.flat_cnt__gt, filters.flat_cnt__lt]}
           setFilterRange={setFlatCnt}
           title={"Кол-во квартир в подъезде жилого дома"}
-          fullRange={[-1, 5000]}
+          fullRange={ranges.flat_cnt || [0, 0]}
+          filterKey={"flat_cnt"}
         />
       </div>
       <div>
@@ -60,17 +61,19 @@ export const AdvancedFilters = () => {
           filterRange={[filters.target_post_cnt__gt, filters.target_post_cnt__lt]}
           setFilterRange={setTargetPostCnt}
           title={"Кол-во постаматов Мой постамат"}
-          fullRange={[-1, 5000]}
+          fullRange={ranges.target_post_cnt || [0, 0]}
+          filterKey={"target_post_cnt"}
+        />
+      </div>
+      <div>
+        <FilterSlider
+          filterRange={[filters.flats_cnt__gt, filters.flats_cnt__lt]}
+          setFilterRange={setFlatsCnt}
+          title={"Кол-во квартир в окрестности"}
+          fullRange={ranges.flats_cnt || [0, 0]}
+          filterKey={"flats_cnt"}
         />
       </div>
-      {/*<div>*/}
-      {/*  <FilterSlider*/}
-      {/*    filterRange={[filters.flats_cnt__gt, filters.flats_cnt__lt]}*/}
-      {/*    setFilterRange={setFlatsCnt}*/}
-      {/*    title={"Кол-во квартир в окрестности"}*/}
-      {/*    fullRange={[-1, 500]}*/}
-      {/*  />*/}
-      {/*</div>*/}
       <div>
         <FilterSlider
           filterRange={[filters.tc_cnt__gt, filters.tc_cnt__lt]}
@@ -119,14 +122,14 @@ export const AdvancedFilters = () => {
           fullRange={[-1, 5000]}
         />
       </div>
-      {/*<div>*/}
-      {/*  <FilterSlider*/}
-      {/*    filterRange={[filters.metro_dist__gt, filters.metro_dist__lt]}*/}
-      {/*    setFilterRange={setMetroDist}*/}
-      {/*    title={"Расстояние до метро"}*/}
-      {/*    fullRange={[-1, 50000]}*/}
-      {/*  />*/}
-      {/*</div>*/}
+      <div>
+        <FilterSlider
+          filterRange={[filters.metro_dist__gt, filters.metro_dist__lt]}
+          setFilterRange={setMetroDist}
+          title={"Расстояние до метро"}
+          fullRange={[-1, 5000]}
+        />
+      </div>
 
     </div>
   );

src/modules/Sidebar/PendingPointsFilters/AdvancedFilters/AdvancedFiltersWrapper.jsx

@@ -12,6 +12,7 @@ export const AdvancedFiltersWrapper = () => {
     <Dropdown
       trigger="click"
       dropdownRender={() => filtersRender()}
+      forceRender
       placement='right'
     >
       <Button

src/stores/useLayersVisibility.js

@@ -11,6 +11,8 @@ const INITIAL_STATE = {
   [LAYER_IDS.cancelled]: false,
   [LAYER_IDS.pvz]: true,
   [LAYER_IDS.other]: true,
+  [`${LAYER_IDS.pvz_category}1`]: true,
+  [`${LAYER_IDS.pvz_category}2`]: true,
 };
 
 const STATIC_LAYERS = [LAYER_IDS.pvz, LAYER_IDS.other];