Removing placeholders. Updating validation messages

elastic · Nov 5, 2020 · c00eef4 · c00eef4
1 parent ea0736e
commit c00eef4
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 10 deletions.
diff --git a/...rs_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.tsx b/...rs_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.tsx
@@ -98,7 +98,6 @@ const JiraConnectorFields: React.FC<ActionConnectorFieldsProps<JiraActionConnect
               readOnly={readOnly}
               value={apiUrl || ''} // Needed to prevent uncontrolled input error when value is undefined
               data-test-subj="apiUrlFromInput"
-              placeholder="https://<site-url>"
               onChange={(evt) => handleOnChangeActionConfig('apiUrl', evt.target.value)}
               onBlur={() => {
                 if (!apiUrl) {

diff --git a/...iggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts b/...iggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts
@@ -37,7 +37,7 @@ export const API_URL_REQUIRED = i18n.translate(
 export const API_URL_INVALID = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.jira.invalidApiUrlTextField',
   {
-    defaultMessage: 'URL is invalid.',
+    defaultMessage: 'URL is invalid. URL must start with https://',
   }
 );
 

diff --git a/..._ui/public/application/components/builtin_action_types/resilient/resilient_connectors.tsx b/..._ui/public/application/components/builtin_action_types/resilient/resilient_connectors.tsx
@@ -98,7 +98,6 @@ const ResilientConnectorFields: React.FC<ActionConnectorFieldsProps<ResilientAct
               readOnly={readOnly}
               value={apiUrl || ''} // Needed to prevent uncontrolled input error when value is undefined
               data-test-subj="apiUrlFromInput"
-              placeholder="https://<site-url>"
               onChange={(evt) => handleOnChangeActionConfig('apiUrl', evt.target.value)}
               onBlur={() => {
                 if (!apiUrl) {

diff --git a/...s_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts b/...s_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts
@@ -37,7 +37,7 @@ export const API_URL_REQUIRED = i18n.translate(
 export const API_URL_INVALID = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.resilient.invalidApiUrlTextField',
   {
-    defaultMessage: 'URL is invalid.',
+    defaultMessage: 'URL is invalid. URL must start with https://',
   }
 );
 

diff --git a/...i/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx b/...i/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
@@ -104,7 +104,6 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<
               readOnly={readOnly}
               value={apiUrl || ''} // Needed to prevent uncontrolled input error when value is undefined
               data-test-subj="apiUrlFromInput"
-              placeholder="https://<site-url>"
               onChange={(evt) => handleOnChangeActionConfig('apiUrl', evt.target.value)}
               onBlur={() => {
                 if (!apiUrl) {

diff --git a/..._actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts b/..._actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts
@@ -37,7 +37,7 @@ export const API_URL_REQUIRED = i18n.translate(
 export const API_URL_INVALID = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.servicenow.invalidApiUrlTextField',
   {
-    defaultMessage: 'URL is invalid.',
+    defaultMessage: 'URL is invalid. URL must start with https://',
   }
 );
 

diff --git a/..._actions_ui/public/application/components/builtin_action_types/slack/slack_connectors.tsx b/..._actions_ui/public/application/components/builtin_action_types/slack/slack_connectors.tsx
@@ -47,7 +47,6 @@ const SlackActionFields: React.FunctionComponent<ActionConnectorFieldsProps<
             isInvalid={errors.webhookUrl.length > 0 && webhookUrl !== undefined}
             name="webhookUrl"
             readOnly={readOnly}
-            placeholder="Example: https://hooks.slack.com/services"
             value={webhookUrl || ''}
             data-test-subj="slackWebhookUrlInput"
             onChange={(e) => {

diff --git a/...rs_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx b/...rs_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx
@@ -126,7 +126,7 @@ describe('webhook connector validation', () => {
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
       errors: {
-        url: ['URL is invalid.'],
+        url: ['URL is invalid. URL must start with http:// or https://'],
         method: [],
         user: [],
         password: [],

diff --git a/...riggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx b/...riggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx
@@ -59,7 +59,7 @@ export function getActionType(): ActionTypeModel<
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.error.invalidUrlTextField',
             {
-              defaultMessage: 'URL is invalid.',
+              defaultMessage: 'URL is invalid. URL must start with http:// or https://',
             }
           ),
         ];

diff --git a/...ions_ui/public/application/components/builtin_action_types/webhook/webhook_connectors.tsx b/...ions_ui/public/application/components/builtin_action_types/webhook/webhook_connectors.tsx
@@ -261,7 +261,6 @@ const WebhookActionConnectorFields: React.FunctionComponent<ActionConnectorField
               fullWidth
               readOnly={readOnly}
               value={url || ''}
-              placeholder="https://<site-url> or http://<site-url>"
               data-test-subj="webhookUrlText"
               onChange={(e) => {
                 editActionConfig('url', e.target.value);