Change substr to substring

Add validate option in routes
Change kibana/server path

Author: johtani

public/application.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from '../../../src/core/public';
+import { AppMountParameters, CoreStart } from 'kibana/public';
 import { AppPluginStartDependencies } from './types';
 import { AnalyzeApiUiApp } from './components/app';
 

public/components/analyze_ui/analyze_ui.tsx

@@ -76,7 +76,8 @@ export class AnalyzeUi extends Component {
       this.setState({
         "detail": {},
         "showResult": false,
-        "esRequest": ""
+        "esRequest": "",
+        "resultAnalyzers": []
       });
     }
   }
@@ -87,7 +88,7 @@ export class AnalyzeUi extends Component {
       (response) => {
         this.setState({
           showResult: true,
-          detail: response.resultAnalyzers,
+          resultAnalyzers: response.resultAnalyzers,
           resultType: "multi"
         });
       }
@@ -256,6 +257,7 @@ export class AnalyzeUi extends Component {
             detail={this.state.detail}
             esRequest={this.state.esRequest}
             indexName={indexName}
+            resultAnalyzers={this.state.resultAnalyzers}
           />
         )}
       </Fragment>

public/components/result/analyzer_result/tokenizer_and_filters/tokenizer_and_filters.tsx

@@ -75,8 +75,8 @@ export function displayRowsComponent(WrappedComponent) {
   return class extends WrappedComponent {
 
     shortenName(name) {
-      if (name.indexOf('.') > 0) {
-        return name.substr(name.lastIndexOf('.')+1);
+      if (name && name.indexOf('.') > 0) {
+        return name.substring(name.lastIndexOf('.')+1);
       }
       return name;
     }
@@ -110,4 +110,4 @@ export function displayRowsComponent(WrappedComponent) {
       );
     }
   }
-}
+}

public/components/result/compare_result/compare_result.tsx

@@ -20,9 +20,9 @@ export class CompareResult extends Component {
     super(props);
   }
 
