feat: [M3-6971] Add dynamic pricing model to Volume creation flows #9569
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@linode/manager": Changed | ||
| --- | ||
|
|
||
| Allow volumes to feature the dynamic pricing model ([#9569](https://github.com/linode/manager/pull/9569)) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abailly-akamai marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,10 @@ import NoticePanel from './NoticePanel'; | |
| import { PricePanel } from './PricePanel'; | ||
| import VolumesActionsPanel from './VolumesActionsPanel'; | ||
|
|
||
| import type { FlagSet } from 'src/featureFlags'; | ||
|
|
||
| interface Props { | ||
| flags: FlagSet; | ||
| onClose: () => void; | ||
| volumeId: number; | ||
| volumeLabel: string; | ||
|
|
@@ -27,7 +30,14 @@ interface Props { | |
| const initialValues = { label: '' }; | ||
|
|
||
| export const CloneVolumeForm = (props: Props) => { | ||
| const { | ||
| flags, | ||
abailly-akamai marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| onClose, | ||
| volumeId, | ||
| volumeLabel, | ||
| volumeRegion, | ||
| volumeSize, | ||
| } = props; | ||
|
|
||
| const { mutateAsync: cloneVolume } = useCloneVolumeMutation(); | ||
|
|
||
|
|
@@ -87,7 +97,12 @@ export const CloneVolumeForm = (props: Props) => { | |
| onChange={handleChange} | ||
| value={values.label} | ||
| /> | ||
| <PricePanel | ||
| currentSize={volumeSize} | ||
| flags={flags} | ||
| regionId={volumeRegion} | ||
| value={volumeSize} | ||
| /> | ||
| <VolumesActionsPanel | ||
| onCancel={() => { | ||
| resetForm(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,13 +39,16 @@ import SizeField from './SizeField'; | |
| import VolumesActionsPanel from './VolumesActionsPanel'; | ||
| import { modes } from './modes'; | ||
|
|
||
| import type { FlagSet } from 'src/featureFlags'; | ||
|
|
||
| const useStyles = makeStyles((theme: Theme) => ({ | ||
| textWrapper: { | ||
| marginBottom: theme.spacing(1.25), | ||
| }, | ||
| })); | ||
|
|
||
| interface Props { | ||
| flags: FlagSet; | ||
| linode_id: number; | ||
| linodeLabel: string; | ||
| linodeRegion: string; | ||
|
|
@@ -63,6 +66,7 @@ const CreateVolumeForm: React.FC<CombinedProps> = (props) => { | |
| const classes = useStyles(); | ||
| const { | ||
| actions, | ||
| flags, | ||
| linode_id, | ||
| linodeLabel, | ||
| linodeRegion, | ||
|
|
@@ -210,10 +214,12 @@ const CreateVolumeForm: React.FC<CombinedProps> = (props) => { | |
| <SizeField | ||
| disabled={disabled} | ||
| error={touched.size ? errors.size : undefined} | ||
| flags={flags} | ||
| isFromLinode | ||
| name="size" | ||
| onBlur={handleBlur} | ||
| onChange={handleChange} | ||
| regionId={linodeRegion} | ||
| value={values.size} | ||
| /> | ||
|
|
||
|
|
@@ -245,7 +251,12 @@ const CreateVolumeForm: React.FC<CombinedProps> = (props) => { | |
| value={values.tags} | ||
| /> | ||
|
|
||
| <PricePanel | ||
| currentSize={10} | ||
| flags={flags} | ||
| regionId={linodeRegion} | ||
| value={values.size} | ||
| /> | ||
|
|
||
| <VolumesActionsPanel | ||
| onCancel={() => { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,29 +3,40 @@ import * as React from 'react'; | |
| import { Box } from 'src/components/Box'; | ||
| import { DisplayPrice } from 'src/components/DisplayPrice'; | ||
| import { MAX_VOLUME_SIZE } from 'src/constants'; | ||
| import { getDynamicVolumePrice } from 'src/utilities/pricing/dynamicVolumePrice'; | ||
|
|
||
| import type { FlagSet } from 'src/featureFlags'; | ||
|
|
||
| interface Props { | ||
| currentSize: number; | ||
| flags: FlagSet; | ||
| regionId: string; | ||
| value: number; | ||
| } | ||
|
|
||
| export const PricePanel = ({ currentSize, flags, regionId, value }: Props) => { | ||
| const getPrice = (size: number) => { | ||
| return getDynamicVolumePrice({ | ||
| flags, | ||
| regionId, | ||
| size, | ||
| }); | ||
| }; | ||
|
|
||
| const getClampedPrice = ( | ||
| newSize: number, | ||
| currentSize: Props['currentSize'] | ||
| ) => | ||
| newSize >= currentSize | ||
| ? newSize <= MAX_VOLUME_SIZE | ||
| ? getPrice(newSize) | ||
| : getPrice(MAX_VOLUME_SIZE) | ||
| : getPrice(currentSize); | ||
| const price = getClampedPrice(value, currentSize); | ||
|
|
||
| return ( | ||
| <Box marginTop={4}> | ||
| <DisplayPrice interval="mo" price={Number(price)} /> | ||
|
There was a problem hiding this comment. There's inconsistencies in the way price is passed to children resulting in some expecting a string and others a number, such as |
||
| </Box> | ||
| ); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,22 +15,28 @@ import { PricePanel } from './PricePanel'; | |
| import SizeField from './SizeField'; | ||
| import VolumesActionsPanel from './VolumesActionsPanel'; | ||
|
|
||
| import type { FlagSet } from 'src/featureFlags'; | ||
|
|
||
| interface Props { | ||
| flags: FlagSet; | ||
| onClose: () => void; | ||
| onSuccess: (volumeLabel: string, message?: string) => void; | ||
| readOnly?: boolean; | ||
| volumeId: number; | ||
| volumeLabel: string; | ||
| volumeRegion: string; | ||
| volumeSize: number; | ||
| } | ||
|
|
||
| export const ResizeVolumeForm = (props: Props) => { | ||
| const { | ||
| flags, | ||
| onClose, | ||
| onSuccess, | ||
| readOnly, | ||
| volumeId, | ||
| volumeLabel, | ||
| volumeRegion, | ||
| volumeSize, | ||
| } = props; | ||
|
|
||
|
|
@@ -96,16 +102,25 @@ export const ResizeVolumeForm = (props: Props) => { | |
| text={`You don't have permissions to edit ${volumeLabel}. Please contact an account administrator for details.`} | ||
| /> | ||
| )} | ||
|
|
||
| <SizeField | ||
| disabled={readOnly} | ||
| error={errors.size} | ||
| flags={flags} | ||
| name="size" | ||
| onBlur={handleBlur} | ||
| onChange={handleChange} | ||
| regionId={volumeRegion} | ||
| resize={volumeSize} | ||
| value={values.size} | ||
| /> | ||
|
|
||
| <PricePanel | ||
| currentSize={volumeSize} | ||
| flags={flags} | ||
| regionId={volumeRegion} | ||
| value={values.size} | ||
| /> | ||
| <VolumesActionsPanel | ||
| onCancel={() => { | ||
| resetForm(); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.