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

Sync develop & master #14253

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Sync develop & master #14253

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
95035ff
fix(catalog): clear url search param based on search field (#14162)
sachinrameshn Nov 21, 2024
a6bd9fa
feat(kms): remove new and beta tag from menu for KMS (#14130)
vovh Nov 21, 2024
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: 1 addition & 0 deletions packages/manager/apps/catalog/src/components/SearchBar/SearchBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const SearchBar: React.FC<SearchbarProps> = ({
event: OsdsSearchBarCustomEvent<OdsInputValueChangeEventDetail>,
) => {
setLocalSearchValue(event.detail.value);
setSearchValue(event.detail.value);
};

const onDeleteCategory = (category: string) =>
Expand Down
2 changes: 0 additions & 2 deletions .../manager/apps/container/src/container/legacy/server-sidebar/universe/DedicatedSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,12 @@ export default function DedicatedSidebar() {
id: 'identity-security-operations',
label: t('sidebar_identity_security_operations'),
icon: <OsdsIcon name={ODS_ICON_NAME.CLOUD_EYE_CONCEPT} size={ODS_ICON_SIZE.xxs} color={ODS_THEME_COLOR_INTENT.text}/>,
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() {
Expand Down
2 changes: 0 additions & 2 deletions ...apps/container/src/container/legacy/server-sidebar/universe/HostedPrivateCloudSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,12 @@ export default function HostedPrivateCloudSidebar() {
id: 'identity-security-operations',
label: t('sidebar_identity_security_operations'),
icon: <OsdsIcon name={ODS_ICON_NAME.CLOUD_EYE_CONCEPT} size={ODS_ICON_SIZE.xxs} color={ODS_THEME_COLOR_INTENT.text}/>,
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() {
Expand Down
2 changes: 0 additions & 2 deletions ...ager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
},
],
},
Expand Down
Loading