Automatic Merge
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
4c718c4b9a
Коммит
2a35a97a18
@@ -331,7 +331,9 @@ function shouldSkipNotification(
|
||||
if (attachment.fields) {
|
||||
for (const field of attachment.fields) {
|
||||
appendText(field.title);
|
||||
appendText(field.value);
|
||||
if (typeof field.value === 'string') {
|
||||
appendText(field.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +56,8 @@ const ActionButton = ({
|
||||
(action.style.match('^#(?:[0-9a-fA-F]{3}){1,2}$') && action.style);
|
||||
}
|
||||
|
||||
const name = action.name || action.id || '';
|
||||
|
||||
return (
|
||||
<ActionBtn
|
||||
data-action-id={action.id}
|
||||
@@ -71,7 +73,7 @@ const ActionButton = ({
|
||||
text={actionExecutingMessage}
|
||||
>
|
||||
<Markdown
|
||||
message={action.name}
|
||||
message={name}
|
||||
options={markdownOptions}
|
||||
/>
|
||||
</LoadingWrapper>
|
||||
|
||||
@@ -99,6 +99,7 @@ export default class ActionMenu extends React.PureComponent<Props, State> {
|
||||
|
||||
render() {
|
||||
const {action, disabled} = this.props;
|
||||
const name = action.name || action.id || '';
|
||||
|
||||
return (
|
||||
<PostContext.Consumer>
|
||||
@@ -106,7 +107,7 @@ export default class ActionMenu extends React.PureComponent<Props, State> {
|
||||
<AutocompleteSelector
|
||||
providers={this.providers}
|
||||
onSelected={this.handleSelected}
|
||||
placeholder={action.name}
|
||||
placeholder={name}
|
||||
inputClassName='post-attachment-dropdown'
|
||||
value={this.state.value}
|
||||
toggleFocus={handlePopupOpened}
|
||||
|
||||
@@ -5,7 +5,7 @@ import truncate from 'lodash/truncate';
|
||||
import React from 'react';
|
||||
import type {KeyboardEvent, MouseEvent, CSSProperties} from 'react';
|
||||
|
||||
import type {PostAction, PostActionOption} from '@mattermost/types/integration_actions';
|
||||
import type {PostActionOption} from '@mattermost/types/integration_actions';
|
||||
import type {
|
||||
MessageAttachment as MessageAttachmentType,
|
||||
} from '@mattermost/types/message_attachments';
|
||||
@@ -144,7 +144,7 @@ export default class MessageAttachment extends React.PureComponent<Props, State>
|
||||
|
||||
const content = [] as JSX.Element[];
|
||||
|
||||
actions.forEach((action: PostAction) => {
|
||||
actions.forEach((action) => {
|
||||
if (!action.id || !action.name) {
|
||||
return;
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user