Merge branch 'actions/feature' into actions/feature-and-rbac

* actions/feature: added readonly support to servicenow connector
elastic · Jul 7, 2020 · 5c5ff2d · 5c5ff2d
2 parents d412665 + a3f6142
commit 5c5ff2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...lic/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx b/...lic/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx
@@ -34,6 +34,7 @@ describe('ServiceNowActionConnectorFields renders', () => {
  editActionConfig={() => {}}
  editActionSecrets={() => {}}
  docLinks={deps!.docLinks}
+ readOnly={false}
  />
  );
  expect(
@@ -72,6 +73,7 @@ describe('ServiceNowActionConnectorFields renders', () => {
  editActionConfig={() => {}}
  editActionSecrets={() => {}}
  docLinks={deps!.docLinks}
+ readOnly={false}
  />
  );
  expect(wrapper.find('[data-test-subj="case-servicenow-mappings"]').length > 0).toBeTruthy();

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
@@ -23,7 +23,7 @@ import { FieldMapping } from './case_mappings/field_mapping';
 
 const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<
  ServiceNowActionConnector
->> = ({ action, editActionSecrets, editActionConfig, errors, consumer }) => {
+>> = ({ action, editActionSecrets, editActionConfig, errors, consumer, readOnly }) => {
  // TODO: remove incidentConfiguration later, when Case ServiceNow will move their fields to the level of action execution
  const { apiUrl, incidentConfiguration, isCaseOwned } = action.config;
  const mapping = incidentConfiguration ? incidentConfiguration.mapping : [];
@@ -84,6 +84,7 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<
  fullWidth
  isInvalid={isApiUrlInvalid}
  name="apiUrl"
+ readOnly={readOnly}
  value={apiUrl || ''} // Needed to prevent uncontrolled input error when value is undefined
  data-test-subj="apiUrlFromInput"
  placeholder="https://<site-url>"
@@ -110,6 +111,7 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<
  <EuiFieldText
  fullWidth
  isInvalid={isUsernameInvalid}
+ readOnly={readOnly}
  name="connector-servicenow-username"
  value={username || ''} // Needed to prevent uncontrolled input error when value is undefined
  data-test-subj="connector-servicenow-username-form-input"
@@ -135,6 +137,7 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<
  >
  <EuiFieldPassword
  fullWidth
+ readOnly={readOnly}
  isInvalid={isPasswordInvalid}
  name="connector-servicenow-password"
  value={password || ''} // Needed to prevent uncontrolled input error when value is undefined