Index Pattern class - remove toJSON and toString (elastic#76246)

* remove toJSON * remove toJSON, toString * fix ml url * Update actions_panel.tsx * fix url Co-authored-by: Elastic Machine <[email protected]>
mattkime · Sep 2, 2020 · be59e9f · be59e9f
1 parent 8e88729
commit be59e9f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 48 deletions.
diff --git a/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -64,7 +64,5 @@ export declare class IndexPattern implements IIndexPattern
 |  [refreshFields()](./kibana-plugin-plugins-data-public.indexpattern.refreshfields.md) |  |  |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
 |  [save(saveAttempts)](./kibana-plugin-plugins-data-public.indexpattern.save.md) |  |  |
-|  [toJSON()](./kibana-plugin-plugins-data-public.indexpattern.tojson.md) |  |  |
 |  [toSpec()](./kibana-plugin-plugins-data-public.indexpattern.tospec.md) |  |  |
-|  [toString()](./kibana-plugin-plugins-data-public.indexpattern.tostring.md) |  |  |
 
diff --git a/...nt/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tojson.md b/...nt/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tojson.md
diff --git a/.../plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tostring.md b/.../plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tostring.md
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -151,8 +151,6 @@ describe('IndexPattern', () => {
       expect(indexPattern).toHaveProperty('getNonScriptedFields');
       expect(indexPattern).toHaveProperty('addScriptedField');
       expect(indexPattern).toHaveProperty('removeScriptedField');
-      expect(indexPattern).toHaveProperty('toString');
-      expect(indexPattern).toHaveProperty('toJSON');
       expect(indexPattern).toHaveProperty('save');
 
       // properties

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -664,12 +664,4 @@ export class IndexPattern implements IIndexPattern {
         });
       });
   }
-
-  toJSON() {
-    return this.id;
-  }
-
-  toString() {
-    return '' + this.toJSON();
-  }
 }
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
@@ -1059,12 +1059,8 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     title: string;
     // (undocumented)
-    toJSON(): string | undefined;
-    // (undocumented)
     toSpec(): IndexPatternSpec;
     // (undocumented)
-    toString(): string;
-    // (undocumented)
     type: string | undefined;
     // (undocumented)
     typeMeta?: IndexPatternTypeMeta;

diff --git a/.../public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx b/.../public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
@@ -13,13 +13,15 @@ import { EuiSpacer, EuiText, EuiTitle, EuiFlexGroup } from '@elastic/eui';
 import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
 import { CreateJobLinkCard } from '../../../../components/create_job_link_card';
 import { DataRecognizer } from '../../../../components/data_recognizer';
+import { getBasePath } from '../../../../util/dependency_cache';
 
 interface Props {
   indexPattern: IndexPattern;
 }
 
 export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
   const [recognizerResultsCount, setRecognizerResultsCount] = useState(0);
+  const basePath = getBasePath();
 
   const recognizerResults = {
     count: 0,
@@ -31,7 +33,7 @@ export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
   function openAdvancedJobWizard() {
     // TODO - pass the search string to the advanced job page as well as the index pattern
     //       (add in with new advanced job wizard?)
-    window.open(`#/jobs/new_job/advanced?index=${indexPattern}`, '_self');
+    window.open(`${basePath.get()}/app/ml/jobs/new_job/advanced?index=${indexPattern.id}`, '_self');
   }
 
   // Note we use display:none for the DataRecognizer section as it needs to be
@@ -86,7 +88,7 @@ export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
             'Use the full range of options to create a job for more advanced use cases',
         })}
         onClick={openAdvancedJobWizard}
-        href={`#/jobs/new_job/advanced?index=${indexPattern}`}
+        href={`${basePath.get()}/app/ml/jobs/new_job/advanced?index=${indexPattern.id}`}
         data-test-subj="mlDataVisualizerCreateAdvancedJobCard"
       />
     </div>