chore (release): version 0.7.1 (#39)

- fix yarn conflict that is preventing merge due to main branch lock - revert unstable backstage package and its dependencies - changed release publishing to a manual process - add support for profile images - refactor oncall user list behavior to only show users on escalation level 1 - remove duplicates from oncall user list
PagerDuty · Nov 16, 2023 · 9830bc5 · 9830bc5
1 parent 94e6823
commit 9830bc5
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 7 deletions.
diff --git a/dev/mockPagerDutyApi.ts b/dev/mockPagerDutyApi.ts
@@ -39,6 +39,7 @@ export const mockPagerDutyApi: PagerDutyApi = {
             email: 'email@email.com',
             html_url: 'http://user',
             name: 'some-user',
+            avatar_url: 'http://avatar',
           },
         },
       },
@@ -61,6 +62,7 @@ export const mockPagerDutyApi: PagerDutyApi = {
             email: 'email@email.com',
             html_url: 'http://user',
             name: 'some-user',
+            avatar_url: 'http://avatar',
           },
         },
       },
@@ -122,21 +124,22 @@ export const mockPagerDutyApi: PagerDutyApi = {
   },
 
   async getOnCallByPolicyId() {
-    const oncall = (name: string, escalation: number) => {
+    const oncall = (id: string, name: string, escalation: number) => {
       return {
         user: {
-          id: '123',
+          id: id,
           name: name,
           html_url: 'http://assignee',
           summary: 'summary',
           email: 'email@email.com',
+          avatar_url: 'http://avatar',
         },
         escalation_level: escalation,
       };
     };
 
     return {
-      oncalls: [oncall('Jane Doe', 1), oncall('John Doe', 2)],
+      oncalls: [oncall('1', 'Jane Doe', 1), oncall('2', 'John Doe', 2), oncall('3', 'James Doe', 1)],
     };
   },
 

diff --git a/src/api/client.test.ts b/src/api/client.test.ts
@@ -40,6 +40,7 @@ const user: PagerDutyUser = {
   summary: 'person1',
   email: 'person1@example.com',
   html_url: 'http://a.com/id1',
+  avatar_url: 'http://a.com/id1/avatar',
 };
 
 const service: PagerDutyService = {

diff --git a/src/components/EntityPagerDutyCard/index.test.tsx b/src/components/EntityPagerDutyCard/index.test.tsx
@@ -79,6 +79,7 @@ const user: PagerDutyUser = {
   summary: 'person1',
   email: 'person1@example.com',
   html_url: 'http://a.com/id1',
+  avatar_url: 'http://a.com/id1/avatar',
 };
 
 const service: PagerDutyService = {

diff --git a/src/components/Escalation/Escalation.test.tsx b/src/components/Escalation/Escalation.test.tsx
@@ -57,8 +57,9 @@ describe('Escalation', () => {
               id: 'p1',
               summary: 'person1',
               email: 'person1@example.com',
-              html_url: 'http://a.com/id1',
+              html_url: 'http://a.com/id1',              
             } as PagerDutyUser,
+            escalation_level: 1,
           },
         ],
       }));
@@ -77,6 +78,139 @@ describe('Escalation', () => {
     expect(mockPagerDutyApi.getOnCallByPolicyId).toHaveBeenCalledWith('abc');
   });
 
