moved onboarding availability flag to context

jdi-testing · Jul 27, 2023 · f1b6d5f · f1b6d5f
1 parent 8be8060
commit f1b6d5f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/src/app/components/OnboardingButton.tsx b/src/app/components/OnboardingButton.tsx
@@ -1,9 +1,6 @@
 import { Button, Tooltip } from "antd";
 import { BookOpen } from "phosphor-react";
 import React, { useContext } from "react";
-import { useSelector } from "react-redux";
-import { RootState } from "../store/store";
-import { BackendStatus } from "../types/mainSlice.types";
 import { useOnBoardingRef } from "../../features/onboarding/utils/useOnboardingRef";
 import { OnbrdStep } from "../../features/onboarding/types/constants";
 import { OnboardingPopup } from "../../features/onboarding/components/OnboardingPopup";
@@ -13,10 +10,7 @@ import { OnboardingContext } from "../../features/onboarding/OnboardingProvider"
 export const OnboardingButton = () => {
   const [isTooltipVisible, setIsTooltipVisible] = React.useState(false);
 
-  const isOnboardingAvailable =
-    useSelector<RootState>((_state) => _state.main.backendAvailable) === BackendStatus.Accessed;
-
-  const { isOpen: isOnboardingOpen } = useContext(OnboardingContext);
+  const { isOnboardingAvailable } = useContext(OnboardingContext);
 
   const onbrdRef = useOnBoardingRef(OnbrdStep.Onboarding);
 
@@ -29,7 +23,7 @@ export const OnboardingButton = () => {
         title={componentsTexts.OnboardingButtonTitle}
       >
         <Button
-          disabled={!isOnboardingAvailable || isOnboardingOpen}
+          disabled={!isOnboardingAvailable}
           ref={onbrdRef}
           type="link"
           icon={<BookOpen size={14} color="#8C8C8C" />}

diff --git a/src/features/onboarding/OnboardingProvider.tsx b/src/features/onboarding/OnboardingProvider.tsx
@@ -29,6 +29,7 @@ export const OnboardingProvider: FC<Props> = ({ children }) => {
   const isBackendAvailable = useSelector((state: RootState) => state.main.backendAvailable) === BackendStatus.Accessed;
   const isDefaultState = useSelector<RootState>(selectIsDefaultState);
   const isSessionUnique = useSelector((state: RootState) => state.main.isSessionUnique);
+  const isOnboardingAvailable = isBackendAvailable && !isOnbrdOpen;
 
   const dispatch = useDispatch();
 
@@ -131,6 +132,7 @@ export const OnboardingProvider: FC<Props> = ({ children }) => {
       value={{
         defaultStep,
         isOpen: isOnbrdOpen,
+        isOnboardingAvailable,
         tourSteps,
         isCustomLocatorFlow,
         addRef,

diff --git a/src/features/onboarding/components/OnboardingPopup.tsx b/src/features/onboarding/components/OnboardingPopup.tsx
@@ -4,7 +4,6 @@ import { Popconfirm } from "antd";
 import { RootState } from "../../../app/store/store";
 import { selectIsDefaultState } from "../../../app/main.selectors";
 import { OnboardingContext } from "../OnboardingProvider";
-import { BackendStatus } from "../../../app/types/mainSlice.types";
 import { OnboardingPopupText, OnboardingPopupButtons } from "../types/constants";
 
 interface Props {
@@ -14,10 +13,7 @@ interface Props {
 export const OnboardingPopup: FC<Props> = ({ children }) => {
   const { openOnboarding } = useContext(OnboardingContext);
   const isDefaultState = useSelector<RootState>(selectIsDefaultState);
-  const { isOpen: isOnboardingOpen } = useContext(OnboardingContext);
-
-  const isOnboardingAvailable =
-    useSelector<RootState>((_state) => _state.main.backendAvailable) === BackendStatus.Accessed && !isOnboardingOpen;
+  const { isOnboardingAvailable } = useContext(OnboardingContext);
 
   return (
     <Popconfirm

diff --git a/src/features/onboarding/types/context.types.ts b/src/features/onboarding/types/context.types.ts
@@ -8,6 +8,7 @@ export interface OnboardingContext {
   defaultStep?: number;
   isCustomLocatorFlow: boolean;
   isOpen: boolean;
+  isOnboardingAvailable: boolean;
   tourSteps: TourProps["steps"];
   addRef: (
     name: OnbrdStep,