Merge branch 'master' into fix/revert-use-kibana-ui-setting

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",

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',

src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_editor/editor.test.tsx

@@ -62,10 +62,6 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
           updateCurrentState: () => {},
         },
       },
-      // eslint-disable-next-line
-      ResizeChecker: function() {
-        return { on: () => {} };
-      },
       docLinkVersion: 'NA',
     };
     editor = mount(

src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_editor/editor.tsx

@@ -63,7 +63,6 @@ const DEFAULT_INPUT_VALUE = `GET _search
 function _Editor({ previousStateLocation = 'stored' }: EditorProps) {
   const {
     services: { history, notifications },
-    ResizeChecker,
     docLinkVersion,
   } = useAppContext();
 
@@ -130,7 +129,6 @@ function _Editor({ previousStateLocation = 'stored' }: EditorProps) {
     mappings.retrieveAutoCompleteInfo();
 
     const unsubscribeResizer = subscribeResizeChecker(
-      ResizeChecker,
       editorRef.current!,
       editorInstanceRef.current
     );

src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_editor/editor_output.tsx

@@ -31,7 +31,6 @@ function _EditorOuput() {
   const editorInstanceRef = useRef<null | any>(null);
   const {
     services: { settings },
-    ResizeChecker,
   } = useAppContext();
 
   const dispatch = useEditorActionContext();
@@ -42,11 +41,7 @@ function _EditorOuput() {
     const editor$ = $(editorRef.current!);
     editorInstanceRef.current = initializeOutput(editor$, settings);
     editorInstanceRef.current.update('');
-    const unsubscribe = subscribeResizeChecker(
-      ResizeChecker,
-      editorRef.current!,
-      editorInstanceRef.current
-    );
+    const unsubscribe = subscribeResizeChecker(editorRef.current!, editorInstanceRef.current);
 
     dispatch({ type: 'setOutputEditor', value: editorInstanceRef.current });
 

src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_history/console_history.tsx

@@ -45,7 +45,6 @@ const CHILD_ELEMENT_PREFIX = 'historyReq';
 export function ConsoleHistory({ close }: Props) {
   const {
     services: { history },
-    ResizeChecker,
   } = useAppContext();
 
   const dispatch = useEditorActionContext();
@@ -200,7 +199,6 @@ export function ConsoleHistory({ close }: Props) {
           <HistoryViewer
             settings={readOnlySettings}
             req={viewingReq}
-            ResizeChecker={ResizeChecker}
           />
         </div>
 

src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_history/history_viewer.tsx

@@ -31,10 +31,9 @@ import { applyCurrentSettings } from '../console_editor/apply_editor_settings';
 interface Props {
   settings: DevToolsSettings;
   req: any | null;
-  ResizeChecker: any;
 }
 
-export function HistoryViewer({ settings, ResizeChecker, req }: Props) {
+export function HistoryViewer({ settings, req }: Props) {
   const divRef = useRef<HTMLDivElement | null>(null);
   const viewerRef = useRef<any | null>(null);
 
@@ -43,7 +42,7 @@ export function HistoryViewer({ settings, ResizeChecker, req }: Props) {
     viewerRef.current = viewer;
     viewer.renderer.setShowPrintMargin(false);
     viewer.$blockScrolling = Infinity;
-    const unsubscribe = subscribeResizeChecker(ResizeChecker, divRef.current!, viewer);
+    const unsubscribe = subscribeResizeChecker(divRef.current!, viewer);
     return () => unsubscribe();
   }, []);
 

src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts

@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { ResizeChecker } from '../../../../../../../../../plugins/kibana_utils/public';
 
-export function subscribeResizeChecker(ResizeChecker: any, $el: any, ...editors: any[]) {
-  const checker = new ResizeChecker($el);
+export function subscribeResizeChecker(el: HTMLElement, ...editors: any[]) {
+  const checker = new ResizeChecker(el);
   checker.on('resize', () =>
     editors.forEach(e => {
       e.resize();

src/legacy/core_plugins/console/np_ready/public/application/context/app_context.tsx

@@ -29,7 +29,6 @@ interface ContextValue {
     notifications: NotificationsSetup;
   };
   docLinkVersion: string;
-  ResizeChecker: any;
 }
 
 interface ContextProps {

src/legacy/core_plugins/console/np_ready/public/application/index.tsx

@@ -32,10 +32,9 @@ export function legacyBackDoorToSettings() {
 export function boot(deps: {
   docLinkVersion: string;
   I18nContext: any;
-  ResizeChecker: any;
   notifications: NotificationsSetup;
 }) {
-  const { I18nContext, ResizeChecker, notifications, docLinkVersion } = deps;
+  const { I18nContext, notifications, docLinkVersion } = deps;
 
   const storage = createStorage({
     engine: window.localStorage,
@@ -51,7 +50,6 @@ export function boot(deps: {
         value={{
           docLinkVersion,
           services: { storage, history, settings, notifications },
-          ResizeChecker,
         }}
       >
         <EditorContextProvider settings={settings.toJSON()}>

src/legacy/core_plugins/console/np_ready/public/legacy.ts

@@ -26,15 +26,13 @@ import 'brace/mode/text';
 /* eslint-disable @kbn/eslint/no-restricted-paths */
 import { npSetup, npStart } from 'ui/new_platform';
 import { I18nContext } from 'ui/i18n';
-import { ResizeChecker } from 'ui/resize_checker';
 /* eslint-enable @kbn/eslint/no-restricted-paths */
 
 export interface XPluginSet {
   devTools: DevToolsSetup;
   feature_catalogue: FeatureCatalogueSetup;
   __LEGACY: {
     I18nContext: any;
-    ResizeChecker: any;
   };
 }
 
@@ -48,7 +46,6 @@ pluginInstance.setup(npSetup.core, {
   ...npSetup.plugins,
   __LEGACY: {
     I18nContext,
-    ResizeChecker,
   },
 });
 pluginInstance.start(npStart.core);

src/legacy/core_plugins/console/np_ready/public/plugin.ts

@@ -30,7 +30,7 @@ export class ConsoleUIPlugin implements Plugin<any, any> {
 
   async setup({ notifications }: CoreSetup, pluginSet: XPluginSet) {
     const {
-      __LEGACY: { I18nContext, ResizeChecker },
+      __LEGACY: { I18nContext },
       devTools,
       feature_catalogue,
     } = pluginSet;
@@ -62,7 +62,6 @@ export class ConsoleUIPlugin implements Plugin<any, any> {
           boot({
             docLinkVersion: ctx.core.docLinks.DOC_LINK_VERSION,
             I18nContext,
-            ResizeChecker,
             notifications,
           }),
           element