[data views] Reduce deprecated api usage

packages/kbn-optimizer/limits.yml

@@ -112,7 +112,7 @@ pageLoadAssetSize:
   uiActionsEnhanced: 38494
   urlDrilldown: 30063
   dataViewEditor: 12000
-  dataViewFieldEditor: 20000
+  dataViewFieldEditor: 27000
   dataViewManagement: 5000
   reporting: 57003
   visTypeHeatmap: 25340

src/plugins/data/common/index.ts

@@ -54,7 +54,6 @@ export type {
 export type {
   IndexPatternsContract,
   DataViewsContract,
-  IndexPatternListItem,
   DataViewListItem,
 } from '../../data_views/common';
 export {
@@ -68,7 +67,6 @@ export {
   DataViewField,
   IndexPatternField,
   DataViewType,
-  IndexPatternType,
   IndexPatternsService,
   DataViewsService,
   IndexPattern,

src/plugins/data/common/kbn_field_types/index.ts

@@ -8,19 +8,12 @@
 
 // NOTE: trick to mark exports as deprecated (only for constants and types, but not for interfaces, classes or enums)
 import {
-  castEsToKbnFieldTypeName as oldCastEsToKbnFieldTypeName,
   getFilterableKbnTypeNames as oldGetFilterableKbnTypeNames,
   getKbnFieldType as oldGetKbnFieldType,
   getKbnTypeNames as oldGetKbnTypeNames,
   KbnFieldType,
 } from '@kbn/field-types';
 
-/**
- * @deprecated Import from the "@kbn/field-types" package directly instead.
- * @removeBy 8.1
- */
-const castEsToKbnFieldTypeName = oldCastEsToKbnFieldTypeName;
-
 /**
  * @deprecated Import from the "@kbn/field-types" package directly instead.
  * @removeBy 8.1
@@ -39,10 +32,4 @@ const getKbnFieldType = oldGetKbnFieldType;
  */
 const getKbnTypeNames = oldGetKbnTypeNames;
 
-export {
-  castEsToKbnFieldTypeName,
-  getKbnFieldType,
-  getKbnTypeNames,
-  getFilterableKbnTypeNames,
-  KbnFieldType,
-};
+export { getKbnFieldType, getKbnTypeNames, getFilterableKbnTypeNames, KbnFieldType };

src/plugins/data/public/index.ts

@@ -82,15 +82,13 @@ export type {
   IndexPatternLoadExpressionFunctionDefinition,
   GetFieldsOptions,
   AggregationRestrictions,
-  IndexPatternListItem,
   DataViewListItem,
 } from '../common';
 export {
   ES_FIELD_TYPES,
   KBN_FIELD_TYPES,
   UI_SETTINGS,
   fieldList,
-  IndexPatternType,
   DuplicateDataViewError,
 } from '../common';
 
@@ -295,12 +293,7 @@ export type {
 
 export type { AggsStart } from './search/aggs';
 
-export {
-  getTime,
-  // kbn field types
-  castEsToKbnFieldTypeName,
-  getKbnTypeNames,
-} from '../common';
+export { getTime, getKbnTypeNames } from '../common';
 
 export { isTimeRange, isQuery } from '../common';
 

src/plugins/data/server/index.ts

@@ -106,7 +106,7 @@ export const search = {
  */
 
 export type { TimeRange } from '../common';
-export { castEsToKbnFieldTypeName, getTime, parseInterval } from '../common';
+export { getTime, parseInterval } from '../common';
 
 /**
  * Static code to be shared externally

src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx

@@ -13,7 +13,7 @@ import memoizeOne from 'memoize-one';
 import { DataViewField } from '../../../data_views/public';
 
 import {
-  IndexPatternSpec,
+  DataViewSpec,
   Form,
   useForm,
   useFormData,
@@ -51,7 +51,7 @@ export interface Props {
   /**
    * Handler for the "save" footer button
    */
-  onSave: (indexPatternSpec: IndexPatternSpec) => void;
+  onSave: (indexPatternSpec: DataViewSpec) => void;
   /**
    * Handler for the "cancel" footer button
    */
@@ -84,7 +84,7 @@ const IndexPatternEditorFlyoutContentComponent = ({
         return;
       }
 
-      const indexPatternStub: IndexPatternSpec = {
+      const indexPatternStub: DataViewSpec = {
         title: formData.title,
         timeFieldName: formData.timestampField?.value,
         id: formData.id,

src/plugins/data_view_editor/public/components/data_view_flyout_content_container.tsx

@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternSpec, useKibana } from '../shared_imports';
+import { DataViewSpec, useKibana } from '../shared_imports';
 import { IndexPatternEditorFlyoutContent } from './data_view_editor_flyout_content';
 import { DataViewEditorContext, DataViewEditorProps } from '../types';
 
@@ -23,9 +23,9 @@ const IndexPatternFlyoutContentContainer = ({
     services: { dataViews, notifications },
   } = useKibana<DataViewEditorContext>();
 
-  const onSaveClick = async (indexPatternSpec: IndexPatternSpec) => {
+  const onSaveClick = async (dataViewSpec: DataViewSpec) => {
     try {
-      const indexPattern = await dataViews.createAndSave(indexPatternSpec);
+      const indexPattern = await dataViews.createAndSave(dataViewSpec);
 
       const message = i18n.translate('indexPatternEditor.saved', {
         defaultMessage: "Saved '{indexPatternTitle}'",

src/plugins/data_view_editor/public/shared_imports.ts

@@ -8,11 +8,11 @@
 
 export type {
   DataPublicPluginStart,
-  IndexPatternSpec,
   GetFieldsOptions,
   IndexPatternAggRestrictions,
 } from '../../data/public';
 export { IndexPattern, IndexPatternField } from '../../data/public';
+export type { DataViewSpec } from '../../data_views/public';
 export { DataView } from '../../data_views/public';
 
 export {

src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx

@@ -19,7 +19,7 @@ import {
 } from 'src/plugins/data/public';
 import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
 import { CoreStart } from 'src/core/public';
-import { castEsToKbnFieldTypeName } from '../../../../data/public';
+import { castEsToKbnFieldTypeName } from '@kbn/field-types';
 import { FormatEditor } from './format_editor';
 import { FormatEditorServiceStart } from '../../service';
 import { FieldFormatConfig } from '../../types';

src/plugins/data_views/common/data_views/data_views.ts

@@ -53,12 +53,6 @@ export interface DataViewListItem {
   typeMeta?: TypeMeta;
 }
 
-/**
- * @deprecated Use DataViewListItem. All index pattern interfaces were renamed.
- */
-
-export type IndexPatternListItem = DataViewListItem;
-
 export interface DataViewsServiceDeps {
   uiSettings: UiSettingsCommon;
   savedObjectsClient: SavedObjectsClientCommon;
@@ -173,7 +167,7 @@ export class DataViewsService {
    * Get list of index pattern ids with titles
    * @param refresh Force refresh of index pattern list
    */
-  getIdsWithTitle = async (refresh: boolean = false): Promise<IndexPatternListItem[]> => {
+  getIdsWithTitle = async (refresh: boolean = false): Promise<DataViewListItem[]> => {
     if (!this.savedObjectsCache || refresh) {
       await this.refreshSavedObjectsCache();
     }

src/plugins/data_views/common/fields/types.ts

@@ -10,7 +10,7 @@ import { FieldSpec, DataView } from '..';
 
 /**
  * @deprecated Use {@link IndexPatternField}
- * @removeBy 8.1
+ * @removeBy 8.2
  */
 export interface IFieldType extends DataViewFieldBase {
   count?: number;

src/plugins/data_views/common/index.ts

@@ -54,10 +54,10 @@ export type {
   IndexPatternSpec,
   SourceFilter,
 } from './types';
-export { DataViewType, IndexPatternType } from './types';
+export { DataViewType } from './types';
 export type { IndexPatternsContract, DataViewsContract } from './data_views';
 export { IndexPatternsService, DataViewsService } from './data_views';
-export type { IndexPatternListItem, DataViewListItem, TimeBasedDataView } from './data_views';
+export type { DataViewListItem, TimeBasedDataView } from './data_views';
 export { IndexPattern, DataView } from './data_views';
 export {
   DuplicateDataViewError,

src/plugins/data_views/public/index.ts

@@ -16,6 +16,7 @@ export {
 export { onRedirectNoIndexPattern } from './data_views';
 
 export type { IIndexPatternFieldList, TypeMeta } from '../common';
+export type { DataViewSpec } from '../common';
 export { IndexPatternField, DataViewField, DataViewType, META_FIELDS } from '../common';
 
 export type { IndexPatternsContract } from './data_views';

src/plugins/data_views/server/deprecations/scripted_fields.ts

@@ -13,9 +13,9 @@ import {
   RegisterDeprecationsConfig,
 } from 'kibana/server';
 import { i18n } from '@kbn/i18n';
-import { IndexPatternAttributes } from '../../common';
+import { DataViewAttributes } from '../../common';
 
-type IndexPatternAttributesWithFields = Pick<IndexPatternAttributes, 'title' | 'fields'>;
+type IndexPatternAttributesWithFields = Pick<DataViewAttributes, 'title' | 'fields'>;
 
 export const createScriptedFieldsDeprecationsConfig: (
   core: CoreSetup

src/plugins/data_views/server/utils.ts

@@ -10,13 +10,13 @@ import { SavedObjectsClientContract } from 'kibana/server';
 import {
   IFieldType,
   DATA_VIEW_SAVED_OBJECT_TYPE,
-  IndexPatternAttributes,
+  DataViewAttributes,
   SavedObject,
 } from '../common';
 
 export const getFieldByName = (
   fieldName: string,
-  indexPattern: SavedObject<IndexPatternAttributes>
+  indexPattern: SavedObject<DataViewAttributes>
 ): IFieldType | undefined => {
   const fields: IFieldType[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
   const field = fields && fields.find((f) => f.name === fieldName);
@@ -27,8 +27,8 @@ export const getFieldByName = (
 export const findIndexPatternById = async (
   savedObjectsClient: SavedObjectsClientContract,
   index: string
-): Promise<SavedObject<IndexPatternAttributes> | undefined> => {
-  const savedObjectsResponse = await savedObjectsClient.find<IndexPatternAttributes>({
+): Promise<SavedObject<DataViewAttributes> | undefined> => {
+  const savedObjectsResponse = await savedObjectsClient.find<DataViewAttributes>({
     type: DATA_VIEW_SAVED_OBJECT_TYPE,
     fields: ['fields'],
     search: `"${index}"`,