Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Visualize: Upgrading vis with pipeline agg from 6.8 doesn't render #93427

Merged
merged 3 commits into from
Mar 9, 2021
Merged

Visualize: Upgrading vis with pipeline agg from 6.8 doesn't render #93427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab12b0f
Migration script for 'schema'
VladLasitsa Mar 3, 2021
c824535
Merge branch 'master' into 93026
kibanamachine Mar 5, 2021
8a1e726
Merge branch 'master' into 93026
kibanamachine Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 141 additions & 0 deletions src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,4 +1762,145 @@ describe('migration visualization', () => {
});
});
});

describe('7.12.0 update "schema" in aggregations', () => {
const migrate = (doc: any) =>
visualizationSavedObjectTypeMigrations['7.12.0'](
doc as Parameters<SavedObjectMigrationFn>[0],
savedObjectMigrationContext
);
const testDoc = {
attributes: {
title: 'My Vis',
description: 'This is my super cool vis.',
visState: JSON.stringify({
type: 'metric',
title: '[Flights] Delay Type',
aggs: [
{
id: '1',
type: 'avg_bucket',
schema: 'metric',
customBucket: {
id: '1-bucket',
params: {
orderAgg: {
schema: {
name: 'orderAgg',
},
},
},
schema: {
name: 'bucketAgg',
},
},
customMetric: {
id: '1-metric',
schema: {
name: 'metricAgg',
},
params: {
customMetric: {
schema: {
name: 'metricAgg',
},
},
},
},
},
{
id: '2',
type: 'avg_bucket',
schema: 'metric',
customBucket: {
id: '2-bucket',
params: {
orderAgg: {
schema: {
name: 'orderAgg',
},
},
},
},
customMetric: {
id: '2-metric',
schema: 'metricAgg',
params: {
customMetric: {
schema: {
name: 'metricAgg',
},
},
},
},
},
],
}),
},
};

const expectedDoc = {
attributes: {
title: 'My Vis',
description: 'This is my super cool vis.',
visState: JSON.stringify({
type: 'metric',
title: '[Flights] Delay Type',
aggs: [
{
id: '1',
type: 'avg_bucket',
schema: 'metric',
customBucket: {
id: '1-bucket',
params: {
orderAgg: {
schema: 'orderAgg',
},
},
schema: 'bucketAgg',
},
customMetric: {
id: '1-metric',
schema: 'metricAgg',
params: {
customMetric: {
schema: 'metricAgg',
},
},
},
},
{
id: '2',
type: 'avg_bucket',
schema: 'metric',
customBucket: {
id: '2-bucket',
params: {
orderAgg: {
schema: 'orderAgg',
},
},
},
customMetric: {
id: '2-metric',
schema: 'metricAgg',
params: {
customMetric: {
schema: 'metricAgg',
},
},
},
},
],
}),
},
};

it('should replace all schema object with schema name', () => {
const migratedTestDoc = migrate(testDoc);

expect(migratedTestDoc).toEqual(expectedDoc);
});
});
});
46 changes: 44 additions & 2 deletions src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

import { cloneDeep, get, omit, has, flow } from 'lodash';
import { cloneDeep, get, omit, has, flow, forOwn } from 'lodash';

import { SavedObjectMigrationFn } from 'kibana/server';

Expand Down Expand Up @@ -248,6 +248,48 @@ const migrateDateHistogramAggregation: SavedObjectMigrationFn<any, any> = (doc)
return doc;
};

// Migrate schemas inside aggregation (replace 'schema' object to name of the schema)
const migrateSchema: SavedObjectMigrationFn<any, any> = (doc) => {
const visStateJSON = get(doc, 'attributes.visState');
let visState;

if (visStateJSON) {
try {
visState = JSON.parse(visStateJSON);
} catch (e) {
// Let it go, the data is invalid and we'll leave it as is
}

function replaceSchema(agg: any) {
forOwn(agg, (value: any, key: string) => {
if (typeof value === 'object') {
if (key === 'schema') {
agg[key] = value.name;
} else {
replaceSchema(value);
}
}
});
}

if (visState && visState.aggs) {
for (const agg of visState.aggs) {
if (typeof agg === 'object') {
replaceSchema(agg);
}
}
return {
...doc,
attributes: {
...doc.attributes,
visState: JSON.stringify(visState),
},
};
}
}
return doc;
};

const removeDateHistogramTimeZones: SavedObjectMigrationFn<any, any> = (doc) => {
const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
Expand Down Expand Up @@ -883,5 +925,5 @@ export const visualizationSavedObjectTypeMigrations = {
'7.9.3': flow(migrateMatchAllQuery),
'7.10.0': flow(migrateFilterRatioQuery, removeTSVBSearchSource),
'7.11.0': flow(enableDataTableVisToolbar),
'7.12.0': flow(migrateVislibAreaLineBarTypes),
'7.12.0': flow(migrateVislibAreaLineBarTypes, migrateSchema),
};