diff --git a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts index 36ea911602..ee30fda344 100644 --- a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts +++ b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts @@ -8,4 +8,9 @@ export const useStyles = makeStyles(theme => ({ display: 'block', margin: '1rem 0 0 0', }, + envName: { + position: 'relative', + top: '6px', + fontWeight: 'bold' + }, })); diff --git a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx index 780cab1a37..f5e0577804 100644 --- a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx +++ b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx @@ -1,6 +1,7 @@ import { UPDATE_FEATURE } from '../../../providers/AccessProvider/permissions'; import ConditionallyRender from '../../ConditionallyRender'; import PermissionButton from '../../PermissionButton/PermissionButton'; +import StringTruncator from '../../StringTruncator/StringTruncator'; import NoItems from '../NoItems'; import { useStyles } from './NoItemsStrategies.styles'; @@ -21,7 +22,13 @@ const NoItemsStrategies = ({ return (

- No strategies added in the {envName} environment + No strategies added in the{' '} + {' '} + environment

@@ -30,6 +37,8 @@ const NoItemsStrategies = ({ Read more here diff --git a/frontend/src/component/environments/CreateEnvironment/CreateEnvironmentSuccess/CreateEnvironmentSuccessCard/CreateEnvironmentSuccessCard.tsx b/frontend/src/component/environments/CreateEnvironment/CreateEnvironmentSuccess/CreateEnvironmentSuccessCard/CreateEnvironmentSuccessCard.tsx index 0283c07755..8e428e3e0d 100644 --- a/frontend/src/component/environments/CreateEnvironment/CreateEnvironmentSuccess/CreateEnvironmentSuccessCard/CreateEnvironmentSuccessCard.tsx +++ b/frontend/src/component/environments/CreateEnvironment/CreateEnvironmentSuccess/CreateEnvironmentSuccessCard/CreateEnvironmentSuccessCard.tsx @@ -1,4 +1,5 @@ import { CloudCircle } from '@material-ui/icons'; +import StringTruncator from '../../../../common/StringTruncator/StringTruncator'; import { ICreateEnvironmentSuccessProps } from '../CreateEnvironmentSuccess'; import { useStyles } from './CreateEnvironmentSuccessCard.styles'; @@ -16,7 +17,9 @@ const CreateEnvironmentSuccessCard = ({

Id
-
{name}
+
+ +
Type
diff --git a/frontend/src/component/environments/EnvironmentList/EnvironmentDeleteConfirm/EnvironmentDeleteConfirm.tsx b/frontend/src/component/environments/EnvironmentList/EnvironmentDeleteConfirm/EnvironmentDeleteConfirm.tsx index e1e1672aa5..147e582643 100644 --- a/frontend/src/component/environments/EnvironmentList/EnvironmentDeleteConfirm/EnvironmentDeleteConfirm.tsx +++ b/frontend/src/component/environments/EnvironmentList/EnvironmentDeleteConfirm/EnvironmentDeleteConfirm.tsx @@ -52,10 +52,7 @@ const EnvironmentDeleteConfirm = ({ strategies that are active in this environment across all feature toggles. - +

In order to delete this environment, please enter the id of the diff --git a/frontend/src/component/environments/EnvironmentList/EnvironmentListItem/EnvironmentListItem.tsx b/frontend/src/component/environments/EnvironmentList/EnvironmentListItem/EnvironmentListItem.tsx index 4aca2ad472..67b68ba903 100644 --- a/frontend/src/component/environments/EnvironmentList/EnvironmentListItem/EnvironmentListItem.tsx +++ b/frontend/src/component/environments/EnvironmentList/EnvironmentListItem/EnvironmentListItem.tsx @@ -24,6 +24,7 @@ import { import { useDrag, useDrop, DropTargetMonitor } from 'react-dnd'; import { XYCoord } from 'dnd-core'; import DisabledIndicator from '../../../common/DisabledIndicator/DisabledIndicator'; +import StringTruncator from '../../../common/StringTruncator/StringTruncator'; interface IEnvironmentListItemProps { env: IEnvironment; @@ -132,7 +133,9 @@ const EnvironmentListItem = ({ - {env.name} + + + } diff --git a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentBody/FeatureOverviewEnvironmentBody.tsx b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentBody/FeatureOverviewEnvironmentBody.tsx index 3944758775..c44423a721 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentBody/FeatureOverviewEnvironmentBody.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentBody/FeatureOverviewEnvironmentBody.tsx @@ -19,7 +19,7 @@ const FeatureOverviewEnvironmentBody = ({ const { projectId, featureId } = useParams(); const styles = useStyles(); const history = useHistory(); - const strategiesLink = `/projects/${projectId}/features2/${featureId}/strategies?environment=${featureEnvironment?.name}`; + const strategiesLink = `/projects/${projectId}/features2/${featureId}/strategies?environment=${featureEnvironment?.name}&addStrategy=true`; if (!featureEnvironment) return null; diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesCreateHeader/FeatureStrategiesCreateHeader.tsx b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesCreateHeader/FeatureStrategiesCreateHeader.tsx index a9241d938b..41ba6ff27b 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesCreateHeader/FeatureStrategiesCreateHeader.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesCreateHeader/FeatureStrategiesCreateHeader.tsx @@ -1,6 +1,7 @@ import { useContext } from 'react'; import FeatureStrategiesUIContext from '../../../../../../contexts/FeatureStrategiesUIContext'; import EnvironmentIcon from '../../../../../common/EnvironmentIcon/EnvironmentIcon'; +import StringTruncator from '../../../../../common/StringTruncator/StringTruncator'; import { useStyles } from './FeatureStrategiesCreateHeader.styles'; const FeatureStrategiesCreateHeader = () => { @@ -13,8 +14,12 @@ const FeatureStrategiesCreateHeader = () => { return (

- {' '} - Configuring strategy for {activeEnvironment?.name} + + Configuring strategy for  +
);