Skip to content

Fix Watcher translation keys on error prop missing #2

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

Closed
sebelga wants to merge 1 commit into from
Closed

Fix Watcher translation keys on error prop missing #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions x-pack/plugins/watcher/server/models/action/action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class Action {
static fromUpstreamJson(json, options = { throwExceptions: {} }) {
if (!json.id) {
throw badRequest(
i18n.translate('xpack.watcher.models.actionStatus.absenceOfIdPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.actionStatus.idPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {id} property',
values: {
id: 'id'
Expand All @@ -40,7 +40,7 @@ export class Action {

if (!json.actionJson) {
throw badRequest(
i18n.translate('xpack.watcher.models.action.absenceOfActionJsonPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.action.actionJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJson} property',
values: {
actionJson: 'actionJson'
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/watcher/server/models/action/base_action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class BaseAction {
static getPropsFromUpstreamJson(json) {
if (!json.id) {
throw badRequest(
i18n.translate('xpack.watcher.models.baseAction.absenceOfIdPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.baseAction.idPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {id} property',
values: {
id: 'id'
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/watcher/server/models/action/email_action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export class EmailAction extends BaseAction {
const errors = [];

if (!json.email) {
const message = i18n.translate('xpack.watcher.models.emailAction.absenceOfActionJsonEmailPropertyBadRequestMessage', {
const message = i18n.translate('xpack.watcher.models.emailAction.actionJsonEmailPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJsonEmail} property',
values: {
actionJsonEmail: 'actionJson.email'
Expand All @@ -113,7 +113,7 @@ export class EmailAction extends BaseAction {
}

if (!json.email.to) {
const message = i18n.translate('xpack.watcher.models.emailAction.absenceOfActionJsonEmailToPropertyBadRequestMessage', {
const message = i18n.translate('xpack.watcher.models.emailAction.actionJsonEmailToPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJsonEmailTo} property',
values: {
actionJsonEmailTo: 'actionJson.email.to'
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/watcher/server/models/action/logging_action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class LoggingAction extends BaseAction {
if (!json.logging) {
errors.push({
code: ERROR_CODES.ERR_PROP_MISSING,
message: i18n.translate('xpack.watcher.models.loggingAction.absenceOfActionJsonLoggingPropertyBadRequestMessage', {
message: i18n.translate('xpack.watcher.models.loggingAction.actionJsonLoggingPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJsonLogging} property',
values: {
actionJsonLogging: 'actionJson.logging'
Expand All @@ -85,7 +85,7 @@ export class LoggingAction extends BaseAction {
if (!json.logging.text) {
errors.push({
code: ERROR_CODES.ERR_PROP_MISSING,
message: i18n.translate('xpack.watcher.models.loggingAction.absenceOfActionJsonLoggingTextPropertyBadRequestMessage', {
message: i18n.translate('xpack.watcher.models.loggingAction.actionJsonLoggingTextPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJsonLoggingText} property',
values: {
actionJsonLoggingText: 'actionJson.logging.text'
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/watcher/server/models/action/slack_action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class SlackAction extends BaseAction {
if (!json.slack) {
errors.push({
code: ERROR_CODES.ERR_PROP_MISSING,
message: i18n.translate('xpack.watcher.models.slackAction.absenceOfActionJsonSlackPropertyBadRequestMessage', {
message: i18n.translate('xpack.watcher.models.slackAction.actionJsonSlackPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJsonSlack} property',
values: {
actionJsonSlack: 'actionJson.slack'
Expand All @@ -94,7 +94,7 @@ export class SlackAction extends BaseAction {
if (!json.slack.message) {
errors.push({
code: ERROR_CODES.ERR_PROP_MISSING,
message: i18n.translate('xpack.watcher.models.slackAction.absenceOfActionJsonSlackMessagePropertyBadRequestMessage', {
message: i18n.translate('xpack.watcher.models.slackAction.actionJsonSlackMessagePropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJsonSlackMessage} property',
values: {
actionJsonSlackMessage: 'actionJson.slack.message'
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/watcher/server/models/action/unknown_action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class UnknownAction extends BaseAction {
if (!json.actionJson) {
errors.push({
code: ERROR_CODES.ERR_PROP_MISSING,
message: i18n.translate('xpack.watcher.models.unknownAction.absenceOfActionJsonPropertyBadRequestMessage', {
message: i18n.translate('xpack.watcher.models.unknownAction.actionJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionJson} property',
values: {
actionJson: 'actionJson'
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/watcher/server/models/action_status/action_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class ActionStatus {
static fromUpstreamJson(json) {
if (!json.id) {
throw badRequest(
i18n.translate('xpack.watcher.models.actionStatus.absenceOfIdPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.actionStatus.idPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {id} property',
values: {
id: 'id'
Expand All @@ -113,7 +113,7 @@ export class ActionStatus {
}
if (!json.actionStatusJson) {
throw badRequest(
i18n.translate('xpack.watcher.models.actionStatus.absenceOfActionStatusJsonPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.actionStatus.actionStatusJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {actionStatusJson} property',
values: {
actionStatusJson: 'actionStatusJson'
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/watcher/server/models/fields/fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class Fields {
static fromUpstreamJson(json) {
if (!json.fields) {
throw badRequest(
i18n.translate('xpack.watcher.models.fields.absenceOfFieldsPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.fields.fieldsPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain a {fields} property',
values: {
fields: 'fields'
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/watcher/server/models/watch/base_watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class BaseWatch {
static getPropsFromUpstreamJson(json, options) {
if (!json.id) {
throw badRequest(
i18n.translate('xpack.watcher.models.baseWatch.absenceOfIdPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.baseWatch.idPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {id} property',
values: {
id: 'id'
Expand All @@ -103,7 +103,7 @@ export class BaseWatch {
}
if (!json.watchJson) {
throw badRequest(
i18n.translate('xpack.watcher.models.baseWatch.absenceOfWatchJsonPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.baseWatch.watchJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain a {watchJson} property',
values: {
watchJson: 'watchJson'
Expand All @@ -113,7 +113,7 @@ export class BaseWatch {
}
if (!json.watchStatusJson) {
throw badRequest(
i18n.translate('xpack.watcher.models.baseWatch.absenceOfWatchStatusJsonPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.baseWatch.watchStatusJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain a {watchStatusJson} property',
values: {
watchStatusJson: 'watchStatusJson'
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/watcher/server/models/watch/watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class Watch {
static fromDownstreamJson(json) {
if (!json.type) {
throw badRequest(
i18n.translate('xpack.watcher.models.watch.absenceOfTypePropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.watch.typePropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {type} property',
values: {
type: 'type'
Expand All @@ -39,7 +39,7 @@ export class Watch {
const WatchType = WatchTypes[json.type];
if (!WatchType) {
throw badRequest(
i18n.translate('xpack.watcher.models.watch.unknownJsonTypeAttemptedToLoadBadRequestMessage', {
i18n.translate('xpack.watcher.models.watch.unknownWatchTypeLoadingAttemptBadRequestMessage', {
defaultMessage: 'Attempted to load unknown type {jsonType}',
values: { jsonType: json.type }
}),
Expand All @@ -53,7 +53,7 @@ export class Watch {
static fromUpstreamJson(json, options) {
if (!json.watchJson) {
throw badRequest(
i18n.translate('xpack.watcher.models.watch.absenceOfWatchJsonPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.watch.watchJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain a {watchJson} property',
values: {
watchJson: 'watchJson'
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/watcher/server/models/watch_history_item/watch_history_item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class WatchHistoryItem {
static fromUpstreamJson(json, opts) {
if (!json.id) {
throw badRequest(
i18n.translate('xpack.watcher.models.watchHistoryItem.absenceOfIdPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.watchHistoryItem.idPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {id} property',
values: {
id: 'id'
Expand All @@ -49,7 +49,7 @@ export class WatchHistoryItem {
}
if (!json.watchId) {
throw badRequest(
i18n.translate('xpack.watcher.models.watchHistoryItem.absenceOfWatchIdPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.watchHistoryItem.watchIdPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain a {watchId} property',
values: {
watchId: 'watchId'
Expand All @@ -59,7 +59,7 @@ export class WatchHistoryItem {
}
if (!json.watchHistoryItemJson) {
throw badRequest(
i18n.translate('xpack.watcher.models.watchHistoryItem.absenceOfWatchHistoryItemJsonPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.watchHistoryItem.watchHistoryItemJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain a {watchHistoryItemJson} property',
values: {
watchHistoryItemJson: 'watchHistoryItemJson'
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/watcher/server/models/watch_status/watch_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export class WatchStatus {
static fromUpstreamJson(json) {
if (!json.id) {
throw badRequest(
i18n.translate('xpack.watcher.models.watchStatus.absenceOfIdPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.watchStatus.idPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain an {id} property',
values: {
id: 'id'
Expand All @@ -150,7 +150,7 @@ export class WatchStatus {
}
if (!json.watchStatusJson) {
throw badRequest(
i18n.translate('xpack.watcher.models.watchStatus.absenceOfWatchStatusJsonPropertyBadRequestMessage', {
i18n.translate('xpack.watcher.models.watchStatus.watchStatusJsonPropertyMissingBadRequestMessage', {
defaultMessage: 'json argument must contain a {watchStatusJson} property',
values: {
watchStatusJson: 'watchStatusJson'
Expand Down