summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/generated_setting.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-05-18 09:28:18 -0400
committerGitHub <noreply@github.com>2017-05-18 09:28:18 -0400
commit2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 (patch)
treec97936580a81c561aa9884d1c414c54bd49d401a /webapp/components/admin_console/generated_setting.jsx
parent63e599c43b66f0dd95f7f07c783c40fdaf89e3fb (diff)
downloadchat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.gz
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.bz2
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.zip
Updating client dependencies. Switching to yarn. (#6433)
* Updating client dependancies. Switching to using yarn. * Updating React * Moving pure components to using function syntax (performance gains with newer react version) * Updating client dependancies. * Ignore .yarninstall * Enabling pre-lockfile because it's the entire point of using yarn. * Removing old webpack config * Moving to new prop-types * Fixing ESLint Errors * Updating jest snapshots. * Cleaning up package.json
Diffstat (limited to 'webapp/components/admin_console/generated_setting.jsx')
-rw-r--r--webapp/components/admin_console/generated_setting.jsx20
1 files changed, 11 insertions, 9 deletions
diff --git a/webapp/components/admin_console/generated_setting.jsx b/webapp/components/admin_console/generated_setting.jsx
index 9103d1804..b6a495f93 100644
--- a/webapp/components/admin_console/generated_setting.jsx
+++ b/webapp/components/admin_console/generated_setting.jsx
@@ -1,3 +1,5 @@
+import PropTypes from 'prop-types';
+
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
@@ -10,15 +12,15 @@ import {FormattedMessage} from 'react-intl';
export default class GeneratedSetting extends React.Component {
static get propTypes() {
return {
- id: React.PropTypes.string.isRequired,
- label: React.PropTypes.node.isRequired,
- placeholder: React.PropTypes.string,
- value: React.PropTypes.string.isRequired,
- onChange: React.PropTypes.func.isRequired,
- disabled: React.PropTypes.bool.isRequired,
- disabledText: React.PropTypes.node,
- helpText: React.PropTypes.node.isRequired,
- regenerateText: React.PropTypes.node
+ id: PropTypes.string.isRequired,
+ label: PropTypes.node.isRequired,
+ placeholder: PropTypes.string,
+ value: PropTypes.string.isRequired,
+ onChange: PropTypes.func.isRequired,
+ disabled: PropTypes.bool.isRequired,
+ disabledText: PropTypes.node,
+ helpText: PropTypes.node.isRequired,
+ regenerateText: PropTypes.node
};
}