From 7304a61ef597970be3031b14e652fb3a4df44304 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 13 Nov 2017 11:38:16 -0500
Subject: Add placeholder field and user_autocomplete type to plugin manifest
 (#7817)

* Add placholder field and user_autocomplete type to plugin manifest

* user_autocomplete -> username
---
 model/manifest.go      | 6 ++++++
 model/manifest_test.go | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/model/manifest.go b/model/manifest.go
index 48024fe92..12f105aaa 100644
--- a/model/manifest.go
+++ b/model/manifest.go
@@ -19,6 +19,7 @@ const (
 	PLUGIN_CONFIG_TYPE_RADIO     = "radio"
 	PLUGIN_CONFIG_TYPE_DROPDOWN  = "dropdown"
 	PLUGIN_CONFIG_TYPE_GENERATED = "generated"
+	PLUGIN_CONFIG_TYPE_USERNAME  = "username"
 )
 
 type PluginOption struct {
@@ -47,6 +48,8 @@ type PluginSetting struct {
 	// of pre-defined options.
 	//
 	// "text" will result in a string setting that can be typed in manually.
+	//
+	// "username" will result in a text setting that will autocomplete to a username.
 	Type string `json:"type" yaml:"type"`
 
 	// The help text to display to the user.
@@ -55,6 +58,9 @@ type PluginSetting struct {
 	// The help text to display alongside the "Regenerate" button for settings of the "generated" type.
 	RegenerateHelpText string `json:"regenerate_help_text,omitempty" yaml:"regenerate_help_text,omitempty"`
 
+	// The placeholder to display for "text", "generated" and "username" types when blank.
+	Placeholder string `json:"placeholder" yaml:"placeholder"`
+
 	// The default value of the setting.
 	Default interface{} `json:"default" yaml:"default"`
 
diff --git a/model/manifest_test.go b/model/manifest_test.go
index 3f174d3a7..0edd1fed4 100644
--- a/model/manifest_test.go
+++ b/model/manifest_test.go
@@ -76,6 +76,7 @@ func TestManifestUnmarshal(t *testing.T) {
 					Type:               PLUGIN_CONFIG_TYPE_DROPDOWN,
 					HelpText:           "thehelptext",
 					RegenerateHelpText: "theregeneratehelptext",
+					Placeholder:        "theplaceholder",
 					Options: []*PluginOption{
 						&PluginOption{
 							DisplayName: "theoptiondisplayname",
@@ -104,6 +105,7 @@ settings_schema:
             type: dropdown
             help_text: thehelptext
             regenerate_help_text: theregeneratehelptext
+            placeholder: theplaceholder
             options:
                 - display_name: theoptiondisplayname
                   value: thevalue
@@ -129,6 +131,7 @@ settings_schema:
                 "type": "dropdown",
                 "help_text": "thehelptext",
                 "regenerate_help_text": "theregeneratehelptext",
+                "placeholder": "theplaceholder",
                 "options": [
                     {
                         "display_name": "theoptiondisplayname",
@@ -178,6 +181,7 @@ func TestManifestJson(t *testing.T) {
 					Type:               PLUGIN_CONFIG_TYPE_DROPDOWN,
 					HelpText:           "thehelptext",
 					RegenerateHelpText: "theregeneratehelptext",
+					Placeholder:        "theplaceholder",
 					Options: []*PluginOption{
 						&PluginOption{
 							DisplayName: "theoptiondisplayname",
@@ -241,6 +245,7 @@ func TestManifestClientManifest(t *testing.T) {
 					Type:               PLUGIN_CONFIG_TYPE_DROPDOWN,
 					HelpText:           "thehelptext",
 					RegenerateHelpText: "theregeneratehelptext",
+					Placeholder:        "theplaceholder",
 					Options: []*PluginOption{
 						&PluginOption{
 							DisplayName: "theoptiondisplayname",
-- 
cgit v1.2.3-1-g7c22