+  it("Renders a list of users without duplicates", async () => {
+    mockPagerDutyApi.getOnCallByPolicyId = jest
+      .fn()
+      .mockImplementationOnce(async () => ({
+        oncalls: [
+          {
+            user: {
+              name: "person1",
+              id: "p1",
+              summary: "person1",
+              email: "person1@example.com",
+              html_url: "http://a.com/id1",
+            } as PagerDutyUser,
+            escalation_level: 1,
+          },
+          {
+            user: {
+              name: "person2",
+              id: "p2",
+              summary: "person2",
+              email: "person2@example.com",
+              html_url: "http://a.com/id2",
+            } as PagerDutyUser,
+            escalation_level: 1,
+          },
+          {
+            user: {
+              name: "person2",
+              id: "p2",
+              summary: "person2",
+              email: "person2@example.com",
+              html_url: "http://a.com/id2",
+            } as PagerDutyUser,
+            escalation_level: 1,
+          },
+        ],
+      }));
+
+    const { getByText, queryByTestId, queryAllByText } = render(
+      wrapInTestApp(
+        <ApiProvider apis={apis}>
+          <EscalationPolicy policyId="abc" />
+        </ApiProvider>
+      )
+    );
+    await waitFor(() => !queryByTestId("progress"));
+
+    expect(getByText("person1")).toBeInTheDocument();
+    expect(getByText("person1@example.com")).toBeInTheDocument();
+    expect(queryAllByText("person2").length).toBe(1);
+    expect(queryAllByText("person2@example.com").length).toBe(1);
+    expect(mockPagerDutyApi.getOnCallByPolicyId).toHaveBeenCalledWith("abc");
+  });
+
+  it("Renders only user(s) in escalation level 1", async () => {
+    mockPagerDutyApi.getOnCallByPolicyId = jest
+      .fn()
+      .mockImplementationOnce(async () => ({
+        oncalls: [
+          {
+            user: {
+              name: "person1",
+              id: "p1",
+              summary: "person1",
+              email: "person1@example.com",
+              html_url: "http://a.com/id1",
+            } as PagerDutyUser,
+            escalation_level: 1,
+          },
+          {
+            user: {
+              name: "person2",
+              id: "p2",
+              summary: "person2",
+              email: "person2@example.com",
+              html_url: "http://a.com/id2",
+            } as PagerDutyUser,
+            escalation_level: 2,
+          },
+        ],
+      }));
+
+    const { getByText, queryByTestId, queryByText } = render(
+      wrapInTestApp(
+        <ApiProvider apis={apis}>
+          <EscalationPolicy policyId="abc" />
+        </ApiProvider>
+      )
+    );
+    await waitFor(() => !queryByTestId("progress"));
+
+    expect(getByText("person1")).toBeInTheDocument();
+    expect(getByText("person1@example.com")).toBeInTheDocument();
+    expect(queryByText("person2")).not.toBeInTheDocument();
+    expect(queryByText("person2@example.com")).not.toBeInTheDocument();
+    expect(mockPagerDutyApi.getOnCallByPolicyId).toHaveBeenCalledWith("abc");
+  });
+
+  it("Renders a user with profile picture", async () => {
+    mockPagerDutyApi.getOnCallByPolicyId = jest
+      .fn()
+      .mockImplementationOnce(async () => ({
+        oncalls: [
+          {
+            user: {
+              name: "person1",
+              id: "p1",
+              summary: "person1",
+              email: "person1@example.com",
+              html_url: "http://a.com/id1",
+              avatar_url:
+                "https://gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y",
+            } as PagerDutyUser,
+            escalation_level: 1,
+          },
+        ],
+      }));
+
+    const { getByText, queryByTestId, getByAltText } = render(
+      wrapInTestApp(
+        <ApiProvider apis={apis}>
+          <EscalationPolicy policyId="abc" />
+        </ApiProvider>
+      )
+    );
+    await waitFor(() => !queryByTestId("progress"));
+
+    expect(getByText("person1")).toBeInTheDocument();
+    expect(getByText("person1@example.com")).toBeInTheDocument();
+    expect(getByAltText("User")).toHaveAttribute("src", "https://gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y")
+    expect(mockPagerDutyApi.getOnCallByPolicyId).toHaveBeenCalledWith("abc");
+  });
+
   it('Handles errors', async () => {
     mockPagerDutyApi.getOnCallByPolicyId = jest
       .fn()

diff --git a/src/components/Escalation/EscalationPolicy.tsx b/src/components/Escalation/EscalationPolicy.tsx
@@ -39,8 +39,20 @@ export const EscalationPolicy = ({ policyId }: Props) => {
   } = useAsync(async () => {
     const { oncalls } = await api.getOnCallByPolicyId(policyId);
     const usersItem = oncalls
-      .sort((a, b) => a.escalation_level - b.escalation_level)
-      .map(oncall => oncall.user);
+      .filter((oncall) => oncall.escalation_level === 1)
+      .sort((a, b) => a.user.name > b.user.name ? 1 : -1)
+      .map((oncall) => oncall.user);
+
+    // remove duplicates from usersItem
+    const uniqueUsers = new Map();
+    usersItem.forEach((user) => {
+      uniqueUsers.set(user.id, user);
+    });
+
+    usersItem.length = 0;
+    uniqueUsers.forEach((user) => {
+      usersItem.push(user);
+    });
 
     return usersItem;
   });

diff --git a/src/components/Escalation/EscalationUser.tsx b/src/components/Escalation/EscalationUser.tsx
@@ -46,7 +46,7 @@ export const EscalationUser = ({ user }: Props) => {
   return (
     <ListItem>
       <ListItemIcon>
-        <Avatar alt="User" />
+        <Avatar alt="User" src={user.avatar_url} />
       </ListItemIcon>
       <ListItemText
         primary={

diff --git a/src/components/PagerDutyCard/index.test.tsx b/src/components/PagerDutyCard/index.test.tsx
@@ -31,6 +31,7 @@ const user: PagerDutyUser = {
   summary: 'person1',
   email: 'person1@example.com',
   html_url: 'http://a.com/id1',
+  avatar_url: 'http://a.com/id1/avatar',
 };
 
 const service: PagerDutyService = {

diff --git a/src/components/types.ts b/src/components/types.ts
@@ -82,6 +82,7 @@ export type PagerDutyUser = {
   email: string;
   html_url: string;
   name: string;
+  avatar_url: string;
 };
 
 /** @public */