Merge remote-tracking branch 'upstream/master' into lens/hidden-column

elastic · Feb 3, 2021 · 0ec8926 · 0ec8926
2 parents 46ec8ac + e108e5b
commit 0ec8926
Show file tree

Hide file tree

Showing 15 changed files with 87 additions and 16 deletions.
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
@@ -34,18 +34,19 @@ export type GetDataFrameAnalyticsStatsResponse =
   | GetDataFrameAnalyticsStatsResponseOk
   | GetDataFrameAnalyticsStatsResponseError;
 
-interface GetDataFrameAnalyticsResponse {
+export interface GetDataFrameAnalyticsResponse {
   count: number;
   data_frame_analytics: DataFrameAnalyticsConfig[];
 }
 
-interface DeleteDataFrameAnalyticsWithIndexResponse {
+export interface DeleteDataFrameAnalyticsWithIndexResponse {
   acknowledged: boolean;
   analyticsJobDeleted: DeleteDataFrameAnalyticsWithIndexStatus;
   destIndexDeleted: DeleteDataFrameAnalyticsWithIndexStatus;
   destIndexPatternDeleted: DeleteDataFrameAnalyticsWithIndexStatus;
 }
-interface JobsExistsResponse {
+
+export interface JobsExistsResponse {
   results: {
     [jobId: string]: boolean;
   };

diff --git a/x-pack/plugins/ml/server/models/job_service/error_utils.ts b/x-pack/plugins/ml/server/models/job_service/error_utils.ts
@@ -14,7 +14,7 @@ export function isRequestTimeout(error: { name: string }) {
   return error.name === REQUEST_TIMEOUT_NAME;
 }
 
-interface Results {
+export interface Results {
   [id: string]: {
     [status: string]: any;
     error?: any;

diff --git a/x-pack/plugins/ml/server/models/job_service/groups.ts b/x-pack/plugins/ml/server/models/job_service/groups.ts
@@ -10,13 +10,13 @@ import { Job } from '../../../common/types/anomaly_detection_jobs';
 import { MlJobsResponse } from '../../../common/types/job_service';
 import type { MlClient } from '../../lib/ml_client';
 
-interface Group {
+export interface Group {
   id: string;
   jobIds: string[];
   calendarIds: string[];
 }
 
-interface Results {
+export interface Results {
   [id: string]: {
     success: boolean;
     error?: any;

diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
@@ -17,7 +17,7 @@ interface Result {
   value: Value;
 }
 
-interface ProcessedResults {
+export interface ProcessedResults {
   success: boolean;
   results: Record<number, Result[]>;
   totalResults: number;

diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
@@ -23,7 +23,7 @@ interface Result {
   values: Thing[];
 }
 
-interface ProcessedResults {
+export interface ProcessedResults {
   success: boolean;
   results: Record<number, Result[]>;
   totalResults: number;

diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
@@ -9,7 +9,7 @@ import { _DOC_COUNT } from '../../../../common/constants/field_types';
 import { Aggregation, Field, NewJobCaps } from '../../../../common/types/fields';
 import { fieldServiceProvider } from './field_service';
 
-interface NewJobCapsResponse {
+export interface NewJobCapsResponse {
   [indexPattern: string]: NewJobCaps;
 }
 

diff --git a/x-pack/plugins/ml/server/saved_objects/checks.ts b/x-pack/plugins/ml/server/saved_objects/checks.ts
@@ -33,7 +33,7 @@ interface JobStatus {
   };
 }
 
-interface StatusResponse {
+export interface StatusResponse {
   savedObjects: {
     [type in JobType]: JobSavedObjectStatus[];
   };

diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
@@ -0,0 +1,34 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "common/**/*",
+    "public/**/*",
+    "server/**/*",
+    "__mocks__/**/*",
+    "shared_imports.ts",
+    "../../../typings/**/*",
+    // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
+    "public/**/*.json",
+    "server/**/*.json",
+  ],
+  "references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../../../src/plugins/embeddable/tsconfig.json" },
+    { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" },
+    { "path": "../cloud/tsconfig.json" },
+    { "path": "../features/tsconfig.json" },
+    { "path": "../file_upload/tsconfig.json" },
+    { "path": "../license_management/tsconfig.json" },
+    { "path": "../licensing/tsconfig.json" },
+    { "path": "../maps/tsconfig.json" },
+    { "path": "../security/tsconfig.json" },
+    { "path": "../spaces/tsconfig.json" },
+  ]
+}
diff --git a/x-pack/plugins/security_solution/public/cases/components/case_view/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/case_view/index.test.tsx
@@ -144,7 +144,7 @@ describe('CaseView ', () => {
     jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
     useGetCaseUserActionsMock.mockImplementation(() => defaultUseGetCaseUserActions);
     usePostPushToServiceMock.mockImplementation(() => ({ isLoading: false, postPushToService }));
-    useConnectorsMock.mockImplementation(() => ({ connectors: connectorsMock, isLoading: false }));
+    useConnectorsMock.mockImplementation(() => ({ connectors: connectorsMock, loading: false }));
     useQueryAlertsMock.mockImplementation(() => ({
       loading: false,
       data: { hits: { hits: alertsHit } },
@@ -705,4 +705,38 @@ describe('CaseView ', () => {
       expect(updateObject.updateValue).toEqual({ syncAlerts: false });
     });
   });
+
+  describe('Callouts', () => {
+    it('it shows the danger callout when a connector has been deleted', async () => {
+      useConnectorsMock.mockImplementation(() => ({ connectors: [], loading: false }));
+      const wrapper = mount(
+        <TestProviders>
+          <Router history={mockHistory}>
+            <CaseComponent {...caseProps} />
+          </Router>
+        </TestProviders>
+      );
+
+      await waitFor(() => {
+        wrapper.update();
+        expect(wrapper.find('.euiCallOut--danger').first().exists()).toBeTruthy();
+      });
+    });
+
+    it('it does NOT shows the danger callout when connectors are loading', async () => {
+      useConnectorsMock.mockImplementation(() => ({ connectors: [], loading: true }));
+      const wrapper = mount(
+        <TestProviders>
+          <Router history={mockHistory}>
+            <CaseComponent {...caseProps} />
+          </Router>
+        </TestProviders>
+      );
+
+      await waitFor(() => {
+        wrapper.update();
+        expect(wrapper.find('.euiCallOut--danger').first().exists()).toBeFalsy();
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/cases/components/case_view/index.tsx b/x-pack/plugins/security_solution/public/cases/components/case_view/index.tsx
@@ -295,7 +295,7 @@ export const CaseComponent = React.memo<CaseProps>(
       connectors,
       updateCase: handleUpdateCase,
       userCanCrud,
-      isValidConnector,
+      isValidConnector: isLoadingConnectors ? true : isValidConnector,
       alerts,
     });
 

diff --git a/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts b/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts
@@ -13,8 +13,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const appsMenu = getService('appsMenu');
   const managementMenu = getService('managementMenu');
 
-  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/89180
-  describe.skip('security', () => {
+  describe('security', () => {
     before(async () => {
       await esArchiver.load('empty_kibana');
       await PageObjects.common.navigateToApp('home');

diff --git a/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts b/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts
@@ -13,8 +13,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const appsMenu = getService('appsMenu');
   const managementMenu = getService('managementMenu');
 
-  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/89181
-  describe.skip('security', () => {
+  describe('security', () => {
     before(async () => {
       await esArchiver.load('empty_kibana');
       await PageObjects.common.navigateToApp('home');

diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
@@ -52,6 +52,7 @@
     { "path": "../plugins/event_log/tsconfig.json" },
     { "path": "../plugins/licensing/tsconfig.json" },
     { "path": "../plugins/lens/tsconfig.json" },
+    { "path": "../plugins/ml/tsconfig.json" },
     { "path": "../plugins/task_manager/tsconfig.json" },
     { "path": "../plugins/telemetry_collection_xpack/tsconfig.json" },
     { "path": "../plugins/triggers_actions_ui/tsconfig.json" },

diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
@@ -26,6 +26,7 @@
     "plugins/maps/**/*",
     "plugins/maps_file_upload/**/*",
     "plugins/maps_legacy_licensing/**/*",
+    "plugins/ml/**/*",
     "plugins/observability/**/*",
     "plugins/reporting/**/*",
     "plugins/searchprofiler/**/*",
@@ -118,6 +119,7 @@
     { "path": "./plugins/maps_file_upload/tsconfig.json" },
     { "path": "./plugins/maps_legacy_licensing/tsconfig.json" },
     { "path": "./plugins/maps/tsconfig.json" },
+    { "path": "./plugins/ml/tsconfig.json" },
     { "path": "./plugins/observability/tsconfig.json" },
     { "path": "./plugins/painless_lab/tsconfig.json" },
     { "path": "./plugins/saved_objects_tagging/tsconfig.json" },

diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json
@@ -29,6 +29,7 @@
     { "path": "./plugins/maps_file_upload/tsconfig.json" },
     { "path": "./plugins/maps_legacy_licensing/tsconfig.json" },
     { "path": "./plugins/maps/tsconfig.json" },
+    { "path": "./plugins/ml/tsconfig.json" },
     { "path": "./plugins/observability/tsconfig.json" },
     { "path": "./plugins/painless_lab/tsconfig.json" },
     { "path": "./plugins/reporting/tsconfig.json" },