Index Pattern Field class - factor out copy_field code for future typescripting

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md

@@ -29,7 +29,6 @@ export declare class Field implements IFieldType
 |  [format](./kibana-plugin-plugins-data-public.indexpatternfield.format.md) |  | <code>any</code> |  |
 |  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string</code> |  |
 |  [name](./kibana-plugin-plugins-data-public.indexpatternfield.name.md) |  | <code>string</code> |  |
-|  [routes](./kibana-plugin-plugins-data-public.indexpatternfield.routes.md) |  | <code>Record&lt;string, string&gt;</code> |  |
 |  [script](./kibana-plugin-plugins-data-public.indexpatternfield.script.md) |  | <code>string</code> |  |
 |  [scripted](./kibana-plugin-plugins-data-public.indexpatternfield.scripted.md) |  | <code>boolean</code> |  |
 |  [searchable](./kibana-plugin-plugins-data-public.indexpatternfield.searchable.md) |  | <code>boolean</code> |  |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfieldlist.md

@@ -24,5 +24,5 @@ export declare class FieldList extends Array<Field> implements IFieldList
 |  [getByName](./kibana-plugin-plugins-data-public.indexpatternfieldlist.getbyname.md) |  | <code>(name: string) =&gt; Field &#124; undefined</code> |  |
 |  [getByType](./kibana-plugin-plugins-data-public.indexpatternfieldlist.getbytype.md) |  | <code>(type: string) =&gt; any[]</code> |  |
 |  [remove](./kibana-plugin-plugins-data-public.indexpatternfieldlist.remove.md) |  | <code>(field: IFieldType) =&gt; void</code> |  |
