From 95a8a59845a66c7c6cf0451a3f7772640438e680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 31 Oct 2018 12:50:44 +0100
Subject: [PATCH] restored transition

---
 .../core/components/Animations/SlideDown.tsx  |  6 ++++--
 public/app/features/api-keys/ApiKeysPage.tsx  | 20 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/public/app/core/components/Animations/SlideDown.tsx b/public/app/core/components/Animations/SlideDown.tsx
index 497af02ade9..70dacd73849 100644
--- a/public/app/core/components/Animations/SlideDown.tsx
+++ b/public/app/core/components/Animations/SlideDown.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React from 'react';
 import Transition from 'react-transition-group/Transition';
 
 interface Style {
@@ -6,9 +6,11 @@ interface Style {
   overflow?: string;
 }
 
-const defaultMaxHeight = '200px'; // When animating using max-height we need to use a static value.
+// When animating using max-height we need to use a static value.
 // If this is not enough, pass in <SlideDown maxHeight="....
+const defaultMaxHeight = '200px';
 const defaultDuration = 200;
+
 export const defaultStyle: Style = {
   transition: `max-height ${defaultDuration}ms ease-in-out`,
   overflow: 'hidden',
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index 86937e47d00..d2aa1f24c57 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -8,7 +8,7 @@ import { getApiKeys, getApiKeysCount } from './state/selectors';
 import { loadApiKeys, deleteApiKey, setSearchQuery, addApiKey } from './state/actions';
 import PageHeader from 'app/core/components/PageHeader/PageHeader';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
-import SlideDown, { defaultStyle as slideDownDefaultStyle } from 'app/core/components/Animations/SlideDown';
+import SlideDown from 'app/core/components/Animations/SlideDown';
 import ApiKeysAddedModal from './ApiKeysAddedModal';
 import config from 'app/core/config';
 import appEvents from 'app/core/app_events';
@@ -85,6 +85,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
       return {
         ...prevState,
         newApiKey: initialApiKeyState,
+        isAdding: false,
       };
     });
   };
@@ -130,10 +131,9 @@ export class ApiKeysPage extends PureComponent<Props, any> {
 
   renderAddApiKeyForm() {
     const { newApiKey, isAdding } = this.state;
-    const slideDownStyle = isAdding ? slideDownDefaultStyle : { ...slideDownDefaultStyle, transition: 'unset' };
 
     return (
-      <SlideDown in={isAdding} style={slideDownStyle}>
+      <SlideDown in={isAdding}>
         <div className="cta-form">
           <button className="cta-form__close btn btn-transparent" onClick={this.onToggleAdding}>
             <i className="fa fa-close" />
@@ -242,9 +242,15 @@ export class ApiKeysPage extends PureComponent<Props, any> {
     return (
       <div>
         <PageHeader model={navModel} />
-        {hasFetched ?
-          (apiKeysCount > 0 ? this.renderApiKeyList() : this.renderEmptyList())
-        : <PageLoader pageName="Api keys" />}
+        {hasFetched ? (
+          apiKeysCount > 0 ? (
+            this.renderApiKeyList()
+          ) : (
+            this.renderEmptyList()
+          )
+        ) : (
+          <PageLoader pageName="Api keys" />
+        )}
       </div>
     );
   }
@@ -256,7 +262,7 @@ function mapStateToProps(state) {
     apiKeys: getApiKeys(state.apiKeys),
     searchQuery: state.apiKeys.searchQuery,
     apiKeysCount: getApiKeysCount(state.apiKeys),
-    hasFetched: state.apiKeys.hasFetched
+    hasFetched: state.apiKeys.hasFetched,
   };
 }