From f60bc0237218836e7ee9cd55cd4723ce1d430bad Mon Sep 17 00:00:00 2001 From: Qxisylolo Date: Thu, 31 Oct 2024 15:44:49 +0800 Subject: [PATCH 1/8] resolve conflicts Signed-off-by: Qxisylolo --- .../public/chrome/ui/header/recent_items.tsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx index 298bf51d2bc6..71822a2a5157 100644 --- a/src/core/public/chrome/ui/header/recent_items.tsx +++ b/src/core/public/chrome/ui/header/recent_items.tsx @@ -17,6 +17,7 @@ import { EuiSpacer, EuiHeaderSectionItemButtonProps, EuiButtonIcon, + EuiAvatar, EuiRadioGroup, EuiTextColor, EuiPopover, @@ -138,14 +139,13 @@ export const RecentItems = ({ { setIsPreferencesPopoverOpen((IsPreferencesPopoverOpe) => !IsPreferencesPopoverOpe); }} > - {i18n.translate('core.header.recent.preferences', { - defaultMessage: 'Preferences', - })} + } isOpen={isPreferencesPopoverOpen} @@ -273,12 +273,13 @@ export const RecentItems = ({ panelPaddingSize="m" > {renderBreadcrumbs} - +

@@ -309,8 +310,9 @@ export const RecentItems = ({ - {item.label} + {item.label + ' '} {item.workspaceName ? ( ({item.workspaceName}) ) : null} @@ -328,7 +330,7 @@ export const RecentItems = ({ })} )} - + {preferencePopover} From 4bdc327b8b53d80ed03f6d25a0e83e39df8bfe15 Mon Sep 17 00:00:00 2001 From: Qxisylolo Date: Thu, 12 Sep 2024 14:52:50 +0800 Subject: [PATCH 2/8] fix/ fix the_UI_of_recent_assets, delete comments Signed-off-by: Qxisylolo --- src/core/public/chrome/ui/header/recent_items.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx index 71822a2a5157..c3bde069d051 100644 --- a/src/core/public/chrome/ui/header/recent_items.tsx +++ b/src/core/public/chrome/ui/header/recent_items.tsx @@ -9,7 +9,6 @@ import { EuiPanel, EuiListGroup, EuiListGroupItem, - EuiTitle, EuiPopoverTitle, EuiIcon, EuiText, @@ -17,7 +16,6 @@ import { EuiSpacer, EuiHeaderSectionItemButtonProps, EuiButtonIcon, - EuiAvatar, EuiRadioGroup, EuiTextColor, EuiPopover, From bc8ca44eb3ac705915e140f7d8df64256d03c3d0 Mon Sep 17 00:00:00 2001 From: Qxisylolo Date: Wed, 18 Sep 2024 16:40:18 +0800 Subject: [PATCH 3/8] fix/ fix the recent title size Signed-off-by: Qxisylolo --- src/core/public/chrome/ui/header/recent_items.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx index c3bde069d051..561d3852ba43 100644 --- a/src/core/public/chrome/ui/header/recent_items.tsx +++ b/src/core/public/chrome/ui/header/recent_items.tsx @@ -9,6 +9,7 @@ import { EuiPanel, EuiListGroup, EuiListGroupItem, + EuiTitle, EuiPopoverTitle, EuiIcon, EuiText, From 9222c24323680d9811a295a6cc4142c1d6516cf1 Mon Sep 17 00:00:00 2001 From: Qxisylolo Date: Mon, 30 Sep 2024 10:15:25 +0200 Subject: [PATCH 4/8] fix/the_UI_of_recent_assets, use icon button Signed-off-by: Qxisylolo --- src/core/public/chrome/ui/header/recent_items.tsx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx index 561d3852ba43..9ba2314a848f 100644 --- a/src/core/public/chrome/ui/header/recent_items.tsx +++ b/src/core/public/chrome/ui/header/recent_items.tsx @@ -13,7 +13,6 @@ import { EuiPopoverTitle, EuiIcon, EuiText, - EuiButtonEmpty, EuiSpacer, EuiHeaderSectionItemButtonProps, EuiButtonIcon, @@ -135,17 +134,15 @@ export const RecentItems = ({ ownFocus={false} panelPaddingSize="s" button={ - { setIsPreferencesPopoverOpen((IsPreferencesPopoverOpe) => !IsPreferencesPopoverOpe); }} - > - - + iconType="managementApp" + data-test-subj="preferencesSettingButton" + /> } isOpen={isPreferencesPopoverOpen} anchorPosition="downLeft" From 75bdd38e914de48a6b29829dd28cc3bce83a165a Mon Sep 17 00:00:00 2001 From: Qxisylolo Date: Wed, 9 Oct 2024 11:28:41 +0800 Subject: [PATCH 5/8] fix/the_UI_of_recent_assets, a small fix Signed-off-by: Qxisylolo --- src/core/public/chrome/ui/header/recent_items.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx index 9ba2314a848f..ad3b31fe6bc4 100644 --- a/src/core/public/chrome/ui/header/recent_items.tsx +++ b/src/core/public/chrome/ui/header/recent_items.tsx @@ -11,6 +11,7 @@ import { EuiListGroupItem, EuiTitle, EuiPopoverTitle, + EuiButtonEmpty, EuiIcon, EuiText, EuiSpacer, @@ -123,6 +124,9 @@ export const RecentItems = ({ const navLinks = useObservable(navLinks$, []); const loadingCount = useObservable(loadingCount$, 0); + // eslint-disable-next-line + console.log('loadingCount', loadingCount); + const handleItemClick = (link: string) => { navigateToUrl(link); setIsPopoverOpen(false); From c568819d35e64f2233bc1db03298bda56f13d695 Mon Sep 17 00:00:00 2001 From: Qxisylolo Date: Thu, 31 Oct 2024 15:42:54 +0800 Subject: [PATCH 6/8] remove comment Signed-off-by: Qxisylolo --- src/core/public/chrome/ui/header/recent_items.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx index ad3b31fe6bc4..fe48c7eb9d1e 100644 --- a/src/core/public/chrome/ui/header/recent_items.tsx +++ b/src/core/public/chrome/ui/header/recent_items.tsx @@ -124,9 +124,6 @@ export const RecentItems = ({ const navLinks = useObservable(navLinks$, []); const loadingCount = useObservable(loadingCount$, 0); - // eslint-disable-next-line - console.log('loadingCount', loadingCount); - const handleItemClick = (link: string) => { navigateToUrl(link); setIsPopoverOpen(false); From 618c9759e18ae02fadf02e64cca051ce4d7ea782 Mon Sep 17 00:00:00 2001 From: Qxisylolo Date: Mon, 23 Dec 2024 13:42:27 +0800 Subject: [PATCH 7/8] new resolve conflicts Signed-off-by: Qxisylolo --- src/core/public/chrome/ui/header/recent_items.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx index fe48c7eb9d1e..76dc3bcb3410 100644 --- a/src/core/public/chrome/ui/header/recent_items.tsx +++ b/src/core/public/chrome/ui/header/recent_items.tsx @@ -11,9 +11,9 @@ import { EuiListGroupItem, EuiTitle, EuiPopoverTitle, - EuiButtonEmpty, EuiIcon, EuiText, + EuiButtonEmpty, EuiSpacer, EuiHeaderSectionItemButtonProps, EuiButtonIcon, From 0da49070d6e9f7fc2b1004fe7eefb89378595483 Mon Sep 17 00:00:00 2001 From: "opensearch-changeset-bot[bot]" <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 05:44:15 +0000 Subject: [PATCH 8/8] Changeset file for PR #8156 created/updated --- changelogs/fragments/8156.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/8156.yml diff --git a/changelogs/fragments/8156.yml b/changelogs/fragments/8156.yml new file mode 100644 index 000000000000..c7b035ce443b --- /dev/null +++ b/changelogs/fragments/8156.yml @@ -0,0 +1,2 @@ +fix: +- Fix the UI of recent assets in the header ([#8156](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8156)) \ No newline at end of file