Merge pull request #1419 from jdi-testing/issue_1415

Issue 1415: fix onboarding step for context menu
jdi-testing · Jul 28, 2023 · d1da3ff · d1da3ff
2 parents 51b9874 + 3f2a79e
commit d1da3ff
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "name": "JDN",
   "description": "JDN – helps Test Automation Engineer to create Page Objects in the test automation framework and speed up test development",
   "devtools_page": "index.html",
-  "version": "3.13.539",
+  "version": "3.13.540",
   "icons": {
     "128": "icon128.png"
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jdn-ai-chrome-extension",
-  "version": "3.13.539",
+  "version": "3.13.540",
   "description": "jdn-ai chrome extension",
   "scripts": {
     "start": "webpack --watch --env devenv",

diff --git a/src/features/locators/Locator.tsx b/src/features/locators/Locator.tsx
@@ -52,7 +52,7 @@ export const Locator: React.FC<Props> = ({ element, currentPage, searchState, de
   const dispatch = useDispatch();
 
   const [isEditModalOpen, setIsEditModalOpen] = useState(false);
-  const { isOpen: isCustomLocatorFlow } = useContext(OnboardingContext);
+  const { isCustomLocatorFlow } = useContext(OnboardingContext);
 
   const { element_id, type, name, locator, generate, message, deleted, active, isCustomLocator } = element;
 

diff --git a/src/features/onboarding/utils/tourSteps.tsx b/src/features/onboarding/utils/tourSteps.tsx
@@ -176,9 +176,6 @@ export const createPOSteps = (refs: Record<OnbrdStep, StepRef>) => [
 ];
 
 export const addLocatorsSteps = (refs: Record<OnbrdStep, StepRef>, isCustomLocatorFlow: boolean) => {
-  // if (!isCustomLocatorFlow) {
-  //   return [customLocator(refs, isCustomLocatorFlow), contextMenu(refs), addToPO(refs), saveLocators(refs)];
-  // }
   return [
     customLocator(refs, isCustomLocatorFlow),
     isCustomLocatorFlow ? createCustomLocator(refs) : contextMenu(refs),

diff --git a/src/features/onboarding/utils/useOnboardingRef.ts b/src/features/onboarding/utils/useOnboardingRef.ts
@@ -4,6 +4,8 @@ import { OnbrdStep } from "../types/constants";
 import { useSelector } from "react-redux";
 import { selectFirstLocatorByPO } from "../../locators/selectors/locatorsByPO.selectors";
 
+const locatorPageSteps = [OnbrdStep.CustomLocator, OnbrdStep.EditLocator, OnbrdStep.AddToPO, OnbrdStep.SaveLocators];
+
 export const useOnBoardingRef = (
   refName: OnbrdStep,
   onClickNext?: (...args: any) => void,
@@ -12,16 +14,18 @@ export const useOnBoardingRef = (
 ) => {
   const ref = useRef<HTMLDivElement>(null);
 
-  const { addRef, isCustomLocatorFlow } = useContext(OnboardingContext);
+  const { addRef, isCustomLocatorFlow, isOpen } = useContext(OnboardingContext);
   const isFirstLocatorChecked = useSelector(selectFirstLocatorByPO)?.generate;
+  /* if unboarding is closed, no need to save these refs */
+  const isRedundantStep = !isOpen && locatorPageSteps.includes(refName);
 
   useLayoutEffect(() => {
     const _ref =
       refName === OnbrdStep.EditLocator && isCustomLocatorFlow && ref.current
         ? { current: ref.current.closest(".ant-modal-content") }
         : ref;
-    !isSkipHook && addRef(refName, _ref, onClickNext, onClickPrev);
+    !isSkipHook && !isRedundantStep && addRef(refName, _ref, onClickNext, onClickPrev);
   }, [ref, isFirstLocatorChecked]);
 
-  return !isSkipHook ? ref : null;
+  return !isSkipHook && !isRedundantStep ? ref : null;
 };