fix(FOROME-1087): fix activating final step

ForomePlatform · Jun 2, 2022 · 1090a8a · 1090a8a
1 parent 5388dfc
commit 1090a8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/pages/filter/dtree/components/active-step.store.ts b/src/pages/filter/dtree/components/active-step.store.ts
@@ -62,11 +62,7 @@ class ActiveStep {
     const isReturnedVariants =
       this.activeStepOption === ActiveStepOptions.ReturnedVariants
 
-    const indexForApi = isReturnedVariants
-      ? String(+indexFromIndexes + 1)
-      : indexFromIndexes
-
-    return indexForApi
+    return isReturnedVariants ? String(+indexFromIndexes + 1) : indexFromIndexes
   }
 
   makeStepActive(index: number, option: ActiveStepOptions) {

diff --git a/src/pages/filter/dtree/components/query-builder/ui/final-step.tsx b/src/pages/filter/dtree/components/query-builder/ui/final-step.tsx
@@ -32,7 +32,7 @@ export const FinalStep = observer(
 
       if (shouldMakeActive) {
         activeStepStore.makeStepActive(
-          stepNo - 1,
+          stepNo,
           ActiveStepOptions.StartedVariants,
         )
       }
@@ -70,7 +70,7 @@ export const FinalStep = observer(
             )}
             onClick={event => setStepActive(index, event)}
           >
-            <div className="flex w-full items-center  step-content-area">
+            <div className="flex w-full items-center step-content-area">
               <Step className="mb-2 mt-2">{t('dtree.finalStep')}</Step>
 
               <div className="flex ml-4">