Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed adding an extra space character on selecting alert variable in action text fields #70028

Merged
merged 8 commits into from
Jul 3, 2020
Merged

Fixed adding an extra space character on selecting alert variable in action text fields #70028

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61ae892
Fixed adding an extra space character on selecting alert variable in …
YulNaumenko Jun 26, 2020
6e90c98
Merge remote-tracking branch 'upstream/master' into alerting-remove-s…
YulNaumenko Jun 30, 2020
3652434
Made components for variables to be able to insert the variable by th…
YulNaumenko Jul 1, 2020
46946c0
cleanup
YulNaumenko Jul 1, 2020
9d1ac4a
Added variables support for all components
YulNaumenko Jul 2, 2020
b9a0881
Merge remote-tracking branch 'upstream/master' into alerting-remove-s…
YulNaumenko Jul 2, 2020
d246c5a
update on handle selections for text
YulNaumenko Jul 2, 2020
e94c0cc
Fixed functional tests
YulNaumenko Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...gers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const EmailParamsFields = ({
const onSelectMessageVariable = (paramsProperty: string, variable: string) => {
editAction(
paramsProperty,
((actionParams as any)[paramsProperty] ?? '').concat(` {{${variable}}}`),
!(actionParams as any)[paramsProperty] ? `{{${variable}}}` : ` {{${variable}}}`,
YulNaumenko marked this conversation as resolved.
Show resolved Hide resolved
index
);
};
Expand Down
2 changes: 1 addition & 1 deletion ...ctions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const IndexParamsFields = ({
documents && documents.length > 0 ? documents[0] : null
);
const onSelectMessageVariable = (variable: string) => {
const value = (xJson ?? '').concat(` {{${variable}}}`);
const value = !xJson ? `{{${variable}}}` : ` {{${variable}}}`;
setXJson(value);
// Keep the documents in sync with the editor content
onDocumentsChange(convertToJson(value));
Expand Down
2 changes: 1 addition & 1 deletion ...ions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
const onSelectMessageVariable = (paramsProperty: string, variable: string) => {
editAction(
paramsProperty,
((actionParams as any)[paramsProperty] ?? '').concat(` {{${variable}}}`),
!(actionParams as any)[paramsProperty] ? `{{${variable}}}` : ` {{${variable}}}`,
index
);
};
Expand Down
2 changes: 1 addition & 1 deletion ...ns_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const ServerLogParamsFields: React.FunctionComponent<ActionParamsProps<
}, []);

const onSelectMessageVariable = (paramsProperty: string, variable: string) => {
editAction(paramsProperty, (message ?? '').concat(` {{${variable}}}`), index);
editAction(paramsProperty, !message ? `{{${variable}}}` : ` {{${variable}}}`, index);
};

return (
Expand Down
2 changes: 1 addition & 1 deletion ...gers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const SlackParamsFields: React.FunctionComponent<ActionParamsProps<SlackActionPa
}, []);

const onSelectMessageVariable = (paramsProperty: string, variable: string) => {
editAction(paramsProperty, (message ?? '').concat(` {{${variable}}}`), index);
editAction(paramsProperty, !message ? `{{${variable}}}` : ` {{${variable}}}`, index);
};

return (
Expand Down
2 changes: 1 addition & 1 deletion ..._actions_ui/public/application/components/builtin_action_types/webhook/webhook_params.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const WebhookParamsFields: React.FunctionComponent<ActionParamsProps<WebhookActi
}) => {
const { body } = actionParams;
const onSelectMessageVariable = (paramsProperty: string, variable: string) => {
editAction(paramsProperty, (body ?? '').concat(` {{${variable}}}`), index);
editAction(paramsProperty, !body ? `{{${variable}}}` : ` {{${variable}}}`, index);
};
return (
<Fragment>
Expand Down