From a2a579cea7af34609fd798c62d8d815cb2267a93 Mon Sep 17 00:00:00 2001
From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Date: Thu, 2 Apr 2020 13:25:09 +0200
Subject: [PATCH] Forms migration: Finalizing Select namespace (#23281)

---
 packages/grafana-ui/src/components/Forms/index.ts  | 3 ---
 packages/grafana-ui/src/components/Select/types.ts | 2 --
 2 files changed, 5 deletions(-)

diff --git a/packages/grafana-ui/src/components/Forms/index.ts b/packages/grafana-ui/src/components/Forms/index.ts
index 2a83aa0e763..e2afb6f0f58 100644
--- a/packages/grafana-ui/src/components/Forms/index.ts
+++ b/packages/grafana-ui/src/components/Forms/index.ts
@@ -9,8 +9,6 @@ import { Switch } from './Switch';
 import { Legend } from './Legend';
 import { TextArea } from './TextArea/TextArea';
 import { Checkbox } from './Checkbox';
-//Remove after Enterprise migrations have been merged
-import { Select } from '../Select/Select';
 
 const Forms = {
   RadioButtonGroup,
@@ -24,7 +22,6 @@ const Forms = {
   TextArea,
   Checkbox,
   Legend,
-  Select,
 };
 
 export default Forms;
diff --git a/packages/grafana-ui/src/components/Select/types.ts b/packages/grafana-ui/src/components/Select/types.ts
index d50be346202..ee63702b122 100644
--- a/packages/grafana-ui/src/components/Select/types.ts
+++ b/packages/grafana-ui/src/components/Select/types.ts
@@ -18,8 +18,6 @@ export interface SelectCommonProps<T> {
   onKeyDown?: (event: React.KeyboardEvent) => void;
   placeholder?: string;
   disabled?: boolean;
-  //To be removed, is here to make Enterprise mergable
-  isDisabled?: boolean;
   isSearchable?: boolean;
   isClearable?: boolean;
   autoFocus?: boolean;