Merge branch 'main' into osweb

Author: staxly[bot]

src/app/auth/hooks/trackUser.spec.ts

@@ -1,8 +1,5 @@
-import { getType } from 'typesafe-actions';
 import { GoogleAnalyticsClient } from '../../../gateways/googleAnalyticsClient';
 import googleAnalyticsClient from '../../../gateways/googleAnalyticsClient';
-import { clearAcceptCookies, doAcceptCookies } from '../../notifications/acceptCookies';
-import { acceptCookies } from '../../notifications/actions';
 import { receiveUser } from '../actions';
 import { User } from '../types';
 import { trackUserHookBody } from './trackUser';
@@ -31,9 +28,6 @@ describe('trackUser', () => {
     });
 
     describe('user already accepted Cookies', () => {
-      beforeEach(() => {
-        doAcceptCookies();
-      });
 
       it('tracks the user', async() => {
         await (trackUserHookBody(helpers))(receiveUser(user));
@@ -49,9 +43,6 @@ describe('trackUser', () => {
     });
 
     describe('user not yet accepted cookies', () => {
-      beforeEach(() => {
-        clearAcceptCookies();
-      });
 
       it('tracks the user', async() => {
         await (trackUserHookBody(helpers))(receiveUser(user));
@@ -70,25 +61,6 @@ describe('trackUser', () => {
           await (trackUserHookBody(helpers))(receiveUser(user));
           expect(dispatchMock).not.toHaveBeenCalled();
         });
-
-        it('prompts to accept if CookieYes is not running', async() => {
-          window.cookieYesActive = false;
-          await (trackUserHookBody(helpers))(receiveUser(user));
-          expect(dispatchMock).toHaveBeenCalledWith({
-            meta: undefined,
-            payload: undefined,
-            type: getType(acceptCookies),
-          });
-        });
-      });
-
-      it('prompts to accept cookies', async() => {
-        await (trackUserHookBody(helpers))(receiveUser(user));
-        expect(dispatchMock).toHaveBeenCalledWith({
-          meta: undefined,
-          payload: undefined,
-          type: getType(acceptCookies),
-        });
       });
     });
   });

src/app/auth/hooks/trackUser.ts

@@ -1,15 +1,10 @@
 import googleAnalyticsClient from '../../../gateways/googleAnalyticsClient';
-import { isAcceptCookiesNeeded } from '../../notifications/acceptCookies';
-import { acceptCookies } from '../../notifications/actions';
 import { ActionHookBody } from '../../types';
 import { actionHook } from '../../utils';
 import { receiveUser } from '../actions';
 
-export const trackUserHookBody: ActionHookBody<typeof receiveUser> = (middleware) => async({payload}) => {
+export const trackUserHookBody: ActionHookBody<typeof receiveUser> = () => async({payload}) => {
   if (payload.isNotGdprLocation) {
-    if (isAcceptCookiesNeeded()) {
-      middleware.dispatch(acceptCookies());
-    }
 
     googleAnalyticsClient.setUserId(payload.uuid);
   }

src/app/developer/components/Notifications.tsx

@@ -12,11 +12,10 @@ interface Props {
   updateAvailable: () => void;
   error: (error: Error) => void;
   sendMessages: () => void;
-  acceptCookies: () => void;
 }
 
 // tslint:disable-next-line:variable-name
-const Notifications = ({updateAvailable, error, sendMessages, acceptCookies}: Props) => {
+const Notifications = ({updateAvailable, error, sendMessages}: Props) => {
   const [showError, setError] = useState(false);
 
   if (showError) {
@@ -26,8 +25,6 @@ const Notifications = ({updateAvailable, error, sendMessages, acceptCookies}: Pr
   return <Panel title='Notifications'>
     <ButtonGroup expand vertical>
 
-      <Button onClick={acceptCookies} >accept cookies</Button>
-
       <Button onClick={updateAvailable} data-testid='trigger-updates-available'>update available</Button>
       <Button onClick={sendMessages} data-testid='trigger-messages'>app messages</Button>
       <Button onClick={() => setError(true)} data-testid='trigger-inline-error'>inline error</Button>
@@ -41,7 +38,6 @@ const Notifications = ({updateAvailable, error, sendMessages, acceptCookies}: Pr
 export default connect<{}, React.ComponentProps<typeof Notifications>>(
   () => ({}),
   (dispatch: Dispatch): Props => ({
-    acceptCookies: flow(notifications.acceptCookies, dispatch),
     error: (error: Error) => {
       dispatch(recordError(error));
       dispatch(showErrorDialog());

src/app/developer/components/__snapshots__/Home.spec.tsx.snap

@@ -469,12 +469,6 @@ Array [
               <div
                 className="c7"
               >
-                <button
-                  className="c8"
-                  onClick={[Function]}
-                >
-                  accept cookies
-                </button>
                 <button
                   className="c8"
                   data-testid="trigger-updates-available"

src/app/notifications/acceptCookies.ts

@@ -3,7 +3,6 @@ import { AnyNotification, Message, ToastMeta } from './types';
 
 export const retiredBookRedirect = createStandardAction('Notification/retiredBookRedirect')();
 export const updateAvailable = createStandardAction('Notification/updateAvailable')();
-export const acceptCookies = createStandardAction('Notification/acceptCookies')();
 
 export const addToast = createStandardAction('Notification/toasts/add')
   .map((messageKey: string, meta: ToastMeta) => ({

src/app/notifications/actions.ts

@@ -3,7 +3,7 @@ import renderer from 'react-test-renderer';
 import createTestStore from '../../../test/createTestStore';
 import TestContainer from '../../../test/TestContainer';
 import { Store } from '../../types';
-import { acceptCookies, receiveMessages, retiredBookRedirect, updateAvailable } from '../actions';
+import { receiveMessages, retiredBookRedirect, updateAvailable } from '../actions';
 import ConnectedNotifications from './Notifications';
 
 describe('Notifications', () => {
@@ -35,17 +35,6 @@ describe('Notifications', () => {
     expect(tree).toMatchSnapshot();
   });
 
-  it('matches snapshot for acceptCookies', () => {
-    store.dispatch(acceptCookies());
-
-    const component = renderer.create(<TestContainer store={store}>
-      <ConnectedNotifications />
-    </TestContainer>);
-
-    const tree = component.toJSON();
-    expect(tree).toMatchSnapshot();
-  });
-
   it('matches snapshot for appMessage', () => {
     store.dispatch(receiveMessages([{
       dismissable: false,

src/app/notifications/components/AcceptCookies.spec.tsx

@@ -6,7 +6,6 @@ import * as actions from '../actions';
 import { appMessageType } from '../reducer';
 import * as select from '../selectors';
 import { ModalNotification } from '../types';
-import AcceptCookies from './AcceptCookies';
 import AppMessage from './AppMessage';
 import RetiredBookRedirect from './RetiredBookRedirect';
 import UpdatesAvailable from './UpdatesAvailable';
@@ -27,11 +26,6 @@ const renderNotificationModal = (
     case getType(actions.updateAvailable): {
       return <UpdatesAvailable className={className} />;
     }
-    case getType(actions.acceptCookies): {
-      return (
-        <AcceptCookies notification={notification} className={className} />
-      );
-    }
     case appMessageType: {
       return <AppMessage notification={notification} className={className} />;
     }