From 61691009d80468c46b44161ac6d3f4e4cb918d89 Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Tue, 16 Apr 2024 16:29:52 +0200 Subject: [PATCH 1/3] fix: [UIE-7601] - disable smaller plans --- .../DatabaseDetail/DatabaseResize/DatabaseResize.tsx | 2 +- .../src/features/components/PlansPanel/PlanSelection.tsx | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx index 094db3a7339..6ee9df2fc30 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx @@ -204,7 +204,7 @@ export const DatabaseResize = ({ database }: Props) => { const currentPlan = displayTypes?.find((type) => type.id === database.type); const disabledPlans = displayTypes?.filter( - (type) => type.disk < (currentPlan ? currentPlan.disk : 0) + (type) => type.disk <= (currentPlan ? currentPlan.disk : 0) ); if (typesLoading) { return ; diff --git a/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx b/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx index 25b6a7b1e20..dcfdb684d60 100644 --- a/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx +++ b/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx @@ -147,16 +147,12 @@ export const PlanSelection = (props: PlanSelectionProps) => { {/* Displays Table Row for larger screens */} - !isSamePlan && !isDisabled && !isDisabledClass && !planTooSmall - ? onSelect(type.id) - : undefined - } aria-disabled={rowAriaDisabled} aria-label={rowAriaLabel} data-qa-plan-row={type.formattedLabel} disabled={rowAriaDisabled} key={type.id} + onClick={() => (!rowAriaDisabled ? onSelect(type.id) : undefined)} > {!isSamePlan && ( @@ -173,7 +169,6 @@ export const PlanSelection = (props: PlanSelectionProps) => { planTooSmall || disabled || isDisabled || isDisabledClass } id={type.id} - onChange={() => onSelect(type.id)} /> } aria-label={type.heading} From 225f07c87d20b1da544ce32424bbc78b62fcb28b Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Tue, 16 Apr 2024 16:47:31 +0200 Subject: [PATCH 2/3] Added changeset: Prevent clickable disabled smaller plans in Resizing Tab --- packages/manager/.changeset/pr-10381-fixed-1713278851268.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/manager/.changeset/pr-10381-fixed-1713278851268.md diff --git a/packages/manager/.changeset/pr-10381-fixed-1713278851268.md b/packages/manager/.changeset/pr-10381-fixed-1713278851268.md new file mode 100644 index 00000000000..643c19058e7 --- /dev/null +++ b/packages/manager/.changeset/pr-10381-fixed-1713278851268.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Fixed +--- + +Prevent clickable disabled smaller plans in Resizing Tab ([#10381](https://github.com/linode/manager/pull/10381)) From e32bc4af0bf1e33e55f29b3e7463f7ee51f57d22 Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Tue, 16 Apr 2024 16:47:31 +0200 Subject: [PATCH 3/3] Added changeset: Prevent clickable disabled smaller plans in Resizing Tab --- .../manager/.changeset/pr-10381-fixed-1713278851268.md | 5 +++++ .../DatabaseDetail/DatabaseResize/DatabaseResize.tsx | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 packages/manager/.changeset/pr-10381-fixed-1713278851268.md diff --git a/packages/manager/.changeset/pr-10381-fixed-1713278851268.md b/packages/manager/.changeset/pr-10381-fixed-1713278851268.md new file mode 100644 index 00000000000..643c19058e7 --- /dev/null +++ b/packages/manager/.changeset/pr-10381-fixed-1713278851268.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Fixed +--- + +Prevent clickable disabled smaller plans in Resizing Tab ([#10381](https://github.com/linode/manager/pull/10381)) diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx index 6ee9df2fc30..a7d9e2b3550 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx @@ -203,9 +203,13 @@ export const DatabaseResize = ({ database }: Props) => { const currentPlan = displayTypes?.find((type) => type.id === database.type); - const disabledPlans = displayTypes?.filter( - (type) => type.disk <= (currentPlan ? currentPlan.disk : 0) + const currentPlanDisk = currentPlan ? currentPlan.disk : 0; + const disabledPlans = displayTypes?.filter((type) => + type.class === 'dedicated' + ? type.disk < currentPlanDisk + : type.disk <= currentPlanDisk ); + if (typesLoading) { return ; }