rename type and class, fix test

plugins/pagerduty/README.md

@@ -56,7 +56,7 @@ createApiFactory({
   api: pagerDutyApiRef,
   deps: { discoveryApi: discoveryApiRef },
   factory: ({ discoveryApi }) =>
-    new PagerDutyClientApi({
+    new PagerDutyClient({
       discoveryApi: discoveryApi,
       eventUrl: "https://events.pagerduty.com/v2" //to override the default value
   }),

plugins/pagerduty/src/api/client.ts

@@ -17,7 +17,7 @@
 import { createApiRef } from '@backstage/core';
 import { Service, Incident, OnCall } from '../components/types';
 import {
-  PagerDutyClient,
+  PagerDutyApi,
   TriggerAlarmRequest,
   ServicesResponse,
   IncidentsResponse,
@@ -28,12 +28,12 @@ import {
 
 export class UnauthorizedError extends Error {}
 
-export const pagerDutyApiRef = createApiRef<PagerDutyClient>({
+export const pagerDutyApiRef = createApiRef<PagerDutyApi>({
   id: 'plugin.pagerduty.api',
   description: 'Used to fetch data from PagerDuty API',
 });
 
-export class PagerDutyClientApi implements PagerDutyClient {
+export class PagerDutyClient implements PagerDutyApi {
   constructor(private readonly config: ClientApiConfig) {}
 
   async getServiceByIntegrationKey(integrationKey: string): Promise<Service[]> {

plugins/pagerduty/src/api/index.ts

@@ -14,9 +14,5 @@
  * limitations under the License.
  */
 
-export {
-  PagerDutyClientApi,
-  pagerDutyApiRef,
-  UnauthorizedError,
-} from './client';
-export type { PagerDutyClient } from './types';
+export { PagerDutyClient, pagerDutyApiRef, UnauthorizedError } from './client';
+export type { PagerDutyApi } from './types';

plugins/pagerduty/src/api/types.ts

@@ -24,7 +24,7 @@ export type TriggerAlarmRequest = {
   userName: string;
 };
 
-export interface PagerDutyClient {
+export interface PagerDutyApi {
   /**
    * Fetches a list of services, filtered by the provided integration key.
    *

plugins/pagerduty/src/components/Incident/Incidents.test.tsx

@@ -35,11 +35,7 @@ describe('Incidents', () => {
     const { getByText, queryByTestId } = render(
       wrapInTestApp(
         <ApiProvider apis={apis}>
-          <Incidents
-            serviceId="abc"
-            onTriggerRefresh={false}
-            setShouldRefreshIncidents={() => {}}
-          />
+          <Incidents serviceId="abc" refreshIncidents={false} />
         </ApiProvider>,
       ),
     );
@@ -99,11 +95,7 @@ describe('Incidents', () => {
     } = render(
       wrapInTestApp(
         <ApiProvider apis={apis}>
-          <Incidents
-            serviceId="abc"
-            onTriggerRefresh={false}
-            setShouldRefreshIncidents={() => {}}
-          />
+          <Incidents serviceId="abc" refreshIncidents={false} />
         </ApiProvider>,
       ),
     );
@@ -129,11 +121,7 @@ describe('Incidents', () => {
     const { getByText, queryByTestId } = render(
       wrapInTestApp(
         <ApiProvider apis={apis}>
-          <Incidents
-            serviceId="abc"
-            onTriggerRefresh={false}
-            setShouldRefreshIncidents={() => {}}
-          />
+          <Incidents serviceId="abc" refreshIncidents={false} />
         </ApiProvider>,
       ),
     );

plugins/pagerduty/src/components/PagerDutyCard.test.tsx

@@ -15,7 +15,7 @@
  */
 import React from 'react';
 import { render, waitFor, fireEvent } from '@testing-library/react';
-import { PagerDutyCard } from './PagerdutyCard';
+import { PagerDutyCard } from './PagerDutyCard';
 import { Entity } from '@backstage/catalog-model';
 import { wrapInTestApp } from '@backstage/test-utils';
 import {

plugins/pagerduty/src/index.ts

@@ -17,9 +17,9 @@ export { plugin } from './plugin';
 export {
   isPluginApplicableToEntity,
   PagerDutyCard,
-} from './components/PagerdutyCard';
+} from './components/PagerDutyCard';
 export {
-  PagerDutyClientApi,
+  PagerDutyClient,
   pagerDutyApiRef,
   UnauthorizedError,
 } from './api/client';

plugins/pagerduty/src/plugin.ts

@@ -19,7 +19,7 @@ import {
   createRouteRef,
   discoveryApiRef,
 } from '@backstage/core';
-import { pagerDutyApiRef, PagerDutyClientApi } from './api';
+import { pagerDutyApiRef, PagerDutyClient } from './api';
 
 export const rootRouteRef = createRouteRef({
   path: '/pagerduty',
@@ -33,7 +33,7 @@ export const plugin = createPlugin({
       api: pagerDutyApiRef,
       deps: { discoveryApi: discoveryApiRef },
       factory: ({ discoveryApi }) =>
-        new PagerDutyClientApi({
+        new PagerDutyClient({
           discoveryApi: discoveryApi,
         }),
     }),