From df60dbd7494ac0a13d08884fffcedceaeed31798 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 21 Apr 2020 10:55:48 +0200
Subject: [PATCH] @grafana/ui: Fix login icon (#23732)

* Fix sign in button

* Fix modal button in button
---
 packages/grafana-ui/src/types/icon.ts                    | 2 ++
 public/app/core/components/sidemenu/SignIn.tsx           | 2 +-
 .../sidemenu/__snapshots__/SignIn.test.tsx.snap          | 3 ++-
 public/app/features/api-keys/ApiKeysPage.tsx             | 4 +---
 .../api-keys/__snapshots__/ApiKeysPage.test.tsx.snap     | 9 +++------
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/grafana-ui/src/types/icon.ts b/packages/grafana-ui/src/types/icon.ts
index 2d9ce0297b8..bc1120b17c8 100644
--- a/packages/grafana-ui/src/types/icon.ts
+++ b/packages/grafana-ui/src/types/icon.ts
@@ -52,6 +52,7 @@ export type IconName =
   | 'circle'
   | 'arrow-up'
   | 'arrow-from-right'
+  | 'arrow-from-left'
   | 'keyboard'
   | 'search'
   | 'chart-line'
@@ -162,6 +163,7 @@ export const getAvailableIcons = (): IconName[] => [
   'circle',
   'arrow-up',
   'arrow-from-right',
+  'arrow-from-left',
   'keyboard',
   'search',
   'chart-line',
diff --git a/public/app/core/components/sidemenu/SignIn.tsx b/public/app/core/components/sidemenu/SignIn.tsx
index 7e59696e17a..1e96da2497b 100644
--- a/public/app/core/components/sidemenu/SignIn.tsx
+++ b/public/app/core/components/sidemenu/SignIn.tsx
@@ -9,7 +9,7 @@ export const SignIn: FC<any> = ({ url }) => {
     <div className="sidemenu-item">
       <a href={loginUrl} className="sidemenu-link" target="_self">
         <span className="icon-circle sidemenu-icon">
-          <Icon name="sign-in-alt" />
+          <Icon name="arrow-from-left" size="xl" />
         </span>
       </a>
       <a href={loginUrl} target="_self">
diff --git a/public/app/core/components/sidemenu/__snapshots__/SignIn.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/SignIn.test.tsx.snap
index bf7f6b16e63..bb393114721 100644
--- a/public/app/core/components/sidemenu/__snapshots__/SignIn.test.tsx.snap
+++ b/public/app/core/components/sidemenu/__snapshots__/SignIn.test.tsx.snap
@@ -13,7 +13,8 @@ exports[`Render should render component 1`] = `
       className="icon-circle sidemenu-icon"
     >
       <Icon
-        name="sign-in-alt"
+        name="arrow-from-left"
+        size="xl"
       />
     </span>
   </a>
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index 64aa7dac53b..16a3b071899 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -180,9 +180,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
     return (
       <SlideDown in={isAdding}>
         <div className="cta-form">
-          <button className="cta-form__close btn btn-transparent" onClick={this.onToggleAdding}>
-            <IconButton name="times" />
-          </button>
+          <IconButton name="times" className="cta-form__close btn btn-transparent" onClick={this.onToggleAdding} />
           <h5>Add API Key</h5>
           <form className="gf-form-group" onSubmit={this.onAddApiKey}>
             <div className="gf-form-inline">
diff --git a/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap b/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap
index b84cb6b9a6a..5893486b92a 100644
--- a/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap
+++ b/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap
@@ -49,14 +49,11 @@ exports[`Render should render CTA if there are no API keys 1`] = `
       <div
         className="cta-form"
       >
-        <button
+        <IconButton
           className="cta-form__close btn btn-transparent"
+          name="times"
           onClick={[Function]}
-        >
-          <IconButton
-            name="times"
-          />
-        </button>
+        />
         <h5>
           Add API Key
         </h5>