From 0c0931fcc7316dff484ae6827f035c36837a73f1 Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Wed, 14 Feb 2024 16:54:09 +0100 Subject: [PATCH 1/5] change: [UIE-7292] - update scale-up to resize --- .../DatabaseScaleUp/DatabaseScaleUp.test.tsx | 14 +++++++------- .../DatabaseScaleUp/DatabaseScaleUp.tsx | 18 +++++++++--------- .../Databases/DatabaseDetail/index.tsx | 4 ++-- .../components/PlansPanel/PlanContainer.tsx | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx index 20a93af8c8e..faa62b22e56 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx @@ -23,7 +23,7 @@ afterEach(() => { queryClient.clear(); }); -describe('database scale up', () => { +describe('database resize', () => { const database = databaseFactory.build(); const dedicatedTypes = databaseTypeFactory.buildList(7, { class: 'dedicated', @@ -101,7 +101,7 @@ describe('database scale up', () => { ); }); - it('scale up button should be disabled when no input is provided in the form', async () => { + it('resize button should be disabled when no input is provided in the form', async () => { const { getByTestId, getByText } = renderWithTheme( , { @@ -110,14 +110,14 @@ describe('database scale up', () => { ); await waitForElementToBeRemoved(getByTestId(loadingTestId)); expect( - getByText(/Scale Up Database Cluster/i).closest('button') + getByText(/Resize Database Cluster/i).closest('button') ).toHaveAttribute('aria-disabled', 'true'); }); - it('when a plan is selected, scale up button should be enabled and on click of it, it should show a confirmation dialog', async () => { + it('when a plan is selected, resize button should be enabled and on click of it, it should show a confirmation dialog', async () => { // Mock route history so the Plan Selection table displays prices without requiring a region in the DB scale up flow. const history = createMemoryHistory(); - history.push(`databases/${database.engine}/${database.id}/scale-up`); + history.push(`databases/${database.engine}/${database.id}/resize`); const { container, getByTestId, getByText } = renderWithTheme( @@ -129,13 +129,13 @@ describe('database scale up', () => { await waitForElementToBeRemoved(getByTestId(loadingTestId)); const getById = queryByAttribute.bind(null, 'id'); fireEvent.click(getById(container, examplePlanType)); - const scaleUpButton = getByText(/Scale Up Database Cluster/i); + const scaleUpButton = getByText(/Resize Database Cluster/i); expect(scaleUpButton.closest('button')).toHaveAttribute( 'aria-disabled', 'false' ); fireEvent.click(scaleUpButton); - getByText(`Scale up ${database.label}?`); + getByText(`Resize ${database.label}?`); }); }); }); diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.tsx index a6cee534055..f96f4053848 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.tsx @@ -46,7 +46,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { price: string; }>(); // This will be set to `false` once one of the configuration is selected from available plan. This is used to disable the - // "Scale up" button unless there have been changes to the form. + // "Resize" button unless there have been changes to the form. const [ shouldSubmitBeDisabled, setShouldSubmitBeDisabled, @@ -76,7 +76,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { type: planSelected, }).then(() => { enqueueSnackbar( - `Your database cluster ${database.label} is being scaled up.`, + `Your database cluster ${database.label} is being resized.`, { variant: 'info', } @@ -87,7 +87,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { const scaleUpDescription = ( <> - Scaling up a Database Cluster + Resize a Database Cluster Adapt the cluster to your needs by scaling it up. Clusters cannot be scaled down. @@ -121,7 +121,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { { const costSummary = ( - {`The cost of the scaled-up database is ${summaryText?.price}.`} + {`The cost of the resized database is ${summaryText?.price}.`} ); const confirmationPopUpMessage = @@ -143,7 +143,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { <> {costSummary} - {`Warning: This operation will cause downtime for your upscaled node cluster.`} + {`Warning: This operation will cause downtime for your resized node cluster.`} ) : ( @@ -250,7 +250,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { { disabled={shouldSubmitBeDisabled} type="submit" > - Scale Up Database Cluster + Resize Database Cluster { error={scaleUpError?.[0].reason} onClose={() => setIsScaleUpConfirmationDialogOpen(false)} open={isScaleUpConfirmationDialogOpen} - title={`Scale up ${database.label}?`} + title={`Resize ${database.label}?`} > {confirmationPopUpMessage} diff --git a/packages/manager/src/features/Databases/DatabaseDetail/index.tsx b/packages/manager/src/features/Databases/DatabaseDetail/index.tsx index 449002010a0..1a85737f542 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/index.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/index.tsx @@ -86,8 +86,8 @@ export const DatabaseDetail = () => { if (flags.databaseScaleUp) { tabs.push({ - routeName: `/databases/${engine}/${id}/scale-up`, - title: 'Scale Up', + routeName: `/databases/${engine}/${id}/resize`, + title: 'Resize', }); } diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx index d5dc3b34a96..8619ead118b 100644 --- a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx +++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx @@ -85,7 +85,7 @@ export const PlanContainer = (props: Props) => { // DC Dynamic price logic - DB creation and DB scale up flows are currently out of scope const isDatabaseCreateFlow = location.pathname.includes('/databases/create'); const isDatabaseScaleUpFlow = - location.pathname.match(/\/databases\/.*\/(\d+\/scale-up)/)?.[0] === + location.pathname.match(/\/databases\/.*\/(\d+\/resize)/)?.[0] === location.pathname; const shouldDisplayNoRegionSelectedMessage = !selectedRegionId && !isDatabaseCreateFlow && !isDatabaseScaleUpFlow; From 1c25ff19b45ef0545043b546f07c280ae1f53997 Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Fri, 16 Feb 2024 12:55:11 +0100 Subject: [PATCH 2/5] Added changeset: rename scale up to resize --- .../manager/.changeset/pr-10193-changed-1708084372716.md | 5 +++++ .../manager/.changeset/pr-10193-changed-1708084511111.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 packages/manager/.changeset/pr-10193-changed-1708084372716.md create mode 100644 packages/manager/.changeset/pr-10193-changed-1708084511111.md diff --git a/packages/manager/.changeset/pr-10193-changed-1708084372716.md b/packages/manager/.changeset/pr-10193-changed-1708084372716.md new file mode 100644 index 00000000000..f9c7fbf223a --- /dev/null +++ b/packages/manager/.changeset/pr-10193-changed-1708084372716.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Changed +--- + +rename "scale up" to "resize" ([#10193](https://github.com/linode/manager/pull/10193)) diff --git a/packages/manager/.changeset/pr-10193-changed-1708084511111.md b/packages/manager/.changeset/pr-10193-changed-1708084511111.md new file mode 100644 index 00000000000..ca143bd31df --- /dev/null +++ b/packages/manager/.changeset/pr-10193-changed-1708084511111.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Changed +--- + +rename scale up to resize ([#10193](https://github.com/linode/manager/pull/10193)) From 9707ab55f962bfc5687beaeda16c9c54d1e4fea8 Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Fri, 16 Feb 2024 13:49:57 +0100 Subject: [PATCH 3/5] change: [UIE-7292] - delete duplicated changeset --- packages/api-v4/src/account/types.ts | 2 +- .../manager/.changeset/pr-10193-changed-1708084372716.md | 5 ----- .../DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx | 2 +- packages/manager/src/features/Events/constants.ts | 2 +- .../manager/src/features/Events/eventMessageGenerator.ts | 2 +- .../src/features/components/PlansPanel/PlanContainer.tsx | 2 +- .../src/features/components/PlansPanel/PlanSelection.tsx | 2 +- 7 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 packages/manager/.changeset/pr-10193-changed-1708084372716.md diff --git a/packages/api-v4/src/account/types.ts b/packages/api-v4/src/account/types.ts index 24594de091b..26c5b73b3c8 100644 --- a/packages/api-v4/src/account/types.ts +++ b/packages/api-v4/src/account/types.ts @@ -286,7 +286,7 @@ export type EventAction = | 'community_question_reply' | 'credit_card_updated' | 'database_low_disk_space' - | 'database_scale' + | 'database_resize' | 'database_backup_restore' | 'database_create' | 'database_credentials_reset' diff --git a/packages/manager/.changeset/pr-10193-changed-1708084372716.md b/packages/manager/.changeset/pr-10193-changed-1708084372716.md deleted file mode 100644 index f9c7fbf223a..00000000000 --- a/packages/manager/.changeset/pr-10193-changed-1708084372716.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@linode/manager": Changed ---- - -rename "scale up" to "resize" ([#10193](https://github.com/linode/manager/pull/10193)) diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx index faa62b22e56..ea4ca051ce8 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx @@ -115,7 +115,7 @@ describe('database resize', () => { }); it('when a plan is selected, resize button should be enabled and on click of it, it should show a confirmation dialog', async () => { - // Mock route history so the Plan Selection table displays prices without requiring a region in the DB scale up flow. + // Mock route history so the Plan Selection table displays prices without requiring a region in the DB resize flow. const history = createMemoryHistory(); history.push(`databases/${database.engine}/${database.id}/resize`); const { container, getByTestId, getByText } = renderWithTheme( diff --git a/packages/manager/src/features/Events/constants.ts b/packages/manager/src/features/Events/constants.ts index 800a6bb2786..57f3d58ec62 100644 --- a/packages/manager/src/features/Events/constants.ts +++ b/packages/manager/src/features/Events/constants.ts @@ -16,7 +16,7 @@ export const EVENT_ACTIONS: Event['action'][] = [ 'database_delete', 'database_update_failed', 'database_update', - 'database_scale', + 'database_resize', 'disk_create', 'disk_delete', 'disk_duplicate', diff --git a/packages/manager/src/features/Events/eventMessageGenerator.ts b/packages/manager/src/features/Events/eventMessageGenerator.ts index 3e1f12d73ff..545e8b205a9 100644 --- a/packages/manager/src/features/Events/eventMessageGenerator.ts +++ b/packages/manager/src/features/Events/eventMessageGenerator.ts @@ -122,7 +122,7 @@ export const eventMessageCreators: { [index: string]: CreatorsForStatus } = { `Low disk space alert for database ${e.entity!.label} has cleared.`, notification: (e) => `Database ${e.entity!.label} has low disk space.`, }, - database_scale: { + database_resize: { failed: (e) => `Database ${e.entity!.label} could not be scaled up.`, finished: (e) => `Database ${e.entity!.label} has been scaled up.`, scheduled: (e) => diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx index 8619ead118b..4e389b02667 100644 --- a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx +++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx @@ -82,7 +82,7 @@ export const PlanContainer = (props: Props) => { const shouldShowNetwork = showTransfer && plans.some((plan: ExtendedType) => plan.network_out); - // DC Dynamic price logic - DB creation and DB scale up flows are currently out of scope + // DC Dynamic price logic - DB creation and DB resize flows are currently out of scope const isDatabaseCreateFlow = location.pathname.includes('/databases/create'); const isDatabaseScaleUpFlow = location.pathname.match(/\/databases\/.*\/(\d+\/resize)/)?.[0] === diff --git a/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx b/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx index 6989ac30063..1b44a7f47ae 100644 --- a/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx +++ b/packages/manager/src/features/components/PlansPanel/PlanSelection.tsx @@ -89,7 +89,7 @@ export const PlanSelection = (props: PlanSelectionProps) => { ? `${type.formattedLabel} this plan is too small for resize` : type.formattedLabel; - // DC Dynamic price logic - DB creation and DB scale up flows are currently out of scope + // DC Dynamic price logic - DB creation and DB resize flows are currently out of scope const isDatabaseFlow = location.pathname.includes('/databases'); const price: PriceObject | undefined = !isDatabaseFlow ? getLinodeRegionPrice(type, selectedRegionId) From f0758d427d9a2971cb1c3c7193bf37f3f877af62 Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Tue, 20 Feb 2024 11:15:37 +0100 Subject: [PATCH 4/5] Added changeset: rename scale up to resize --- packages/api-v4/.changeset/pr-10193-changed-1708424137596.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/api-v4/.changeset/pr-10193-changed-1708424137596.md diff --git a/packages/api-v4/.changeset/pr-10193-changed-1708424137596.md b/packages/api-v4/.changeset/pr-10193-changed-1708424137596.md new file mode 100644 index 00000000000..e95d7374393 --- /dev/null +++ b/packages/api-v4/.changeset/pr-10193-changed-1708424137596.md @@ -0,0 +1,5 @@ +--- +"@linode/api-v4": Changed +--- + +rename scale up to resize ([#10193](https://github.com/linode/manager/pull/10193)) From cb53bad460919797105950a97dd3a484f587175a Mon Sep 17 00:00:00 2001 From: mpolotsk Date: Wed, 21 Feb 2024 18:02:45 +0100 Subject: [PATCH 5/5] change: [UIE-7292] - rename DatabaseScaleUp and all variables --- packages/manager/src/featureFlags.ts | 2 +- .../DatabaseResize.style.ts} | 4 +- .../DatabaseResize.test.tsx} | 16 +++---- .../DatabaseResize.tsx} | 44 +++++++++---------- ...tabaseResizeCurrentConfiguration.style.ts} | 0 ...tabaseResizeCurrentConfiguration.test.tsx} | 6 +-- .../DatabaseResizeCurrentConfiguration.tsx} | 4 +- .../Databases/DatabaseDetail/index.tsx | 12 ++--- .../features/Events/eventMessageGenerator.ts | 9 ++-- .../components/PlansPanel/PlanContainer.tsx | 4 +- 10 files changed, 50 insertions(+), 51 deletions(-) rename packages/manager/src/features/Databases/DatabaseDetail/{DatabaseScaleUp/DatabaseScaleUp.style.ts => DatabaseResize/DatabaseResize.style.ts} (92%) rename packages/manager/src/features/Databases/DatabaseDetail/{DatabaseScaleUp/DatabaseScaleUp.test.tsx => DatabaseResize/DatabaseResize.test.tsx} (90%) rename packages/manager/src/features/Databases/DatabaseDetail/{DatabaseScaleUp/DatabaseScaleUp.tsx => DatabaseResize/DatabaseResize.tsx} (88%) rename packages/manager/src/features/Databases/DatabaseDetail/{DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.style.ts => DatabaseResize/DatabaseResizeCurrentConfiguration.style.ts} (100%) rename packages/manager/src/features/Databases/DatabaseDetail/{DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.test.tsx => DatabaseResize/DatabaseResizeCurrentConfiguration.test.tsx} (90%) rename packages/manager/src/features/Databases/DatabaseDetail/{DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.tsx => DatabaseResize/DatabaseResizeCurrentConfiguration.tsx} (97%) diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts index c972cf17c3f..6e88368d995 100644 --- a/packages/manager/src/featureFlags.ts +++ b/packages/manager/src/featureFlags.ts @@ -44,7 +44,7 @@ export interface Flags { aclbFullCreateFlow: boolean; apiMaintenance: APIMaintenance; databaseBeta: boolean; - databaseScaleUp: boolean; + databaseResize: boolean; databases: boolean; firewallNodebalancer: boolean; ipv6Sharing: boolean; diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.style.ts b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.style.ts similarity index 92% rename from packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.style.ts rename to packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.style.ts index 1ffa8cd9ff5..173dfdf4c7c 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.style.ts +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.style.ts @@ -18,8 +18,8 @@ export const StyledGrid = styled(Grid, { label: 'StyledGrid' })( }) ); -export const StyledScaleUpButton = styled(Button, { - label: 'StyledScaleUpButton', +export const StyledResizeButton = styled(Button, { + label: 'StyledResizeButton', })(({ theme }) => ({ [theme.breakpoints.down('md')]: { marginRight: theme.spacing(), diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.test.tsx similarity index 90% rename from packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx rename to packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.test.tsx index ea4ca051ce8..d14ab0c7775 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.test.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.test.tsx @@ -13,7 +13,7 @@ import { makeResourcePage } from 'src/mocks/serverHandlers'; import { rest, server } from 'src/mocks/testServer'; import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers'; -import { DatabaseScaleUp } from './DatabaseScaleUp'; +import { DatabaseResize } from './DatabaseResize'; const queryClient = new QueryClient(); const loadingTestId = 'circle-progress'; @@ -31,7 +31,7 @@ describe('database resize', () => { it('should render a loading state', async () => { const { getByTestId } = renderWithTheme( - , + , { queryClient, } @@ -61,7 +61,7 @@ describe('database resize', () => { ); const { getByTestId, getByText } = renderWithTheme( - , + , { queryClient, } @@ -103,7 +103,7 @@ describe('database resize', () => { it('resize button should be disabled when no input is provided in the form', async () => { const { getByTestId, getByText } = renderWithTheme( - , + , { queryClient, } @@ -120,7 +120,7 @@ describe('database resize', () => { history.push(`databases/${database.engine}/${database.id}/resize`); const { container, getByTestId, getByText } = renderWithTheme( - + , { queryClient, @@ -129,12 +129,12 @@ describe('database resize', () => { await waitForElementToBeRemoved(getByTestId(loadingTestId)); const getById = queryByAttribute.bind(null, 'id'); fireEvent.click(getById(container, examplePlanType)); - const scaleUpButton = getByText(/Resize Database Cluster/i); - expect(scaleUpButton.closest('button')).toHaveAttribute( + const resizeButton = getByText(/Resize Database Cluster/i); + expect(resizeButton.closest('button')).toHaveAttribute( 'aria-disabled', 'false' ); - fireEvent.click(scaleUpButton); + fireEvent.click(resizeButton); getByText(`Resize ${database.label}?`); }); }); diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx similarity index 88% rename from packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.tsx rename to packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx index f96f4053848..1957bec5b23 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUp.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResize.tsx @@ -28,15 +28,15 @@ import { StyledGrid, StyledPlanSummarySpan, StyledPlansPanel, - StyledScaleUpButton, -} from './DatabaseScaleUp.style'; -import { DatabaseScaleUpCurrentConfiguration } from './DatabaseScaleUpCurrentConfiguration'; + StyledResizeButton, +} from './DatabaseResize.style'; +import { DatabaseResizeCurrentConfiguration } from './DatabaseResizeCurrentConfiguration'; interface Props { database: Database; } -export const DatabaseScaleUp = ({ database }: Props) => { +export const DatabaseResize = ({ database }: Props) => { const history = useHistory(); const [planSelected, setPlanSelected] = React.useState(); @@ -53,12 +53,12 @@ export const DatabaseScaleUp = ({ database }: Props) => { ] = React.useState(true); const [ - isScaleUpConfirmationDialogOpen, - setIsScaleUpConfirmationDialogOpen, + isResizeConfirmationDialogOpen, + setIsResizeConfirmationDialogOpen, ] = React.useState(false); const { - error: scaleUpError, + error: resizeError, isLoading: submitInProgress, mutateAsync: updateDatabase, } = useDatabaseMutation(database.engine, database.id); @@ -71,7 +71,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { const { enqueueSnackbar } = useSnackbar(); - const onScaleUp = () => { + const onResize = () => { updateDatabase({ type: planSelected, }).then(() => { @@ -85,12 +85,12 @@ export const DatabaseScaleUp = ({ database }: Props) => { }); }; - const scaleUpDescription = ( + const resizeDescription = ( <> Resize a Database Cluster - Adapt the cluster to your needs by scaling it up. Clusters cannot be - scaled down. + Adapt the cluster to your needs by resizing to a larger plan. Clusters + cannot be resized to smaller plans. ); @@ -123,12 +123,12 @@ export const DatabaseScaleUp = ({ database }: Props) => { 'data-testid': 'button-confirm', label: 'Resize', loading: submitInProgress, - onClick: onScaleUp, + onClick: onResize, }} secondaryButtonProps={{ 'data-testid': 'button-cancel', label: 'Cancel', - onClick: () => setIsScaleUpConfirmationDialogOpen(false), + onClick: () => setIsResizeConfirmationDialogOpen(false), }} /> ); @@ -228,7 +228,7 @@ export const DatabaseScaleUp = ({ database }: Props) => { // We don't have a "Nanodes" tab anymore, so use `shared` const selectedTypeClass = currentPlanClass === 'nanode' ? 'standard' : currentPlanClass; - // User cannot switch to different plan type apart from current plan while scaling up a DB cluster. So disable rest of the tabs. + // User cannot switch to different plan type apart from current plan while resizing a DB cluster. So disable rest of the tabs. const tabsToBeDisabled = typeClasses .filter((typeClass) => typeClass !== selectedTypeClass) .map((plan) => (plan === 'standard' ? 'shared' : plan)); @@ -242,9 +242,9 @@ export const DatabaseScaleUp = ({ database }: Props) => { return ( <> - {scaleUpDescription} + {resizeDescription} - + @@ -264,22 +264,22 @@ export const DatabaseScaleUp = ({ database }: Props) => { {summaryPanel} - { - setIsScaleUpConfirmationDialogOpen(true); + setIsResizeConfirmationDialogOpen(true); }} buttonType="primary" disabled={shouldSubmitBeDisabled} type="submit" > Resize Database Cluster - + setIsScaleUpConfirmationDialogOpen(false)} - open={isScaleUpConfirmationDialogOpen} + error={resizeError?.[0].reason} + onClose={() => setIsResizeConfirmationDialogOpen(false)} + open={isResizeConfirmationDialogOpen} title={`Resize ${database.label}?`} > {confirmationPopUpMessage} diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.style.ts b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.style.ts similarity index 100% rename from packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.style.ts rename to packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.style.ts diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.test.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.test.tsx similarity index 90% rename from packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.test.tsx rename to packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.test.tsx index 89f705623d8..6d41b67a3ea 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.test.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.test.tsx @@ -7,7 +7,7 @@ import { makeResourcePage } from 'src/mocks/serverHandlers'; import { rest, server } from 'src/mocks/testServer'; import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers'; -import { DatabaseScaleUpCurrentConfiguration } from './DatabaseScaleUpCurrentConfiguration'; +import { DatabaseResizeCurrentConfiguration } from './DatabaseResizeCurrentConfiguration'; const queryClient = new QueryClient(); const loadingTestId = 'circle-progress'; @@ -21,7 +21,7 @@ describe('database current configuration section', () => { const database = databaseFactory.build(); it('should render a loading state', async () => { const { getByTestId } = renderWithTheme( - , + , { queryClient, } @@ -54,7 +54,7 @@ describe('database current configuration section', () => { ); const { getByTestId, getByText } = renderWithTheme( - , + , { queryClient, } diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.tsx similarity index 97% rename from packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.tsx rename to packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.tsx index 1fea3ed69b2..ba01bb75260 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseScaleUp/DatabaseScaleUpCurrentConfiguration.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseResize/DatabaseResizeCurrentConfiguration.tsx @@ -22,7 +22,7 @@ import { StyledSummaryTextBox, StyledSummaryTextTypography, StyledTitleTypography, -} from './DatabaseScaleUpCurrentConfiguration.style'; +} from './DatabaseResizeCurrentConfiguration.style'; interface Props { database: Database; @@ -32,7 +32,7 @@ export const getDatabaseVersionNumber = ( version: DatabaseInstance['version'] ) => version.split('/')[1]; -export const DatabaseScaleUpCurrentConfiguration = ({ database }: Props) => { +export const DatabaseResizeCurrentConfiguration = ({ database }: Props) => { const { data: types, error: typesError, diff --git a/packages/manager/src/features/Databases/DatabaseDetail/index.tsx b/packages/manager/src/features/Databases/DatabaseDetail/index.tsx index 1a85737f542..77300fc74ce 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/index.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/index.tsx @@ -23,9 +23,9 @@ import { getAPIErrorOrDefault } from 'src/utilities/errorUtils'; const DatabaseSummary = React.lazy(() => import('./DatabaseSummary')); const DatabaseBackups = React.lazy(() => import('./DatabaseBackups')); const DatabaseSettings = React.lazy(() => import('./DatabaseSettings')); -const DatabaseScaleUp = React.lazy(() => - import('./DatabaseScaleUp/DatabaseScaleUp').then(({ DatabaseScaleUp }) => ({ - default: DatabaseScaleUp, +const DatabaseResize = React.lazy(() => + import('./DatabaseResize/DatabaseResize').then(({ DatabaseResize }) => ({ + default: DatabaseResize, })) ); @@ -84,7 +84,7 @@ export const DatabaseDetail = () => { }, ]; - if (flags.databaseScaleUp) { + if (flags.databaseResize) { tabs.push({ routeName: `/databases/${engine}/${id}/resize`, title: 'Resize', @@ -164,9 +164,9 @@ export const DatabaseDetail = () => { - {flags.databaseScaleUp ? ( + {flags.databaseResize ? ( - + ) : null} diff --git a/packages/manager/src/features/Events/eventMessageGenerator.ts b/packages/manager/src/features/Events/eventMessageGenerator.ts index 545e8b205a9..d2c3c1e73cd 100644 --- a/packages/manager/src/features/Events/eventMessageGenerator.ts +++ b/packages/manager/src/features/Events/eventMessageGenerator.ts @@ -123,11 +123,10 @@ export const eventMessageCreators: { [index: string]: CreatorsForStatus } = { notification: (e) => `Database ${e.entity!.label} has low disk space.`, }, database_resize: { - failed: (e) => `Database ${e.entity!.label} could not be scaled up.`, - finished: (e) => `Database ${e.entity!.label} has been scaled up.`, - scheduled: (e) => - `Database ${e.entity!.label} is scheduled for scaling up.`, - started: (e) => `Database ${e.entity!.label} is scaling up.`, + failed: (e) => `Database ${e.entity!.label} could not be resized.`, + finished: (e) => `Database ${e.entity!.label} has been resized.`, + scheduled: (e) => `Database ${e.entity!.label} is scheduled for resizing.`, + started: (e) => `Database ${e.entity!.label} is resizing.`, }, database_update: { finished: (e) => `Database ${e.entity!.label} has been updated.`, diff --git a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx index 4e389b02667..c200d51fd0f 100644 --- a/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx +++ b/packages/manager/src/features/components/PlansPanel/PlanContainer.tsx @@ -84,11 +84,11 @@ export const PlanContainer = (props: Props) => { // DC Dynamic price logic - DB creation and DB resize flows are currently out of scope const isDatabaseCreateFlow = location.pathname.includes('/databases/create'); - const isDatabaseScaleUpFlow = + const isDatabaseResizeFlow = location.pathname.match(/\/databases\/.*\/(\d+\/resize)/)?.[0] === location.pathname; const shouldDisplayNoRegionSelectedMessage = - !selectedRegionId && !isDatabaseCreateFlow && !isDatabaseScaleUpFlow; + !selectedRegionId && !isDatabaseCreateFlow && !isDatabaseResizeFlow; const renderPlanSelection = React.useCallback(() => { return plans.map((plan, id) => {