diff options
author | 94117nl <rttededersixtwo@gmail.com> | 2017-08-03 08:25:07 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-03 09:25:07 -0400 |
commit | ea095d6206ad8bb9b1b1ffbf74584669a24f1ca8 (patch) | |
tree | a18650bc5e447f1c5c2ea040857ec7a9d3c57550 /webapp/components | |
parent | b54d1342990253d3fe4a00c64df27cdd1bb0719b (diff) | |
download | chat-ea095d6206ad8bb9b1b1ffbf74584669a24f1ca8.tar.gz chat-ea095d6206ad8bb9b1b1ffbf74584669a24f1ca8.tar.bz2 chat-ea095d6206ad8bb9b1b1ffbf74584669a24f1ca8.zip |
GH-6452 Migrate installed_command.jsx to be pure and use Redux (#6903)
* Migrate installed_command.jsx to be pure and use Redux
* Add test for InstalledCommand component
* Fix failing test and typo
* Whoops. Revert back deleted filter
* Add filter test
* Remove commands related code from /stores/integration_store.jsx
Diffstat (limited to 'webapp/components')
3 files changed, 44 insertions, 27 deletions
diff --git a/webapp/components/integrations/components/commands_container/commands_container.jsx b/webapp/components/integrations/components/commands_container/commands_container.jsx index 55ce2017b..8f89ff631 100644 --- a/webapp/components/integrations/components/commands_container/commands_container.jsx +++ b/webapp/components/integrations/components/commands_container/commands_container.jsx @@ -33,7 +33,7 @@ export default class CommandsContainer extends React.PureComponent { users: PropTypes.object, /** - * Installed splash commands to display + * Installed slash commands to display */ commands: PropTypes.array, diff --git a/webapp/components/integrations/components/installed_command.jsx b/webapp/components/integrations/components/installed_command.jsx index 691ae75fb..1470712b0 100644 --- a/webapp/components/integrations/components/installed_command.jsx +++ b/webapp/components/integrations/components/installed_command.jsx @@ -1,43 +1,59 @@ -import PropTypes from 'prop-types'; - // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. import React from 'react'; +import PropTypes from 'prop-types'; import {Link} from 'react-router'; import {FormattedMessage} from 'react-intl'; import DeleteIntegration from './delete_integration.jsx'; -export default class InstalledCommand extends React.Component { - static get propTypes() { - return { - team: PropTypes.object.isRequired, - command: PropTypes.object.isRequired, - onRegenToken: PropTypes.func.isRequired, - onDelete: PropTypes.func.isRequired, - filter: PropTypes.string, - creator: PropTypes.object.isRequired, - canChange: PropTypes.bool.isRequired - }; - } - - constructor(props) { - super(props); - - this.handleRegenToken = this.handleRegenToken.bind(this); - this.handleDelete = this.handleDelete.bind(this); - - this.matchesFilter = this.matchesFilter.bind(this); +export default class InstalledCommand extends React.PureComponent { + static propTypes = { + + /** + * The team data + */ + team: PropTypes.object.isRequired, + + /** + * Installed slash command to display + */ + command: PropTypes.object.isRequired, + + /** + * The function to call when Regenerate Token link is clicked + */ + onRegenToken: PropTypes.func.isRequired, + + /** + * The function to call when Delete link is clicked + */ + onDelete: PropTypes.func.isRequired, + + /** + * Set to filter command, comes from BackstageList + */ + filter: PropTypes.string, + + /** + * The creator user data + */ + creator: PropTypes.object.isRequired, + + /** + * Set to show edit link + */ + canChange: PropTypes.bool.isRequired } - handleRegenToken(e) { + handleRegenToken = (e) => { e.preventDefault(); this.props.onRegenToken(this.props.command); } - handleDelete() { + handleDelete = () => { this.props.onDelete(this.props.command); } @@ -60,6 +76,7 @@ export default class InstalledCommand extends React.Component { } let name; + if (command.display_name) { name = command.display_name; } else { diff --git a/webapp/components/integrations/components/installed_commands/installed_commands.jsx b/webapp/components/integrations/components/installed_commands/installed_commands.jsx index 379ade8a1..7085afdc4 100644 --- a/webapp/components/integrations/components/installed_commands/installed_commands.jsx +++ b/webapp/components/integrations/components/installed_commands/installed_commands.jsx @@ -30,7 +30,7 @@ export default class InstalledCommands extends React.PureComponent { users: PropTypes.object, /** - * Installed splash commands to display + * Installed slash commands to display */ commands: PropTypes.array, @@ -40,7 +40,7 @@ export default class InstalledCommands extends React.PureComponent { loading: PropTypes.bool, /** - * Set to allow changes to installed splash commands + * Set to allow changes to installed slash commands */ isAdmin: PropTypes.bool, |