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

* actions/feature: added actions feature to features test show prompt if user has no privileges in actions form
elastic · Jul 6, 2020 · a449385 · a449385
2 parents 3cc2cb5 + 76d2818
commit a449385
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 39 deletions.
diff --git a/...ins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/...ins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -407,6 +407,16 @@ export const ActionForm = ({
  : actionItem.actionTypeId;
  const actionTypeRegistered = actionTypeRegistry.get(actionItem.actionTypeId);
  if (!actionTypeRegistered || actionItem.group !== defaultActionGroupId) return null;
+
+ const noConnectorsLabel = (
+ <FormattedMessage
+ id="xpack.triggersActionsUI.sections.alertForm.emptyConnectorsLabel"
+ defaultMessage="No {actionTypeName} connectors."
+ values={{
+ actionTypeName,
+ }}
+ />
+ );
  return (
  <Fragment key={index}>
  <EuiAccordion
@@ -461,50 +471,54 @@ export const ActionForm = ({
  }
  paddingSize="l"
  >
- <EuiEmptyPrompt
- title={
- emptyActionsIds.find((emptyId: string) => actionItem.id === emptyId) ? (
+ {canSave ? (
+ <EuiEmptyPrompt
+ title={
+ emptyActionsIds.find((emptyId: string) => actionItem.id === emptyId) ? (
+ noConnectorsLabel
+ ) : (
+ <EuiCallOut
+ title={i18n.translate(
+ 'xpack.triggersActionsUI.sections.alertForm.unableToLoadConnectorTitle',
+ {
+ defaultMessage: 'Unable to load connector.',
+ }
+ )}
+ color="warning"
+ />
+ )
+ }
+ actions={[
+ <EuiButton
+ color="primary"
+ fill
+ size="s"
+ data-test-subj="createActionConnectorButton"
+ onClick={() => {
+ setActiveActionItem({ actionTypeId: actionItem.actionTypeId, index });
+ setAddModalVisibility(true);
+ }}
+ >
+ <FormattedMessage
+ id="xpack.triggersActionsUI.sections.alertForm.addConnectorButtonLabel"
+ defaultMessage="Create a connector"
+ />
+ </EuiButton>,
+ ]}
+ />
+ ) : (
+ <EuiCallOut title={noConnectorsLabel}>
+ <p>
  <FormattedMessage
- id="xpack.triggersActionsUI.sections.alertForm.emptyConnectorsLabel"
- defaultMessage="No {actionTypeName} connectors."
+ id="xpack.triggersActionsUI.sections.alertForm.unauthorizedToCreateForEmptyConnectors"
+ defaultMessage="There are no {actionTypeName} connectors available, but they could be configured by an authorized user. Please contact your administrator for assistance."
  values={{
  actionTypeName,
  }}
  />
- ) : (
- <EuiCallOut
- title={i18n.translate(
- 'xpack.triggersActionsUI.sections.alertForm.unableToLoadConnectorTitle',
- {
- defaultMessage: 'Unable to load connector.',
- }
- )}
- color="warning"
- />
- )
- }
- actions={
- canSave
- ? [
- <EuiButton
- color="primary"
- fill
- size="s"
- data-test-subj="createActionConnectorButton"
- onClick={() => {
- setActiveActionItem({ actionTypeId: actionItem.actionTypeId, index });
- setAddModalVisibility(true);
- }}
- >
- <FormattedMessage
- id="xpack.triggersActionsUI.sections.alertForm.addConnectorButtonLabel"
- defaultMessage="Create a connector"
- />
- </EuiButton>,
- ]
- : []
- }
- />
+ </p>
+ </EuiCallOut>
+ )}
  </EuiAccordion>
  <EuiSpacer size="xs" />
  </Fragment>

diff --git a/x-pack/test/api_integration/apis/features/features/features.ts b/x-pack/test/api_integration/apis/features/features/features.ts
@@ -97,6 +97,7 @@ export default function ({ getService }: FtrProviderContext) {
  'visualize',
  'dashboard',
  'dev_tools',
+ 'actions',
  'advancedSettings',
  'indexPatterns',
  'timelion',