🐛 Make tutorials from params have precedence over tutorials that shou…

…ld pop up
equinor · Oct 23, 2024 · 95ff0f9 · 95ff0f9
1 parent 1eb95bb
commit 95ff0f9
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/providers/TutorialProvider/TutorialProviderInner.tsx b/src/providers/TutorialProvider/TutorialProviderInner.tsx
@@ -92,16 +92,19 @@ const TutorialProviderInner: FC = () => {
 
   useEffect(() => {
     if (tutorialsForPath.length < 1) return;
-    const tutorialToRun = tutorialsForPath.find(
-      (item) =>
-        !window.localStorage.getItem(item.shortName) ||
-        (shortNameFromParams &&
-          tutorialsForPath.some(
-            (item) => item.shortName === shortNameFromParams
-          ))
+
+    const tutorialToRunFromParams = tutorialsForPath.find(
+      (item) => item.shortName === shortNameFromParams
     );
-    if (tutorialToRun) {
-      runTutorial(tutorialToRun);
+
+    const tutorialThatShouldPopUp = tutorialsForPath.find((item) => {
+      !window.localStorage.getItem(item.shortName) && item.willPopUp;
+    });
+
+    if (tutorialToRunFromParams) {
+      runTutorial(tutorialToRunFromParams);
+    } else if (tutorialThatShouldPopUp) {
+      runTutorial(tutorialThatShouldPopUp);
     }
   }, [runTutorial, shortNameFromParams, tutorialsForPath]);