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

[ML] Fixing optional plugin dependency types #64450

Merged
merged 2 commits into from
Apr 27, 2020
Merged

[ML] Fixing optional plugin dependency types #64450

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
7a6b469
[ML] Fixing optional plugin dependency types
jgowdyelastic Apr 24, 2020
f3d6179
Merge branch 'master' into fixing-optional-dependency-types
elasticmachine Apr 27, 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
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { LicenseManagementUIPluginSetup } from '../../../../../license_managemen

interface StartPlugins {
data: DataPublicPluginStart;
security: SecurityPluginSetup;
security?: SecurityPluginSetup;
licenseManagement?: LicenseManagementUIPluginSetup;
}
export type StartServices = CoreStart & StartPlugins;
Expand Down
8 changes: 5 additions & 3 deletions ...on/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ export const FilebeatConfigFlyout: FC<Props> = ({
} = useMlKibana();

useEffect(() => {
security.authc.getCurrentUser().then(user => {
setUsername(user.username === undefined ? null : user.username);
});
if (security !== undefined) {
security.authc.getCurrentUser().then(user => {
setUsername(user.username === undefined ? null : user.username);
});
}
}, []);

useEffect(() => {
Expand Down
7 changes: 5 additions & 2 deletions x-pack/plugins/ml/public/application/management/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ export function initManagementSection(
) {
const licensing = pluginsSetup.licensing.license$.pipe(take(1));
licensing.subscribe(license => {
if (license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === 'valid') {
const management = pluginsSetup.management;
const management = pluginsSetup.management;
if (
management !== undefined &&
license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === 'valid'
) {
const mlSection = management.sections.register({
id: PLUGIN_ID,
title: i18n.translate('xpack.ml.management.mlTitle', {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/public/application/util/dependency_cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export interface DependencyCache {
savedObjectsClient: SavedObjectsClientContract | null;
application: ApplicationStart | null;
http: HttpStart | null;
security: SecurityPluginSetup | null;
security: SecurityPluginSetup | undefined | null;
i18n: I18nStart | null;
urlGenerators: SharePluginStart['urlGenerators'] | null;
mlConfig: MlConfigType | null;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/ml/public/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ export interface MlStartDependencies {
share: SharePluginStart;
}
export interface MlSetupDependencies {
security: SecurityPluginSetup;
security?: SecurityPluginSetup;
licensing: LicensingPluginSetup;
management: ManagementSetup;
management?: ManagementSetup;
usageCollection: UsageCollectionSetup;
licenseManagement?: LicenseManagementUIPluginSetup;
home: HomePublicPluginSetup;
Expand Down