Transform addons reducer/actions/action creators into a ducks module (#…

…3025)

src/amo/components/Addon/index.js

@@ -13,7 +13,7 @@ import NotFound from 'amo/components/ErrorPage/NotFound';
 import DefaultRatingManager from 'amo/components/RatingManager';
 import ScreenShots from 'amo/components/ScreenShots';
 import Link from 'amo/components/Link';
-import { fetchAddon } from 'core/actions/addons';
+import { fetchAddon } from 'core/reducers/addons';
 import { withErrorHandler } from 'core/errorHandler';
 import InstallButton from 'core/components/InstallButton';
 import {

src/amo/components/AddonReviewList.js

@@ -7,7 +7,7 @@ import { compose } from 'redux';
 import Rating from 'ui/components/Rating';
 import { fetchReviews } from 'amo/actions/reviews';
 import { setViewContext } from 'amo/actions/viewContext';
-import { fetchAddon } from 'core/actions/addons';
+import { fetchAddon } from 'core/reducers/addons';
 import Paginate from 'core/components/Paginate';
 import { withErrorHandler } from 'core/errorHandler';
 import translate from 'core/i18n/translate';

src/core/constants.js

@@ -98,7 +98,6 @@ export const SEARCH_SORT_POPULAR = 'hotness';
 export const SEARCH_SORT_TOP_RATED = 'rating';
 
 // Action types.
-export const FETCH_ADDON = 'FETCH_ADDON';
 export const CATEGORIES_FETCH = 'CATEGORIES_FETCH';
 export const CATEGORIES_LOAD = 'CATEGORIES_LOAD';
 export const CLEAR_ERROR = 'CLEAR_ERROR';

src/core/reducers/addons.js

@@ -1,8 +1,43 @@
+/* @flow */
 import { ADDON_TYPE_THEME } from 'core/constants';
+import type { ErrorHandlerType } from 'core/errorHandler';
+import type { AddonType } from 'core/types/addons';
+
+
+export const FETCH_ADDON = 'FETCH_ADDON';
 
 const initialState = {};
 
-export function getGuid(result) {
+type Action = Object;
+type AddonState = Object;
+
+type FetchAddonParams = {|
+  errorHandler: ErrorHandlerType,
+  slug: string,
+|};
+
+export type FetchAddonAction = {|
+  type: string,
+  payload: {|
+    errorHandlerId: string,
+    slug: string,
+  |},
+|};
+
+export function fetchAddon({ errorHandler, slug }: FetchAddonParams): FetchAddonAction {
+  if (!errorHandler) {
+    throw new Error('errorHandler cannot be empty');
+  }
+  if (!slug) {
+    throw new Error('slug cannot be empty');
+  }
+  return {
+    type: FETCH_ADDON,
+    payload: { errorHandlerId: errorHandler.id, slug },
+  };
+}
+
+export function getGuid(result: AddonType) {
   if (result.type === ADDON_TYPE_THEME) {
     // This mimics how Firefox appends @personas.mozilla.org internally.
     // It's needed to look up themes in mozAddonManager.
@@ -11,7 +46,7 @@ export function getGuid(result) {
   return result.guid;
 }
 
-export function denormalizeAddon(apiAddon) {
+export function denormalizeAddon(apiAddon: AddonType) {
   if (apiAddon.icon_url) {
     return {
       ...apiAddon,
@@ -22,8 +57,12 @@ export function denormalizeAddon(apiAddon) {
   return apiAddon;
 }
 
-export default function addon(state = initialState, action) {
+export default function addon(
+  state: AddonState = initialState,
+  action: Action = {}
+) {
   const { payload } = action;
+
   if (payload && payload.entities && payload.entities.addons) {
     const newState = { ...state };
     Object.keys(payload.entities.addons).forEach((key) => {

src/core/sagas/addons.js

@@ -9,9 +9,9 @@ import { call, put, select, takeEvery } from 'redux-saga/effects';
 
 import { loadEntities } from 'core/actions';
 import { fetchAddon as fetchAddonFromApi } from 'core/api';
-import { FETCH_ADDON } from 'core/constants';
+import { FETCH_ADDON } from 'core/reducers/addons';
 import log from 'core/logger';
-import type { FetchAddonAction } from 'core/actions/addons';
+import type { FetchAddonAction } from 'core/reducers/addons';
 
 import { createErrorHandler, getState } from './utils';
 

tests/unit/amo/components/TestAddon.js

@@ -26,7 +26,7 @@ import RatingManager, {
 } from 'amo/components/RatingManager';
 import createStore from 'amo/store';
 import { loadEntities } from 'core/actions';
-import { fetchAddon as fetchAddonAction } from 'core/actions/addons';
+import { fetchAddon as fetchAddonAction } from 'core/reducers/addons';
 import { setError } from 'core/actions/errors';
 import { setInstallState } from 'core/actions/installations';
 import { createApiError } from 'core/api/index';

tests/unit/amo/components/TestAddonReviewList.js

@@ -12,8 +12,7 @@ import {
 import Link from 'amo/components/Link';
 import Paginate from 'core/components/Paginate';
 import { loadEntities } from 'core/actions';
-import { fetchAddon } from 'core/actions/addons';
-import { denormalizeAddon } from 'core/reducers/addons';
+import { denormalizeAddon, fetchAddon } from 'core/reducers/addons';
 import ErrorList from 'ui/components/ErrorList';
 import Rating from 'ui/components/Rating';
 import { fakeAddon, fakeReview } from 'tests/unit/amo/helpers';

tests/unit/core/reducers/test_addons.js

@@ -1,11 +1,14 @@
 import { loadEntities } from 'core/actions';
 import { ADDON_TYPE_THEME } from 'core/constants';
-import addons, { denormalizeAddon } from 'core/reducers/addons';
-import { createFetchAddonResult } from 'tests/unit/helpers';
+import addons, { denormalizeAddon, fetchAddon } from 'core/reducers/addons';
+import {
+  createFetchAddonResult,
+  createStubErrorHandler,
+} from 'tests/unit/helpers';
 import { createFakeAddon, fakeAddon } from 'tests/unit/amo/helpers';
 
 
-describe('addon reducer', () => {
+describe(__filename, () => {
   let addonsState;
 
   beforeEach(() => {
@@ -180,4 +183,25 @@ describe('addon reducer', () => {
       }),
     });
   });
+
+  describe('fetchAddon', () => {
+    const defaultParams = Object.freeze({
+      slug: 'addon-slug',
+      errorHandler: createStubErrorHandler(),
+    });
+
+    it('requires an error handler', () => {
+      const params = { ...defaultParams };
+      delete params.errorHandler;
+      expect(() => fetchAddon(params))
+        .toThrowError(/errorHandler cannot be empty/);
+    });
+
+    it('requires a slug', () => {
+      const params = { ...defaultParams };
+      delete params.slug;
+      expect(() => fetchAddon(params))
+        .toThrowError(/slug cannot be empty/);
+    });
+  });
 });

tests/unit/core/sagas/testAddons.js

@@ -1,10 +1,9 @@
 import { hideLoading, showLoading } from 'react-redux-loading-bar';
 import SagaTester from 'redux-saga-tester';
 
-import { fetchAddon } from 'core/actions/addons';
 import * as api from 'core/api';
 import { ENTITIES_LOADED } from 'core/constants';
-import addonsReducer from 'core/reducers/addons';
+import addonsReducer, { fetchAddon } from 'core/reducers/addons';
 import apiReducer from 'core/reducers/api';
 import addonsSaga from 'core/sagas/addons';
 import { dispatchSignInActions, fakeAddon } from 'tests/unit/amo/helpers';