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

[Lens] move from slice to reducers/actions and simplify loading #113324

Merged
merged 6 commits into from
Oct 4, 2021
Merged

[Lens] move from slice to reducers/actions and simplify loading #113324

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91639c7
structure changes
mbondyra Sep 28, 2021
a898d74
tests & fix for sessionId
mbondyra Sep 28, 2021
7e24804
share mocks in time_range_middleware
mbondyra Sep 29, 2021
9cb6f34
make switchVisualization and selectSuggestion one reducer as it's ver…
mbondyra Oct 1, 2021
7f332b8
Merge branch 'master' into lens/change_structure_simplify_loading
kibanamachine Oct 4, 2021
2b569a2
CR
mbondyra Oct 4, 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
46 changes: 26 additions & 20 deletions x-pack/plugins/lens/public/app_plugin/app.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ import { App } from './app';
import { LensAppProps, LensAppServices } from './types';
import { EditorFrameInstance, EditorFrameProps } from '../types';
import { Document } from '../persistence';
import { visualizationMap, datasourceMap, makeDefaultServices, mountWithProvider } from '../mocks';
import {
visualizationMap,
datasourceMap,
makeDefaultServices,
mountWithProvider,
mockStoreDeps,
} from '../mocks';
import { I18nProvider } from '@kbn/i18n/react';
import {
SavedObjectSaveModal,
Expand Down Expand Up @@ -94,7 +100,7 @@ describe('Lens App', () => {

async function mountWith({
props = makeDefaultProps(),
services = makeDefaultServices(sessionIdSubject),
services = makeDefaultServices(sessionIdSubject, 'sessionId-1'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be a constant on top?

preloadedState,
}: {
props?: jest.Mocked<LensAppProps>;
Expand All @@ -110,11 +116,11 @@ describe('Lens App', () => {
</I18nProvider>
);
};

const storeDeps = mockStoreDeps({ lensServices: services });
const { instance, lensStore } = await mountWithProvider(
<App {...props} />,
{
data: services.data,
storeDeps,
preloadedState,
},
{ wrappingComponent }
Expand Down Expand Up @@ -144,7 +150,7 @@ describe('Lens App', () => {
});

it('updates global filters with store state', async () => {
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
const indexPattern = { id: 'index1' } as unknown as IndexPattern;
const pinnedField = { name: 'pinnedField' } as unknown as FieldSpec;
const pinnedFilter = esFilters.buildExistsFilter(pinnedField, indexPattern);
Expand Down Expand Up @@ -216,7 +222,7 @@ describe('Lens App', () => {

it('sets originatingApp breadcrumb when the document title changes', async () => {
const props = makeDefaultProps();
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
props.incomingState = { originatingApp: 'coolContainer' };
services.getOriginatingAppName = jest.fn(() => 'The Coolest Container Ever Made');

Expand Down Expand Up @@ -262,7 +268,7 @@ describe('Lens App', () => {

describe('TopNavMenu#showDatePicker', () => {
it('shows date picker if any used index pattern isTimeBased', async () => {
const customServices = makeDefaultServices(sessionIdSubject);
const customServices = makeDefaultServices(sessionIdSubject, 'sessionId-1');
customServices.data.indexPatterns.get = jest
.fn()
.mockImplementation((id) =>
Expand All @@ -275,7 +281,7 @@ describe('Lens App', () => {
);
});
it('shows date picker if active datasource isTimeBased', async () => {
const customServices = makeDefaultServices(sessionIdSubject);
const customServices = makeDefaultServices(sessionIdSubject, 'sessionId-1');
customServices.data.indexPatterns.get = jest
.fn()
.mockImplementation((id) =>
Expand All @@ -290,7 +296,7 @@ describe('Lens App', () => {
);
});
it('does not show date picker if index pattern nor active datasource is not time based', async () => {
const customServices = makeDefaultServices(sessionIdSubject);
const customServices = makeDefaultServices(sessionIdSubject, 'sessionId-1');
customServices.data.indexPatterns.get = jest
.fn()
.mockImplementation((id) =>
Expand Down Expand Up @@ -337,7 +343,7 @@ describe('Lens App', () => {
);
});
it('handles rejected index pattern', async () => {
const customServices = makeDefaultServices(sessionIdSubject);
const customServices = makeDefaultServices(sessionIdSubject, 'sessionId-1');
customServices.data.indexPatterns.get = jest
.fn()
.mockImplementation((id) => Promise.reject({ reason: 'Could not locate that data view' }));
Expand Down Expand Up @@ -385,7 +391,7 @@ describe('Lens App', () => {
: undefined,
};

const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.attributeService.wrapAttributes = jest
.fn()
.mockImplementation(async ({ savedObjectId }) => ({
Expand Down Expand Up @@ -419,7 +425,7 @@ describe('Lens App', () => {
}

it('shows a disabled save button when the user does not have permissions', async () => {
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.application = {
...services.application,
capabilities: {
Expand Down Expand Up @@ -469,7 +475,7 @@ describe('Lens App', () => {

it('Shows Save and Return and Save As buttons in create by value mode with originating app', async () => {
const props = makeDefaultProps();
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.dashboardFeatureFlag = { allowByValueEmbeddables: true };
props.incomingState = {
originatingApp: 'ultraDashboard',
Expand Down Expand Up @@ -618,7 +624,7 @@ describe('Lens App', () => {
const mockedConsoleDir = jest.spyOn(console, 'dir'); // mocked console.dir to avoid messages in the console when running tests
mockedConsoleDir.mockImplementation(() => {});

const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.attributeService.wrapAttributes = jest
.fn()
.mockRejectedValue({ message: 'failed' });
Expand Down Expand Up @@ -692,7 +698,7 @@ describe('Lens App', () => {
});

it('checks for duplicate title before saving', async () => {
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.attributeService.wrapAttributes = jest
.fn()
.mockReturnValue(Promise.resolve({ savedObjectId: '123' }));
Expand Down Expand Up @@ -759,7 +765,7 @@ describe('Lens App', () => {
});

it('should still be enabled even if the user is missing save permissions', async () => {
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.application = {
...services.application,
capabilities: {
Expand Down Expand Up @@ -799,7 +805,7 @@ describe('Lens App', () => {
});

it('should open inspect panel', async () => {
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
const { instance } = await mountWith({ services, preloadedState: { isSaveable: true } });

await runInspect(instance);
Expand Down Expand Up @@ -943,7 +949,7 @@ describe('Lens App', () => {

describe('saved query handling', () => {
it('does not allow saving when the user is missing the saveQuery permission', async () => {
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.application = {
...services.application,
capabilities: {
Expand Down Expand Up @@ -1136,7 +1142,7 @@ describe('Lens App', () => {

it('updates the state if session id changes from the outside', async () => {
const sessionIdS = new Subject<string>();
const services = makeDefaultServices(sessionIdS);
const services = makeDefaultServices(sessionIdS, 'sessionId-1');
const { lensStore } = await mountWith({ props: undefined, services });

act(() => {
Expand Down Expand Up @@ -1180,7 +1186,7 @@ describe('Lens App', () => {
});

it('does not confirm if the user is missing save permissions', async () => {
const services = makeDefaultServices(sessionIdSubject);
const services = makeDefaultServices(sessionIdSubject, 'sessionId-1');
services.application = {
...services.application,
capabilities: {
Expand Down
Loading