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

Simplify data views getCurrentUser #12

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Simplify data views getCurrentUser #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/plugins/data_views/public/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ export type {
DataViewsContract,
HasDataViewsResponse,
IndicesViaSearchResponse,
UserIdGetter,
} from './types';

// Export plugin after all other imports
Expand Down
15 changes: 4 additions & 11 deletions src/plugins/data_views/public/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
DataViewsPublicPluginStart,
DataViewsPublicSetupDependencies,
DataViewsPublicStartDependencies,
UserIdGetter,
} from './types';

import { DataViewsApiClient } from '.';
Expand All @@ -42,7 +41,6 @@ export class DataViewsPublicPlugin
{
private readonly hasData = new HasData();
private rollupsEnabled: boolean = false;
protected userIdGetter: UserIdGetter = async () => undefined;

constructor(private readonly initializerContext: PluginInitializerContext) {}

Expand All @@ -62,14 +60,6 @@ export class DataViewsPublicPlugin
}),
});

core.getStartServices().then(([coreStart]) => {
const getUserId = async function getUserId(): Promise<string | undefined> {
const currentUser = await coreStart.security.authc.getCurrentUser();
return currentUser?.profile_uid;
};
this.userIdGetter = getUserId;
});

return {
enableRollups: () => (this.rollupsEnabled = true),
};
Expand All @@ -96,7 +86,10 @@ export class DataViewsPublicPlugin
hasData: this.hasData.start(core),
uiSettings: new UiSettingsPublicToCommon(uiSettings),
savedObjectsClient: new ContentMagementWrapper(contentManagement.client),
apiClient: new DataViewsApiClient(http, () => this.userIdGetter()),
apiClient: new DataViewsApiClient(http, async () => {
const currentUser = await core.security.authc.getCurrentUser();
return currentUser?.profile_uid;
}),
fieldFormats,
http,
onNotification: (toastInputFields, key) => {
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/data_views/public/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ export interface DataViewsPublicStartDependencies {
contentManagement: ContentManagementPublicStart;
}

export type UserIdGetter = () => Promise<string | undefined>;

/**
* Data plugin public Setup contract
*/
Expand Down
Loading