Skip to content

Commit

Permalink
fix: reporting config page create and delete bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-sheehan-edx committed Dec 20, 2021
1 parent 79647fc commit db2afef
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 5 deletions.
15 changes: 13 additions & 2 deletions src/components/ReportingConfig/ReportingConfigForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ class ReportingConfigForm extends React.Component {
submitState,
} = this.state;
const selectedCatalogs = (config?.enterpriseCustomerCatalogs || []).map(item => item.uuid);
const dataTypesOptions = reportingConfigTypes.dataType.map(item => ({ label: item[1], value: item[0] }));
const dataTypesOptions = reportingConfigTypes.dataType.map((item, index) => ({
key: index, label: item[1], value: item[0],
}));
const dataTypesOptionsValues = dataTypesOptions.map(item => item.value);
const selectedDataTypesOption = config ? [{ label: config.dataType, value: config.dataType, hidden: true }] : [];
return (
Expand Down Expand Up @@ -404,7 +406,16 @@ ReportingConfigForm.propTypes = {
uuid: PropTypes.string,
title: PropTypes.string,
})).isRequired,
reportingConfigTypes: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)).isRequired,
reportingConfigTypes: PropTypes.shape({
dataType: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
reportType: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
deliveryMethod: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
dayOfWeek: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
]))),
frequency: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
}).isRequired,
createConfig: PropTypes.func.isRequired,
updateConfig: PropTypes.func,
deleteConfig: PropTypes.func,
Expand Down
21 changes: 19 additions & 2 deletions src/components/ReportingConfig/ReportingConfigForm.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,23 @@ const createConfig = () => { };
const updateConfig = () => { };

describe('<ReportingConfigForm />', () => {
it('properly handles deletion of configs', () => {
const mock = jest.fn();
const wrapper = mount((
<ReportingConfigForm
config={config}
createConfig={createConfig}
updateConfig={updateConfig}
availableCatalogs={availableCatalogs}
reportingConfigTypes={reportingConfigTypes}
deleteConfig={mock}
/>
));
// It's finding three buttons for some reason??
wrapper.find('.btn-outline-danger').at(0).simulate('click');
expect(mock).toHaveBeenCalled();
});

it('renders the proper fields when changing the delivery method', () => {
const wrapper = mount((
<ReportingConfigForm
Expand Down Expand Up @@ -251,7 +268,7 @@ describe('<ReportingConfigForm />', () => {
/>
));
expect(
wrapper.find('select#enterpriseCustomerCatalogs').instance().value = ['test-enterprise-customer-catalog'],
);
wrapper.find('select#enterpriseCustomerCatalogs').instance().value,
).toEqual('test-enterprise-customer-catalog');
});
});
5 changes: 4 additions & 1 deletion src/components/ReportingConfig/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ class ReportingConfig extends React.Component {
.findIndex(config => config.uuid === uuid);

this.setState((state) => {
const newReportingConfig = { ...state.reportingConfigs }.splice(deletedIndex, 1);
// Copy the existing, needs to be updated, list of reporting configs
const newReportingConfig = [...state.reportingConfigs];
// Splice out the one that's being deleted
newReportingConfig.splice(deletedIndex, 1);
return {
reportingConfigs: newReportingConfig,
};
Expand Down
30 changes: 30 additions & 0 deletions src/components/ReportingConfig/index.test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from 'react';
import { mount } from 'enzyme';
import ReportingConfig from './index';

const defaultProps = {
location: {
state: { hasRequestedCodes: true },
},
match: { path: 'foobar' },
history: { replace: jest.fn() },
enterpriseId: 'enterpriseFoobar',
};

describe('<ReportingConfig /> ', () => {
it('properly removes forms on delete', () => {
const wrapper = mount(<ReportingConfig {...defaultProps} />);
const configUuidToDelete = 'fake enterprise uuid';
wrapper.setState(
{
reportingConfigs: [
{ uuid: configUuidToDelete },
{ uuid: 'foo' },
{ uuid: 'bar' },
],
},
);
// Make sure deleteConfig doesn't blow things up
wrapper.instance().deleteConfig(configUuidToDelete);
});
});

0 comments on commit db2afef

Please sign in to comment.