Skip to content

Commit 61900fe

Browse files
Move src/legacy/server/index_patterns to data plugin (server) (Remove step) (#61618) (#62280)
* Removed legacy index pattern * fix type * remove unnecessary import * Removed old references to indexPatternsServiceFactory Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 9d5ce39 commit 61900fe

File tree

8 files changed

+1
-99
lines changed

8 files changed

+1
-99
lines changed

kibana.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import * as LegacyKibanaServer from './src/legacy/server/kbn_server';
3737
*/
3838
// eslint-disable-next-line @typescript-eslint/no-namespace
3939
export namespace Legacy {
40-
export type IndexPatternsService = LegacyKibanaServer.IndexPatternsService;
4140
export type KibanaConfig = LegacyKibanaServer.KibanaConfig;
4241
export type Request = LegacyKibanaServer.Request;
4342
export type ResponseToolkit = LegacyKibanaServer.ResponseToolkit;

src/legacy/server/index_patterns/index.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/legacy/server/index_patterns/mixin.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/legacy/server/kbn_server.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import { LegacyConfig, ILegacyService, ILegacyInternals } from '../../core/serve
4444
import { ApmOssPlugin } from '../core_plugins/apm_oss';
4545
import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
4646
import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
47-
import { IndexPatternsServiceFactory } from './index_patterns';
4847
import { Capabilities } from '../../core/server';
4948
import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
5049
import { HomeServerPluginSetup } from '../../plugins/home/server';
@@ -68,7 +67,6 @@ declare module 'hapi' {
6867

6968
interface Server {
7069
config: () => KibanaConfig;
71-
indexPatternsServiceFactory: IndexPatternsServiceFactory;
7270
savedObjects: SavedObjectsLegacyService;
7371
injectUiAppVars: (pluginName: string, getAppVars: () => { [key: string]: any }) => void;
7472
getHiddenUiAppById(appId: string): UiApp;
@@ -175,5 +173,4 @@ export default class KbnServer {
175173
export { Server, Request, ResponseToolkit } from 'hapi';
176174

177175
// Re-export commonly accessed api types.
178-
export { IndexPatternsFetcher as IndexPatternsService } from './index_patterns';
179176
export { SavedObjectsLegacyService, SavedObjectsClient } from 'src/core/server';

src/legacy/server/kbn_server.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import pidMixin from './pid';
3333
import configCompleteMixin from './config/complete';
3434
import optimizeMixin from '../../optimize';
3535
import * as Plugins from './plugins';
36-
import { indexPatternsMixin } from './index_patterns';
3736
import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
3837
import { capabilitiesMixin } from './capabilities';
3938
import { serverExtensionsMixin } from './server_extensions';
@@ -114,7 +113,6 @@ export default class KbnServer {
114113

115114
// setup this.uiBundles
116115
uiMixin,
117-
indexPatternsMixin,
118116

119117
// setup saved object routes
120118
savedObjectsMixin,

src/legacy/server/saved_objects/saved_objects_mixin.test.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ describe('Saved Objects Mixin', () => {
118118
get: stubConfig,
119119
};
120120
},
121-
indexPatternsServiceFactory: () => {
122-
return {
123-
getFieldsForWildcard: jest.fn(),
124-
};
125-
},
126121
plugins: {
127122
elasticsearch: {
128123
getCluster: () => {

x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ export interface InfraServerPluginDeps {
2121
spaces: SpacesPluginSetup;
2222
usageCollection: UsageCollectionSetup;
2323
metrics: VisTypeTimeseriesSetup;
24-
indexPatterns: {
25-
indexPatternsServiceFactory: any;
26-
};
2724
features: FeaturesPluginSetup;
2825
apm: APMPluginContract;
2926
alerting: AlertingPluginContract;

x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
/* eslint-disable @typescript-eslint/array-type */
88

99
import { GraphQLSchema } from 'graphql';
10-
import { Legacy } from 'kibana';
1110
import { runHttpQuery } from 'apollo-server-core';
1211
import { schema, TypeOf } from '@kbn/config-schema';
1312
import {
@@ -217,9 +216,7 @@ export class KibanaFramework {
217216
});
218217
}
219218

220-
public getIndexPatternsService(
221-
requestContext: RequestHandlerContext
222-
): Legacy.IndexPatternsService {
219+
public getIndexPatternsService(requestContext: RequestHandlerContext): IndexPatternsFetcher {
223220
return new IndexPatternsFetcher((...rest: Parameters<APICaller>) => {
224221
rest[1] = rest[1] || {};
225222
rest[1].allowNoIndices = true;

0 commit comments

Comments
 (0)