Skip to content
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

fix: variation percentage calculation #3268

Merged
merged 3 commits into from
Jan 19, 2024
Merged

fix: variation percentage calculation #3268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8b6e58
Fix variation percentage calculation
kyle-ssg Jan 10, 2024
b9dd7fc
Fix undefined value
kyle-ssg Jan 11, 2024
0e892f2
Fix undefined value
kyle-ssg Jan 11, 2024
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
10 changes: 6 additions & 4 deletions frontend/web/components/Feature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ export default class Feature extends PureComponent {

const enabledString = isEdit ? 'Enabled' : 'Enabled by default'
const disabled = hide_from_client
const controlValue = Utils.calculateControl(multivariate_options)
const controlPercentage = Utils.calculateControl(multivariate_options)
const valueString = identity
? 'User override'
: !!multivariate_options && multivariate_options.length
? `Control Value - ${controlValue}%`
? `Control Value - ${controlPercentage}%`
: `Value (optional)${' - these can be set per environment'}`

const showValue = !(
Expand Down Expand Up @@ -103,7 +103,8 @@ export default class Feature extends PureComponent {
<VariationOptions
disabled
select
controlValue={environmentFlag.feature_state_value}
controlValue={environmentFlag?.feature_state_value}
controlPercentage={controlPercentage}
variationOverrides={this.props.identityVariations}
setVariations={this.props.onChangeIdentityVariations}
updateVariation={() => {}}
Expand All @@ -121,7 +122,8 @@ export default class Feature extends PureComponent {
{(!!environmentVariations || !isEdit) && (
<VariationOptions
disabled={!!identity || readOnly}
controlValue={controlValue}
controlValue={environmentFlag?.feature_state_value}
controlPercentage={controlPercentage}
variationOverrides={environmentVariations}
updateVariation={this.props.updateVariation}
weightTitle={
Expand Down
8 changes: 6 additions & 2 deletions frontend/web/components/SegmentOverrides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,13 @@ const SegmentOverrideInner = class Override extends React.Component {
<Row className='gap-3'>
<Tooltip
title={
<label className='cols-sm-2 control-label mb-0 ml-3'><Icon name='info-outlined' /></label>
<label className='cols-sm-2 control-label mb-0 ml-3'>
<Icon name='info-outlined' />
</label>
}
>
Set the Feature state to On or Off for Identities in this Segment
Set the Feature state to On or Off for Identities in this
Segment
</Tooltip>
<Switch
data-test={`segment-override-toggle-${index}`}
Expand Down Expand Up @@ -312,6 +315,7 @@ const SegmentOverrideInner = class Override extends React.Component {
readOnlyValue
disabled={readOnly}
controlValue={controlValue}
controlPercentage={controlPercent}
variationOverrides={mvOptions}
multivariateOptions={multivariateOptions.map((mv) => {
const foundMv =
Expand Down
8 changes: 6 additions & 2 deletions frontend/web/components/mv/VariationOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import InfoMessage from 'components/InfoMessage'
import ErrorMessage from 'components/ErrorMessage'

export default function VariationOptions({
controlPercentage,
controlValue,
disabled,
multivariateOptions,
Expand All @@ -18,7 +19,7 @@ export default function VariationOptions({
variationOverrides,
weightTitle,
}) {
const invalid = multivariateOptions.length && controlValue < 0
const invalid = multivariateOptions.length && controlPercentage < 0
if (!multivariateOptions || !multivariateOptions.length) {
return null
}
Expand All @@ -28,7 +29,10 @@ export default function VariationOptions({
return (
<>
{invalid && (
<ErrorMessage error='Your variation percentage splits total to over 100%' />
<ErrorMessage
className='mt-2'
error='Your variation percentage splits total to over 100%'
/>
)}
{!preventRemove && (
<p className='mb-4'>
Expand Down