diff --git a/packages/manager/.changeset/pr-11796-upcoming-features-1741277847530.md b/packages/manager/.changeset/pr-11796-upcoming-features-1741277847530.md new file mode 100644 index 00000000000..64e98cda9d9 --- /dev/null +++ b/packages/manager/.changeset/pr-11796-upcoming-features-1741277847530.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Upcoming Features +--- + +Disable query to get Linode's firewalls for Linodes using new interfaces in LinodeEntityDetail ([#11796](https://github.com/linode/manager/pull/11796)) diff --git a/packages/manager/.changeset/pr-11796-upcoming-features-1741294621831.md b/packages/manager/.changeset/pr-11796-upcoming-features-1741294621831.md new file mode 100644 index 00000000000..31e098ecbeb --- /dev/null +++ b/packages/manager/.changeset/pr-11796-upcoming-features-1741294621831.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Upcoming Features +--- + +Fix typo in copy for Firewall Create VPC template ([#11796](https://github.com/linode/manager/pull/11796)) diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/VPCTemplateRules.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/VPCTemplateRules.tsx index 2d5694f6de3..cebdf61bf90 100644 --- a/packages/manager/src/features/Firewalls/FirewallLanding/VPCTemplateRules.tsx +++ b/packages/manager/src/features/Firewalls/FirewallLanding/VPCTemplateRules.tsx @@ -14,7 +14,7 @@ export const VPCTemplateRules = () => { <> ({ marginTop: theme.spacing(3) })}> Allows for login with SSH, regular networking control data, and inbound - traffice from the VPC address space. + traffic from the VPC address space. ({ marginTop: theme.spacing(2) })}> {STRENGTHEN_TEMPLATE_RULES} diff --git a/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx b/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx index 3aa35555dc2..711b89402f5 100644 --- a/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx +++ b/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx @@ -67,7 +67,10 @@ export const LinodeEntityDetail = (props: Props) => { vpcLinodeIsAssignedTo, } = useVPCConfigInterface(linode.id); - const { data: attachedFirewallData } = useLinodeFirewallsQuery(linode.id); + const { data: attachedFirewallData } = useLinodeFirewallsQuery( + linode.id, + linode.interface_generation !== 'linode' + ); const attachedFirewalls = attachedFirewallData?.data ?? []; diff --git a/packages/manager/src/queries/linodes/firewalls.ts b/packages/manager/src/queries/linodes/firewalls.ts index e3526b6dfc1..4449ce5228e 100644 --- a/packages/manager/src/queries/linodes/firewalls.ts +++ b/packages/manager/src/queries/linodes/firewalls.ts @@ -4,7 +4,11 @@ import { linodeQueries } from './linodes'; import type { APIError, Firewall, ResourcePage } from '@linode/api-v4'; -export const useLinodeFirewallsQuery = (linodeId: number) => - useQuery, APIError[]>( - linodeQueries.linode(linodeId)._ctx.firewalls - ); +export const useLinodeFirewallsQuery = ( + linodeId: number, + enabled: boolean = true +) => + useQuery, APIError[]>({ + ...linodeQueries.linode(linodeId)._ctx.firewalls, + enabled, + });