-  countTokenStreamLength(analyzerResults) {
+  countTokenStreamLength(resultAnalyzers) {
     let tokenStreamLength = 0;
-    analyzerResults.forEach((detail) => {
+    resultAnalyzers.forEach((detail) => {
       tokenStreamLength = getLength(tokenStreamLength, detail.tokens);
     });
     return createTokenIndices(tokenStreamLength);
@@ -56,8 +56,8 @@ export class CompareResult extends Component {
     return tokenCells;
   }
 
-  renderRows(tokenIndices, detail) {
-    const rows = detail.map(
+  renderRows(tokenIndices, resultAnalyzers) {
+    const rows = resultAnalyzers.map(
       (result) =>
         <EuiTableRow
           className="analyzeApiTableRowTop"
@@ -75,9 +75,9 @@ export class CompareResult extends Component {
 
   render() {
     const {
-      detail
+      resultAnalyzers
     } = this.props;
-    const tokenIndices = this.countTokenStreamLength(detail);
+    const tokenIndices = this.countTokenStreamLength(resultAnalyzers);
 
     return (
       <EuiPanel
@@ -86,6 +86,7 @@ export class CompareResult extends Component {
       >
         There are only tokens and positions. If you know analyzer details, use analyzer/custom_analyzer tab.
         <div class="analyzeApiTableScroll">
+
           <EuiTable className="analyzeApiTableLayout">
             <EuiTableHeader>
               <EuiTableHeaderCell
@@ -97,11 +98,11 @@ export class CompareResult extends Component {
               {this.renderHeaderTokensCells(tokenIndices)}
             </EuiTableHeader>
             <EuiTableBody>
-              {this.renderRows(tokenIndices, detail)}
+              {this.renderRows(tokenIndices, resultAnalyzers)}
             </EuiTableBody>
           </EuiTable>
         </div>
       </EuiPanel>
     );
   }
-}
+}

public/components/result/result.tsx

@@ -17,6 +17,7 @@ export class Result extends Component {
     const {esRequest} = this.props;
     const {indexName} = this.props;
     const {showAllTokenAttr} = this.props;
+    const {resultAnalyzers} = this.props;
     if (type === RESULT_TYPE.SINGLE) {
       return (
         <AnalyzerResult
@@ -29,9 +30,9 @@ export class Result extends Component {
     } else {
       return (
         <CompareResult
-          detail={detail}
+          resultAnalyzers={resultAnalyzers}
         />
       );
     }
   }
-}
+}

public/plugin.ts

@@ -1,4 +1,4 @@
-import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '../../../src/core/public';
+import { AppMountParameters, CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import {
   AnalyzeApiUiPluginSetup,
   AnalyzeApiUiPluginStart,

public/services/validator.ts

@@ -92,4 +92,4 @@ function parseCustom(target, label, validatedParams) {
   } else {
     return target;
   }
-};
+};

server/index.ts

@@ -1,4 +1,4 @@
-import { PluginInitializerContext } from '../../../src/core/server';
+import { PluginInitializerContext } from 'kibana/server';
 import { AnalyzeApiUiPlugin } from './plugin';
 
 //  This exports static code and TypeScript types,

server/plugin.ts

@@ -4,7 +4,7 @@ import {
   CoreStart,
   Plugin,
   Logger,
-} from '../../../src/core/server';
+} from 'kibana/server';
 
 import { AnalyzeApiUiPluginSetup, AnalyzeApiUiPluginStart } from './types';
 import { defineRoutes } from './routes';
@@ -23,7 +23,7 @@ export class AnalyzeApiUiPlugin
     const router = core.http.createRouter();
 
     // Register server side APIs
-    defineRoutes(router);
+    defineRoutes(router, this.logger);
 
     return {};
   }

server/routes/index.ts

@@ -1,8 +1,8 @@
-import { IRouter } from '../../../../src/core/server';
+import { IRouter, Logger } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 import { convertEsError } from "./handle_es_error";
 
-export function defineRoutes(router: IRouter) {
+export function defineRoutes(router: IRouter, logger: logger) {
   router.post(
     {
       path: '/api/analyze_api_ui/analyze',
@@ -11,10 +11,10 @@ export function defineRoutes(router: IRouter) {
           text: schema.string(),
           indexName: schema.maybe(schema.nullable(schema.string())),
           analyzer: schema.maybe(schema.nullable(schema.string())),
-          tokenizer: schema.maybe(schema.oneOf([schema.nullable(schema.string()), schema.object({})])),
+          tokenizer: schema.maybe(schema.oneOf([schema.nullable(schema.string()), schema.object({}, { unknowns: 'allow' })])),
           field: schema.maybe(schema.nullable(schema.string())),
-          filters: schema.maybe(schema.arrayOf(schema.nullable(schema.oneOf([schema.string(), schema.object({})])))),
-          charfilters: schema.maybe(schema.arrayOf(schema.nullable(schema.oneOf([schema.string(), schema.object({})]))))
+          filters: schema.maybe(schema.arrayOf(schema.nullable(schema.oneOf([schema.string(), schema.object({}, { unknowns: 'allow' })])))),
+          charfilters: schema.maybe(schema.arrayOf(schema.nullable(schema.oneOf([schema.string(), schema.object({}, { unknowns: 'allow' })]))))
         })
       }
     },
@@ -65,39 +65,43 @@ export function defineRoutes(router: IRouter) {
       };
       if (request.body.indexName) param.index = request.body.indexName;
       const res = {
-        resultAnalyzers: []
+        body: {
+          resultAnalyzers: []
+        }
       };
 
       function getAnalyzerResult(analyzer, id) {
         return new Promise(function (resolve, reject) {
           param.body.analyzer = analyzer;
-          context.core.elasticsearch.client.asCurrentUser.indices.analyze(param)
-            .then(function (response) {
-              res.resultAnalyzers.push({analyzer: analyzer, id: id, tokens: response.tokens});
-              resolve(res);
-            })
-            .catch(error => {
+          const results = context.core.elasticsearch.client.asCurrentUser.indices.analyze(param)
+            results.then(
+              (x) => {
+                res.body.resultAnalyzers.push({analyzer: analyzer, id: id, tokens: x.body.tokens});
+                resolve(res);
+              }
+            );
+            results.catch(error => {
               reject(convertEsError(response, error));
             });
         });
       };
 
       if (Array.isArray(request.body.analyzers) && request.body.analyzers.length >= 1) {
         try {
-          const response = await Promise.all(request.body.analyzers.map(getAnalyzerResult));
-          res.resultAnalyzers.sort(
+          const res_promise = await Promise.all(request.body.analyzers.map(getAnalyzerResult));
+          res.body.resultAnalyzers.sort(
             function (a, b) {
               if (a.id < b.id) return -1;
               if (a.id > b.id) return 1;
               return 0;
             }
           );
-          return res;
+          return response.ok(res);
         } catch (error) {
           return convertEsError(response, error);
         }
       } else {
-        return res;
+        return response.ok(res);
       }
     }
   );