Merge branch 'master' into i18n/integrate_master_7.5

elastic · Nov 17, 2019 · da680b3 · da680b3
2 parents 9eeabe6 + 18e587f
commit da680b3
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -327,6 +327,7 @@
     "@types/pngjs": "^3.3.2",
     "@types/podium": "^1.0.0",
     "@types/prop-types": "^15.5.3",
+    "@types/reach__router": "^1.2.6",
     "@types/react": "^16.8.0",
     "@types/react-dom": "^16.8.0",
     "@types/react-redux": "^6.0.6",

diff --git a/renovate.json5 b/renovate.json5
@@ -513,6 +513,14 @@
           '@types/podium',
         ],
       },
+      {
+        groupSlug: '@reach/router',
+        groupName: '@reach/router related packages',
+        packageNames: [
+          '@reach/router',
+          '@types/reach__router',
+        ],
+      },
       {
         groupSlug: 'request',
         groupName: 'request related packages',

diff --git a/...omponents/node_available_warning/index.ts → ...omponents/node_available_warning/index.ts b/...omponents/node_available_warning/index.ts → ...omponents/node_available_warning/index.ts
diff --git a/...ilable_warning/node_available_warning.tsx → ...ilable_warning/node_available_warning.tsx b/...ilable_warning/node_available_warning.tsx → ...ilable_warning/node_available_warning.tsx
@@ -8,8 +8,8 @@ import React, { Fragment, FC } from 'react';
 
 import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { mlNodesAvailable, permissionToViewMlNodeCount } from '../../../../ml_nodes_check';
-import { getCloudDeploymentId, isCloud } from '../../../../services/ml_server_info';
+import { mlNodesAvailable, permissionToViewMlNodeCount } from '../../ml_nodes_check';
+import { getCloudDeploymentId, isCloud } from '../../services/ml_server_info';
 
 export const NodeAvailableWarning: FC = () => {
   if (mlNodesAvailable() === true || permissionToViewMlNodeCount() === false) {

diff --git a/...ins/ml/public/components/upgrade/index.js → ...ins/ml/public/components/upgrade/index.ts b/...ins/ml/public/components/upgrade/index.js → ...ins/ml/public/components/upgrade/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-
 export { UpgradeWarning } from './upgrade_warning';
diff --git a/...lic/components/upgrade/upgrade_warning.js → ...ic/components/upgrade/upgrade_warning.tsx b/...lic/components/upgrade/upgrade_warning.js → ...ic/components/upgrade/upgrade_warning.tsx
@@ -4,26 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import React, { FC } from 'react';
 
-import React from 'react';
-
-import {
-  EuiCallOut,
-  EuiSpacer,
-} from '@elastic/eui';
+import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { isUpgradeInProgress } from '../../services/upgrade_service';
 
-export function UpgradeWarning() {
+export const UpgradeWarning: FC = () => {
   if (isUpgradeInProgress() === true) {
     return (
       <React.Fragment>
         <EuiCallOut
-          title={(<FormattedMessage
-            id="xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningTitle"
-            defaultMessage="Index migration in progress"
-          />)}
+          title={
+            <FormattedMessage
+              id="xpack.ml.upgrade.upgradeWarning.upgradeInProgressWarningTitle"
+              defaultMessage="Index migration in progress"
+            />
+          }
           color="warning"
           iconType="alert"
         >
@@ -45,4 +43,4 @@ export function UpgradeWarning() {
   }
 
   return null;
-}
+};
diff --git a/.../data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/.../data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
@@ -6,6 +6,7 @@
 
 import { DeepPartial } from '../../../../../../common/types/common';
 import { checkPermission } from '../../../../../privilege/check_privilege';
+import { mlNodesAvailable } from '../../../../../ml_nodes_check/check_ml_nodes';
 
 import { DataFrameAnalyticsId, DataFrameAnalyticsConfig } from '../../../../common';
 
@@ -102,6 +103,7 @@ export const getInitialState = (): State => ({
   },
   jobConfig: {},
   disabled:
+    !mlNodesAvailable() ||
     !checkPermission('canCreateDataFrameAnalytics') ||
     !checkPermission('canStartStopDataFrameAnalytics'),
   indexNames: [],

diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/page.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/page.tsx
@@ -22,6 +22,8 @@ import { NavigationMenu } from '../../../components/navigation_menu';
 import { DataFrameAnalyticsList } from './components/analytics_list';
 import { useRefreshInterval } from './components/analytics_list/use_refresh_interval';
 import { useCreateAnalyticsForm } from './hooks/use_create_analytics_form';
+import { NodeAvailableWarning } from '../../../components/node_available_warning';
+import { UpgradeWarning } from '../../../components/upgrade';
 
 export const Page: FC = () => {
   const [blockRefresh, setBlockRefresh] = useState(false);
@@ -62,6 +64,10 @@ export const Page: FC = () => {
               </EuiTitle>
             </EuiPageHeaderSection>
           </EuiPageHeader>
+
+          <NodeAvailableWarning />
+          <UpgradeWarning />
+
           <DataFrameAnalyticsList
             blockRefresh={blockRefresh}
             createAnalyticsForm={createAnalyticsForm}

diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/route.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/route.ts
@@ -9,6 +9,8 @@ import uiRoutes from 'ui/routes';
 // @ts-ignore
 import { checkFullLicense } from '../../../license/check_license';
 import { checkGetJobsPrivilege } from '../../../privilege/check_privilege';
+import { loadMlServerInfo } from '../../../services/ml_server_info';
+import { getMlNodeCount } from '../../../ml_nodes_check/check_ml_nodes';
 import {
   loadCurrentIndexPattern,
   loadCurrentSavedSearch,
@@ -26,5 +28,7 @@ uiRoutes.when('/data_frame_analytics/?', {
     privileges: checkGetJobsPrivilege,
     indexPattern: loadCurrentIndexPattern,
     savedSearch: loadCurrentSavedSearch,
+    mlNodeCount: getMlNodeCount,
+    loadMlServerInfo,
   },
 });
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/jobs_list_view/jobs_list_view.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/jobs_list_view/jobs_list_view.js
@@ -21,7 +21,7 @@ import { CreateWatchFlyout } from '../create_watch_flyout';
 import { MultiJobActions } from '../multi_job_actions';
 import { NewJobButton } from '../new_job_button';
 import { JobStatsBar } from '../jobs_stats_bar';
-import { NodeAvailableWarning } from '../node_available_warning';
+import { NodeAvailableWarning } from '../../../../components/node_available_warning';
 import { UpgradeWarning } from '../../../../components/upgrade';
 import { RefreshJobsListButton } from '../refresh_jobs_list_button';
 import { isEqual } from 'lodash';

diff --git a/x-pack/legacy/plugins/ml/public/overview/overview_page.tsx b/x-pack/legacy/plugins/ml/public/overview/overview_page.tsx
@@ -11,17 +11,23 @@ import { mlNodesAvailable } from '../ml_nodes_check/check_ml_nodes';
 import { NavigationMenu } from '../components/navigation_menu';
 import { OverviewSideBar } from './components/sidebar';
 import { OverviewContent } from './components/content';
+import { NodeAvailableWarning } from '../components/node_available_warning';
+import { UpgradeWarning } from '../components/upgrade';
 
 export const OverviewPage: FC = () => {
   const disableCreateAnomalyDetectionJob = !checkPermission('canCreateJob') || !mlNodesAvailable();
   const disableCreateAnalyticsButton =
+    !mlNodesAvailable() ||
     !checkPermission('canCreateDataFrameAnalytics') ||
     !checkPermission('canStartStopDataFrameAnalytics');
   return (
     <Fragment>
       <NavigationMenu tabId="overview" />
       <EuiPage data-test-subj="mlPageOverview">
         <EuiPageBody>
+          <NodeAvailableWarning />
+          <UpgradeWarning />
+
           <EuiFlexGroup>
             <OverviewSideBar createAnomalyDetectionJobDisabled={disableCreateAnomalyDetectionJob} />
             <OverviewContent

diff --git a/x-pack/legacy/plugins/ml/public/overview/route.ts b/x-pack/legacy/plugins/ml/public/overview/route.ts
@@ -9,6 +9,7 @@ import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
 // @ts-ignore no declaration module
 import { checkFullLicense } from '../license/check_license';
 import { checkGetJobsPrivilege } from '../privilege/check_privilege';
+import { loadMlServerInfo } from '../services/ml_server_info';
 import { getOverviewBreadcrumbs } from './breadcrumbs';
 import './directive';
 
@@ -21,5 +22,6 @@ uiRoutes.when('/overview/?', {
     CheckLicense: checkFullLicense,
     privileges: checkGetJobsPrivilege,
     mlNodeCount: getMlNodeCount,
+    loadMlServerInfo,
   },
 });
diff --git a/x-pack/package.json b/x-pack/package.json
@@ -36,7 +36,6 @@
     "@kbn/test": "1.0.0",
     "@kbn/utility-types": "1.0.0",
     "@mattapperson/slapshot": "1.4.0",
-    "@reach/router": "^1.2.1",
     "@storybook/addon-actions": "^5.2.6",
     "@storybook/addon-console": "^1.2.1",
     "@storybook/addon-info": "^5.2.6",

diff --git a/yarn.lock b/yarn.lock
@@ -3791,7 +3791,7 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
-"@types/reach__router@^1.2.3":
+"@types/reach__router@^1.2.3", "@types/reach__router@^1.2.6":
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.2.6.tgz#b14cf1adbd1a365d204bbf6605cd9dd7b8816c87"
   integrity sha512-Oh5DAVr/L2svBvubw6QEFpXGu295Y406BPs4i9t1n2pp7M+q3pmCmhzb9oZV5wncR41KCD3NHl1Yhi7uKnTPsA==