From 0c1bf302e5b85e3b2ea62f9e8046419981c2a997 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Sat, 4 Mar 2023 23:08:02 +0200
Subject: [PATCH] feat(webapp): deprecate the subscription step in onboarding
 process

---
 packages/webapp/src/constants/registerWizard.tsx         | 3 ---
 .../webapp/src/containers/Setup/SetupRightSection.tsx    | 9 ---------
 .../webapp/src/containers/Setup/SetupWizardContent.tsx   | 3 +--
 .../webapp/src/containers/Setup/WizardSetupSteps.tsx     | 1 +
 packages/webapp/src/hooks/query/organization.tsx         | 8 ++------
 .../webapp/src/store/organizations/withSetupWizard.tsx   | 3 ---
 6 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/packages/webapp/src/constants/registerWizard.tsx b/packages/webapp/src/constants/registerWizard.tsx
index f1d971d2e..e901d5202 100644
--- a/packages/webapp/src/constants/registerWizard.tsx
+++ b/packages/webapp/src/constants/registerWizard.tsx
@@ -2,9 +2,6 @@
 import intl from 'react-intl-universal';
 
 export const getSetupWizardSteps = () => [
-  {
-    label: intl.get('setup.plan.plans'),
-  },
   {
     label: intl.get('setup.plan.getting_started'),
   },
diff --git a/packages/webapp/src/containers/Setup/SetupRightSection.tsx b/packages/webapp/src/containers/Setup/SetupRightSection.tsx
index 91ee8fa1e..c382b2586 100644
--- a/packages/webapp/src/containers/Setup/SetupRightSection.tsx
+++ b/packages/webapp/src/containers/Setup/SetupRightSection.tsx
@@ -23,9 +23,6 @@ function SetupRightSection({
   // #withSetupWizard
   setupStepId,
   setupStepIndex,
-
-  // #withSubscriptions
-  isSubscriptionActive,
 }) {
   return (
     <section className={'setup-page__right-section'}>
@@ -57,12 +54,6 @@ export default compose(
       isOrganizationBuildRunning,
     }),
   ),
-  withSubscriptions(
-    ({ isSubscriptionActive }) => ({
-      isSubscriptionActive,
-    }),
-    'main',
-  ),
   withSetupWizard(({ setupStepId, setupStepIndex }) => ({
     setupStepId,
     setupStepIndex,
diff --git a/packages/webapp/src/containers/Setup/SetupWizardContent.tsx b/packages/webapp/src/containers/Setup/SetupWizardContent.tsx
index 57b162ccf..603aa395e 100644
--- a/packages/webapp/src/containers/Setup/SetupWizardContent.tsx
+++ b/packages/webapp/src/containers/Setup/SetupWizardContent.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import SetupSteps from './SetupSteps';
 import WizardSetupSteps from './WizardSetupSteps';
 
-import SetupSubscription from './SetupSubscription';
+// import SetupSubscription from './SetupSubscription';
 import SetupOrganizationPage from './SetupOrganizationPage';
 import SetupInitializingForm from './SetupInitializingForm';
 import SetupCongratsPage from './SetupCongratsPage';
@@ -19,7 +19,6 @@ export default function SetupWizardContent({ setupStepIndex, setupStepId }) {
 
       <div class="setup-page-form">
         <SetupSteps step={{ id: setupStepId }}>
-          <SetupSubscription id="subscription" />
           <SetupOrganizationPage id="organization" />
           <SetupInitializingForm id={'initializing'} />
           <SetupCongratsPage id="congrats" />
diff --git a/packages/webapp/src/containers/Setup/WizardSetupSteps.tsx b/packages/webapp/src/containers/Setup/WizardSetupSteps.tsx
index 36b53a37e..0381d11d9 100644
--- a/packages/webapp/src/containers/Setup/WizardSetupSteps.tsx
+++ b/packages/webapp/src/containers/Setup/WizardSetupSteps.tsx
@@ -25,6 +25,7 @@ export default function WizardSetupSteps({ currentStep = 1 }) {
             <WizardSetupStep
               label={step.label}
               isActive={index + 1 === currentStep}
+              key={index}
             />
           ))}
         </ul>
diff --git a/packages/webapp/src/hooks/query/organization.tsx b/packages/webapp/src/hooks/query/organization.tsx
index aea3ab96c..3945de70f 100644
--- a/packages/webapp/src/hooks/query/organization.tsx
+++ b/packages/webapp/src/hooks/query/organization.tsx
@@ -1,11 +1,11 @@
 // @ts-nocheck
+import { omit } from 'lodash';
 import { useMutation, useQueryClient } from 'react-query';
 import { batch } from 'react-redux';
 import t from './types';
 import useApiRequest from '../useRequest';
 import { useRequestQuery } from '../useQueryRequest';
-import { useSetOrganizations, useSetSubscriptions } from '../state';
-import { omit } from 'lodash';
+import { useSetOrganizations } from '../state';
 
 /**
  * Retrieve organizations of the authenticated user.
@@ -32,7 +32,6 @@ export function useOrganizations(props) {
  */
 export function useCurrentOrganization(props) {
   const setOrganizations = useSetOrganizations();
-  const setSubscriptions = useSetSubscriptions();
 
   return useRequestQuery(
     [t.ORGANIZATION_CURRENT],
@@ -44,9 +43,6 @@ export function useCurrentOrganization(props) {
         const organization = omit(data, ['subscriptions']);
 
         batch(() => {
-          // Sets subscriptions.
-          setSubscriptions(data.subscriptions);
-
           // Sets organizations.
           setOrganizations([organization]);
         });
diff --git a/packages/webapp/src/store/organizations/withSetupWizard.tsx b/packages/webapp/src/store/organizations/withSetupWizard.tsx
index 7f39a2466..1a0b27f5b 100644
--- a/packages/webapp/src/store/organizations/withSetupWizard.tsx
+++ b/packages/webapp/src/store/organizations/withSetupWizard.tsx
@@ -6,18 +6,15 @@ export default (mapState) => {
     const {
       isOrganizationSetupCompleted,
       isOrganizationReady,
-      isSubscriptionActive,
       isOrganizationBuildRunning
     } = props;
 
     const condits = {
       isCongratsStep: isOrganizationSetupCompleted,
-      isSubscriptionStep: !isSubscriptionActive,
       isInitializingStep: isOrganizationBuildRunning,
       isOrganizationStep: !isOrganizationReady && !isOrganizationBuildRunning,
     };
     const scenarios = [
-      { condition: condits.isSubscriptionStep, step: 'subscription' },
       { condition: condits.isOrganizationStep, step: 'organization' },
       { condition: condits.isInitializingStep, step: 'initializing' },
       { condition: condits.isCongratsStep, step: 'congrats' },