diff --git a/packages/manager/.changeset/pr-11150-upcoming-features-1729746495913.md b/packages/manager/.changeset/pr-11150-upcoming-features-1729746495913.md new file mode 100644 index 00000000000..bbe5b071ce9 --- /dev/null +++ b/packages/manager/.changeset/pr-11150-upcoming-features-1729746495913.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Upcoming Features +--- + +Add default xfilter for DBasS aiven clusters fetch in resource selection component ([#11150](https://github.com/linode/manager/pull/11150)) diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx index 220c8b2813b..a333a379858 100644 --- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx +++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx @@ -83,7 +83,7 @@ export const CloudPulseDashboard = (props: DashboardProperties) => { Boolean(dashboard?.service_type), dashboard?.service_type, {}, - {} + dashboard?.service_type === 'dbaas' ? { platform: 'rdbms-default' } : {} ); const { diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardSelect.tsx index 19828bc4328..cc009df1b56 100644 --- a/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardSelect.tsx +++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardSelect.tsx @@ -95,9 +95,7 @@ export const CloudPulseDashboardSelect = React.memo( renderGroup={(params) => ( - {serviceTypeMap.has(params.group) - ? serviceTypeMap.get(params.group) - : params.group} + {serviceTypeMap.get(params.group) || params.group} {params.children} diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx index 9ee85d4cd6e..15c7a6af83e 100644 --- a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx +++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx @@ -43,11 +43,22 @@ export const CloudPulseResourcesSelect = React.memo( xFilter, } = props; + const platformFilter = + resourceType === 'dbaas' ? { platform: 'rdbms-default' } : {}; + const { data: resources, isLoading } = useResourcesQuery( disabled !== undefined ? !disabled : Boolean(region && resourceType), resourceType, {}, - xFilter ? xFilter : { region } + xFilter + ? { + ...platformFilter, + ...xFilter, + } + : { + ...platformFilter, + region, + } ); const [selectedResources, setSelectedResources] = React.useState<