Merge pull request #40 from equinor/fix/tutorial-bug

🐛 Make tutorials from params have precedence over tutorials that should popup
equinor · Oct 23, 2024 · d53af25 · d53af25
2 parents 1eb95bb + 96d345e
commit d53af25
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/subsurface-app-management",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "React Typescript components/hooks to communicate with equinor/sam",
   "types": "dist/index.d.ts",
   "type": "module",

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
+    );
+
+    const tutorialThatShouldPopUp = tutorialsForPath.find(
+      (item) => !window.localStorage.getItem(item.shortName) && item.willPopUp
     );
-    if (tutorialToRun) {
-      runTutorial(tutorialToRun);
+
+    if (tutorialToRunFromParams) {
+      runTutorial(tutorialToRunFromParams);
+    } else if (tutorialThatShouldPopUp) {
+      runTutorial(tutorialThatShouldPopUp);
     }
   }, [runTutorial, shortNameFromParams, tutorialsForPath]);