fix(catalog): merge errors

plugins/catalog/src/api/CatalogClient.ts

@@ -140,4 +140,20 @@ export class CatalogClient implements CatalogApi {
       .map(r => r.data)
       .find(l => locationCompound === `${l.type}:${l.target}`);
   }
+
+  async removeEntityByUid(uid: string): Promise<void> {
+    const response = await fetch(
+      `${this.apiOrigin}${this.basePath}/entities/by-uid/${uid}`,
+      {
+        method: 'DELETE',
+      },
+    );
+    if (!response.ok) {
+      const payload = await response.text();
+      throw new Error(
+        `Request failed with ${response.status} ${response.statusText}, ${payload}`,
+      );
+    }
+    return undefined;
+  }
 }

plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { Entity } from '@backstage/catalog-model';
 import {
   ApiProvider,
   ApiRegistry,
@@ -28,6 +27,7 @@ import React from 'react';
 import { catalogApiRef } from '../..';
 import { CatalogApi } from '../../api/types';
 import { CatalogPage } from './CatalogPage';
+import { Entity } from '@backstage/catalog-model';
 
 describe('CatalogPage', () => {
   const mockErrorApi = new MockErrorApi();

plugins/catalog/src/data/filters.ts

@@ -22,7 +22,6 @@ import StarIcon from '@material-ui/icons/Star';
 import { StarredCount } from '../components/CatalogFilter/StarredCount';
 import { AllServicesCount } from '../components/CatalogFilter/AllServicesCount';
 import { FilterGroupItem } from '../types';
-import { Entity } from '@backstage/catalog-model';
 
 export const filterGroups: CatalogFilterGroup[] = [
   {

plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.test.tsx

@@ -29,9 +29,10 @@ const catalogApi: jest.Mocked<typeof catalogApiRef.T> = {
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
   addLocation: jest.fn((_a, _b) => new Promise(() => {})),
   getEntities: jest.fn(),
-  getEntity: jest.fn(),
   getLocationByEntity: jest.fn(),
   getLocationById: jest.fn(),
+  removeEntityByUid: jest.fn(),
+  getEntityByName: jest.fn(),
 };
 
 const setup = () => ({