MM-11880 Have Team Settings modal use the patch endpoint instead of t…

…he update endpoint (mattermost#1853)

* Change team settings to use patch instead of update endpoint

* Fix after rebase

* Change team test to use patchTeam

* Fix assertions

.gitignore

@@ -8,3 +8,4 @@ node_modules
 tests/reports
 .DS_Store
 mattermost-webapp.iml
+.vscode/

components/team_general_tab/index.js

@@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {updateTeam, removeTeamIcon, setTeamIcon} from 'mattermost-redux/actions/teams';
+import {patchTeam, removeTeamIcon, setTeamIcon} from 'mattermost-redux/actions/teams';
 import {Permissions} from 'mattermost-redux/constants';
 import {haveITeamPermission} from 'mattermost-redux/selectors/entities/roles';
 
@@ -26,7 +26,7 @@ function mapStateToProps(state, ownProps) {
 function mapDispatchToProps(dispatch) {
  return {
  actions: bindActionCreators({
- updateTeam,
+ patchTeam,
  removeTeamIcon,
  setTeamIcon,
  }, dispatch),

components/team_general_tab/team_general_tab.jsx

@@ -23,7 +23,7 @@ export default class GeneralTab extends React.Component {
  collapseModal: PropTypes.func.isRequired,
  maxFileSize: PropTypes.number.isRequired,
  actions: PropTypes.shape({
- updateTeam: PropTypes.func.isRequired,
+ patchTeam: PropTypes.func.isRequired,
  removeTeamIcon: PropTypes.func.isRequired,
  setTeamIcon: PropTypes.func.isRequired,
  }).isRequired,
@@ -109,7 +109,7 @@ export default class GeneralTab extends React.Component {
  var data = {...this.props.team};
  data.allowed_domains = this.state.allowed_domains;
 
- const {error} = await this.props.actions.updateTeam(data);
+ const {error} = await this.props.actions.patchTeam(data);
 
  if (error) {
  state.serverError = error.message;
@@ -125,7 +125,7 @@ export default class GeneralTab extends React.Component {
  var data = {...this.props.team};
  data.allow_open_invite = this.state.allow_open_invite;
 
- const {error} = await this.props.actions.updateTeam(data);
+ const {error} = await this.props.actions.patchTeam(data);
 
  if (error) {
  state.serverError = error.message;
@@ -170,7 +170,7 @@ export default class GeneralTab extends React.Component {
  var data = {...this.props.team};
  data.display_name = this.state.name;
 
- const {error} = await this.props.actions.updateTeam(data);
+ const {error} = await this.props.actions.patchTeam(data);
 
  if (error) {
  state.serverError = error.message;
@@ -201,7 +201,7 @@ export default class GeneralTab extends React.Component {
  var data = {...this.props.team};
  data.invite_id = this.state.invite_id;
 
- const {error} = await this.props.actions.updateTeam(data);
+ const {error} = await this.props.actions.patchTeam(data);
 
  if (error) {
  state.serverError = error.message;
@@ -236,7 +236,7 @@ export default class GeneralTab extends React.Component {
  var data = {...this.props.team};
  data.description = this.state.description;
 
- const {error} = await this.props.actions.updateTeam(data);
+ const {error} = await this.props.actions.patchTeam(data);
 
  if (error) {
  state.serverError = error.message;

tests/components/team_general_tab.test.jsx

@@ -14,7 +14,7 @@ describe('components/TeamSettings', () => {
  closeModal: () => {}, //eslint-disable-line no-empty-function
  collapseModal: () => {}, //eslint-disable-line no-empty-function
  actions: {
- updateTeam: () => {}, //eslint-disable-line no-empty-function
+ patchTeam: () => {}, //eslint-disable-line no-empty-function
  removeTeamIcon: () => {}, //eslint-disable-line no-empty-function
  setTeamIcon: () => {}, //eslint-disable-line no-empty-function
  },
@@ -60,7 +60,7 @@ describe('components/TeamSettings', () => {
 
  test('should call actions.setTeamIcon on handleTeamIconSubmit', () => {
  const actions = {
- updateTeam: jest.fn(),
+ patchTeam: jest.fn(),
  removeTeamIcon: jest.fn(),
  setTeamIcon: jest.fn(),
  };
@@ -88,7 +88,7 @@ describe('components/TeamSettings', () => {
 
  test('should call actions.removeTeamIcon on handleTeamIconRemove', () => {
  const actions = {
- updateTeam: jest.fn(),
+ patchTeam: jest.fn(),
  removeTeamIcon: jest.fn(),
  setTeamIcon: jest.fn(),
  };
@@ -112,4 +112,94 @@ describe('components/TeamSettings', () => {
  expect(wrapper1).toMatchSnapshot();
  expect(wrapper2).toMatchSnapshot();
  });
+
+ test('should call actions.patchTeam on handleAllowedDomainsSubmit', () => {
+ const actions = {
+ patchTeam: jest.fn(),
+ removeTeamIcon: jest.fn(),
+ setTeamIcon: jest.fn(),
+ };
+
+ const props = {...defaultProps, actions};
+
+ const wrapper = shallow(<GeneralTab {...props}/>);
+
+ wrapper.instance().handleAllowedDomainsSubmit({preventDefault: jest.fn()});
+
+ expect(actions.patchTeam).toHaveBeenCalledTimes(1);
+ expect(actions.patchTeam).toHaveBeenCalledWith(props.team);
+ });
+
+ test('should call actions.patchTeam on handleOpenInviteSubmit', () => {
+ const actions = {
+ patchTeam: jest.fn(),
+ removeTeamIcon: jest.fn(),
+ setTeamIcon: jest.fn(),
+ };
+
+ const props = {...defaultProps, actions};
+
+ const wrapper = shallow(<GeneralTab {...props}/>);
+
+ wrapper.instance().handleOpenInviteSubmit({preventDefault: jest.fn()});
+
+ expect(actions.patchTeam).toHaveBeenCalledTimes(1);
+ expect(actions.patchTeam).toHaveBeenCalledWith(props.team);
+ });
+
+ test('should call actions.patchTeam on handleNameSubmit', () => {
+ const actions = {
+ patchTeam: jest.fn(),
+ removeTeamIcon: jest.fn(),
+ setTeamIcon: jest.fn(),
+ };
+
+ const props = {...defaultProps, actions};
+ props.team.display_name = 'TestTeam';
+
+ const wrapper = shallow(<GeneralTab {...props}/>);
+
+ wrapper.instance().handleNameSubmit({preventDefault: jest.fn()});
+
+ expect(actions.patchTeam).toHaveBeenCalledTimes(1);
+ expect(actions.patchTeam).toHaveBeenCalledWith(props.team);
+ });
+
+ test('should call actions.patchTeam on handleInviteIdSubmit', () => {
+ const actions = {
+ patchTeam: jest.fn(),
+ removeTeamIcon: jest.fn(),
+ setTeamIcon: jest.fn(),
+ };
+
+ const props = {...defaultProps, actions};
+ props.team.invite_id = '12345';
+
+ const wrapper = shallow(<GeneralTab {...props}/>);
+
+ wrapper.instance().handleInviteIdSubmit({preventDefault: jest.fn()});
+
+ expect(actions.patchTeam).toHaveBeenCalledTimes(1);
+ expect(actions.patchTeam).toHaveBeenCalledWith(props.team);
+ });
+
+ test('should call actions.patchTeam on handleDescriptionSubmit', () => {
+ const actions = {
+ patchTeam: jest.fn(),
+ removeTeamIcon: jest.fn(),
+ setTeamIcon: jest.fn(),
+ };
+
+ const props = {...defaultProps, actions};
+
+ const wrapper = shallow(<GeneralTab {...props}/>);
+
+ const newDescription = 'The Test Team';
+ wrapper.setState({description: newDescription});
+ wrapper.instance().handleDescriptionSubmit({preventDefault: jest.fn()});
+ props.team.description = newDescription;
+
+ expect(actions.patchTeam).toHaveBeenCalledTimes(1);
+ expect(actions.patchTeam).toHaveBeenCalledWith(props.team);
+ });
 });