enables data and analysis routes from sidebar navigation

Vizzuality · Apr 16, 2024 · 664a739 · 664a739
1 parent 1dead51
commit 664a739
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 30 deletions.
diff --git a/client/src/components/icons/report.tsx b/client/src/components/icons/report.tsx
@@ -3,34 +3,10 @@ import type { SVGAttributes } from 'react';
 const ReportSVG = (props?: SVGAttributes<SVGSVGElement>) => {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="25" fill="none" {...props}>
-      <path fill="#DCDCDC" d="M0 0h24v25H0z" />
-      <g clipPath="url(#a)">
-        <path fill="#fff" d="M-44-374h1440V650H-44z" />
-        <path fill="#2E34B0" d="M-44-374H68v855H-44z" />
-        <mask id="b" fill="#fff">
-          <path d="M-28-3.435c0-5.523 4.477-10 10-10h60c5.523 0 10 4.477 10 10v66.188c0 5.523-4.477 10-10 10h-60c-5.523 0-10-4.477-10-10z" />
-        </mask>
-        <path
-          fill="#000"
-          fillOpacity=".3"
-          d="M-28-3.435c0-5.523 4.477-10 10-10h60c5.523 0 10 4.477 10 10v66.188c0 5.523-4.477 10-10 10h-60c-5.523 0-10-4.477-10-10z"
-        />
-        <path
-          fill="#000"
-          fillOpacity=".2"
-          d="M-28-13.435h80zm80 76.188c0 6.076-4.925 11-11 11h-58c-6.075 0-11-4.924-11-11 0 4.971 4.477 9 10 9h60c5.523 0 10-4.029 10-9m-80 10v-86.188zm80-86.188v86.188z"
-          mask="url(#b)"
-        />
-        <g fill="#fff" fillRule="evenodd" clipRule="evenodd">
-          <path d="M7.502 6.66h7.128A3.375 3.375 0 0 1 18 10.033v9.375a3 3 0 0 0 3-3V6.767c0-1.505-1.125-2.81-2.664-2.94a49 49 0 0 0-.673-.05A3 3 0 0 0 15 2.16h-1.5a3 3 0 0 0-2.663 1.618q-.338.023-.673.05c-1.502.127-2.61 1.374-2.662 2.832m5.998-3a1.5 1.5 0 0 0-1.5 1.5h4.5a1.5 1.5 0 0 0-1.5-1.5z" />
-          <path d="M3 10.034c0-1.036.84-1.875 1.875-1.875h9.75c1.036 0 1.875.84 1.875 1.875v11.25c0 1.035-.84 1.875-1.875 1.875h-9.75A1.875 1.875 0 0 1 3 21.284zm3 2.625a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75H6.75a.75.75 0 0 1-.75-.75zm2.25 0a.75.75 0 0 1 .75-.75h3.75a.75.75 0 1 1 0 1.5H9a.75.75 0 0 1-.75-.75m-2.25 3a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75H6.75a.75.75 0 0 1-.75-.75zm2.25 0a.75.75 0 0 1 .75-.75h3.75a.75.75 0 1 1 0 1.5H9a.75.75 0 0 1-.75-.75m-2.25 3a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75H6.75a.75.75 0 0 1-.75-.75zm2.25 0a.75.75 0 0 1 .75-.75h3.75a.75.75 0 1 1 0 1.5H9a.75.75 0 0 1-.75-.75" />
-        </g>
+      <g fill="#fff" fillRule="evenodd" clipRule="evenodd">
+        <path d="M7.502 6.66h7.128A3.375 3.375 0 0 1 18 10.033v9.375a3 3 0 0 0 3-3V6.767c0-1.505-1.125-2.81-2.664-2.94a49 49 0 0 0-.673-.05A3 3 0 0 0 15 2.16h-1.5a3 3 0 0 0-2.663 1.618q-.338.023-.673.05c-1.502.127-2.61 1.374-2.662 2.832m5.998-3a1.5 1.5 0 0 0-1.5 1.5h4.5a1.5 1.5 0 0 0-1.5-1.5z" />
+        <path d="M3 10.034c0-1.036.84-1.875 1.875-1.875h9.75c1.036 0 1.875.84 1.875 1.875v11.25c0 1.035-.84 1.875-1.875 1.875h-9.75A1.875 1.875 0 0 1 3 21.284zm3 2.625a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75H6.75a.75.75 0 0 1-.75-.75zm2.25 0a.75.75 0 0 1 .75-.75h3.75a.75.75 0 1 1 0 1.5H9a.75.75 0 0 1-.75-.75m-2.25 3a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75H6.75a.75.75 0 0 1-.75-.75zm2.25 0a.75.75 0 0 1 .75-.75h3.75a.75.75 0 1 1 0 1.5H9a.75.75 0 0 1-.75-.75m-2.25 3a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75H6.75a.75.75 0 0 1-.75-.75zm2.25 0a.75.75 0 0 1 .75-.75h3.75a.75.75 0 1 1 0 1.5H9a.75.75 0 0 1-.75-.75" />
       </g>
-      <defs>
-        <clipPath id="a">
-          <path fill="#fff" d="M-44-374h1440V650H-44z" />
-        </clipPath>
-      </defs>
     </svg>
   );
 };

diff --git a/client/src/containers/analysis-sidebar/component.tsx b/client/src/containers/analysis-sidebar/component.tsx
@@ -142,7 +142,7 @@ const ScenariosComponent: React.FC<{ scrollref?: MutableRefObject<HTMLDivElement
               </div>
               <Anchor
                 href="/data/scenarios/new"
-                className="block w-full"
+                className="w-full"
                 variant="primary"
                 size="xl"
                 data-testid="create-scenario"

diff --git a/client/src/layouts/application/component.tsx b/client/src/layouts/application/component.tsx
@@ -23,13 +23,12 @@ const ApplicationLayout: React.FC<React.PropsWithChildren> = ({ children }) => {
         default: CollectionIconOutline,
         active: CollectionIconSolid,
       },
-      disabled: true,
     },
     {
       name: 'Analysis',
       href: '/analysis',
       icon: { default: ChartBarIconOutline, active: ChartBarIconSolid },
-      disabled: true,
+      disabled: !!(!lastTask || lastTask?.status === 'processing'),
     },
   ];