Merge pull request #10571 from linode/staging

Release v1.121.1 - staging → master
linode · Jun 12, 2024 · ddcd69a · ddcd69a
2 parents bf556e5 + 2561918
commit ddcd69a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git 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
@@ -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": {

diff --git 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) => {

diff --git 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',
+    },
   ],
 };
 

diff --git 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 =