7.17 updates

walterra · Jan 4, 2023 · acf91cd · acf91cd
1 parent cf42480
commit acf91cd
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/server/plugin.ts b/server/plugin.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+
 import {
   PluginInitializerContext,
   CoreSetup,
@@ -31,7 +33,7 @@ import {
   KibanaMilestonesVisPluginSetupDeps,
   KibanaMilestonesVisPluginStartDeps,
 } from './types';
-import { registerRoutes } from './routes';
+import { defineRoutes } from './routes';
 
 export class KibanaMilestonesVisPlugin
   implements
@@ -40,7 +42,8 @@ export class KibanaMilestonesVisPlugin
       KibanaMilestonesVisPluginStart,
       KibanaMilestonesVisPluginSetupDeps,
       KibanaMilestonesVisPluginStartDeps
-    > {
+    >
+{
   private readonly logger: Logger;
 
   constructor(initializerContext: PluginInitializerContext) {
@@ -49,10 +52,10 @@ export class KibanaMilestonesVisPlugin
 
   public setup(core: CoreSetup<KibanaMilestonesVisPluginStartDeps>) {
     this.logger.debug('kibanaMilestonesVis: Setup');
-    const router = core.http.createRouter();
+    const router = core.http.createRouter<DataRequestHandlerContext>();
 
     core.getStartServices().then(() => {
-      registerRoutes(router);
+      defineRoutes(router);
     });
 
     return {};

diff --git a/server/routes/define_routes.ts b/server/routes/define_routes.ts
@@ -0,0 +1,9 @@
+import type { IRouter } from 'kibana/server';
+
+import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+
+import { defineServerSearchRoute } from './server_search_route';
+
+export function defineRoutes(router: IRouter<DataRequestHandlerContext>) {
+  defineServerSearchRoute(router);
+}
diff --git a/server/routes/index.ts b/server/routes/index.ts
@@ -1 +1 @@
-export { registerRoutes } from './register_routes';
+export { defineRoutes } from './define_routes';
diff --git a/server/routes/register_routes.ts b/server/routes/register_routes.ts
diff --git a/server/routes/server_search_route.ts b/server/routes/server_search_route.ts
@@ -1,11 +1,15 @@
 import { get } from 'lodash';
-import { IEsSearchRequest } from 'src/plugins/data/server';
+
 import { schema } from '@kbn/config-schema';
-import { IEsSearchResponse } from 'src/plugins/data/common';
-import { IRouter } from '../../../../src/core/server';
+
+import type { DataRequestHandlerContext, IEsSearchRequest } from 'src/plugins/data/server';
+import type { IEsSearchResponse } from 'src/plugins/data/common';
+
+import type { IRouter } from '../../../../src/core/server';
+
 import { NONE_SELECTED, SERVER_SEARCH_ROUTE_PATH } from '../../common';
 
-export function registerServerSearchRoute(router: IRouter) {
+export function defineServerSearchRoute(router: IRouter<DataRequestHandlerContext>) {
   router.post(
     {
       path: SERVER_SEARCH_ROUTE_PATH,