Merge pull request #615 from Vizzuality/fix/MARXAN-954/pre-gap-analys…

…is-layer

Fix(front):[MARXAN-954][MARXAN-938]

app/hooks/map/index.ts

@@ -438,12 +438,12 @@ export function usePUGridLayer({
               layout: {
                 visibility: getLayerVisibility(PreGapAnalysisVisibility),
               },
-              ...runId && {
-                filter: [
-                  'all',
-                  ['in', `-${runId}-`, ['get', 'valuePosition']],
-                ],
-              },
+              // ...runId && {
+              //   filter: [
+              //     'all',
+              //     ['in', `-${runId}-`, ['get', 'valuePosition']],
+              //   ],
+              // },
               paint: {
                 'fill-color': COLORS.features,
                 'fill-opacity': [

app/layout/projects/new/form/planning-area-grid-uploader/component.tsx

@@ -288,6 +288,7 @@ export const PlanningAreaGridUploader: React.FC<PlanningAreaGridUploaderProps> =
                         theme="primary"
                         size="xl"
                         type="submit"
+                        onClick={() => setOpened(false)}
                       >
                         Save
                       </Button>

app/layout/projects/new/form/planning-area-uploader/component.tsx

@@ -180,7 +180,7 @@ export const PlanningAreUploader: React.FC<PlanningAreUploaderProps> = ({
           onClose={() => setOpened(false)}
         >
           <Form
-            onSubmit={successFile && onUploadSubmit}
+            onSubmit={onUploadSubmit}
             render={({ handleSubmit }) => {
               return (
                 <form onSubmit={handleSubmit}>

app/layout/scenarios/show/map/component.tsx

@@ -8,6 +8,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import { useRouter } from 'next/router';
 
 import { getScenarioSlice } from 'store/slices/scenarios/detail';
+import { getScenarioEditSlice } from 'store/slices/scenarios/edit';
 
 import PluginMapboxGl from '@vizzuality/layer-manager-plugin-mapboxgl';
 import { LayerManager, Layer } from '@vizzuality/layer-manager-react';
@@ -47,17 +48,22 @@ export const ScenariosMap: React.FC<ScenariosShowMapProps> = () => {
   const { pid, sid } = query;
 
   const scenarioSlice = getScenarioSlice(sid);
+  getScenarioEditSlice(sid);
+
   const { setLayerSettings } = scenarioSlice.actions;
 
   const {
     tab,
     subtab,
-    cache,
     selectedSolution,
     highlightFeatures,
     layerSettings,
   } = useSelector((state) => state[`/scenarios/${sid}`]);
 
+  const {
+    cache,
+  } = useSelector((state) => state[`/scenarios/${sid}/edit`]);
+
   const {
     data = {},
   } = useProject(pid);
@@ -172,6 +178,7 @@ export const ScenariosMap: React.FC<ScenariosShowMapProps> = () => {
   });
 
   const PUGridLayer = usePUGridLayer({
+    cache,
     active: true,
     sid: sid ? `${sid}` : null,
     include,

app/store/slices/scenarios/detail.ts

@@ -6,6 +6,7 @@ interface ScenarioShowStateProps {
   tab: string,
   subtab: string,
   selectedSolution: Solution,
+  cache: number;
   // FEATURES
   highlightFeatures: string[],
   // SETTINGS
@@ -16,6 +17,7 @@ const initialState = {
   tab: 'solutions',
   subtab: null,
   selectedSolution: null,
+  cache: Date.now(),
   // FEATURES
   highlightFeatures: [],
   // SETTINGS
@@ -36,7 +38,9 @@ export function getScenarioSlice(id) {
       setSelectedSolution: (state, action: PayloadAction<Solution>) => {
         state.selectedSolution = action.payload;
       },
-
+      setCache: (state, action: PayloadAction<number>) => {
+        state.cache = action.payload;
+      },
       // FEATURES
       setHighlightFeatures: (state, action: PayloadAction<string[]>) => {
         state.highlightFeatures = action.payload;