From e0f228c46f29971c1e78f99b76eb937c2a35209c Mon Sep 17 00:00:00 2001 From: Oliver Sand Date: Thu, 12 Aug 2021 11:52:37 +0200 Subject: [PATCH] Migrate my changes to the new core-* apis Signed-off-by: Oliver Sand --- .../DefaultImportComponentPage.test.tsx | 4 ++-- .../DefaultImportComponentPage.tsx | 5 ++--- .../src/components/ImportInfoCard/ImportInfoCard.test.tsx | 4 ++-- .../src/components/ImportInfoCard/ImportInfoCard.tsx | 5 +++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.test.tsx b/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.test.tsx index 5e49872319..e807559cbf 100644 --- a/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.test.tsx +++ b/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.test.tsx @@ -18,9 +18,9 @@ import { CatalogClient } from '@backstage/catalog-client'; import { ApiProvider, ApiRegistry, - configApiRef, ConfigReader, -} from '@backstage/core'; +} from '@backstage/core-app-api'; +import { configApiRef } from '@backstage/core-plugin-api'; import { catalogApiRef } from '@backstage/plugin-catalog-react'; import { wrapInTestApp } from '@backstage/test-utils'; import { act, render } from '@testing-library/react'; diff --git a/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.tsx b/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.tsx index b9aad55274..d9e9e09335 100644 --- a/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.tsx +++ b/plugins/catalog-import/src/components/DefaultImportComponentPage/DefaultImportComponentPage.tsx @@ -15,14 +15,13 @@ */ import { - configApiRef, Content, ContentHeader, Header, Page, SupportButton, - useApi, -} from '@backstage/core'; +} from '@backstage/core-components'; +import { configApiRef, useApi } from '@backstage/core-plugin-api'; import { Grid } from '@material-ui/core'; import React from 'react'; import { ImportInfoCard } from '../ImportInfoCard'; diff --git a/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.test.tsx b/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.test.tsx index 899ad18cc3..c2302403d3 100644 --- a/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.test.tsx +++ b/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.test.tsx @@ -17,9 +17,9 @@ import { ApiProvider, ApiRegistry, - configApiRef, ConfigReader, -} from '@backstage/core'; +} from '@backstage/core-app-api'; +import { configApiRef } from '@backstage/core-plugin-api'; import { wrapInTestApp } from '@backstage/test-utils'; import { act, render } from '@testing-library/react'; import React from 'react'; diff --git a/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.tsx b/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.tsx index 8fbbe6cc82..282070ad28 100644 --- a/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.tsx +++ b/plugins/catalog-import/src/components/ImportInfoCard/ImportInfoCard.tsx @@ -14,8 +14,9 @@ * limitations under the License. */ -import { ConfigApi, configApiRef, InfoCard, useApi } from '@backstage/core'; -import { Typography } from '@material-ui/core'; +import { InfoCard } from '@backstage/core-components'; +import { configApiRef, useApi } from '@backstage/core-plugin-api'; +import { Chip, Typography } from '@material-ui/core'; import React from 'react'; import { useImportOptions } from '../ImportOptionsContext';