Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

fix(generator): remove deprecated holocron api #65

Merged
merged 1 commit into from
Apr 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"@americanexpress/one-app-router": "^1.0.0",
"holocron": "^1.0.0",
"holocron": "^1.1.0",
"react": "^16.12.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
import toJson from 'enzyme-to-json';
import { fromJS } from 'immutable';
import {
<%=moduleNamePascal%>, mapDispatchToProps, mapStateToProps, load,
<%=moduleNamePascal%>, mapDispatchToProps, mapStateToProps, loadModuleData,
} from '../../src/components/<%=moduleNamePascal%>';

jest.mock('@americanexpress/one-app-ducks', () => ({
Expand Down Expand Up @@ -118,11 +118,14 @@ describe('<%=moduleNamePascal%> should render as expected', () => {
});
});

describe('holocronModule load', () => {
it('should load language pack for <%=modulePackageName%> module', () => {
const mockDispatch = jest.fn();
load()(mockDispatch);
expect(mockDispatch.mock.calls[0][0]).toBe('I am loading the language pack for <%=modulePackageName%> and my fallback locale is en-US');
describe('loadModuleData', () => {
const fakeStore = {
dispatch: jest.fn((x) => x),
};
it('should load language pack for <%=modulePackageName%> module ', async () => {
const langPackAsyncState = await loadModuleData({ store: fakeStore });
expect(langPackAsyncState).toBe('I am loading the language pack for <%=modulePackageName%> and my fallback locale is en-US');
expect(fakeStore.dispatch).toHaveBeenCalledWith(langPackAsyncState);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ import PropTypes from 'prop-types';
import { loadLanguagePack, updateLocale } from '@americanexpress/one-app-ducks';
import { FormattedMessage, IntlProvider } from 'react-intl';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { holocronModule } from 'holocron';
import { fromJS } from 'immutable';

export const <%=moduleNamePascal%> = ({ switchLanguage, languageData, localeName }) => {
const locales = ['en-US', 'en-CA', 'es-MX'];
// Read about loading async data:
// Read about loading async data:
// https://github.com/americanexpress/one-app/blob/master/docs/api/modules/Loading-Data.md
// quick and dirty solution - implement based on your use case
if (languageData.greeting) {
Expand Down Expand Up @@ -63,12 +61,11 @@ export const mapStateToProps = (state) => {
};
};

export const load = () => (dispatch) => dispatch(loadLanguagePack('<%=modulePackageName%>', { fallbackLocale: 'en-US' }));
export const loadModuleData = ({ store: { dispatch } }) => dispatch(loadLanguagePack('<%=modulePackageName%>', { fallbackLocale: 'en-US' }));

export default compose(
connect(mapStateToProps, mapDispatchToProps),
holocronModule({
name: '<%=modulePackageName%>',
load,
})
)(<%=moduleNamePascal%>);
<%=moduleNamePascal%>.holocron = {
name: '<%=modulePackageName%>',
loadModuleData,
};

export default connect(mapStateToProps, mapDispatchToProps)(<%=moduleNamePascal%>);
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { fromJS } from 'immutable';
import { Route } from '@americanexpress/one-app-router';
import childRoutes from '../../src/childRoutes';
import {
<%=moduleNamePascal%>, mapDispatchToProps, mapStateToProps, load,
<%=moduleNamePascal%>, mapDispatchToProps, mapStateToProps, loadModuleData,
} from '../../src/components/<%=moduleNamePascal%>';

jest.mock('@americanexpress/one-app-ducks', () => ({
Expand Down Expand Up @@ -127,11 +127,14 @@ describe('<%=moduleNamePascal%> should render as expected', () => {
});
});

describe('holocronModule load', () => {
it('should load language pack for <%=modulePackageName%> module', () => {
const mockDispatch = jest.fn();
load()(mockDispatch);
expect(mockDispatch.mock.calls[0][0]).toBe('I am loading the language pack for <%=modulePackageName%> and my fallback locale is en-US');
describe('loadModuleData', () => {
const fakeStore = {
dispatch: jest.fn((x) => x),
};
it('should load language pack for <%=modulePackageName%> module ', async () => {
const langPackAsyncState = await loadModuleData({ store: fakeStore });
expect(langPackAsyncState).toBe('I am loading the language pack for <%=modulePackageName%> and my fallback locale is en-US');
expect(fakeStore.dispatch).toHaveBeenCalledWith(langPackAsyncState);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
import { loadLanguagePack, updateLocale } from '@americanexpress/one-app-ducks';
import { FormattedMessage, IntlProvider } from 'react-intl';
import { connect } from 'react-redux';
import { compose } from 'redux';
import { holocronModule } from 'holocron';
import { fromJS } from 'immutable';
import childRoutes from '../childRoutes';

Expand Down Expand Up @@ -74,12 +72,11 @@ export const mapStateToProps = (state) => {
};
};

export const load = () => (dispatch) => dispatch(loadLanguagePack('<%=modulePackageName%>', { fallbackLocale: 'en-US' }));
export const loadModuleData = ({ store: { dispatch } }) => dispatch(loadLanguagePack('<%=modulePackageName%>', { fallbackLocale: 'en-US' }));

export default compose(
connect(mapStateToProps, mapDispatchToProps),
holocronModule({
name: '<%=modulePackageName%>',
load,
})
)(<%=moduleNamePascal%>);
<%=moduleNamePascal%>.holocron = {
name: '<%=modulePackageName%>',
loadModuleData,
};

export default connect(mapStateToProps, mapDispatchToProps)(<%=moduleNamePascal%>);