add a toggle to our Slack settings for enabling/disabling Metabot.

frontend/src/admin/settings/components/SettingsSlackForm.jsx

@@ -3,6 +3,7 @@ import React, { Component, PropTypes } from "react";
 import MetabaseAnalytics from "metabase/lib/analytics";
 import MetabaseUtils from "metabase/lib/utils";
 import SettingsEmailFormElement from "./SettingsEmailFormElement.jsx";
+import SettingsSetting from "./SettingsSetting.jsx";
 
 import Icon from "metabase/components/Icon.jsx";
 
@@ -34,7 +35,7 @@ export default class SettingsSlackForm extends Component {
         // this gives us an opportunity to load up our formData with any existing values for elements
         let formData = {};
         this.props.elements.forEach(function(element) {
-            formData[element.key] = element.value;
+            formData[element.key] = element.value || element.defaultValue;
         });
 
         this.setState({formData});
@@ -156,10 +157,22 @@ export default class SettingsSlackForm extends Component {
             let errorMessage = (formErrors && formErrors.elements) ? formErrors.elements[element.key] : validationErrors[element.key],
                 value = formData[element.key] || element.defaultValue;
 
-            return <SettingsEmailFormElement
+            if (element.key === "slack-token") {
+                return (
+                    <SettingsEmailFormElement
                         key={element.key}
                         element={_.extend(element, {value, errorMessage })}
                         handleChangeEvent={this.handleChangeEvent.bind(this)} />
+                );
+            } else if (element.key === "metabot-enabled") {
+                return (
+                    <SettingsSetting
+                        key={element.key}
+                        setting={_.extend(element, {value, errorMessage })}
+                        updateSetting={(setting, value) => this.handleChangeEvent(setting, value)}
+                    />
+                );
+            }
         });
 
         let saveSettingsButtonStates = {

frontend/src/admin/settings/settings.controllers.js

@@ -105,7 +105,15 @@ const SECTIONS = [
                 type: "string",
                 required: true,
                 autoFocus: true
-            }
+            },
+            {
+                key: "metabot-enabled",
+                display_name: "Metabot",
+                type: "boolean",
+                defaultValue: "true",
+                required: true,
+                autoFocus: false
+            },
         ]
     }
 ];

src/metabase/metabot.clj

@@ -18,7 +18,7 @@
             [metabase.util :as u]
             [metabase.util.urls :as urls]))
 
-(setting/defsetting metabot-enabled "Enable Metabot, which lets you search for and view your saved questions directly via Slack" "true")
+(setting/defsetting metabot-enabled "Enable Metabot, which lets you search for and view your saved questions directly via Slack." "true")
 
 ;;; # ------------------------------------------------------------ Metabot Command Handlers ------------------------------------------------------------