From 6d3f745b4b5526895df12c9cb42ad0bdd425b465 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 25 May 2020 18:10:34 +0200
Subject: [PATCH] packages/app: move AlertDisplay to core

---
 packages/app/package.json                                   | 1 -
 packages/app/src/App.tsx                                    | 3 +--
 packages/core/package.json                                  | 1 +
 .../src/components/AlertDisplay/AlertDisplay.tsx            | 6 ++----
 packages/{app => core}/src/components/AlertDisplay/index.ts | 2 +-
 packages/core/src/index.ts                                  | 1 +
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename packages/{app => core}/src/components/AlertDisplay/AlertDisplay.tsx (93%)
 rename packages/{app => core}/src/components/AlertDisplay/index.ts (93%)

diff --git a/packages/app/package.json b/packages/app/package.json
index 0a3d68603b..a366dcce1a 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -18,7 +18,6 @@
     "@backstage/plugin-sentry": "^0.1.1-alpha.6",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "4.0.0-alpha.45",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index e29fac8865..327bca48f8 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import { createApp, OAuthRequestDialog } from '@backstage/core';
+import { createApp, AlertDisplay, OAuthRequestDialog } from '@backstage/core';
 import React, { FC } from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import Root from './components/Root';
-import AlertDisplay from './components/AlertDisplay';
 import * as plugins from './plugins';
 import apis, { alertApiForwarder } from './apis';
 
diff --git a/packages/core/package.json b/packages/core/package.json
index e4521530b1..b1800f5db3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -31,6 +31,7 @@
     "@backstage/theme": "^0.1.1-alpha.6",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
     "@types/classnames": "^2.2.9",
     "@types/google-protobuf": "^3.7.2",
     "@types/jest": "^25.2.2",
diff --git a/packages/app/src/components/AlertDisplay/AlertDisplay.tsx b/packages/core/src/components/AlertDisplay/AlertDisplay.tsx
similarity index 93%
rename from packages/app/src/components/AlertDisplay/AlertDisplay.tsx
rename to packages/core/src/components/AlertDisplay/AlertDisplay.tsx
index d9dd0b240b..23d1c7825f 100644
--- a/packages/app/src/components/AlertDisplay/AlertDisplay.tsx
+++ b/packages/core/src/components/AlertDisplay/AlertDisplay.tsx
@@ -19,14 +19,14 @@ import PropTypes from 'prop-types';
 import { Snackbar, IconButton } from '@material-ui/core';
 import CloseIcon from '@material-ui/icons/Close';
 import { Alert } from '@material-ui/lab';
-import { AlertApiForwarder, AlertMessage } from '@backstage/core';
+import { AlertApiForwarder, AlertMessage } from '../../api';
 
 type Props = {
   forwarder: AlertApiForwarder;
 };
 
 // TODO: improve on this and promote to a shared component for use by all apps.
-const AlertDisplay: FC<Props> = ({ forwarder }) => {
+export const AlertDisplay: FC<Props> = ({ forwarder }) => {
   const [messages, setMessages] = useState<Array<AlertMessage>>([]);
 
   useEffect(() => {
@@ -73,5 +73,3 @@ const AlertDisplay: FC<Props> = ({ forwarder }) => {
 AlertDisplay.propTypes = {
   forwarder: PropTypes.instanceOf(AlertApiForwarder).isRequired,
 };
-
-export default AlertDisplay;
diff --git a/packages/app/src/components/AlertDisplay/index.ts b/packages/core/src/components/AlertDisplay/index.ts
similarity index 93%
rename from packages/app/src/components/AlertDisplay/index.ts
rename to packages/core/src/components/AlertDisplay/index.ts
index b60bc1776b..7bfac0c981 100644
--- a/packages/app/src/components/AlertDisplay/index.ts
+++ b/packages/core/src/components/AlertDisplay/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { default } from './AlertDisplay';
+export * from './AlertDisplay';
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 415f167067..013c80e2fa 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -28,6 +28,7 @@ export { default as InfoCard } from './layout/InfoCard';
 export { CardTab, TabbedCard } from './layout/TabbedCard';
 export { default as ErrorBoundary } from './layout/ErrorBoundary';
 export * from './layout/Sidebar';
+export { AlertDisplay } from './components/AlertDisplay';
 export { default as HorizontalScrollGrid } from './components/HorizontalScrollGrid';
 export { default as ProgressCard } from './components/ProgressBars/ProgressCard';
 export { default as CircleProgress } from './components/ProgressBars/CircleProgress';