[Lens] library annotation groups

packages/core/capabilities/core-capabilities-browser-mocks/src/capabilities_service.mock.ts

@@ -6,19 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { deepFreeze } from '@kbn/std';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   CapabilitiesStart,
   CapabilitiesService,
 } from '@kbn/core-capabilities-browser-internal';
 
 const createStartContractMock = (): jest.Mocked<CapabilitiesStart> => ({
-  capabilities: deepFreeze({
+  capabilities: {
     catalogue: {},
     management: {},
     navLinks: {},
-  }),
+  },
 });
 
 const createMock = (): jest.Mocked<PublicMethodsOf<CapabilitiesService>> => ({

packages/core/capabilities/core-capabilities-browser-mocks/tsconfig.json

@@ -12,7 +12,6 @@
     "**/*.tsx",
   ],
   "kbn_references": [
-    "@kbn/std",
     "@kbn/utility-types",
     "@kbn/core-capabilities-browser-internal"
   ],

packages/kbn-check-mappings-update-cli/current_mappings.json

@@ -931,6 +931,17 @@
       }
     }
   },
+  "event-annotation-group": {
+    "dynamic": false,
+    "properties": {
+      "title": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      }
+    }
+  },
   "visualization": {
     "dynamic": false,
     "properties": {

packages/kbn-optimizer/limits.yml

@@ -39,7 +39,7 @@ pageLoadAssetSize:
   embeddableEnhanced: 22107
   enterpriseSearch: 35741
   esUiShared: 326654
-  eventAnnotation: 20500
+  eventAnnotation: 22000
   exploratoryView: 74673
   expressionError: 22127
   expressionGauge: 25000

src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts

@@ -86,6 +86,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "enterprise_search_telemetry": "9ac912e1417fc8681e0cd383775382117c9e3d3d",
         "epm-packages": "2449bb565f987eff70b1b39578bb17e90c404c6e",
         "epm-packages-assets": "7a3e58efd9a14191d0d1a00b8aaed30a145fd0b1",
+        "event-annotation-group": "715ba867d8c68f3c9438052210ea1c30a9362582",
         "event_loop_delays_daily": "01b967e8e043801357503de09199dfa3853bab88",
         "exception-list": "4aebc4e61fb5d608cae48eaeb0977e8db21c61a4",
         "exception-list-agnostic": "6d3262d58eee28ac381ec9654f93126a58be6f5d",

src/core/server/integration_tests/saved_objects/migrations/group3/dot_kibana_split.test.ts

@@ -201,6 +201,7 @@ describe('split .kibana index into multiple system indices', () => {
             "enterprise_search_telemetry",
             "epm-packages",
             "epm-packages-assets",
+            "event-annotation-group",
             "event_loop_delays_daily",
             "exception-list",
             "exception-list-agnostic",

src/core/server/integration_tests/saved_objects/migrations/group3/type_registrations.test.ts

@@ -43,6 +43,7 @@ const previouslyRegisteredTypes = [
   'csp-rule-template',
   'csp_rule',
   'dashboard',
+  'event-annotation-group',
   'endpoint:user-artifact',
   'endpoint:user-artifact-manifest',
   'enterprise_search_telemetry',

src/plugins/chart_expressions/expression_xy/public/plugin.ts

@@ -12,7 +12,7 @@ import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { CoreSetup, CoreStart, IUiSettingsClient } from '@kbn/core/public';
-import { EventAnnotationPluginSetup } from '@kbn/event-annotation-plugin/public';
+import type { EventAnnotationPluginStart } from '@kbn/event-annotation-plugin/public';
 import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import { ExpressionXyPluginSetup, ExpressionXyPluginStart, SetupDeps } from './types';
 import {
@@ -37,7 +37,7 @@ export interface XYPluginStartDependencies {
   data: DataPublicPluginStart;
   fieldFormats: FieldFormatsStart;
   charts: ChartsPluginStart;
-  eventAnnotation: EventAnnotationPluginSetup;
+  eventAnnotation: EventAnnotationPluginStart;
   usageCollection?: UsageCollectionStart;
 }
 

src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx

@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { EuiFormRow, EuiTextArea, EuiSwitch } from '@elastic/eui';
+import { EuiFormRow, EuiSwitch } from '@elastic/eui';
 import { SavedObjectSaveModal } from '@kbn/saved-objects-plugin/public';
 
 import type { DashboardSaveOptions } from '../../../types';
@@ -39,14 +39,12 @@ interface Props {
 }
 
 interface State {
-  description: string;
   tags: string[];
   timeRestore: boolean;
 }
 
 export class DashboardSaveModal extends React.Component<Props, State> {
   state: State = {
-    description: this.props.description,
     timeRestore: this.props.timeRestore,
     tags: this.props.tags ?? [],
   };
@@ -57,18 +55,20 @@ export class DashboardSaveModal extends React.Component<Props, State> {
 
   saveDashboard = ({
     newTitle,
+    newDescription,
     newCopyOnSave,
     isTitleDuplicateConfirmed,
     onTitleDuplicate,
   }: {
     newTitle: string;
+    newDescription: string;
     newCopyOnSave: boolean;
     isTitleDuplicateConfirmed: boolean;
     onTitleDuplicate: () => void;
   }) => {
     this.props.onSave({
       newTitle,
-      newDescription: this.state.description,
+      newDescription,
       newCopyOnSave,
       newTimeRestore: this.state.timeRestore,
       isTitleDuplicateConfirmed,
@@ -77,12 +77,6 @@ export class DashboardSaveModal extends React.Component<Props, State> {
     });
   };
 
-  onDescriptionChange = (event: any) => {
-    this.setState({
-      description: event.target.value,
-    });
-  };
-
   onTimeRestoreChange = (event: any) => {
     this.setState({
       timeRestore: event.target.checked,
@@ -102,26 +96,12 @@ export class DashboardSaveModal extends React.Component<Props, State> {
             tags,
           });
         }}
+        markOptional
       />
     ) : undefined;
 
     return (
       <Fragment>
-        <EuiFormRow
-          label={
-            <FormattedMessage
-              id="dashboard.topNav.saveModal.descriptionFormRowLabel"
-              defaultMessage="Description"
-            />
-          }
-        >
-          <EuiTextArea
-            data-test-subj="dashboardDescription"
-            value={this.state.description}
-            onChange={this.onDescriptionChange}
-          />
-        </EuiFormRow>
-
         {tagSelector}
 
         <EuiFormRow
@@ -154,13 +134,14 @@ export class DashboardSaveModal extends React.Component<Props, State> {
         onSave={this.saveDashboard}
         onClose={this.props.onClose}
         title={this.props.title}
+        description={this.props.description}
+        showDescription
         showCopyOnSave={this.props.showCopyOnSave}
         initialCopyOnSave={this.props.showCopyOnSave}
         objectType={i18n.translate('dashboard.topNav.saveModal.objectType', {
           defaultMessage: 'dashboard',
         })}
         options={this.renderDashboardSaveOptions()}
-        showDescription={false}
       />
     );
   }

src/plugins/event_annotation/common/constants.ts

@@ -23,3 +23,5 @@ export const AvailableAnnotationIcons = {
   TAG: 'tag',
   TRIANGLE: 'triangle',
 } as const;
+
+export const EVENT_ANNOTATION_GROUP_TYPE = 'event-annotation-group';

src/plugins/event_annotation/common/index.ts

@@ -33,4 +33,7 @@ export type {
   QueryPointEventAnnotationConfig,
   AvailableAnnotationIcon,
   EventAnnotationOutput,
+  EventAnnotationGroupAttributes,
 } from './types';
+
+export { EVENT_ANNOTATION_GROUP_TYPE } from './constants';

src/plugins/event_annotation/common/types.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KibanaQueryOutput } from '@kbn/data-plugin/common';
+import { DataViewSpec, KibanaQueryOutput } from '@kbn/data-plugin/common';
 import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { $Values } from '@kbn/utility-types';
 import { AvailableAnnotationIcons } from './constants';
@@ -82,10 +82,23 @@ export type EventAnnotationConfig =
   | RangeEventAnnotationConfig
   | QueryPointEventAnnotationConfig;
 
+export interface EventAnnotationGroupAttributes {
+  title: string;
+  description: string;
+  tags: string[];
+  ignoreGlobalFilters: boolean;
+  annotations: EventAnnotationConfig[];
+  dataViewSpec?: DataViewSpec;
+}
+
 export interface EventAnnotationGroupConfig {
   annotations: EventAnnotationConfig[];
   indexPatternId: string;
-  ignoreGlobalFilters?: boolean;
+  ignoreGlobalFilters: boolean;
+  title: string;
+  description: string;
+  tags: string[];
+  dataViewSpec?: DataViewSpec;
 }
 
 export type EventAnnotationArgs =

src/plugins/event_annotation/kibana.jsonc

@@ -9,7 +9,12 @@
     "browser": true,
     "requiredPlugins": [
       "expressions",
-      "data"
+      "savedObjectsManagement",
+      "data",
+    ],
+    "requiredBundles": [
+      "savedObjectsFinder",
+      "dataViews"
     ],
     "extraPublicDirs": [
       "common"