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

Jump to bottom

Make Field a React.lazy export #78483

Merged
merged 3 commits into from
Sep 29, 2020
Merged

Make Field a React.lazy export #78483

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
7dcbbb4
Make Field a React.lazy export
Sep 24, 2020
afe6ab1
Fix broken types
Sep 25, 2020
8022ceb
Merge branch 'master' into fix/advanced-setting-bundle-size
elasticmachine Sep 28, 2020
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
10 changes: 9 additions & 1 deletion src/plugins/advanced_settings/public/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,19 @@
* under the License.
*/

import React from 'react';
import { PluginInitializerContext } from 'kibana/public';
import { AdvancedSettingsPlugin } from './plugin';
export { AdvancedSettingsSetup, AdvancedSettingsStart } from './types';
export { ComponentRegistry } from './component_registry';
export { Field } from './management_app/components/field';

/**
* Exports the field component as a React.lazy component. We're explicitly naming it lazy here
* so any plugin that would import that can clearly see it's lazy loaded and can only be used
* inside a suspense context.
*/
const LazyField = React.lazy(() => import('./management_app/components/field'));
export { LazyField };

export function plugin(initializerContext: PluginInitializerContext) {
return new AdvancedSettingsPlugin();
Expand Down
3 changes: 3 additions & 0 deletions src/plugins/advanced_settings/public/management_app/components/field/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
*/

export { Field, getEditableValue } from './field';

// eslint-disable-next-line import/no-default-export
export { Field as default } from './field';
203 changes: 1 addition & 202 deletions ...gement_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 24 additions & 11 deletions ...gins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import TelemetryManagementSection from './telemetry_management_section';
import { TelemetryService } from '../../../telemetry/public/services';
import { coreMock } from '../../../../core/public/mocks';
import { render } from '@testing-library/react';

describe('TelemetryManagementSectionComponent', () => {
const coreStart = coreMock.createStart();
Expand Down Expand Up @@ -73,19 +74,31 @@ describe('TelemetryManagementSectionComponent', () => {
http: coreSetup.http,
});

const component = mountWithIntl(
<TelemetryManagementSection
telemetryService={telemetryService}
onQueryMatchChange={onQueryMatchChange}
showAppliesSettingMessage={false}
enableSaving={true}
toasts={coreStart.notifications.toasts}
/>
const component = render(
<React.Suspense fallback={<span>Fallback</span>}>
<TelemetryManagementSection
telemetryService={telemetryService}
onQueryMatchChange={onQueryMatchChange}
showAppliesSettingMessage={false}
enableSaving={true}
toasts={coreStart.notifications.toasts}
/>
</React.Suspense>
);

try {
expect(
component.setProps({ ...component.props(), query: { text: 'asssdasdsad' } })
).toMatchSnapshot();
component.rerender(
<React.Suspense fallback={<span>Fallback</span>}>
<TelemetryManagementSection
query={{ text: 'asdasdasd' }}
telemetryService={telemetryService}
onQueryMatchChange={onQueryMatchChange}
showAppliesSettingMessage={false}
enableSaving={true}
toasts={coreStart.notifications.toasts}
/>
</React.Suspense>
);
expect(onQueryMatchChange).toHaveBeenCalledWith(false);
expect(onQueryMatchChange).toHaveBeenCalledTimes(1);
} finally {
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { i18n } from '@kbn/i18n';
import { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
import { PRIVACY_STATEMENT_URL } from '../../../telemetry/common/constants';
import { OptInExampleFlyout } from './opt_in_example_flyout';
import { Field } from '../../../advanced_settings/public';
import { LazyField } from '../../../advanced_settings/public';
import { ToastsStart } from '../../../../core/public';

type TelemetryService = TelemetryPluginSetup['telemetryService'];
Expand Down Expand Up @@ -119,7 +119,7 @@ export class TelemetryManagementSection extends Component<Props, State> {

{this.maybeGetAppliesSettingMessage()}
<EuiSpacer size="s" />
<Field
<LazyField
setting={
{
type: 'boolean',
Expand Down