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

[Graph] Fix default discover url template building #47587

Merged
merged 2 commits into from
Oct 9, 2019
Merged

[Graph] Fix default discover url template building #47587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aa66c9
fix default discover template building
flash1293 Oct 8, 2019
a83b6c3
remove unused import
flash1293 Oct 8, 2019
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
15 changes: 14 additions & 1 deletion x-pack/legacy/plugins/graph/public/state_management/legacy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
updateFieldProperties,
} from './fields';
import { AdvancedSettings, WorkspaceField, WorkspaceNode } from '../types';
import { loadTemplates, syncTemplatesSaga } from './url_templates';

/**
* This suite tests all the sagas that only exist to sync the legacy world
Expand All @@ -25,7 +26,13 @@ describe('legacy sync sagas', () => {

beforeEach(() => {
env = createMockGraphStore({
sagas: [syncSettingsSaga, updateSaveButtonSaga, syncFieldsSaga, syncNodeStyleSaga],
sagas: [
syncSettingsSaga,
updateSaveButtonSaga,
syncFieldsSaga,
syncNodeStyleSaga,
syncTemplatesSaga,
],
initialStateOverwrites: {
fields: {
field1: {
Expand Down Expand Up @@ -67,6 +74,12 @@ describe('legacy sync sagas', () => {
expect(env.mockedDeps.getWorkspace()!.options.exploreControls).toBe(newSettings);
});

it('syncs templates with workspace', () => {
env.store.dispatch(loadTemplates([]));
expect(env.mockedDeps.setUrlTemplates).toHaveBeenCalledWith([]);
expect(env.mockedDeps.notifyAngular).toHaveBeenCalled();
});

it('notifies angular when fields are selected', () => {
env.store.dispatch(selectField('field1'));
expect(env.mockedDeps.notifyAngular).toHaveBeenCalled();
Expand Down
3 changes: 2 additions & 1 deletion x-pack/legacy/plugins/graph/public/state_management/url_templates.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ describe('url_templates', () => {
);
expect(templates.length).toBe(1);
expect(templates[0].encoder).toBe(outlinkEncoders[0]);
expect(templates[0].url).toContain('test-pattern');
expect(templates[0].url).not.toContain('test-pattern');
expect(templates[0].url).toContain('123456');
expect(templates[0].isDefault).toBe(true);
});

Expand Down
7 changes: 5 additions & 2 deletions x-pack/legacy/plugins/graph/public/state_management/url_templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function generateDefaultTemplate(
'_a',
rison.encode({
columns: ['_source'],
index: datasource.title,
index: datasource.id,
interval: 'auto',
query: { language: 'kuery', query: urlTemplatePlaceholder },
sort: ['_score', 'desc'],
Expand Down Expand Up @@ -106,6 +106,9 @@ export const syncTemplatesSaga = ({ setUrlTemplates, notifyAngular }: GraphStore
}

return function*() {
yield takeEvery(matchesOne(loadTemplates, saveTemplate, removeTemplate), syncTemplates);
yield takeEvery(
matchesOne(loadTemplates, saveTemplate, removeTemplate, requestDatasource, setDatasource),
syncTemplates
);
};
};