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

[8.16] [Security Assistant] Knowledge base settings author column fix (#197114) #197137

Merged
merged 1 commit into from
Oct 21, 2024
Merged

[8.16] [Security Assistant] Knowledge base settings author column fix (#197114) #197137

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
19 changes: 3 additions & 16 deletions ...-elastic-assistant/impl/knowledge_base/knowledge_base_settings_management/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,20 +168,6 @@ export const ENTRY_NAME_INPUT_PLACEHOLDER = i18n.translate(
}
);

export const ENTRY_SPACE_INPUT_LABEL = i18n.translate(
'xpack.elasticAssistant.assistant.settings.knowledgeBaseSettingsManagement.entrySpaceInputLabel',
{
defaultMessage: 'Space',
}
);

export const ENTRY_SPACE_INPUT_PLACEHOLDER = i18n.translate(
'xpack.elasticAssistant.assistant.settings.knowledgeBaseSettingsManagement.entrySpaceInputPlaceholder',
{
defaultMessage: 'Select',
}
);

export const SHARING_PRIVATE_OPTION_LABEL = i18n.translate(
'xpack.elasticAssistant.assistant.settings.knowledgeBaseSettingsManagement.sharingPrivateOptionLabel',
{
Expand Down Expand Up @@ -272,7 +258,8 @@ export const ENTRY_DESCRIPTION_HELP_LABEL = i18n.translate(
export const ENTRY_DESCRIPTION_PLACEHOLDER = i18n.translate(
'xpack.elasticAssistant.assistant.settings.knowledgeBaseSettingsManagement.entryDescriptionPlaceholder',
{
defaultMessage: 'Use this index to answer any question related to asset information.',
defaultMessage:
'Example: "Use this index to answer any question related to asset information."',
}
);

Expand All @@ -295,7 +282,7 @@ export const ENTRY_QUERY_DESCRIPTION_PLACEHOLDER = i18n.translate(
'xpack.elasticAssistant.assistant.settings.knowledgeBaseSettingsManagement.entryQueryDescriptionPlaceholder',
{
defaultMessage:
'Key terms to retrieve asset related information, like host names, IP Addresses or cloud objects.',
'Example: "Key terms to retrieve asset related information, like host names, IP Addresses or cloud objects."',
}
);

Expand Down
29 changes: 18 additions & 11 deletions ...stant/impl/knowledge_base/knowledge_base_settings_management/use_knowledge_base_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,29 @@ import {
} from '@kbn/elastic-assistant-common';

import useAsync from 'react-use/lib/useAsync';
import { UserProfileAvatarData } from '@kbn/user-profile-components';
import { useAssistantContext } from '../../..';
import * as i18n from './translations';
import { BadgesColumn } from '../../assistant/common/components/assistant_settings_management/badges';
import { useInlineActions } from '../../assistant/common/components/assistant_settings_management/inline_actions';
import { isSystemEntry } from './helpers';

const AuthorColumn = ({ entry }: { entry: KnowledgeBaseEntryResponse }) => {
const { currentUserAvatar, userProfileService } = useAssistantContext();
const { userProfileService } = useAssistantContext();

const userProfile = useAsync(async () => {
const profile = await userProfileService?.bulkGet({ uids: new Set([entry.createdBy]) });
return profile?.[0].user.username;
}, []);
const profile = await userProfileService?.bulkGet<{ avatar: UserProfileAvatarData }>({
uids: new Set([entry.createdBy]),
dataPath: 'avatar',
});
return { username: profile?.[0].user.username, avatar: profile?.[0].data.avatar };
}, [entry.createdBy]);

const userName = useMemo(() => userProfile?.value ?? 'Unknown', [userProfile?.value]);
const userName = useMemo(
() => userProfile?.value?.username ?? 'Unknown',
[userProfile?.value?.username]
);
const userAvatar = userProfile.value?.avatar;
const badgeItem = isSystemEntry(entry) ? 'Elastic' : userName;
const userImage = isSystemEntry(entry) ? (
<EuiIcon
Expand All @@ -40,22 +48,22 @@ const AuthorColumn = ({ entry }: { entry: KnowledgeBaseEntryResponse }) => {
margin-right: 14px;
`}
/>
) : currentUserAvatar?.imageUrl != null ? (
) : userAvatar?.imageUrl != null ? (
<EuiAvatar
name={userName}
imageUrl={currentUserAvatar.imageUrl}
imageUrl={userAvatar.imageUrl}
size={'s'}
color={currentUserAvatar?.color ?? 'subdued'}
color={userAvatar.color ?? 'subdued'}
css={css`
margin-right: 10px;
`}
/>
) : (
<EuiAvatar
name={userName}
initials={currentUserAvatar?.initials}
initials={userAvatar?.initials}
size={'s'}
color={currentUserAvatar?.color ?? 'subdued'}
color={userAvatar?.color ?? 'subdued'}
css={css`
margin-right: 10px;
`}
Expand Down Expand Up @@ -123,7 +131,6 @@ export const useKnowledgeBaseTable = () => {
},
{
name: i18n.COLUMN_AUTHOR,
sortable: ({ users }: KnowledgeBaseEntryResponse) => users[0]?.name,
render: (entry: KnowledgeBaseEntryResponse) => <AuthorColumn entry={entry} />,
},
{
Expand Down
1 change: 1 addition & 0 deletions x-pack/packages/kbn-elastic-assistant/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
"@kbn/core",
"@kbn/zod",
"@kbn/data-views-plugin",
"@kbn/user-profile-components",
]
}