diff --git a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.styles.ts b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.styles.ts index 4874c05e0e..835ff44f51 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.styles.ts +++ b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.styles.ts @@ -70,8 +70,8 @@ export const useStyles = makeStyles(theme => ({ alignItems: 'center', }, percentageContainer: { - width: '50px', - height: '50px', + width: '90px', + height: '90px', border: `2px solid ${theme.palette.primary.light}`, borderRadius: '50%', display: 'flex', @@ -95,6 +95,7 @@ export const useStyles = makeStyles(theme => ({ requestText: { textAlign: 'center', marginTop: '1rem', + fontSize: theme.fontSizes.smallBody, }, linkContainer: { display: 'flex', @@ -135,6 +136,9 @@ export const useStyles = makeStyles(theme => ({ truncator: { textAlign: 'center', }, + resultContainer: { + flexWrap: 'wrap', + }, }, [theme.breakpoints.down(400)]: { accordionHeader: { @@ -145,4 +149,20 @@ export const useStyles = makeStyles(theme => ({ padding: '0.5rem', }, }, + resultContainer: { + display: 'flex', + width: '100%', + justifyContent: 'space-around', + }, + dataContainer: { + display: 'flex', + flexDirection: 'column', + justifyContent: 'center', + alignContent: 'center', + alignItems: 'center', + padding: '0px 15px', + }, + resultTitle: { + color: theme.palette.primary.main, + }, })); diff --git a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentFooter/FeatureOverviewEnvironmentFooter.tsx b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentFooter/FeatureOverviewEnvironmentFooter.tsx index d8ec877f27..09deed1ffa 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentFooter/FeatureOverviewEnvironmentFooter.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentFooter/FeatureOverviewEnvironmentFooter.tsx @@ -1,12 +1,8 @@ -import { Warning } from '@material-ui/icons'; import { IFeatureEnvironment, IFeatureEnvironmentMetrics, } from '../../../../../../../interfaces/featureToggle'; import { calculatePercentage } from '../../../../../../../utils/calculate-percentage'; -import ConditionallyRender from '../../../../../../common/ConditionallyRender'; -import FeatureEnvironmentMetrics from '../../../FeatureEnvironmentMetrics/FeatureEnvironmentMetrics'; - import { useStyles } from '../FeatureOverviewEnvironment.styles'; interface IFeatureOverviewEnvironmentFooterProps { @@ -32,37 +28,41 @@ const FeatureOverviewEnvironmentFooter = ({
- - } - elseShow={ -
- -

- As long as the environment is disabled, all - requests made for this feature toggle will - return false. Add a strategy and turn on the - environment to enable it for your users. -

+
+
+

Exposure

+
+ {environmentMetric?.yes}
- } - /> - -
- Total requests {totalTraffic} -
- {calculatePercentage( - totalTraffic, - environmentMetric?.yes - )} - % +

+ Total exposure of the feature in the environment in + the last hour +

+
+
+

% exposure

+
+ {calculatePercentage( + totalTraffic, + environmentMetric?.yes + )} + % +
+

+ Total exposure of the feature in the environment in + the last hour +

+
+
+

Total requests

+
+ {environmentMetric?.yes + environmentMetric?.no} +
+

+ The total request of the feature in the environment + in the last hour +

-

- Received enabled for this feature in this environment in - the last hour. -

diff --git a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.styles.ts b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.styles.ts index fdcc581370..7d384805a7 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.styles.ts +++ b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.styles.ts @@ -17,15 +17,18 @@ export const useStyles = makeStyles(theme => ({ width: '75px', }, infoParagraph: { - maxWidth: '150px', + maxWidth: '215px', marginTop: '0.25rem', fontSize: theme.fontSizes.smallBody, }, percentage: { color: theme.palette.primary.light, - textAlign: 'center', + textAlign: 'right', fontSize: theme.fontSizes.subHeader, }, + percentageCircle: { + transform: 'scale(0.85)', + }, [theme.breakpoints.down(700)]: { infoParagraph: { display: 'none', @@ -35,8 +38,6 @@ export const useStyles = makeStyles(theme => ({ icon: { display: 'none', }, - }, - [theme.breakpoints.down(400)]: { percentageCircle: { display: 'none', }, diff --git a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx index 446e0ea411..f0ff52afba 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx @@ -27,7 +27,8 @@ const FeatureOverviewEnvironmentMetrics = ({ {percentage}%

- No one has received this feature in the last hour. + The feature has been requested 0 times and + exposed 0 times in the last hour

{percentage}%

- {environmentMetric.yes} users have received the feature in - the last hour. + The feature has been requested{' '} + {environmentMetric.yes + environmentMetric.no} times{' '} + and exposed {environmentMetric.yes} times in the last + hour

- {parameters[key]}% of your user base{' '} + {parameters[key]}% of your base{' '} {constraints.length > 0 ? 'who match constraints' : ''}{' '} @@ -146,8 +146,7 @@ const FeatureStrategyExecution = ({ return (

- {strategy?.parameters[param.name]}% of your user - base{' '} + {strategy?.parameters[param.name]}% of your base{' '} {constraints?.length > 0 ? 'who match constraints' : ''}{' '}