Merge pull request #338 from fcoronelmakingsense/sitetracking-trial-r…

…edirect

feat(site tracking trial): add redirect ctrl panel when activated

src/components/SiteTrackingRequired/SiteTrackingRequired.js

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { InjectAppServices } from '../../services/pure-di';
 import { FormattedHTMLMessage, FormattedMessage } from 'react-intl';
+import RedirectToLegacyUrl from '../RedirectToLegacyUrl';
 
 export const SiteTrackingNotAvailableReasons = {
   freeAccount: 'freeAccount',
@@ -20,18 +21,23 @@ export const SiteTrackingRequired = InjectAppServices(
     dependencies: {
       appConfiguration: { dopplerLegacyUrl },
       dopplerLegacyClient,
-      sessionManager,
     },
   }) => {
-    const [isActivatingTrial, setIsActivatingTrial] = useState(false);
+    const [state, setState] = useState({});
+
+    if (state.isActivatedTrial) {
+      return <RedirectToLegacyUrl to="/ControlPanel/CampaignsPreferences/SiteTrackingSettings" />;
+    }
 
     const activateTrial = async () => {
-      setIsActivatingTrial(true);
+      setState({ isLoading: true });
       try {
-        await dopplerLegacyClient.activateSiteTrackingTrial();
-        sessionManager.restart();
+        const isActivatedTrial = await dopplerLegacyClient.activateSiteTrackingTrial();
+        if (isActivatedTrial.success) {
+          setState({ isActivatedTrial: true });
+        }
       } finally {
-        setIsActivatingTrial(false);
+        setState({ isLoading: false });
       }
     };
 
@@ -54,9 +60,9 @@ export const SiteTrackingRequired = InjectAppServices(
                   onClick={activateTrial}
                   className={
                     'dp-button button-medium primary-green' +
-                    ((isActivatingTrial && ' button--loading') || '')
+                    ((state.isLoading && ' button--loading') || '')
                   }
-                  disabled={isActivatingTrial}
+                  disabled={state.isLoading}
                 >
                   <FormattedMessage id="reports.allow_enable_trial_button" />
                 </button>

src/components/SiteTrackingRequired/SiteTrackingRequired.test.js

@@ -0,0 +1,120 @@
+import React from 'react';
+import { render, cleanup, waitForDomChange } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import DopplerIntlProvider from '../../i18n/DopplerIntlProvider.double-with-ids-as-values';
+import { AppServicesProvider } from '../../services/pure-di';
+import { SiteTrackingRequired, SiteTrackingNotAvailableReasons } from './SiteTrackingRequired';
+
+describe('site tracking', () => {
+  afterEach(cleanup);
+
+  it('should show free account messages', () => {
+    // Arrange
+    const reason = SiteTrackingNotAvailableReasons.freeAccount;
+
+    // Act
+    const { getByText } = render(
+      <AppServicesProvider>
+        <DopplerIntlProvider>
+          <SiteTrackingRequired reason={reason} />
+        </DopplerIntlProvider>
+      </AppServicesProvider>,
+    );
+
+    // Assert
+    expect(getByText('reports.upgrade_account_free_title')).toBeInTheDocument();
+  });
+
+  it('should show trial not accepted messages', () => {
+    // Arrange
+    const reason = SiteTrackingNotAvailableReasons.trialNotAccepted;
+
+    // Act
+    const { getByText } = render(
+      <AppServicesProvider>
+        <DopplerIntlProvider>
+          <SiteTrackingRequired reason={reason} />
+        </DopplerIntlProvider>
+      </AppServicesProvider>,
+    );
+
+    // Assert
+    expect(getByText('reports.allow_enable_trial_title')).toBeInTheDocument();
+  });
+
+  it('should show not domains messages', () => {
+    // Arrange
+    const reason = SiteTrackingNotAvailableReasons.thereAreNotDomains;
+
+    // Act
+    const { getByText } = render(
+      <AppServicesProvider>
+        <DopplerIntlProvider>
+          <SiteTrackingRequired reason={reason} />
+        </DopplerIntlProvider>
+      </AppServicesProvider>,
+    );
+
+    // Assert
+    expect(getByText('reports.datahub_not_domains_title')).toBeInTheDocument();
+  });
+
+  //TODO: research why fails in jenkins /
+  // it('should be activate the trial and redirect to control panel site tracking settings', async () => {
+  //   // Arrange
+  //   const reason = SiteTrackingNotAvailableReasons.trialNotAccepted;
+  //   const dependencies = {
+  //     dopplerLegacyClient: {
+  //       activateSiteTrackingTrial: async () => ({ success: true }),
+  //     },
+  //     appConfiguration: { dopplerLegacyUrl: 'http://localhost:52191' },
+  //     window: { location: {} },
+  //   };
+
+  //   // Act
+  //   const { container } = render(
+  //     <AppServicesProvider forcedServices={dependencies}>
+  //       <DopplerIntlProvider>
+  //         <SiteTrackingRequired reason={reason} />
+  //       </DopplerIntlProvider>
+  //     </AppServicesProvider>,
+  //   );
+
+  //   container.querySelector('button').click();
+  //   await waitForDomChange();
+
+  //   // Assert
+  //   expect(dependencies.window.location.href).toEqual(
+  //     'http://localhost:52191/ControlPanel/CampaignsPreferences/SiteTrackingSettings',
+  //   );
+  // });
+
+  it('should be activate the trial and fails and do nothing', async () => {
+    // Arrange
+    const reason = SiteTrackingNotAvailableReasons.trialNotAccepted;
+    const dependencies = {
+      dopplerLegacyClient: {
+        activateSiteTrackingTrial: async () => ({ success: false }),
+      },
+      appConfiguration: { dopplerLegacyUrl: 'localhost:3000' },
+      window: { location: {} },
+    };
+
+    // Act
+    const { container } = render(
+      <AppServicesProvider forcedServices={dependencies}>
+        <DopplerIntlProvider>
+          <SiteTrackingRequired reason={reason} />
+        </DopplerIntlProvider>
+      </AppServicesProvider>,
+    );
+
+    container.querySelector('button').click();
+    await waitForDomChange();
+
+    // Assert
+    expect(dependencies.window.location.href).not.toBe(
+      'localhost:3000/ControlPanel/CampaignsPreferences/SiteTrackingSettings',
+    );
+  });
+});

src/services/doppler-legacy-client.doubles.ts

@@ -9,6 +9,7 @@ import {
   ResendRegistrationModel,
   ForgotPasswordModel,
   ForgotPasswordResult,
+  ActivateSiteTrackingTrialResult,
 } from './doppler-legacy-client';
 import headerDataJson from '../headerData.json';
 import { timeout } from '../utils';
@@ -105,9 +106,10 @@ export class HardcodedDopplerLegacyClient implements DopplerLegacyClient {
     await timeout(1500);
   }
 
-  public async activateSiteTrackingTrial() {
+  public async activateSiteTrackingTrial(): Promise<ActivateSiteTrackingTrialResult> {
     console.log('activateSiteTrackingTrial');
     await timeout(1500);
+    return { success: true };
   }
 
   public async sendResetPasswordEmail(model: ForgotPasswordModel): Promise<ForgotPasswordResult> {

src/services/doppler-legacy-client.ts

@@ -9,7 +9,7 @@ export interface DopplerLegacyClient {
   sendEmailUpgradePlan(planModel: DopplerLegacyUpgradePlanContactModel): Promise<void>;
   registerUser(userRegistrationModel: UserRegistrationModel): Promise<UserRegistrationResult>;
   resendRegistrationEmail(resendRegistrationModel: ResendRegistrationModel): Promise<void>;
-  activateSiteTrackingTrial(): Promise<void>;
+  activateSiteTrackingTrial(): Promise<ActivateSiteTrackingTrialResult>;
   sendResetPasswordEmail(forgotPasswordModel: ForgotPasswordModel): Promise<ForgotPasswordResult>;
 }
 
@@ -25,6 +25,8 @@ export interface ForgotPasswordModel extends PayloadWithCaptchaToken {
 
 export type ForgotPasswordResult = EmptyResultWithoutExpectedErrors;
 
+export type ActivateSiteTrackingTrialResult = EmptyResultWithoutExpectedErrors;
+
 /* #endregion */
 
 /* #region Login data types */
@@ -417,13 +419,20 @@ export class HttpDopplerLegacyClient implements DopplerLegacyClient {
     // TODO: handle error responses
   }
 
-  public async activateSiteTrackingTrial() {
-    const response = await this.axios.post('/WebApp/EnableSiteTrackingTrial');
-    if (!response || !response.data) {
-      throw new Error('Empty Doppler response');
-    }
-    if (!response.data.success) {
-      throw new Error(`Doppler Error: ${response.data.error}`);
+  public async activateSiteTrackingTrial(): Promise<ActivateSiteTrackingTrialResult> {
+    try {
+      const response = await this.axios.post('/WebApp/EnableSiteTrackingTrial');
+      if (!response.data.success) {
+        return {
+          message: response.data.error || null,
+        };
+      }
+      return { success: true };
+    } catch (error) {
+      return {
+        message: error.message || null,
+        error: error,
+      };
     }
   }