diff --git a/i18n/en.json b/i18n/en.json index 6292c1e031..0dca6ca041 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2059,6 +2059,14 @@ "id": "model.command.is_valid.create_at.app_error", "translation": "Create at must be a valid time" }, + { + "id": "model.command.is_valid.description.app_error", + "translation": "Invalid description" + }, + { + "id": "model.command.is_valid.display_name.app_error", + "translation": "Invalid display name" + }, { "id": "model.command.is_valid.id.app_error", "translation": "Invalid Id" @@ -2215,6 +2223,14 @@ "id": "model.incoming_hook.create_at.app_error", "translation": "Create at must be a valid time" }, + { + "id": "model.incoming_hook.description.app_error", + "translation": "Invalid description" + }, + { + "id": "model.incoming_hook.display_name.app_error", + "translation": "Invalid display name" + }, { "id": "model.incoming_hook.id.app_error", "translation": "Invalid Id" @@ -2279,6 +2295,14 @@ "id": "model.outgoing_hook.is_valid.create_at.app_error", "translation": "Create at must be a valid time" }, + { + "id": "model.outgoing_hook.is_valid.description.app_error", + "translation": "Invalid description" + }, + { + "id": "model.outgoing_hook.is_valid.display_name.app_error", + "translation": "Invalid display name" + }, { "id": "model.outgoing_hook.is_valid.id.app_error", "translation": "Invalid Id" diff --git a/model/command.go b/model/command.go index 56d88f13c5..ca30381226 100644 --- a/model/command.go +++ b/model/command.go @@ -29,6 +29,7 @@ type Command struct { AutoCompleteDesc string `json:"auto_complete_desc"` AutoCompleteHint string `json:"auto_complete_hint"` DisplayName string `json:"display_name"` + Description string `json:"description"` URL string `json:"url"` } @@ -114,6 +115,14 @@ func (o *Command) IsValid() *AppError { return NewLocAppError("Command.IsValid", "model.command.is_valid.method.app_error", nil, "") } + if len(o.DisplayName) > 64 { + return NewLocAppError("Command.IsValid", "model.command.is_valid.display_name.app_error", nil, "") + } + + if len(o.Description) > 128 { + return NewLocAppError("Command.IsValid", "model.command.is_valid.description.app_error", nil, "") + } + return nil } diff --git a/model/command_test.go b/model/command_test.go index 0581625d91..d362d8f2c8 100644 --- a/model/command_test.go +++ b/model/command_test.go @@ -84,6 +84,26 @@ func TestCommandIsValid(t *testing.T) { if err := o.IsValid(); err != nil { t.Fatal(err) } + + o.DisplayName = strings.Repeat("1", 65) + if err := o.IsValid(); err == nil { + t.Fatal("should be invalid") + } + + o.DisplayName = strings.Repeat("1", 64) + if err := o.IsValid(); err != nil { + t.Fatal(err) + } + + o.Description = strings.Repeat("1", 129) + if err := o.IsValid(); err == nil { + t.Fatal("should be invalid") + } + + o.Description = strings.Repeat("1", 128) + if err := o.IsValid(); err != nil { + t.Fatal(err) + } } func TestCommandPreSave(t *testing.T) { diff --git a/model/incoming_webhook.go b/model/incoming_webhook.go index 8432f5fea5..0763b443ef 100644 --- a/model/incoming_webhook.go +++ b/model/incoming_webhook.go @@ -14,13 +14,15 @@ const ( ) type IncomingWebhook struct { - Id string `json:"id"` - CreateAt int64 `json:"create_at"` - UpdateAt int64 `json:"update_at"` - DeleteAt int64 `json:"delete_at"` - UserId string `json:"user_id"` - ChannelId string `json:"channel_id"` - TeamId string `json:"team_id"` + Id string `json:"id"` + CreateAt int64 `json:"create_at"` + UpdateAt int64 `json:"update_at"` + DeleteAt int64 `json:"delete_at"` + UserId string `json:"user_id"` + ChannelId string `json:"channel_id"` + TeamId string `json:"team_id"` + DisplayName string `json:"display_name"` + Description string `json:"description"` } type IncomingWebhookRequest struct { @@ -99,6 +101,14 @@ func (o *IncomingWebhook) IsValid() *AppError { return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.team_id.app_error", nil, "") } + if len(o.DisplayName) > 64 { + return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.display_name.app_error", nil, "") + } + + if len(o.Description) > 128 { + return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.description.app_error", nil, "") + } + return nil } diff --git a/model/incoming_webhook_test.go b/model/incoming_webhook_test.go index 5297d7d904..3f17542448 100644 --- a/model/incoming_webhook_test.go +++ b/model/incoming_webhook_test.go @@ -69,6 +69,26 @@ func TestIncomingWebhookIsValid(t *testing.T) { if err := o.IsValid(); err != nil { t.Fatal(err) } + + o.DisplayName = strings.Repeat("1", 65) + if err := o.IsValid(); err == nil { + t.Fatal("should be invalid") + } + + o.DisplayName = strings.Repeat("1", 64) + if err := o.IsValid(); err != nil { + t.Fatal(err) + } + + o.Description = strings.Repeat("1", 129) + if err := o.IsValid(); err == nil { + t.Fatal("should be invalid") + } + + o.Description = strings.Repeat("1", 128) + if err := o.IsValid(); err != nil { + t.Fatal(err) + } } func TestIncomingWebhookPreSave(t *testing.T) { diff --git a/model/outgoing_webhook.go b/model/outgoing_webhook.go index 70de4d26ed..e13de90800 100644 --- a/model/outgoing_webhook.go +++ b/model/outgoing_webhook.go @@ -20,6 +20,8 @@ type OutgoingWebhook struct { TeamId string `json:"team_id"` TriggerWords StringArray `json:"trigger_words"` CallbackURLs StringArray `json:"callback_urls"` + DisplayName string `json:"display_name"` + Description string `json:"description"` } func (o *OutgoingWebhook) ToJson() string { @@ -106,6 +108,14 @@ func (o *OutgoingWebhook) IsValid() *AppError { } } + if len(o.DisplayName) > 64 { + return NewLocAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.display_name.app_error", nil, "") + } + + if len(o.Description) > 128 { + return NewLocAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.description.app_error", nil, "") + } + return nil } diff --git a/model/outgoing_webhook_test.go b/model/outgoing_webhook_test.go index 665b85b6f1..72c842e03c 100644 --- a/model/outgoing_webhook_test.go +++ b/model/outgoing_webhook_test.go @@ -89,6 +89,26 @@ func TestOutgoingWebhookIsValid(t *testing.T) { if err := o.IsValid(); err != nil { t.Fatal(err) } + + o.DisplayName = strings.Repeat("1", 65) + if err := o.IsValid(); err == nil { + t.Fatal("should be invalid") + } + + o.DisplayName = strings.Repeat("1", 64) + if err := o.IsValid(); err != nil { + t.Fatal(err) + } + + o.Description = strings.Repeat("1", 129) + if err := o.IsValid(); err == nil { + t.Fatal("should be invalid") + } + + o.Description = strings.Repeat("1", 128) + if err := o.IsValid(); err != nil { + t.Fatal(err) + } } func TestOutgoingWebhookPreSave(t *testing.T) { diff --git a/store/sql_command_store.go b/store/sql_command_store.go index 074a6e5884..02b3a0cc54 100644 --- a/store/sql_command_store.go +++ b/store/sql_command_store.go @@ -28,12 +28,14 @@ func NewSqlCommandStore(sqlStore *SqlStore) CommandStore { tableo.ColMap("AutoCompleteDesc").SetMaxSize(1024) tableo.ColMap("AutoCompleteHint").SetMaxSize(1024) tableo.ColMap("DisplayName").SetMaxSize(64) + tableo.ColMap("Description").SetMaxSize(128) } return s } func (s SqlCommandStore) UpgradeSchemaIfNeeded() { + s.CreateColumnIfNotExists("Commands", "Description", "varchar(128)", "varchar(128)", "") } func (s SqlCommandStore) CreateIndexesIfNotExists() { diff --git a/store/sql_webhook_store.go b/store/sql_webhook_store.go index 740c9a33f0..3c1f404e1a 100644 --- a/store/sql_webhook_store.go +++ b/store/sql_webhook_store.go @@ -20,6 +20,8 @@ func NewSqlWebhookStore(sqlStore *SqlStore) WebhookStore { table.ColMap("UserId").SetMaxSize(26) table.ColMap("ChannelId").SetMaxSize(26) table.ColMap("TeamId").SetMaxSize(26) + table.ColMap("DisplayName").SetMaxSize(64) + table.ColMap("Description").SetMaxSize(128) tableo := db.AddTableWithName(model.OutgoingWebhook{}, "OutgoingWebhooks").SetKeys(false, "Id") tableo.ColMap("Id").SetMaxSize(26) @@ -29,12 +31,19 @@ func NewSqlWebhookStore(sqlStore *SqlStore) WebhookStore { tableo.ColMap("TeamId").SetMaxSize(26) tableo.ColMap("TriggerWords").SetMaxSize(1024) tableo.ColMap("CallbackURLs").SetMaxSize(1024) + tableo.ColMap("DisplayName").SetMaxSize(64) + tableo.ColMap("Description").SetMaxSize(128) } return s } func (s SqlWebhookStore) UpgradeSchemaIfNeeded() { + s.CreateColumnIfNotExists("IncomingWebhooks", "DisplayName", "varchar(64)", "varchar(64)", "") + s.CreateColumnIfNotExists("IncomingWebhooks", "Description", "varchar(128)", "varchar(128)", "") + + s.CreateColumnIfNotExists("OutgoingWebhooks", "DisplayName", "varchar(64)", "varchar(64)", "") + s.CreateColumnIfNotExists("OutgoingWebhooks", "Description", "varchar(128)", "varchar(128)", "") } func (s SqlWebhookStore) CreateIndexesIfNotExists() { diff --git a/webapp/components/backstage/add_incoming_webhook.jsx b/webapp/components/backstage/add_incoming_webhook.jsx index 83027c6b3b..f3601cb073 100644 --- a/webapp/components/backstage/add_incoming_webhook.jsx +++ b/webapp/components/backstage/add_incoming_webhook.jsx @@ -18,12 +18,12 @@ export default class AddIncomingWebhook extends React.Component { this.handleSubmit = this.handleSubmit.bind(this); - this.updateName = this.updateName.bind(this); + this.updateDisplayName = this.updateDisplayName.bind(this); this.updateDescription = this.updateDescription.bind(this); this.updateChannelId = this.updateChannelId.bind(this); this.state = { - name: '', + displayName: '', description: '', channelId: '', saving: false, @@ -60,7 +60,9 @@ export default class AddIncomingWebhook extends React.Component { } const hook = { - channel_id: this.state.channelId + channel_id: this.state.channelId, + display_name: this.state.displayName, + description: this.state.description }; AsyncClient.addIncomingHook( @@ -70,15 +72,16 @@ export default class AddIncomingWebhook extends React.Component { }, (err) => { this.setState({ + saving: false, serverError: err.message }); } ); } - updateName(e) { + updateDisplayName(e) { this.setState({ - name: e.target.value + displayName: e.target.value }); } @@ -112,20 +115,21 @@ export default class AddIncomingWebhook extends React.Component {
@@ -143,6 +147,7 @@ export default class AddIncomingWebhook extends React.Component { word.trim()), - callback_urls: this.state.callbackUrls.split('\n').map((url) => url.trim()) + callback_urls: this.state.callbackUrls.split('\n').map((url) => url.trim()), + display_name: this.state.displayName, + description: this.state.description }; AsyncClient.addOutgoingHook( @@ -90,15 +92,16 @@ export default class AddOutgoingWebhook extends React.Component { }, (err) => { this.setState({ + saving: false, serverError: err.message }); } ); } - updateName(e) { + updateDisplayName(e) { this.setState({ - name: e.target.value + displayName: e.target.value }); } @@ -144,20 +147,21 @@ export default class AddOutgoingWebhook extends React.Component {
@@ -175,6 +179,7 @@ export default class AddOutgoingWebhook extends React.Component {
- {channelName} + {incomingWebhook.display_name || channelName}
- {Utils.getWindowLocationOrigin() + '/hooks/' + incomingWebhook.id} + {incomingWebhook.description} + +
+
+ +
diff --git a/webapp/components/backstage/installed_outgoing_webhook.jsx b/webapp/components/backstage/installed_outgoing_webhook.jsx index fee4272602..530474dc38 100644 --- a/webapp/components/backstage/installed_outgoing_webhook.jsx +++ b/webapp/components/backstage/installed_outgoing_webhook.jsx @@ -47,7 +47,7 @@ export default class InstalledOutgoingWebhook extends React.Component {
- {channelName} + {outgoingWebhook.display_name || channelName}
- {Utils.getWindowLocationOrigin() + '/hooks/' + outgoingWebhook.id} - {' - '} - {outgoingWebhook.token} + {outgoingWebhook.description} + +
+
+ +
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 7dc6486abc..8fdb42b4cd 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -814,6 +814,7 @@ "get_team_invite_link_modal.title": "Team Invite Link", "installed_integrations.add": "Add Integration", "installed_integrations.allFilter": "All ({count})", + "installed_integrations.creation": "Created by {creator} on {createAt, date, full}", "installed_integrations.delete": "Delete", "installed_integrations.header": "Installed Integrations", "installed_integrations.incomingWebhookType": "(Incoming Webhook)", diff --git a/webapp/sass/routes/_backstage.scss b/webapp/sass/routes/_backstage.scss index 729c8c912a..13c51c8b48 100644 --- a/webapp/sass/routes/_backstage.scss +++ b/webapp/sass/routes/_backstage.scss @@ -196,7 +196,12 @@ margin-bottom: 1em; } - .list-item__actions { + .item-details__creation { + color: $dark-gray; + margin-bottom: 1em; + } + + .item-actions { flex-grow: 0; flex-shrink: 0; padding-left: 20px; diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx index cc19baa7e3..db0b2258cb 100644 --- a/webapp/utils/async_client.jsx +++ b/webapp/utils/async_client.jsx @@ -1182,10 +1182,10 @@ export function addIncomingHook(hook, success, error) { } }, (err) => { - dispatchError(err, 'addIncomingHook'); - if (error) { error(err); + } else { + dispatchError(err, 'addIncomingHook'); } } ); @@ -1205,10 +1205,10 @@ export function addOutgoingHook(hook, success, error) { } }, (err) => { - dispatchError(err, 'addOutgoingHook'); - if (error) { error(err); + } else { + dispatchError(err, 'addOutgoingHook'); } } );