Refactor feature strategy list to use DisabledInfo component

Author: thomasheartman

frontend/src/component/playground/Playground/PlaygroundResultsTable/FeatureResultInfoPopoverCell/FeatureStrategyList/PlaygroundResultsFeatureStrategyList.tsx

@@ -1,15 +1,48 @@
-import {
-    PlaygroundResultStrategyLists,
-    WrappedPlaygroundResultStrategyList,
-} from './StrategyList/playgroundResultStrategyLists';
+import { PlaygroundResultStrategyLists } from './StrategyList/PlaygroundResultStrategyLists';
 import type { PlaygroundFeatureSchema, PlaygroundRequestSchema } from 'openapi';
-import { Alert } from '@mui/material';
+import { Alert, styled } from '@mui/material';
 
 interface PlaygroundResultFeatureStrategyListProps {
     feature: PlaygroundFeatureSchema;
     input?: PlaygroundRequestSchema;
 }
 
+const StyledAlert = styled(Alert)(({ theme }) => ({
+    marginInline: `var(--popover-inline-padding, ${theme.spacing(4)})`,
+}));
+
+const DisabledInfo = ({ feature }: { feature: PlaygroundFeatureSchema }) => {
+    const resolveHintText = (feature: PlaygroundFeatureSchema) => {
+        if (
+            feature.hasUnsatisfiedDependency &&
+            !feature.isEnabledInCurrentEnvironment
+        ) {
+            return 'If the environment was enabled and parent dependencies were satisfied';
+        }
+        if (feature.hasUnsatisfiedDependency) {
+            return 'If parent dependencies were satisfied';
+        }
+        if (!feature.isEnabledInCurrentEnvironment) {
+            return 'If the environment was enabled';
+        }
+        return '';
+    };
+
+    const text = resolveHintText(feature);
+
+    if (!text) {
+        return null;
+    }
+
+    return (
+        <StyledAlert severity={'info'} color={'info'}>
+            {resolveHintText(feature)}, then this feature flag would be{' '}
+            {feature.strategies?.result ? 'TRUE' : 'FALSE'} with strategies
+            evaluated like this:{' '}
+        </StyledAlert>
+    );
+};
+
 export const PlaygroundResultFeatureStrategyList = ({
     feature,
     input,
@@ -32,21 +65,9 @@ export const PlaygroundResultFeatureStrategyList = ({
         );
     }
 
-    if (
-        (feature.hasUnsatisfiedDependency ||
-            !feature.isEnabledInCurrentEnvironment) &&
-        Boolean(feature?.strategies?.data)
-    ) {
-        return (
-            <WrappedPlaygroundResultStrategyList
-                feature={feature}
-                input={input}
-            />
-        );
-    }
-
     return (
         <>
+            <DisabledInfo feature={feature} />
             <PlaygroundResultStrategyLists
                 strategies={enabledStrategies || []}
                 input={input}

frontend/src/component/playground/Playground/PlaygroundResultsTable/FeatureResultInfoPopoverCell/FeatureStrategyList/StrategyList/playgroundResultStrategyLists.tsx

@@ -2,9 +2,7 @@ import { Alert, styled } from '@mui/material';
 import type {
     PlaygroundStrategySchema,
     PlaygroundRequestSchema,
-    PlaygroundFeatureSchema,
 } from 'openapi';
-import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
 import {
     StyledContentList,
     StyledListItem,
@@ -96,70 +94,3 @@ export const PlaygroundResultStrategyLists = ({
         </div>
     );
 };
-
-interface IWrappedPlaygroundResultStrategyListProps {
-    feature: PlaygroundFeatureSchema;
-    input?: PlaygroundRequestSchema;
-}
-
-const resolveHintText = (feature: PlaygroundFeatureSchema) => {
-    if (
-        feature.hasUnsatisfiedDependency &&
-        !feature.isEnabledInCurrentEnvironment
-    ) {
-        return 'If the environment was enabled and parent dependencies were satisfied';
-    }
-    if (feature.hasUnsatisfiedDependency) {
-        return 'If parent dependencies were satisfied';
-    }
-    if (!feature.isEnabledInCurrentEnvironment) {
-        return 'If the environment was enabled';
-    }
-    return '';
-};
-
-export const WrappedPlaygroundResultStrategyList = ({
-    feature,
-    input,
-}: IWrappedPlaygroundResultStrategyListProps) => {
-    const enabledStrategies = feature.strategies?.data?.filter(
-        (strategy) => !strategy.disabled,
-    );
-    const disabledStrategies = feature.strategies?.data?.filter(
-        (strategy) => strategy.disabled,
-    );
-
-    const showDisabledStrategies = disabledStrategies?.length > 0;
-
-    return (
-        <StyledAlertWrapper sx={{ pb: 1, mt: 2 }}>
-            <StyledAlert severity={'info'} color={'warning'}>
-                {resolveHintText(feature)}, then this feature flag would be{' '}
-                {feature.strategies?.result ? 'TRUE' : 'FALSE'} with strategies
-                evaluated like this:{' '}
-            </StyledAlert>
-            <StyledListWrapper>
-                <PlaygroundResultStrategyLists
-                    strategies={enabledStrategies || []}
-                    input={input}
-                    titlePrefix={showDisabledStrategies ? 'Enabled' : undefined}
-                />
-            </StyledListWrapper>
-            <ConditionallyRender
-                condition={showDisabledStrategies}
-                show={
-                    <StyledListWrapper>
-                        <PlaygroundResultStrategyLists
-                            strategies={disabledStrategies}
-                            input={input}
-                            titlePrefix={'Disabled'}
-                            infoText={
-                                'Disabled strategies are not evaluated for the overall result.'
-                            }
-                        />
-                    </StyledListWrapper>
-                }
-            />
-        </StyledAlertWrapper>
-    );
-};