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

upcoming: [DI-21520] - Added default xFilter for fetching aiven clusters for dbass and fixed label fallback for service-type label #11150

Merged
merged 7 commits into from
Oct 25, 2024
Merged

upcoming: [DI-21520] - Added default xFilter for fetching aiven clusters for dbass and fixed label fallback for service-type label #11150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
db1048a
Merge pull request #39 from ACLPManager/feature/dbass_aiven_fetch_aclp
venkymano-akamai Oct 23, 2024
0c89098
Added changeset: Add default xfilter for DBasS aiven clusters fetch i…
ankita-akamai Oct 24, 2024
5d1791f
Merge branch 'linode:develop' into feature/AivenFetchDbaas
ankita-akamai Oct 24, 2024
bca0438
upcoming: [DI-21520] - Add platform filter for jwe token fetch for ai…
ankita-akamai Oct 24, 2024
f0638d6
upcoming: [DI-21520] - PR Comments
ankita-akamai Oct 24, 2024
8c02c64
upcoming: [DI-21520] - PR Comments
ankita-akamai Oct 24, 2024
9836eba
upcoming: [DI-21520] - PR Comments
ankita-akamai Oct 24, 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
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-11150-upcoming-features-1729746495913.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const CloudPulseDashboard = (props: DashboardProperties) => {
Boolean(dashboard?.service_type),
dashboard?.service_type,
{},
{}
dashboard?.service_type === 'dbaas' ? { platform: 'rdbms-default' } : {}
);

const {
Expand Down
4 changes: 1 addition & 3 deletions packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ export const CloudPulseDashboardSelect = React.memo(
renderGroup={(params) => (
<Box key={params.key}>
<Typography sx={{ marginLeft: '3.5%' }} variant="h3">
{serviceTypeMap.has(params.group)
? serviceTypeMap.get(params.group)
: params.group}
{serviceTypeMap.get(params.group) || params.group}
</Typography>
{params.children}
</Box>
Expand Down
13 changes: 12 additions & 1 deletion packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
abailly-akamai marked this conversation as resolved.
Show resolved Hide resolved
);

const [selectedResources, setSelectedResources] = React.useState<
Expand Down