From c402cd12125264d3255068bacc44e9b580db4de8 Mon Sep 17 00:00:00 2001 From: Sam Mans Date: Mon, 22 Sep 2025 17:32:46 -0400 Subject: [PATCH 1/5] feat: [UIE-9247] - DBaaS - Display Beta chip for VPC fields and update related documentation link --- .../manager/src/dev-tools/FeatureFlagTool.tsx | 1 + packages/manager/src/featureFlags.ts | 1 + .../DatabaseCreate/DatabaseVPCSelector.tsx | 4 ++++ .../DatabaseManageNetworking.tsx | 21 ++++++++++++++++--- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx index 2dea41f2d3c..d3e9336f14c 100644 --- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx +++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx @@ -46,6 +46,7 @@ const options: { flag: keyof Flags; label: string }[] = [ { flag: 'databaseResize', label: 'Database Resize' }, { flag: 'databaseAdvancedConfig', label: 'Database Advanced Config' }, { flag: 'databaseVpc', label: 'Database VPC' }, + { flag: 'databaseVpcBeta', label: 'Database VPC Beta' }, { flag: 'databasePremium', label: 'Database Premium' }, { flag: 'databaseRestrictPlanResize', diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts index bb9f6c93cb5..743afea1d6e 100644 --- a/packages/manager/src/featureFlags.ts +++ b/packages/manager/src/featureFlags.ts @@ -168,6 +168,7 @@ export interface Flags { databaseRestrictPlanResize: boolean; databases: boolean; databaseVpc: boolean; + databaseVpcBeta: boolean; dbaasV2: BetaFeatureFlag; dbaasV2MonitorMetrics: BetaFeatureFlag; disableLargestGbPlans: boolean; diff --git a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx index 6672f518199..cdf67116972 100644 --- a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx +++ b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx @@ -1,6 +1,7 @@ import { useAllVPCsQuery, useRegionQuery } from '@linode/queries'; import { Autocomplete, + BetaChip, Box, Checkbox, Notice, @@ -10,6 +11,7 @@ import { import * as React from 'react'; import { Link } from 'src/components/Link'; +import { useFlags } from 'src/hooks/useFlags'; import { getAPIErrorOrDefault } from 'src/utilities/errorUtils'; import { MANAGE_NETWORKING_LEARN_MORE_LINK } from '../constants'; @@ -40,6 +42,7 @@ export const DatabaseVPCSelector = (props: DatabaseVPCSelectorProps) => { privateNetworkValues, } = props; + const flags = useFlags(); const isCreate = mode === 'create'; const { data: selectedRegion } = useRegionQuery(selectedRegionId); const regionSupportsVPCs = selectedRegion?.capabilities.includes('VPCs'); @@ -131,6 +134,7 @@ export const DatabaseVPCSelector = (props: DatabaseVPCSelectorProps) => { variant="h3" > Assign a VPC + {flags.databaseVpcBeta && } diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx index e441cc3e04d..9f10d7fe46f 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx @@ -1,9 +1,19 @@ import { useAllVPCsQuery } from '@linode/queries'; -import { Button, CircleProgress, ErrorState, Typography } from '@linode/ui'; +import { + BetaChip, + Button, + CircleProgress, + ErrorState, + Typography, +} from '@linode/ui'; import { Grid } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; +import { Link } from 'src/components/Link'; +import { useFlags } from 'src/hooks/useFlags'; + +import { MANAGE_NETWORKING_LEARN_MORE_LINK } from '../../constants'; import { getReadOnlyHost } from '../../utilities'; import { StyledGridContainer, @@ -59,6 +69,7 @@ export const DatabaseManageNetworking = ({ database }: Props) => { }, })); + const flags = useFlags(); const { classes } = useStyles(); const [isManageNetworkingDrawerOpen, setIsManageNetworkingDrawerOpen] = React.useState(false); @@ -117,10 +128,14 @@ export const DatabaseManageNetworking = ({ database }: Props) => {
- Manage Networking + + Manage Networking + {flags.databaseVpcBeta && } +
- Update access settings or the VPC assignment. + Update access settings or the VPC assignment.{' '} + Learn more.
Note that a change of VPC assignment settings can disrupt service availability. Avoid writing data to the database while a change is From b80b819dd8fa3c5c63b1b109194bb4357fa27074 Mon Sep 17 00:00:00 2001 From: Sam Mans Date: Tue, 23 Sep 2025 12:30:51 -0400 Subject: [PATCH 2/5] Updating manage networking link to support directing based on beta status --- .../Databases/DatabaseCreate/DatabaseVPCSelector.tsx | 6 +++++- .../DatabaseNetworking/DatabaseManageNetworking.tsx | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx index cdf67116972..6b7b8a0bd43 100644 --- a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx +++ b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx @@ -139,7 +139,11 @@ export const DatabaseVPCSelector = (props: DatabaseVPCSelectorProps) => { Assign this cluster to an existing VPC.{' '} - Learn more. + + Learn more. + {
Update access settings or the VPC assignment.{' '} - Learn more. + + Learn more. +
Note that a change of VPC assignment settings can disrupt service availability. Avoid writing data to the database while a change is From 62b0e7a175538d11b276f286230bdbd86344b19a Mon Sep 17 00:00:00 2001 From: Sam Mans Date: Tue, 23 Sep 2025 12:50:02 -0400 Subject: [PATCH 3/5] Fixing chip layout --- .../Databases/DatabaseCreate/DatabaseVPCSelector.tsx | 8 ++++---- .../DatabaseNetworking/DatabaseManageNetworking.tsx | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx index 6b7b8a0bd43..ff8ae035028 100644 --- a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx +++ b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseVPCSelector.tsx @@ -126,16 +126,16 @@ export const DatabaseVPCSelector = (props: DatabaseVPCSelectorProps) => { return ( <> - ({ + display: 'flex', marginTop: theme.spacingFunction(20), marginBottom: theme.spacingFunction(4), })} - variant="h3" > - Assign a VPC + Assign a VPC {flags.databaseVpcBeta && } - + Assign this cluster to an existing VPC.{' '} diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx index 04eb744a336..624bef08e12 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx @@ -51,6 +51,7 @@ export const DatabaseManageNetworking = ({ database }: Props) => { }, sectionTitle: { marginBottom: '0.25rem', + display: 'flex', }, sectionTitleAndText: { width: '100%', @@ -128,10 +129,8 @@ export const DatabaseManageNetworking = ({ database }: Props) => {
- - Manage Networking - {flags.databaseVpcBeta && } - + Manage Networking + {flags.databaseVpcBeta && }
Update access settings or the VPC assignment.{' '} From a6c424fb689361db6581f1749b56eb1fe0b4bcc6 Mon Sep 17 00:00:00 2001 From: Sam Mans Date: Tue, 23 Sep 2025 14:52:19 -0400 Subject: [PATCH 4/5] Changelog and package version update --- packages/manager/CHANGELOG.md | 6 ++++++ packages/manager/package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md index 1104346dcc0..51d8bee216e 100644 --- a/packages/manager/CHANGELOG.md +++ b/packages/manager/CHANGELOG.md @@ -4,6 +4,12 @@ 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/). +## [2025-09-29] - v1.151.1 + +### Added: + +- Beta chip and updated Learn link for VPC feature + ## [2025-09-23] - v1.151.0 ### Added: diff --git a/packages/manager/package.json b/packages/manager/package.json index 273ac535304..a4c5b63df94 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.151.0", + "version": "1.151.1", "private": true, "type": "module", "bugs": { From abf9270ec121b163385538e021f718e3e13749a8 Mon Sep 17 00:00:00 2001 From: Sam Mans Date: Tue, 23 Sep 2025 15:26:45 -0400 Subject: [PATCH 5/5] Changelog date update --- packages/manager/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md index 51d8bee216e..23d07c71a98 100644 --- a/packages/manager/CHANGELOG.md +++ b/packages/manager/CHANGELOG.md @@ -4,11 +4,11 @@ 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/). -## [2025-09-29] - v1.151.1 +## [2025-09-25] - v1.151.1 ### Added: -- Beta chip and updated Learn link for VPC feature +- DBaaS - Display Beta chip for VPC fields and update related documentation link ## [2025-09-23] - v1.151.0