[7.x] Move angular related parts from kibana_legacy to monitoring (#1…

…14977) (#115198)

* Move angular related parts from kibana_legacy to monitoring (#114977)

* Move angular related parts from kibana_legacy to monitoring

Closes: #114977

* remove private

* move format angular http error into monitoring

* fix translations

* fix type error

Co-authored-by: Kibana Machine <[email protected]>

src/plugins/kibana_legacy/public/index.ts

@@ -16,7 +16,4 @@ export const plugin = (initializerContext: PluginInitializerContext) =>
   new KibanaLegacyPlugin(initializerContext);
 
 export * from './plugin';
-
-export * from './angular';
 export * from './notify';
-export * from './utils';

src/plugins/kibana_legacy/public/notify/lib/index.ts

@@ -8,8 +8,3 @@
 
 export { formatESMsg } from './format_es_msg';
 export { formatMsg } from './format_msg';
-export {
-  isAngularHttpError,
-  formatAngularHttpError,
-  AngularHttpError,
-} from './format_angular_http_error';

src/plugins/vis_types/vislib/public/vislib/lib/binder.ts

@@ -33,14 +33,14 @@ export class Binder {
     destroyers.forEach((fn) => fn());
   }
 
-  jqOn(el: HTMLElement, ...args: [string, (event: JQueryEventObject) => void]) {
+  jqOn(el: HTMLElement, ...args: [string, (event: JQuery.Event) => void]) {
     const $el = $(el);
     $el.on(...args);
     this.disposal.push(() => $el.off(...args));
   }
 
-  fakeD3Bind(el: HTMLElement, event: string, handler: (event: JQueryEventObject) => void) {
-    this.jqOn(el, event, (e: JQueryEventObject) => {
+  fakeD3Bind(el: HTMLElement, event: string, handler: (event: JQuery.Event) => void) {
+    this.jqOn(el, event, (e: JQuery.Event) => {
       // mimic https://github.com/mbostock/d3/blob/3abb00113662463e5c19eb87cd33f6d0ddc23bc0/src/selection/on.js#L87-L94
       const o = d3.event; // Events can be reentrant (e.g., focus).
       d3.event = e;

x-pack/plugins/monitoring/kibana.json

@@ -7,14 +7,7 @@
     "githubTeam": "stack-monitoring-ui"
   },
   "configPath": ["monitoring"],
-  "requiredPlugins": [
-    "licensing",
-    "features",
-    "data",
-    "navigation",
-    "kibanaLegacy",
-    "observability"
-  ],
+  "requiredPlugins": ["licensing", "features", "data", "navigation", "observability"],
   "optionalPlugins": [
     "infra",
     "usageCollection",
@@ -27,5 +20,12 @@
   ],
   "server": true,
   "ui": true,
-  "requiredBundles": ["kibanaUtils", "home", "alerting", "kibanaReact", "licenseManagement"]
+  "requiredBundles": [
+    "kibanaUtils",
+    "home",
+    "alerting",
+    "kibanaReact",
+    "licenseManagement",
+    "kibanaLegacy"
+  ]
 }

x-pack/plugins/monitoring/public/angular/app_modules.ts

@@ -15,10 +15,7 @@ import { upperFirst } from 'lodash';
 import { CoreStart } from 'kibana/public';
 import { i18nDirective, i18nFilter, I18nProvider } from './angular_i18n';
 import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import {
-  createTopNavDirective,
-  createTopNavHelper,
-} from '../../../../../src/plugins/kibana_legacy/public';
+import { createTopNavDirective, createTopNavHelper } from './top_nav';
 import { MonitoringStartPluginDependencies } from '../types';
 import { GlobalState } from '../url_state';
 import { getSafeForExternalLink } from '../lib/get_safe_for_external_link';

src/plugins/kibana_legacy/public/notify/lib/format_angular_http_error.ts → x-pack/plugins/monitoring/public/angular/helpers/format_angular_http_error.ts

@@ -1,15 +1,14 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
 
 import { i18n } from '@kbn/i18n';
-import { IHttpResponse } from 'angular';
+import type { IHttpResponse } from 'angular';
 
-export type AngularHttpError = IHttpResponse<{ message: string }>;
+type AngularHttpError = IHttpResponse<{ message: string }>;
 
 export function isAngularHttpError(error: any): error is AngularHttpError {
   return (
@@ -25,15 +24,15 @@ export function formatAngularHttpError(error: AngularHttpError) {
   // is an Angular $http "error object"
   if (error.status === -1) {
     // status = -1 indicates that the request was failed to reach the server
-    return i18n.translate('kibana_legacy.notify.fatalError.unavailableServerErrorMessage', {
+    return i18n.translate('xpack.monitoring.notify.fatalError.unavailableServerErrorMessage', {
       defaultMessage:
         'An HTTP request has failed to connect. ' +
         'Please check if the Kibana server is running and that your browser has a working connection, ' +
         'or contact your system administrator.',
     });
   }
 
-  return i18n.translate('kibana_legacy.notify.fatalError.errorStatusMessage', {
+  return i18n.translate('xpack.monitoring.notify.fatalError.errorStatusMessage', {
     defaultMessage: 'Error {errStatus} {errStatusText}: {errMessage}',
     values: {
       errStatus: error.status,

x-pack/plugins/monitoring/public/angular/index.ts

@@ -8,7 +8,7 @@
 import angular, { IModule } from 'angular';
 import { uiRoutes } from './helpers/routes';
 import { Legacy } from '../legacy_shims';
-import { configureAppAngularModule } from '../../../../../src/plugins/kibana_legacy/public';
+import { configureAppAngularModule } from '../angular/top_nav';
 import { localAppModule, appModuleName } from './app_modules';
 import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
 
@@ -28,7 +28,6 @@ export class AngularApp {
       externalConfig,
       triggersActionsUi,
       usageCollection,
-      kibanaLegacy,
       appMountParameters,
     } = deps;
     const app: IModule = localAppModule(deps);
@@ -43,7 +42,6 @@ export class AngularApp {
           isCloud,
           pluginInitializerContext,
           externalConfig,
-          kibanaLegacy,
           triggersActionsUi,
           usageCollection,
           appMountParameters,

src/plugins/kibana_legacy/public/angular/angular_config.tsx → x-pack/plugins/monitoring/public/angular/top_nav/angular_config.tsx

@@ -1,9 +1,8 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
 
 import {
@@ -23,7 +22,7 @@ import { ChromeBreadcrumb, EnvironmentMode, PackageInfo } from 'kibana/public';
 import { History } from 'history';
 
 import { CoreStart } from 'kibana/public';
-import { formatAngularHttpError, isAngularHttpError } from '../notify/lib';
+import { formatAngularHttpError, isAngularHttpError } from '../helpers/format_angular_http_error';
 
 export interface RouteConfiguration {
   controller?: string | ((...args: any[]) => void);

src/plugins/kibana_legacy/public/angular/index.ts → x-pack/plugins/monitoring/public/angular/top_nav/index.ts

@@ -1,10 +1,10 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
+
 export * from './angular_config';
 // @ts-ignore
 export { createTopNavDirective, createTopNavHelper, loadKbnTopNavDirectives } from './kbn_top_nav';