Fix after review

elastic · Apr 9, 2020 · 47945a6 · 47945a6
1 parent 6186e8c
commit 47945a6
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/header.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/header.tsx
@@ -13,8 +13,8 @@ const Container = styled.div`
   background-color: ${props => props.theme.eui.euiPageBackgroundColor};
 `;
 
-const Wrapper = styled.div`
-  max-width: 1200px;
+const Wrapper = styled.div<{ maxWidth?: number }>`
+  max-width: ${props => props.maxWidth || 1200}px;
   margin-left: auto;
   margin-right: auto;
   padding-top: ${props => props.theme.eui.paddingSizes.xl};
@@ -30,6 +30,7 @@ const Tabs = styled(EuiTabs)`
 `;
 
 export interface HeaderProps {
+  restrictHeaderWidth?: number;
   leftColumn?: JSX.Element;
   rightColumn?: JSX.Element;
   tabs?: EuiTabProps[];
@@ -42,9 +43,14 @@ const HeaderColumns: React.FC<Omit<HeaderProps, 'tabs'>> = memo(({ leftColumn, r
   </EuiFlexGroup>
 ));
 
-export const Header: React.FC<HeaderProps> = ({ leftColumn, rightColumn, tabs }) => (
+export const Header: React.FC<HeaderProps> = ({
+  leftColumn,
+  rightColumn,
+  tabs,
+  restrictHeaderWidth,
+}) => (
   <Container>
-    <Wrapper>
+    <Wrapper maxWidth={restrictHeaderWidth}>
       <HeaderColumns leftColumn={leftColumn} rightColumn={rightColumn} />
       <EuiFlexGroup>
         {tabs ? (

diff --git a/.../ingest_manager/sections/agent_config/create_datasource_page/components/confirm_modal.tsx b/.../ingest_manager/sections/agent_config/create_datasource_page/components/confirm_modal.tsx
@@ -5,10 +5,8 @@
  */
 
 import React from 'react';
-import { EuiOverlayMask, EuiConfirmModal } from '@elastic/eui';
+import { EuiCallOut, EuiOverlayMask, EuiConfirmModal, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiCallOut } from '@elastic/eui';
-import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { AgentConfig } from '../../../../types';
 
@@ -21,7 +19,6 @@ export const ConfirmCreateDatasourceModal: React.FunctionComponent<{
   return (
     <EuiOverlayMask>
       <EuiConfirmModal
-        maxWidth="566px"
         title={
           <FormattedMessage
             id="xpack.ingestManager.createDatasource.confirmModalTitle"

diff --git a/...cations/ingest_manager/sections/agent_config/create_datasource_page/components/layout.tsx b/...cations/ingest_manager/sections/agent_config/create_datasource_page/components/layout.tsx
@@ -30,6 +30,8 @@ export const CreateDatasourcePageLayout: React.FunctionComponent<{
 }> = ({ from, basePath, cancelUrl, maxStep, agentConfig, packageInfo, children }) => {
   return (
     <WithHeaderLayout
+      restrictHeaderWidth={833}
+      restrictWidth={833}
       leftColumn={
         <EuiFlexGroup direction="column" gutterSize="s" alignItems="flexStart">
           <EuiFlexItem>
@@ -45,7 +47,7 @@ export const CreateDatasourcePageLayout: React.FunctionComponent<{
               <h1>
                 <FormattedMessage
                   id="xpack.ingestManager.createDatasource.pageTitle"
-                  defaultMessage="New data source"
+                  defaultMessage="Add data source"
                 />
               </h1>
             </EuiText>
@@ -100,9 +102,7 @@ export const CreateDatasourcePageLayout: React.FunctionComponent<{
         </EuiFlexGroup>
       }
     >
-      <EuiFlexGroup style={{ maxWidth: 833 }}>
-        <EuiFlexItem>{children}</EuiFlexItem>
-      </EuiFlexGroup>
+      {children}
     </WithHeaderLayout>
   );
 };
diff --git a/...public/applications/ingest_manager/sections/agent_config/create_datasource_page/index.tsx b/...public/applications/ingest_manager/sections/agent_config/create_datasource_page/index.tsx
@@ -89,6 +89,7 @@ export const CreateDatasourcePage: React.FunctionComponent = () => {
     if (updatedPackageInfo) {
       setPackageInfo(updatedPackageInfo);
     } else {
+      setFormState('INVALID');
       setPackageInfo(undefined);
       setMaxStep('');
     }
@@ -102,6 +103,7 @@ export const CreateDatasourcePage: React.FunctionComponent = () => {
     if (updatedAgentConfig) {
       setAgentConfig(updatedAgentConfig);
     } else {
+      setFormState('INVALID');
       setAgentConfig(undefined);
       setMaxStep('');
     }

diff --git a/...ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx b/...ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiPanel,

diff --git a/...anager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx b/...anager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx
@@ -86,7 +86,7 @@ export const EnrollmentInstructions: React.FunctionComponent<Props> = ({ selecte
           steps={[
             {
               title: i18n.translate('xpack.ingestManager.agentEnrollment.stepSetupAgents', {
-                defaultMessage: 'Setup Beats agent',
+                defaultMessage: 'Setup Elastic agent',
               }),
               children: (
                 <ShellEnrollmentInstructions

diff --git a/...ngest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/...ngest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -364,7 +364,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
         <h2>
           <FormattedMessage
             id="xpack.ingestManager.agentList.noAgentsPrompt"
-            defaultMessage="No agents installed"
+            defaultMessage="No agents enrolled"
           />
         </h2>
       }
@@ -373,7 +373,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
           <EuiButton fill iconType="plusInCircle" onClick={() => setIsEnrollmentFlyoutOpen(true)}>
             <FormattedMessage
               id="xpack.ingestManager.agentList.addButton"
-              defaultMessage="Install new agent"
+              defaultMessage="Enroll new agent"
             />
           </EuiButton>
         ) : null