diff --git a/packages/manager/.changeset/pr-9670-upcoming-features-1694618602374.md b/packages/manager/.changeset/pr-9670-upcoming-features-1694618602374.md new file mode 100644 index 00000000000..467f8411d98 --- /dev/null +++ b/packages/manager/.changeset/pr-9670-upcoming-features-1694618602374.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Upcoming Features +--- + +Standardize "region" and "data center" copy for DC-specific pricing ([#9670](https://github.com/linode/manager/pull/9670)) diff --git a/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts index c6fa9f5ba9f..e9e2b6b3d7c 100644 --- a/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts +++ b/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts @@ -62,7 +62,7 @@ describe('clone linode', () => { const newLinodeLabel = `${linodePayload.label}-clone`; - // TODO Remove feature flag mocks once DC pricing is live. + // TODO: DC Pricing - M3-7073: Remove feature flag mocks once DC pricing is live. mockAppendFeatureFlags({ dcSpecificPricing: makeFeatureFlagData(false), }).as('getFeatureFlags'); @@ -156,11 +156,11 @@ describe('clone linode', () => { '@getLinodeTypes', ]); - // TODO Move these assertions to end-to-end test once `dcSpecificPricing` flag goes away. - // TODO Remove this assertion when DC-specific pricing notice goes away. + // TODO: DC Pricing - M3-7073: Move these assertions to end-to-end test once `dcSpecificPricing` flag goes away. + // TODO: DC Pricing - M3-7086: Remove this assertion when DC-specific pricing notice goes away. cy.findByText(dcPricingRegionNotice, { exact: false }).should('be.visible'); - // TODO Uncomment docs link assertion when docs links are added. + // TODO: DC Pricing - M3-7086: Uncomment docs link assertion when docs links are added. // cy.findByText(dcPricingDocsLabel) // .should('be.visible') // .should('have.attr', 'href', dcPricingDocsUrl); diff --git a/packages/manager/cypress/support/constants/dc-specific-pricing.ts b/packages/manager/cypress/support/constants/dc-specific-pricing.ts index b175da42604..8b6ca19265b 100644 --- a/packages/manager/cypress/support/constants/dc-specific-pricing.ts +++ b/packages/manager/cypress/support/constants/dc-specific-pricing.ts @@ -6,7 +6,7 @@ import { linodeTypeFactory } from '@src/factories'; /** Notice shown to users when selecting a region. */ export const dcPricingRegionNotice = - 'Prices for plans, products, and services may vary based on Region.'; + 'Prices for plans, products, and services may vary based on region.'; /** Notice shown to users when selecting a region with a different price structure. */ export const dcPricingRegionDifferenceNotice = diff --git a/packages/manager/src/components/DynamicPriceNotice.tsx b/packages/manager/src/components/DynamicPriceNotice.tsx index f36b4053839..e80b5d40e8e 100644 --- a/packages/manager/src/components/DynamicPriceNotice.tsx +++ b/packages/manager/src/components/DynamicPriceNotice.tsx @@ -8,7 +8,7 @@ export const DynamicPriceNotice = (props: NoticeProps) => { return ( - Prices for plans, products, and services may vary based on Region.{' '} + Prices for plans, products, and services may vary based on region.{' '} Learn more. diff --git a/packages/manager/src/components/SelectRegionPanel/SelectRegionPanel.tsx b/packages/manager/src/components/SelectRegionPanel/SelectRegionPanel.tsx index ee827edd21f..a4a32be8799 100644 --- a/packages/manager/src/components/SelectRegionPanel/SelectRegionPanel.tsx +++ b/packages/manager/src/components/SelectRegionPanel/SelectRegionPanel.tsx @@ -15,7 +15,7 @@ import { isLinodeTypeDifferentPriceInSelectedRegion } from 'src/utilities/pricin import { getQueryParamsFromQueryString } from 'src/utilities/queryParams'; import { Box } from '../Box'; -import { DocsLink } from '../DocsLink/DocsLink'; +// import { DocsLink } from '../DocsLink/DocsLink'; //TODO: DC Pricing - M3-7086: Uncomment this once pricing info notice is removed import { Link } from '../Link'; interface SelectRegionPanelProps { @@ -85,12 +85,13 @@ export const SelectRegionPanel = (props: SelectRegionPanelProps) => { Region - {flags.dcSpecificPricing && ( + {/* TODO: DC Pricing - M3-7086: Uncomment this once pricing info notice is removed */} + {/* {flags.dcSpecificPricing && ( - )} + )} */} {/** - * Region-specific Transfer Pool Display + * DC-specific Transfer Pool Display */} {regionTransferPools.length > 0 && ( <> @@ -79,7 +79,7 @@ export const TransferDisplayDialog = React.memo( fontFamily={theme.font.bold} marginBottom={theme.spacing()} > - Datacenter-specific Network Transfer Pools + Data Center-Specific Network Transfer Pools { label={`Yes, enable HA control plane. ${ highAvailabilityPrice ? `(${displayPrice(highAvailabilityPrice)}/month)` - : '(Select a Region to view price information.)' + : '(Select a region to view price information.)' }`} control={} name="yes" diff --git a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx index 1f57dd5016d..d0ea7cece71 100644 --- a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx +++ b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx @@ -197,7 +197,7 @@ export const Details = (props: Props) => { )} - Current Datacenter: {region?.label ?? thisLinodeRegion} + Current Data Center: {region?.label ?? thisLinodeRegion} {/* Show the estimated clone time if we're able to submit the form. */} diff --git a/packages/manager/src/features/Linodes/LinodesCreate/utilities.tsx b/packages/manager/src/features/Linodes/LinodesCreate/utilities.tsx index 9688d13f64c..399711de88a 100644 --- a/packages/manager/src/features/Linodes/LinodesCreate/utilities.tsx +++ b/packages/manager/src/features/Linodes/LinodesCreate/utilities.tsx @@ -99,7 +99,7 @@ export const getMonthlyAndHourlyNodePricing = ( }; export const CROSS_DATA_CENTER_CLONE_WARNING = - 'Cloning a Powered Off instance across Data Centers may cause long periods of down time.'; + 'Cloning a powered off instance across data centers may cause long periods of down time.'; /** * Unicode to ASCII (encode data to Base64) diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx index 62b58ab3a48..67fb90fc99b 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx @@ -322,7 +322,7 @@ const IPSharingPanel = (props: Props) => { IP Sharing allows a Linode to share an IP address assignment (one or more additional IP addresses). This can be used to allow one Linode to begin serving requests should another become - unresponsive. Only IPs in the same datacenter are offered for + unresponsive. Only IPs in the same data center are offered for sharing. @@ -348,7 +348,7 @@ const IPSharingPanel = (props: Props) => { marginTop: theme.spacing(2), }} > - You have no other Linodes in this Linode’s datacenter + You have no other Linodes in this Linode’s data center with which to share IPs. ) : ( diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx index ed16deb2523..5c3a51b7312 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx @@ -519,8 +519,8 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => { marginTop: theme.spacing(2), }} > - You have no other linodes in this Linode’s datacenter with - which to transfer IPs. + You have no other linodes in this Linode’s data center + with which to transfer IPs. ) : ( diff --git a/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx b/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx index f776a9230d9..c8f453b3fe2 100644 --- a/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx +++ b/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx @@ -212,7 +212,7 @@ export const MigrateLinode = React.memo((props: Props) => { {/* commenting out for now because we need further clarification from - stakeholders about whether or not we want to prevent multiple cross-datacenter migrations. + stakeholders about whether or not we want to prevent multiple cross-data-center migrations. */} {/* = (props) => { A single Volume can range from 10 to 10240 GB in size. Up to eight Volumes can be attached to a single Linode. - Select a Region to see cost per GB. + Select a region to see cost per GB. ) : ( diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx index 962628f3545..24fd4074f48 100644 --- a/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx +++ b/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx @@ -89,7 +89,7 @@ const SizeField: React.FC = (props) => { const dynamicPricingHelperText = !resize && ( - Select a Region to see cost per month. + Select a region to see cost per month. ); diff --git a/packages/manager/src/utilities/pricing/constants.ts b/packages/manager/src/utilities/pricing/constants.ts index 532ae7b0ef8..7af86e9d6e4 100644 --- a/packages/manager/src/utilities/pricing/constants.ts +++ b/packages/manager/src/utilities/pricing/constants.ts @@ -7,4 +7,4 @@ export const LKE_HA_PRICE = 60; export const PLAN_SELECTION_NO_REGION_SELECTED_MESSAGE = 'Select a region to view plans and prices.'; export const LKE_CREATE_CLUSTER_CHECKOUT_MESSAGE = - 'Select a Region, HA choice, and add a Node Pool to view pricing and create a cluster.'; + 'Select a region, HA choice, and add a Node Pool to view pricing and create a cluster.'; diff --git a/packages/manager/src/utilities/pricing/dynamicPricing.ts b/packages/manager/src/utilities/pricing/dynamicPricing.ts index 7c35a17e449..d049266cc72 100644 --- a/packages/manager/src/utilities/pricing/dynamicPricing.ts +++ b/packages/manager/src/utilities/pricing/dynamicPricing.ts @@ -33,7 +33,7 @@ const priceIncreaseMap = { * flags: { dcSpecificPricing: true }, * regionId: 'us-east', * }); - * @returns a datacenter specific price + * @returns a data center specific price */ export const getDCSpecificPrice = ({ basePrice,