🐛 Better handling to support already serialized formatters

elastic · Oct 22, 2020 · 456a80b · 456a80b
1 parent 7a93683
commit 456a80b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
@@ -117,7 +117,7 @@ const indexPattern2 = ({
   title: 'my-fake-restricted-pattern',
   timeFieldName: 'timestamp',
   hasRestrictions: true,
-  fieldFormatMap: {},
+  fieldFormatMap: { bytes: { id: 'bytes', params: { pattern: '0.0' } } },
   fields: [
     {
       name: 'timestamp',

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
@@ -106,9 +106,10 @@ export async function loadIndexPatterns({
         fieldFormatMap:
           fieldFormatMap &&
           Object.fromEntries(
-            Object.entries(fieldFormatMap)
-              .filter(([id, format]) => format)
-              .map(([id, format]) => [id, format.toJSON()])
+            Object.entries(fieldFormatMap).map(([id, format]) => [
+              id,
+              'toJSON' in format ? format.toJSON() : format,
+            ])
           ),
         fields: newFields,
         hasRestrictions: !!typeMeta?.aggs,

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
@@ -82,7 +82,7 @@ export const createMockedRestrictedIndexPattern = () => ({
   title: 'my-fake-restricted-pattern',
   timeFieldName: 'timestamp',
   hasRestrictions: true,
-  fieldFormatMap: { bytes: null },
+  fieldFormatMap: { bytes: { id: 'bytes', params: { pattern: '0.0' } } },
   fields: [
     {
       name: 'timestamp',