-|  [update](./kibana-plugin-plugins-data-public.indexpatternfieldlist.update.md) |  | <code>(field: Field) =&gt; void</code> |  |
+|  [update](./kibana-plugin-plugins-data-public.indexpatternfieldlist.update.md) |  | <code>(field: Record&lt;string, any&gt;) =&gt; void</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfieldlist.update.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-update: (field: Field) => void;
+update: (field: Record<string, any>) => void;
 ```

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js

@@ -53,7 +53,6 @@ const renderFieldEditor = (
           indexPattern={indexPattern}
           field={field}
           helpers={{
-            Field: IndexPatternField,
             getConfig,
             $http,
             fieldFormatEditors,

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js

@@ -49,6 +49,8 @@ const TAB_INDEXED_FIELDS = 'indexedFields';
 const TAB_SCRIPTED_FIELDS = 'scriptedFields';
 const TAB_SOURCE_FILTERS = 'sourceFilters';
 
+const EDIT_FIELD_PATH = '/management/kibana/index_patterns/{{indexPattern.id}}/field/{{name}}';
+
 function updateSourceFiltersTable($scope) {
   $scope.$$postDigest(() => {
     const node = document.getElementById(REACT_SOURCE_FILTERS_DOM_ELEMENT_ID);
@@ -97,8 +99,8 @@ function updateScriptedFieldsTable($scope) {
           fieldFilter={$scope.fieldFilter}
           scriptedFieldLanguageFilter={$scope.scriptedFieldLanguageFilter}
           helpers={{
-            redirectToRoute: (obj, route) => {
-              $scope.kbnUrl.changeToRoute(obj, route);
+            redirectToRoute: field => {
+              $scope.kbnUrl.changePath(EDIT_FIELD_PATH, field);
               $scope.$apply();
             },
             getRouteHref: (obj, route) => $scope.kbnUrl.getRouteHref(obj, route),
@@ -140,8 +142,8 @@ function updateIndexedFieldsTable($scope) {
           fieldWildcardMatcher={$scope.fieldWildcardMatcher}
           indexedFieldTypeFilter={$scope.indexedFieldTypeFilter}
           helpers={{
-            redirectToRoute: (obj, route) => {
-              $scope.kbnUrl.changeToRoute(obj, route);
+            redirectToRoute: field => {
+              $scope.kbnUrl.changePath(EDIT_FIELD_PATH, field);
               $scope.$apply();
             },
             getFieldInfo: $scope.getFieldInfo,

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/indexed_fields_table/indexed_fields_table.js

@@ -65,7 +65,6 @@ export class IndexedFieldsTable extends Component {
           return {
             ...field,
             displayName: field.displayName,
-            routes: field.routes,
             indexPattern: field.indexPattern,
             format: getFieldFormat(indexPattern, field.name),
             excluded: fieldWildcardMatch ? fieldWildcardMatch(field.name) : false,
@@ -104,7 +103,7 @@ export class IndexedFieldsTable extends Component {
         <Table
           indexPattern={indexPattern}
           items={fields}
-          editField={field => this.props.helpers.redirectToRoute(field, 'edit')}
+          editField={field => this.props.helpers.redirectToRoute(field)}
         />
       </div>
     );

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx

@@ -155,7 +155,7 @@ export class ScriptedFieldsTable extends Component<
         <Table
           indexPattern={indexPattern}
           items={items}
-          editField={field => this.props.helpers.redirectToRoute(field, 'edit')}
+          editField={field => this.props.helpers.redirectToRoute(field)}
           deleteField={this.startDeleteField}
         />
 

src/legacy/ui/public/field_editor/field_editor.js

@@ -66,7 +66,7 @@ import { ScriptingHelpFlyout } from './components/scripting_help';
 import { FieldFormatEditor } from './components/field_format_editor';
 
 import { FIELD_TYPES_BY_LANG, DEFAULT_FIELD_TYPES } from './constants';
-import { copyField, executeScript, isScriptValid } from './lib';
+import { executeScript, isScriptValid } from './lib';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -100,7 +100,6 @@ export class FieldEditor extends PureComponent {
     indexPattern: PropTypes.object.isRequired,
     field: PropTypes.object.isRequired,
     helpers: PropTypes.shape({
-      Field: PropTypes.func.isRequired,
       getConfig: PropTypes.func.isRequired,
       $http: PropTypes.func.isRequired,
       fieldFormatEditors: PropTypes.object.isRequired,
@@ -111,11 +110,7 @@ export class FieldEditor extends PureComponent {
   constructor(props) {
     super(props);
 
-    const {
-      field,
-      indexPattern,
-      helpers: { Field },
-    } = props;
+    const { field, indexPattern } = props;
 
     this.state = {
       isReady: false,
@@ -125,7 +120,7 @@ export class FieldEditor extends PureComponent {
       fieldTypes: [],
       fieldTypeFormats: [],
       existingFieldNames: indexPattern.fields.map(f => f.name),
-      field: copyField(field, indexPattern, Field),
+      field: { ...field, format: field.format },
       fieldFormatId: undefined,
       fieldFormatParams: {},
       showScriptingHelp: false,
@@ -730,7 +725,7 @@ export class FieldEditor extends PureComponent {
   };
 
   saveField = async () => {
-    const field = this.state.field.toActualField();
+    const field = this.state.field;
     const { indexPattern } = this.props;
     const { fieldFormatId } = this.state;
 

src/legacy/ui/public/field_editor/lib/index.js

@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export { copyField } from './copy_field';
 export { executeScript, isScriptValid } from './validate_script';

src/plugins/data/public/index_patterns/fields/field.ts

@@ -45,9 +45,6 @@ export class Field implements IFieldType {
   subType?: IFieldSubType;
   displayName?: string;
   format: any;
-  routes: Record<string, string> = {
-    edit: '/management/kibana/index_patterns/{{indexPattern.id}}/field/{{name}}',
-  };
   $$spec: FieldSpec;
 
   constructor(
@@ -146,7 +143,3 @@ export class Field implements IFieldType {
     return obj.create();
   }
 }
-
-Field.prototype.routes = {
-  edit: '/management/kibana/index_patterns/{{indexPattern.id}}/field/{{name}}',
-};

src/plugins/data/public/index_patterns/fields/field_list.ts

@@ -70,11 +70,12 @@ export class FieldList extends Array<Field> implements IFieldList {
     this.splice(fieldIndex, 1);
   };
 
-  update = (field: Field) => {
-    const index = this.findIndex(f => f.name === field.name);
-    this.splice(index, 1, field);
-    this.setByName(field);
-    this.removeByGroup(field);
-    this.setByGroup(field);
+  update = (field: FieldSpec) => {
+    const newField = new Field(this.indexPattern, field, this.shortDotsEnable);
+    const index = this.findIndex(f => f.name === newField.name);
+    this.splice(index, 1, newField);
+    this.setByName(newField);
+    this.removeByGroup(newField);
+    this.setByGroup(newField);
   };
 }

src/plugins/data/public/public.api.md

@@ -947,8 +947,6 @@ export class IndexPatternField implements IFieldType {
     // (undocumented)
     name: string;
     // (undocumented)
-    routes: Record<string, string>;
-    // (undocumented)
     script?: string;
     // (undocumented)
     scripted?: boolean;
@@ -978,7 +976,7 @@ export class IndexPatternFieldList extends Array<IndexPatternField> implements I
     // (undocumented)
     remove: (field: IFieldType) => void;
     // (undocumented)
-    update: (field: IndexPatternField) => void;
+    update: (field: Record<string, any>) => void;
 }
 
 // Warning: (ae-missing-release-tag) "indexPatterns" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)