From 95221e7b6bf364c216727454124ac6838f803eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= <ivarconr@gmail.com>
Date: Fri, 15 Oct 2021 12:49:14 +0200
Subject: [PATCH] fix: adjust env switch a bit

---
 .../FeatureViewEnvironment.tsx                | 27 +++++++++----------
 frontend/src/interfaces/featureToggle.ts      |  1 +
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/frontend/src/component/feature/FeatureView2/FeatureViewEnvironment/FeatureViewEnvironment.tsx b/frontend/src/component/feature/FeatureView2/FeatureViewEnvironment/FeatureViewEnvironment.tsx
index 03b78b9e04..35d97b4091 100644
--- a/frontend/src/component/feature/FeatureView2/FeatureViewEnvironment/FeatureViewEnvironment.tsx
+++ b/frontend/src/component/feature/FeatureView2/FeatureViewEnvironment/FeatureViewEnvironment.tsx
@@ -100,18 +100,13 @@ const FeatureViewEnvironment: FC<IFeatureViewEnvironmentProps> = ({
                 <div className={iconContainerClasses}>
                     <Cloud className={iconClasses} />
                 </div>
-                <p className={styles.environmentBadgeParagraph}>{env.type}</p>
+                <Tooltip title={`${env.name} is an environment of type "${env.type}".`}>
+                    <p className={styles.environmentBadgeParagraph}>{env.name}</p>
+                </Tooltip>
             </div>
 
             <div className={styles.header}>
                 <div className={styles.headerInfo}>
-                    <Tooltip title={env.name}>
-                        <p data-loading className={styles.environmentTitle}>
-                            {env.name}
-                        </p>
-                    </Tooltip>
-                </div>
-                <div className={styles.environmentStatus} data-loading>
                     <ConditionallyRender
                         condition={env?.strategies?.length > 0}
                         show={
@@ -122,13 +117,16 @@ const FeatureViewEnvironment: FC<IFeatureViewEnvironmentProps> = ({
                                     onChange={toggleEnvironment}
                                 />{' '}
                                 <span className={styles.toggleText}>
-                                    The feature toggle is{' '}
-                                    {env.enabled ? 'enabled' : 'disabled'} in{' '}
-                                    {env.name}
+                                    {env.name}{' environment is '}
+                                    <strong>{env.enabled ? 'enabled' : 'disabled'}</strong>
                                 </span>
                             </div>
-                        }
-                        elseShow={
+                        } />
+                </div>
+                <div className={styles.environmentStatus} data-loading>
+                    <ConditionallyRender
+                        condition={env?.strategies?.length === 0}
+                        show={
                             <>
                                 <p className={styles.toggleText}>
                                     No strategies configured for environment.
@@ -140,8 +138,7 @@ const FeatureViewEnvironment: FC<IFeatureViewEnvironmentProps> = ({
                                     Configure strategies for {env.name}
                                 </Link>
                             </>
-                        }
-                    />
+                        } />
                 </div>
             </div>
 
diff --git a/frontend/src/interfaces/featureToggle.ts b/frontend/src/interfaces/featureToggle.ts
index 59d69acad5..0532830889 100644
--- a/frontend/src/interfaces/featureToggle.ts
+++ b/frontend/src/interfaces/featureToggle.ts
@@ -25,6 +25,7 @@ export interface IFeatureToggle {
 }
 
 export interface IFeatureEnvironment {
+    type: string;
     name: string;
     enabled: boolean;
     strategies: IFeatureStrategy[];