fix merge conflicts

elastic · Apr 30, 2020 · 4799896 · 4799896
1 parent cb373e9
commit 4799896
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/x-pack/plugins/lens/server/migrations.ts b/x-pack/plugins/lens/server/migrations.ts
@@ -19,7 +19,8 @@ interface XYLayerPre77 {
  * Removes the `lens_auto_date` subexpression from a stored expression
  * string. For example: aggConfigs={lens_auto_date aggConfigs="JSON string"}
  */
-const removeLensAutoDate: SavedObjectMigrationFn = (doc, context) => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const removeLensAutoDate: SavedObjectMigrationFn<any, any> = (doc, context) => {
   const expression: string = doc.attributes?.expression;
   try {
     const ast = fromExpression(expression);
@@ -73,7 +74,8 @@ const removeLensAutoDate: SavedObjectMigrationFn = (doc, context) => {
 /**
  * Adds missing timeField arguments to esaggs in the Lens expression
  */
-const addTimeFieldToEsaggs: SavedObjectMigrationFn = (doc, context) => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const addTimeFieldToEsaggs: SavedObjectMigrationFn<any, any> = (doc, context) => {
   const expression: string = doc.attributes?.expression;
 
   try {
@@ -131,7 +133,8 @@ const addTimeFieldToEsaggs: SavedObjectMigrationFn = (doc, context) => {
   }
 };
 
-export const migrations: Record<string, SavedObjectMigrationFn> = {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const migrations: Record<string, SavedObjectMigrationFn<any, any>> = {
   '7.7.0': doc => {
     const newDoc = cloneDeep(doc);
     if (newDoc.attributes?.visualizationType === 'lnsXY') {