From 65da177bd26092f48469a8299344069022404f2f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 10 Mar 2021 11:26:31 +0100
Subject: [PATCH] catalog-react: migrate to use plugin-api

Co-authored-by: Juan Lulkin <jmaiz@spotify.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/catalog-react/package.json                       | 1 +
 plugins/catalog-react/src/api.ts                         | 4 +---
 plugins/catalog-react/src/hooks/useEntity.ts             | 2 +-
 plugins/catalog-react/src/hooks/useRelatedEntities.ts    | 2 +-
 .../catalog-react/src/hooks/useStarredEntities.test.tsx  | 9 ++-------
 plugins/catalog-react/src/hooks/useStarredEntities.ts    | 2 +-
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index a41d2cf518..9763f731af 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -31,6 +31,7 @@
     "@backstage/catalog-client": "^0.3.12",
     "@backstage/catalog-model": "^0.8.0",
     "@backstage/core": "^0.7.11",
+    "@backstage/plugin-api": "^0.1.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
diff --git a/plugins/catalog-react/src/api.ts b/plugins/catalog-react/src/api.ts
index 9379fa7fb3..b87957ba5b 100644
--- a/plugins/catalog-react/src/api.ts
+++ b/plugins/catalog-react/src/api.ts
@@ -15,10 +15,8 @@
  */
 
 import { CatalogApi } from '@backstage/catalog-client';
-import { createApiRef } from '@backstage/core';
+import { createApiRef } from '@backstage/plugin-api';
 
 export const catalogApiRef = createApiRef<CatalogApi>({
   id: 'plugin.catalog.service',
-  description:
-    'Used by the Catalog plugin to make requests to accompanying backend',
 });
diff --git a/plugins/catalog-react/src/hooks/useEntity.ts b/plugins/catalog-react/src/hooks/useEntity.ts
index 0eb365d932..c53b256227 100644
--- a/plugins/catalog-react/src/hooks/useEntity.ts
+++ b/plugins/catalog-react/src/hooks/useEntity.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Entity } from '@backstage/catalog-model';
-import { errorApiRef, useApi } from '@backstage/core';
+import { errorApiRef, useApi } from '@backstage/plugin-api';
 import { createContext, useContext, useEffect } from 'react';
 import { useNavigate } from 'react-router';
 import { useAsync } from 'react-use';
diff --git a/plugins/catalog-react/src/hooks/useRelatedEntities.ts b/plugins/catalog-react/src/hooks/useRelatedEntities.ts
index b47d941ff6..0f58b3aa98 100644
--- a/plugins/catalog-react/src/hooks/useRelatedEntities.ts
+++ b/plugins/catalog-react/src/hooks/useRelatedEntities.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Entity, EntityRelation } from '@backstage/catalog-model';
-import { useApi } from '@backstage/core';
+import { useApi } from '@backstage/plugin-api';
 import { chunk, groupBy } from 'lodash';
 import { useAsync } from 'react-use';
 import { catalogApiRef } from '../api';
diff --git a/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx b/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx
index f1a8df1f32..ce81fa5792 100644
--- a/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx
+++ b/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx
@@ -17,13 +17,8 @@
 import React, { PropsWithChildren } from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useStarredEntities } from './useStarredEntities';
-import {
-  ApiProvider,
-  ApiRegistry,
-  storageApiRef,
-  WebStorage,
-  StorageApi,
-} from '@backstage/core';
+import { ApiProvider, ApiRegistry, WebStorage } from '@backstage/core';
+import { storageApiRef, StorageApi } from '@backstage/plugin-api';
 import { MockErrorApi } from '@backstage/test-utils';
 import { Entity } from '@backstage/catalog-model';
 
diff --git a/plugins/catalog-react/src/hooks/useStarredEntities.ts b/plugins/catalog-react/src/hooks/useStarredEntities.ts
index 7cbbbb7ce6..d959514562 100644
--- a/plugins/catalog-react/src/hooks/useStarredEntities.ts
+++ b/plugins/catalog-react/src/hooks/useStarredEntities.ts
@@ -15,7 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { storageApiRef, useApi } from '@backstage/core';
+import { storageApiRef, useApi } from '@backstage/plugin-api';
 import { useCallback, useEffect, useState } from 'react';
 import { useObservable } from 'react-use';