refetches scenario list on focus

Vizzuality · Oct 3, 2023 · 3efa0b8 · 3efa0b8
1 parent 0eb4a8a
commit 3efa0b8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/app/hooks/scenarios/index.ts b/app/hooks/scenarios/index.ts
@@ -374,6 +374,7 @@ export function useScenarios(pId, options: UseScenariosOptionsProps = {}) {
   const query = useInfiniteQuery(['scenarios', pId, JSON.stringify(options)], fetchScenarios, {
     retry: false,
     keepPreviousData: true,
+    refetchOnWindowFocus: true,
     getNextPageParam: (lastPage) => {
       const {
         data: { meta },

diff --git a/app/layout/project/navigation/hooks.tsx b/app/layout/project/navigation/hooks.tsx
@@ -50,7 +50,7 @@ export const useInventoryItems = (): SubMenuItem[] => {
 export const useGridSetupItems = (): SubMenuItem[] => {
   const { query, route } = useRouter();
   const { pid, sid, tab } = query as { pid: string; sid: string; tab: string };
-  const isScenarioRoute = route.startsWith(SCENARIO_ROUTE);
+  const isScenarioRoute = route.startsWith(SCENARIO_ROUTE) && !route.endsWith('/new');
 
   return [
     {
@@ -91,7 +91,7 @@ export const useGridSetupItems = (): SubMenuItem[] => {
 export const useSolutionItems = (): SubMenuItem[] => {
   const { query, route } = useRouter();
   const { pid, sid, tab } = query as { pid: string; sid: string; tab: string };
-  const isScenarioRoute = route.startsWith(SCENARIO_ROUTE);
+  const isScenarioRoute = route.startsWith(SCENARIO_ROUTE) && !route.endsWith('/new');
 
   return [
     {
@@ -112,7 +112,7 @@ export const useSolutionItems = (): SubMenuItem[] => {
 export const useAdvancedSettingsItems = (): SubMenuItem[] => {
   const { query, route } = useRouter();
   const { pid, sid, tab } = query as { pid: string; sid: string; tab: string };
-  const isScenarioRoute = route.startsWith(SCENARIO_ROUTE);
+  const isScenarioRoute = route.startsWith(SCENARIO_ROUTE) && !route.endsWith('/new');
 
   return [
     {

diff --git a/app/layout/project/navigation/index.tsx b/app/layout/project/navigation/index.tsx
@@ -63,8 +63,8 @@ export const Navigation = (): JSX.Element => {
   const { query, route } = useRouter();
   const { pid, sid, tab } = query as { pid: string; sid: string; tab: string };
 
-  const isProjectRoute = route === '/projects/[pid]';
-  const isScenarioRoute = route.startsWith('/projects/[pid]/scenarios/');
+  const isProjectRoute = route.startsWith('/projects/[pid]');
+  const isScenarioRoute = route.startsWith('/projects/[pid]/scenarios/') && !route.endsWith('/new');
 
   const { addToast } = useToasts();
   const plausible = usePlausible();
@@ -149,7 +149,7 @@ export const Navigation = (): JSX.Element => {
         },
       }
     );
-  }, [addToast, runScenarioMutation, sid]);
+  }, [addToast, runScenarioMutation, sid, plausible, user]);
 
   const isSolutionsSectionEnabled = scenarioQuery.data?.ranAtLeastOnce ?? false;
 

diff --git a/app/layout/project/sidebar/header/title/index.tsx b/app/layout/project/sidebar/header/title/index.tsx
@@ -115,7 +115,7 @@ const EditableTitle = ({
                         <input
                           {...input}
                           ref={titleInputRef}
-                          className="absolute left-0 top-0 h-full w-full cursor-pointer overflow-ellipsis border-none bg-transparent px-1.5 font-heading text-3xl focus:bg-primary-300 focus:text-gray-600 focus:outline-none"
+                          className="absolute left-0 top-0 h-full w-full cursor-pointer overflow-ellipsis border-none bg-transparent font-heading text-3xl focus:bg-primary-300 focus:text-gray-600 focus:outline-none"
                           disabled={!editting}
                           value={input.value}
                         />

diff --git a/app/layout/project/sidebar/scenario/header/index.tsx b/app/layout/project/sidebar/scenario/header/index.tsx
@@ -31,7 +31,9 @@ export const ScenarioHeader = (): JSX.Element => {
     [saveScenarioMutation, sid]
   );
 
-  return <Title title={name} description={description} onEditTitle={onEditScenarioName} />;
+  return (
+    <>{sid && <Title title={name} description={description} onEditTitle={onEditScenarioName} />}</>
+  );
 };
 
 export default ScenarioHeader;