From 95035ff0794e112b946873a4235d8b04955e3b77 Mon Sep 17 00:00:00 2001 From: Sachin Ramesh <104337442+sachinrameshn@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:40:50 +0530 Subject: [PATCH 1/2] fix(catalog): clear url search param based on search field (#14162) ref: MANAGER-16083 Signed-off-by: Sachin Ramesh --- .../manager/apps/catalog/src/components/SearchBar/SearchBar.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/manager/apps/catalog/src/components/SearchBar/SearchBar.tsx b/packages/manager/apps/catalog/src/components/SearchBar/SearchBar.tsx index 2f5dd4b90b5c..16d797666100 100644 --- a/packages/manager/apps/catalog/src/components/SearchBar/SearchBar.tsx +++ b/packages/manager/apps/catalog/src/components/SearchBar/SearchBar.tsx @@ -65,6 +65,7 @@ const SearchBar: React.FC = ({ event: OsdsSearchBarCustomEvent, ) => { setLocalSearchValue(event.detail.value); + setSearchValue(event.detail.value); }; const onDeleteCategory = (category: string) => From a6bd9fa57c23f6c92a675a81815b753f9d0c5b19 Mon Sep 17 00:00:00 2001 From: vovh <155978769+vovh@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:11:59 +0100 Subject: [PATCH 2/2] feat(kms): remove new and beta tag from menu for KMS (#14130) ref: MANAGER-15944 Signed-off-by: Vincent BONMARCHAND --- .../legacy/server-sidebar/universe/DedicatedSidebar.tsx | 2 -- .../server-sidebar/universe/HostedPrivateCloudSidebar.tsx | 2 -- .../legacy/server-sidebar/universe/public-cloud/pci-menu.ts | 2 -- 3 files changed, 6 deletions(-) diff --git a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/DedicatedSidebar.tsx b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/DedicatedSidebar.tsx index ef74e3952ddd..afa5acb9f029 100644 --- a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/DedicatedSidebar.tsx +++ b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/DedicatedSidebar.tsx @@ -380,14 +380,12 @@ export default function DedicatedSidebar() { id: 'identity-security-operations', label: t('sidebar_identity_security_operations'), icon: , - badge: 'new', pathMatcher: new RegExp('^/key-management-service'), subItems: [ { id: 'key-management-service', label: t('sidebar_key-management-service'), href: navigation.getURL('key-management-service', '/'), - badge: 'beta', pathMatcher: new RegExp('^/key-management-service'), icon: keyIcon, async loader() { diff --git a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/HostedPrivateCloudSidebar.tsx b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/HostedPrivateCloudSidebar.tsx index 7d682cde04fe..c5267e956c23 100644 --- a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/HostedPrivateCloudSidebar.tsx +++ b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/HostedPrivateCloudSidebar.tsx @@ -335,14 +335,12 @@ export default function HostedPrivateCloudSidebar() { id: 'identity-security-operations', label: t('sidebar_identity_security_operations'), icon: , - badge: 'new', pathMatcher: new RegExp('^/key-management-service'), subItems: [ { id: 'key-management-service', label: t('sidebar_key-management-service'), href: navigation.getURL('key-management-service', '/'), - badge: 'beta', pathMatcher: new RegExp('^/key-management-service'), icon: keyIcon, async loader() { diff --git a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts index 9f9785a191df..9eaf3060e163 100644 --- a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts +++ b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts @@ -420,13 +420,11 @@ export function getPciProjectMenu( pciMenu.push({ id: 'identity-security', title: 'Identity, Security & Operations', - badge: 'new', subItems: [ { id: 'key-management-service', title: 'Key Management Service', href: getURL('key-management-service', `/`), - badge: 'beta' }, ], },