[Index Management] Fix API Integration Test and use of `timestamp_fie…

…ld` (#69666) (#69755) * fix types and functional api integration test * access timestamp field name in object * temporarily skip the API integration test and fix ts issue Co-authored-by: Jean-Louis Leysens <jloleysens@gmail.com>
elastic · Jun 24, 2020 · d082616 · d082616
1 parent 2488edf
commit d082616
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
@@ -90,7 +90,7 @@ export const setup = async (): Promise<DataStreamsTabTestBed> => {
 
 export const createDataStreamPayload = (name: string): DataStream => ({
   name,
-  timeStampField: '@timestamp',
+  timeStampField: { name: '@timestamp', mapping: { type: 'date' } },
   indices: [
     {
       name: 'indexName',

diff --git a/x-pack/plugins/index_management/common/types/data_streams.ts b/x-pack/plugins/index_management/common/types/data_streams.ts
@@ -4,9 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+interface TimestampFieldFromEs {
+  name: string;
+  mapping: {
+    type: string;
+  };
+}
+
+type TimestampField = TimestampFieldFromEs;
+
 export interface DataStreamFromEs {
   name: string;
-  timestamp_field: string;
+  timestamp_field: TimestampFieldFromEs;
   indices: DataStreamIndexFromEs[];
   generation: number;
 }
@@ -18,7 +27,7 @@ export interface DataStreamIndexFromEs {
 
 export interface DataStream {
   name: string;
-  timeStampField: string;
+  timeStampField: TimestampField;
   indices: DataStreamIndex[];
   generation: number;
 }

diff --git a/...public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx b/...public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx
@@ -59,7 +59,7 @@ export const DataStreamTable: React.FunctionComponent<Props> = ({
       ),
     },
     {
-      field: 'timeStampField',
+      field: 'timeStampField.name',
       name: i18n.translate('xpack.idxMgmt.dataStreamList.table.timeStampFieldColumnTitle', {
         defaultMessage: 'Timestamp field',
       }),

diff --git a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
@@ -50,17 +50,18 @@ export default function ({ getService }: FtrProviderContext) {
 
   const deleteDataStream = (name: string) => {
     return es.dataManagement
-      .deleteComposableIndexTemplate({
+      .deleteDataStream({
         name,
       })
       .then(() =>
-        es.dataManagement.deleteDataStream({
+        es.dataManagement.deleteComposableIndexTemplate({
           name,
         })
       );
   };
 
-  describe('Data streams', function () {
+  // Unskip once ES snapshot has been promoted that updates the data stream response
+  describe.skip('Data streams', function () {
     const testDataStreamName = 'test-data-stream';
 
     describe('Get', () => {
@@ -79,7 +80,7 @@ export default function ({ getService }: FtrProviderContext) {
           expect(dataStreams).to.eql([
             {
               name: testDataStreamName,
-              timeStampField: '@timestamp',
+              timeStampField: { name: '@timestamp', mapping: { type: 'date' } },
               indices: [
                 {
                   name: indexName,