Merge pull request #114 from MediaComem/navigationAndRecos

Clean unused split on params & remove undefined type on general params recos
MediaComem · Dec 6, 2022 · 8cde258 · 8cde258
2 parents 834a11b + bf9b172
commit 8cde258
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/src/components/layout/ByteSimHeader.tsx b/src/components/layout/ByteSimHeader.tsx
@@ -16,7 +16,6 @@ export default function BytesimeHeader() {
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const { search } = useLocation();
-  const imageParams = search.split("&")[0];
   return (
     <Flex
       align="center"
@@ -52,7 +51,6 @@ export default function BytesimeHeader() {
       <ButtonWithIconCustom
         icon={<></>}
         label={"Best practices"}
-        //subLabel={"Start with ByteSim"}
         variant={"ghost"}
         iconAfter
         onClick={() => navigate(`./best-practices${search}`)}

diff --git a/src/components/recommandations/BestPracticesPage.tsx b/src/components/recommandations/BestPracticesPage.tsx
@@ -17,7 +17,6 @@ import { BPTooltipContent } from "./Recommandation";
 export default function BestPracticesPage() {
   const navigate = useNavigate();
   const { search } = useLocation();
-  const imageParams = search.split("&")[0];
   return (
     <>
       <Flex direction="column" p={6}>
@@ -31,7 +30,7 @@ export default function BestPracticesPage() {
           <Button
             variant="outline"
             colorScheme={"brand"}
-            onClick={() => navigate(`/figma${imageParams}`)}
+            onClick={() => navigate(`/figma${search}`)}
             alignSelf="flex-start"
             size={"sm"}
           >

diff --git a/src/components/recommandations/ExportButton.tsx b/src/components/recommandations/ExportButton.tsx
@@ -3,7 +3,6 @@ import { useLocation, useNavigate } from "react-router-dom";
 
 export default function ExportButton() {
   const { search } = useLocation(); // keep image params
-  const imageParams = search.split("&")[0];
   const navigate = useNavigate();
   return (
     <>
@@ -12,7 +11,7 @@ export default function ExportButton() {
         alignSelf={"center"}
         justifySelf={"flex-end"}
         onClick={() => {
-          navigate(`/export${imageParams}`); // keep url params
+          navigate(`/export${search}`); // keep url params
         }}
         size="sm"
         minWidth="min-content"

diff --git a/src/components/recommandations/RecommandationsByZone.tsx b/src/components/recommandations/RecommandationsByZone.tsx
@@ -99,7 +99,9 @@ export default function RecommandationsByZone({
                   ? "General Parameters"
                   : zoneRecommandations[0].zoneName}
               </Text>
-              <Text as="span">{" - " + zone?.zoneType ?? "–"}</Text>
+              <Text as="span" hidden={zone?.zoneType === undefined}>
+                {" - " + zone?.zoneType ?? "–"}
+              </Text>
             </Text>
             <Text fontSize={"xs"}></Text>
             {zone?.zoneType ? (

diff --git a/src/components/recommandations/ReloadRecoButton.tsx b/src/components/recommandations/ReloadRecoButton.tsx
@@ -9,7 +9,6 @@ import {
 import { ReactComponent as ResetIcon } from "../../assets/ResetIcon_Active_MouseOver.svg";
 import { recommandationsPopulated } from "../../features/recommandations/recommandationsSlice";
 import { colorTheme } from "../../theme";
-//import { useNavigate } from "react-router-dom";
 
 export default function ReloadRecoButton() {
   const dispatch = useDispatch();
@@ -18,10 +17,6 @@ export default function ReloadRecoButton() {
   const reloadSimulation = React.useCallback(() => {
     dispatch(recommandationsPopulated([...recosGeneric, ...recos]));
   }, [dispatch, recos]);
-  //const currentDisplayedRecos = useAppSelector((state) => state.recommandations);
-  /*   const newRecos = React.useEffect(() => {
-    if (recos.length !== currentDisplayedRecos.length) { return true }
-  }, [recos, currentDisplayedRecos]); */
 
   return (
     <>

diff --git a/src/features/figma/components/FetchedSVG.tsx b/src/features/figma/components/FetchedSVG.tsx
@@ -101,7 +101,6 @@ const FetchedSVG = ({
     setTimeout(() => {
       dispatch(zonesSetTree([newTree]));
       dispatch(zonesFilterByElementId(newZones));
-
       const newParams = search
         ?.replace("&new=true", "")
         .replace("new=true", "");