Skip to content

fix: hide storage field for Redis managed databases (ElastiCache) #2355

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

Open
Guimove wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

fix: hide storage field for Redis managed databases (ElastiCache) #2355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion libs/pages/database/src/lib/ui/page-settings-resources/page-settings-resources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ export function PageSettingsResources(props: PageSettingsResourcesProps) {
const displayInstanceTypesWarning =
watch('instance_type') !== database.instance_type && database.mode === DatabaseModeEnum.MANAGED

const displayStorageWarning = watch('storage') !== database.storage && database.mode === DatabaseModeEnum.MANAGED
// Storage warning should not be displayed for Redis managed databases (ElastiCache) as storage is determined by node type
const displayStorageWarning =
watch('storage') !== database.storage &&
database.mode === DatabaseModeEnum.MANAGED &&
database.type !== 'REDIS'

return (
<div className="flex w-full flex-col justify-between">
Expand Down
50 changes: 30 additions & 20 deletions ...atabase-settings-resources/ui/database-settings-resources/database-settings-resources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,29 +152,39 @@ export function DatabaseSettingsResources({
isSetting={isSetting}
/>
)}
{/* Storage is not configurable for Redis managed databases (ElastiCache) - capacity is determined by node type */}
<Controller
name="storage"
control={control}
rules={{
pattern: {
value: /^[0-9]+$/,
message: 'Please enter a number.',
},
min: {
value: minStorageValue,
message: `Storage must be at least ${minStorageValue} GiB.`,
},
}}
render={({ field, fieldState: { error } }) => (
<InputText
dataTestId="input-memory-storage"
name={field.name}
label="Storage (GiB)"
value={field.value}
onChange={field.onChange}
error={error?.message}
/>
)}
rules={
isManaged && databaseType === 'REDIS'
? undefined
: {
pattern: {
value: /^[0-9]+$/,
message: 'Please enter a number.',
},
min: {
value: minStorageValue,
message: `Storage must be at least ${minStorageValue} GiB.`,
},
}
}
render={({ field, fieldState: { error } }) =>
isManaged && databaseType === 'REDIS' ? (
// Hidden field to preserve storage value for Redis managed, but it's not used by ElastiCache
<input type="hidden" {...field} />
) : (
<InputText
dataTestId="input-memory-storage"
name={field.name}
label="Storage (GiB)"
value={field.value}
onChange={field.onChange}
error={error?.message}
/>
)
}
/>
{displayStorageWarning && (
<Callout.Root className="mt-3" color="yellow">
Expand Down
Loading