Merge remote-tracking branch 'upstream/master' into task/EMT141-Polic…

…y-UI-Route

x-pack/legacy/plugins/canvas/public/legacy.ts

@@ -10,7 +10,6 @@ import { CanvasStartDeps } from './plugin'; // eslint-disable-line import/order
 // @ts-ignore Untyped Kibana Lib
 import chrome, { loadingCount } from 'ui/chrome'; // eslint-disable-line import/order
 import { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url'; // eslint-disable-line import/order
-import { Storage } from '../../../../../src/plugins/kibana_utils/public'; // eslint-disable-line import/order
 // @ts-ignore Untyped Kibana Lib
 import { formatMsg } from '../../../../../src/plugins/kibana_legacy/public'; // eslint-disable-line import/order
 
@@ -31,7 +30,6 @@ const shimStartPlugins: CanvasStartDeps = {
     absoluteToParsedUrl,
     // ToDo: Copy directly into canvas
     formatMsg,
-    storage: Storage,
     // ToDo: Won't be a part of New Platform. Will need to handle internally
     trackSubUrlForApp: chrome.trackSubUrlForApp,
   },

x-pack/legacy/plugins/canvas/public/lib/clipboard.test.ts

@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+jest.mock('../../../../../../src/plugins/kibana_utils/public');
+
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { setClipboardData, getClipboardData } from './clipboard';
+import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants';
+import { elements } from '../../__tests__/fixtures/workpads';
+
+const set = jest.fn();
+const get = jest.fn();
+
+describe('clipboard', () => {
+  beforeAll(() => {
+    // @ts-ignore
+    Storage.mockImplementation(() => ({
+      set,
+      get,
+    }));
+  });
+
+  test('stores data to local storage', () => {
+    setClipboardData(elements);
+
+    expect(set).toBeCalledWith(LOCALSTORAGE_CLIPBOARD, JSON.stringify(elements));
+  });
+
+  test('gets data from local storage', () => {
+    getClipboardData();
+
+    expect(get).toBeCalledWith(LOCALSTORAGE_CLIPBOARD);
+  });
+});

x-pack/legacy/plugins/canvas/public/lib/clipboard.ts

@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants';
+import { getWindow } from './get_window';
+
+let storage: Storage;
+
+const getStorage = (): Storage => {
+  if (!storage) {
+    storage = new Storage(getWindow().localStorage);
+  }
+
+  return storage;
+};
+
+export const setClipboardData = (data: any) => {
+  getStorage().set(LOCALSTORAGE_CLIPBOARD, JSON.stringify(data));
+};
+
+export const getClipboardData = () => getStorage().get(LOCALSTORAGE_CLIPBOARD);

x-pack/legacy/plugins/canvas/public/lib/get_window.ts

@@ -5,8 +5,10 @@
  */
 
 // return window if it exists, otherwise just return an object literal
-const windowObj = { location: null };
+const windowObj = { location: null, localStorage: {} as Window['localStorage'] };
 
-export const getWindow = (): Window | { location: Location | null } => {
+export const getWindow = ():
+  | Window
+  | { location: Location | null; localStorage: Window['localStorage'] } => {
   return typeof window === 'undefined' ? windowObj : window;
 };

x-pack/legacy/plugins/canvas/public/plugin.tsx

@@ -8,7 +8,6 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Chrome } from 'ui/chrome';
 import { i18n } from '@kbn/i18n';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
 import { CoreSetup, CoreStart, Plugin } from '../../../../../src/core/public';
 import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
 // @ts-ignore: Untyped Local
@@ -43,7 +42,6 @@ export interface CanvasStartDeps {
   __LEGACY: {
     absoluteToParsedUrl: (url: string, basePath: string) => any;
     formatMsg: any;
-    storage: typeof Storage;
     trackSubUrlForApp: Chrome['trackSubUrlForApp'];
   };
 }
@@ -92,7 +90,6 @@ export class CanvasPlugin
     loadExpressionTypes();
     loadTransitions();
 
-    initClipboard(plugins.__LEGACY.storage);
     initLoadingIndicator(core.http.addLoadingCountSource);
 
     core.chrome.setBadge(

x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/detector_cards.tsx

@@ -17,6 +17,7 @@ interface CardProps {
 export const CountCard: FC<CardProps> = ({ onClick, isSelected }) => (
   <EuiFlexItem>
     <EuiCard
+      data-test-subj={`mlJobWizardCategorizationDetectorCountCard${isSelected ? ' selected' : ''}`}
       title={i18n.translate(
         'xpack.ml.newJob.wizard.pickFieldsStep.categorizationDetectorSelect.countCard.title',
         {
@@ -39,6 +40,7 @@ export const CountCard: FC<CardProps> = ({ onClick, isSelected }) => (
 export const RareCard: FC<CardProps> = ({ onClick, isSelected }) => (
   <EuiFlexItem>
     <EuiCard
+      data-test-subj={`mlJobWizardCategorizationDetectorRareCard${isSelected ? ' selected' : ''}`}
       title={i18n.translate(
         'xpack.ml.newJob.wizard.pickFieldsStep.categorizationDetectorSelect.rareCard.title',
         {

x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/examples_valid_callout.tsx

@@ -56,7 +56,11 @@ export const ExamplesValidCallout: FC<Props> = ({
   }
 
   return (
-    <EuiCallOut color={color} title={title}>
+    <EuiCallOut
+      color={color}
+      title={title}
+      data-test-subj={`mlJobWizardCategorizationExamplesCallout ${overallValidStatus}`}
+    >
       {validationChecks.map((v, i) => (
         <div key={i}>{v.message}</div>
       ))}

x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/field_examples.tsx

@@ -57,7 +57,13 @@ export const FieldExamples: FC<Props> = ({ fieldExamples }) => {
     txt.push(buffer);
     return { example: txt };
   });
-  return <EuiBasicTable columns={columns} items={items} />;
+  return (
+    <EuiBasicTable
+      columns={columns}
+      items={items}
+      data-test-subj="mlJobWizardCategorizationExamplesTable"
+    />
+  );
 };
 
 const Token: FC = ({ children }) => (