From 79ea6a30e2e2d870ff747ceb1ba2aaafcb9844b9 Mon Sep 17 00:00:00 2001 From: Hana Xu Date: Tue, 11 Jun 2024 13:06:28 -0400 Subject: [PATCH 1/4] do not display edge plans when a core region is selected --- .../src/features/components/PlansPanel/PlansPanel.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx index 432a1670a0c..69813cf0f6f 100644 --- a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx +++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx @@ -86,9 +86,14 @@ export const PlansPanel = (props: PlansPanelProps) => { Boolean(flags.soldOutChips) && selectedRegionID !== undefined ); - const _types = replaceOrAppendPlaceholder512GbPlans(types); + const _types = types.filter( + (type) => + !type.id.includes('dedicated-edge') && !type.id.includes('nanode-edge') + ); const _plans = getPlanSelectionsByPlanType( - flags.disableLargestGbPlans ? _types : types + flags.disableLargestGbPlans + ? replaceOrAppendPlaceholder512GbPlans(_types) + : _types ); const hideDistributedRegions = From 1b6b0e850033c8c5995ddfb4eaa028ed6eca1b96 Mon Sep 17 00:00:00 2001 From: Hana Xu Date: Tue, 11 Jun 2024 13:41:51 -0400 Subject: [PATCH 2/4] update package version and changelog --- packages/manager/CHANGELOG.md | 7 ++++++- packages/manager/package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md index 9a5a69d2e36..cf21e9f2632 100644 --- a/packages/manager/CHANGELOG.md +++ b/packages/manager/CHANGELOG.md @@ -4,8 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [2024-06-10] - v1.121.0 +## [2024-06-11] - v1.121.1 + +### Fixed: +- Core Plan table display ([#10567](https://github.com/linode/manager/pull/10567)) + +## [2024-06-10] - v1.121.0 ### Added: diff --git a/packages/manager/package.json b/packages/manager/package.json index 0e58e8a5ea6..bd23d36d5d8 100644 --- a/packages/manager/package.json +++ b/packages/manager/package.json @@ -2,7 +2,7 @@ "name": "linode-manager", "author": "Linode", "description": "The Linode Manager website", - "version": "1.121.0", + "version": "1.121.1", "private": true, "type": "module", "bugs": { From b48ea06d914e8fe4e85eb4c5fc92a3118d75ccf0 Mon Sep 17 00:00:00 2001 From: Hana Xu Date: Tue, 11 Jun 2024 15:41:37 -0400 Subject: [PATCH 3/4] fix PlansPanel test --- .../src/features/components/PlansPanel/PlansPanel.test.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.test.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.test.tsx index 798101be7f0..71fa6a84919 100644 --- a/packages/manager/src/features/components/PlansPanel/PlansPanel.test.tsx +++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.test.tsx @@ -28,6 +28,10 @@ const defaultProps: PlansPanelProps = { ...planSelectionTypeFactory.build(), class: 'gpu', }, + { + ...planSelectionTypeFactory.build(), + class: 'premium', + }, ], }; From 8fdfc7d027cf3f70a9bcd5ef9e4fd170542d7dff Mon Sep 17 00:00:00 2001 From: Hana Xu Date: Tue, 11 Jun 2024 17:25:36 -0400 Subject: [PATCH 4/4] fix kubernetes plan panel --- .../KubernetesPlansPanel/KubernetesPlansPanel.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx index fffc1efc25b..2dc8bc961ae 100644 --- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx +++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx @@ -11,13 +11,13 @@ import { } from 'src/features/components/PlansPanel/utils'; import { useFlags } from 'src/hooks/useFlags'; import { useRegionAvailabilityQuery } from 'src/queries/regions/regions'; -import { ExtendedType } from 'src/utilities/extendType'; import { KubernetesPlanContainer } from './KubernetesPlanContainer'; import type { CreateNodePoolData, Region } from '@linode/api-v4'; import type { LinodeTypeClass } from '@linode/api-v4/lib/linodes/types'; import type { PlanSelectionType } from 'src/features/components/PlansPanel/types'; +import type { ExtendedType } from 'src/utilities/extendType'; interface Props { addPool?: (pool?: CreateNodePoolData) => void; @@ -67,9 +67,15 @@ export const KubernetesPlansPanel = (props: Props) => { Boolean(flags.soldOutChips) && selectedRegionId !== undefined ); - const _types = replaceOrAppendPlaceholder512GbPlans(types); + const _types = types.filter( + (type) => + !type.id.includes('dedicated-edge') && !type.id.includes('nanode-edge') + ); + const plans = getPlanSelectionsByPlanType( - flags.disableLargestGbPlans ? _types : types + flags.disableLargestGbPlans + ? replaceOrAppendPlaceholder512GbPlans(_types) + : _types ); const tabs = Object.keys(plans).map((plan: LinodeTypeClass) => {