fixed orgdash change

duplixx · Nov 10, 2024 · 1e96c52 · 1e96c52
1 parent 48f7799
commit 1e96c52
Show file tree

Hide file tree

Showing 2 changed files with 123 additions and 120 deletions.
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx
@@ -120,158 +120,158 @@ describe('Testing Organization Dashboard Screen', () => {
     await waitFor(() => {
       expect(screen.getByTestId('paramsError')).toBeInTheDocument();
     });
+  });
 
-    it('should render Organization Dashboard screen', async () => {
-      renderOrganizationDashboard(link1);
-
-      // Dashboard cards
-      const membersBtn = await screen.findByText(t.members);
-      expect(membersBtn).toBeInTheDocument();
-      expect(screen.getByText(t.admins)).toBeInTheDocument();
-      expect(screen.getByText(t.posts)).toBeInTheDocument();
-      expect(screen.getByText(t.events)).toBeInTheDocument();
-      expect(screen.getByText(t.blockedUsers)).toBeInTheDocument();
-
-      // Upcoming events
-      expect(screen.getByText(t.upcomingEvents)).toBeInTheDocument();
-      expect(screen.getByText('Event 1')).toBeInTheDocument();
-
-      // Latest posts
-      expect(screen.getByText(t.latestPosts)).toBeInTheDocument();
-      expect(screen.getByText('postone')).toBeInTheDocument();
-
-      // Membership requests
-      expect(screen.getByText(t.membershipRequests)).toBeInTheDocument();
-      expect(screen.getByText('Jane Doe')).toBeInTheDocument();
-
-      // Volunteer rankings
-      expect(screen.getByText(t.volunteerRankings)).toBeInTheDocument();
-      expect(screen.getByText('Teresa Bradley')).toBeInTheDocument();
-    });
-
-    it('Click People Card', async () => {
-      renderOrganizationDashboard(link1);
-      const membersBtn = await screen.findByText(t.members);
-      expect(membersBtn).toBeInTheDocument();
-
-      userEvent.click(membersBtn);
-      await waitFor(() => {
-        expect(screen.getByTestId('orgpeople')).toBeInTheDocument();
-      });
-    });
+  it('should render Organization Dashboard screen', async () => {
+    renderOrganizationDashboard(link1);
 
-    it('Click Admin Card', async () => {
-      renderOrganizationDashboard(link1);
-      const adminsBtn = await screen.findByText(t.admins);
-      expect(adminsBtn).toBeInTheDocument();
-    });
+    // Dashboard cards
+    const membersBtn = await screen.findByText(t.members);
+    expect(membersBtn).toBeInTheDocument();
+    expect(screen.getByText(t.admins)).toBeInTheDocument();
+    expect(screen.getByText(t.posts)).toBeInTheDocument();
+    expect(screen.getByText(t.events)).toBeInTheDocument();
+    expect(screen.getByText(t.blockedUsers)).toBeInTheDocument();
+
+    // Upcoming events
+    expect(screen.getByText(t.upcomingEvents)).toBeInTheDocument();
+    expect(screen.getByText('Event 1')).toBeInTheDocument();
+
+    // Latest posts
+    expect(screen.getByText(t.latestPosts)).toBeInTheDocument();
+    expect(screen.getByText('postone')).toBeInTheDocument();
+
+    // Membership requests
+    expect(screen.getByText(t.membershipRequests)).toBeInTheDocument();
+    expect(screen.getByText('Jane Doe')).toBeInTheDocument();
+
+    // Volunteer rankings
+    expect(screen.getByText(t.volunteerRankings)).toBeInTheDocument();
+    expect(screen.getByText('Teresa Bradley')).toBeInTheDocument();
   });
 
-  it('Click Post Card', async () => {
+  it('Click People Card', async () => {
     renderOrganizationDashboard(link1);
-    const postsBtn = await screen.findByText(t.posts);
-    expect(postsBtn).toBeInTheDocument();
+    const membersBtn = await screen.findByText(t.members);
+    expect(membersBtn).toBeInTheDocument();
 
-    userEvent.click(postsBtn);
+    userEvent.click(membersBtn);
     await waitFor(() => {
-      expect(screen.getByTestId('orgpost')).toBeInTheDocument();
+      expect(screen.getByTestId('orgpeople')).toBeInTheDocument();
     });
   });
 
-  it('Click Events Card', async () => {
+  it('Click Admin Card', async () => {
     renderOrganizationDashboard(link1);
-    const eventsBtn = await screen.findByText(t.events);
-    expect(eventsBtn).toBeInTheDocument();
+    const adminsBtn = await screen.findByText(t.admins);
+    expect(adminsBtn).toBeInTheDocument();
+  });
+});
 
-    userEvent.click(eventsBtn);
-    await waitFor(() => {
-      expect(screen.getByTestId('orgevents')).toBeInTheDocument();
-    });
+it('Click Post Card', async () => {
+  renderOrganizationDashboard(link1);
+  const postsBtn = await screen.findByText(t.posts);
+  expect(postsBtn).toBeInTheDocument();
+
+  userEvent.click(postsBtn);
+  await waitFor(() => {
+    expect(screen.getByTestId('orgpost')).toBeInTheDocument();
   });
+});
 
-  it('Click Blocked Users Card', async () => {
-    renderOrganizationDashboard(link1);
-    const blockedUsersBtn = await screen.findByText(t.blockedUsers);
-    expect(blockedUsersBtn).toBeInTheDocument();
+it('Click Events Card', async () => {
+  renderOrganizationDashboard(link1);
+  const eventsBtn = await screen.findByText(t.events);
+  expect(eventsBtn).toBeInTheDocument();
 
-    userEvent.click(blockedUsersBtn);
-    await waitFor(() => {
-      expect(screen.getByTestId('blockuser')).toBeInTheDocument();
-    });
+  userEvent.click(eventsBtn);
+  await waitFor(() => {
+    expect(screen.getByTestId('orgevents')).toBeInTheDocument();
   });
+});
 
-  it('Click Requests Card', async () => {
-    renderOrganizationDashboard(link1);
-    const requestsBtn = await screen.findByText(t.requests);
-    expect(requestsBtn).toBeInTheDocument();
+it('Click Blocked Users Card', async () => {
+  renderOrganizationDashboard(link1);
+  const blockedUsersBtn = await screen.findByText(t.blockedUsers);
+  expect(blockedUsersBtn).toBeInTheDocument();
 
-    userEvent.click(requestsBtn);
-    await waitFor(() => {
-      expect(screen.getByTestId('requests')).toBeInTheDocument();
-    });
+  userEvent.click(blockedUsersBtn);
+  await waitFor(() => {
+    expect(screen.getByTestId('blockuser')).toBeInTheDocument();
+  });
+});
+
+it('Click Requests Card', async () => {
+  renderOrganizationDashboard(link1);
+  const requestsBtn = await screen.findByText(t.requests);
+  expect(requestsBtn).toBeInTheDocument();
+
+  userEvent.click(requestsBtn);
+  await waitFor(() => {
+    expect(screen.getByTestId('requests')).toBeInTheDocument();
   });
+});
 
-  it('Click View All Events', async () => {
-    renderOrganizationDashboard(link1);
-    const viewAllBtn = await screen.findAllByText(t.viewAll);
-    expect(viewAllBtn[0]).toBeInTheDocument();
+it('Click View All Events', async () => {
+  renderOrganizationDashboard(link1);
+  const viewAllBtn = await screen.findAllByText(t.viewAll);
+  expect(viewAllBtn[0]).toBeInTheDocument();
 
-    userEvent.click(viewAllBtn[0]);
-    await waitFor(() => {
-      expect(screen.getByTestId('orgevents')).toBeInTheDocument();
-    });
+  userEvent.click(viewAllBtn[0]);
+  await waitFor(() => {
+    expect(screen.getByTestId('orgevents')).toBeInTheDocument();
   });
+});
 
-  it('Click View All Posts', async () => {
-    renderOrganizationDashboard(link1);
-    const viewAllBtn = await screen.findAllByText(t.viewAll);
-    expect(viewAllBtn[1]).toBeInTheDocument();
+it('Click View All Posts', async () => {
+  renderOrganizationDashboard(link1);
+  const viewAllBtn = await screen.findAllByText(t.viewAll);
+  expect(viewAllBtn[1]).toBeInTheDocument();
 
-    userEvent.click(viewAllBtn[1]);
-    await waitFor(() => {
-      expect(screen.getByTestId('orgpost')).toBeInTheDocument();
-    });
+  userEvent.click(viewAllBtn[1]);
+  await waitFor(() => {
+    expect(screen.getByTestId('orgpost')).toBeInTheDocument();
   });
+});
 
-  it('Click View All Requests', async () => {
-    renderOrganizationDashboard(link1);
-    const viewAllBtn = await screen.findAllByText(t.viewAll);
-    expect(viewAllBtn[2]).toBeInTheDocument();
+it('Click View All Requests', async () => {
+  renderOrganizationDashboard(link1);
+  const viewAllBtn = await screen.findAllByText(t.viewAll);
+  expect(viewAllBtn[2]).toBeInTheDocument();
 
-    userEvent.click(viewAllBtn[2]);
-    await waitFor(() => {
-      expect(toast.success).toHaveBeenCalled();
-    });
+  userEvent.click(viewAllBtn[2]);
+  await waitFor(() => {
+    expect(toast.success).toHaveBeenCalled();
   });
+});
 
-  it('Click View All Leaderboard', async () => {
-    renderOrganizationDashboard(link1);
-    const viewAllBtn = await screen.findAllByText(t.viewAll);
-    expect(viewAllBtn[3]).toBeInTheDocument();
+it('Click View All Leaderboard', async () => {
+  renderOrganizationDashboard(link1);
+  const viewAllBtn = await screen.findAllByText(t.viewAll);
+  expect(viewAllBtn[3]).toBeInTheDocument();
 
-    userEvent.click(viewAllBtn[3]);
-    await waitFor(() => {
-      expect(screen.getByTestId('leaderboard')).toBeInTheDocument();
-    });
+  userEvent.click(viewAllBtn[3]);
+  await waitFor(() => {
+    expect(screen.getByTestId('leaderboard')).toBeInTheDocument();
   });
+});
 
-  it('should render Organization Dashboard screen with empty data', async () => {
-    renderOrganizationDashboard(link3);
+it('should render Organization Dashboard screen with empty data', async () => {
+  renderOrganizationDashboard(link3);
 
-    await waitFor(() => {
-      expect(screen.getByText(t.noUpcomingEvents)).toBeInTheDocument();
-      expect(screen.getByText(t.noPostsPresent)).toBeInTheDocument();
-      expect(screen.getByText(t.noMembershipRequests)).toBeInTheDocument();
-      expect(screen.getByText(t.noVolunteers)).toBeInTheDocument();
-    });
+  await waitFor(() => {
+    expect(screen.getByText(t.noUpcomingEvents)).toBeInTheDocument();
+    expect(screen.getByText(t.noPostsPresent)).toBeInTheDocument();
+    expect(screen.getByText(t.noMembershipRequests)).toBeInTheDocument();
+    expect(screen.getByText(t.noVolunteers)).toBeInTheDocument();
   });
+});
 
-  it('should redirectt to / if error occurs', async () => {
-    renderOrganizationDashboard(link2);
+it('should redirectt to / if error occurs', async () => {
+  renderOrganizationDashboard(link2);
 
-    await waitFor(() => {
-      expect(toast.error).toHaveBeenCalled();
-      expect(screen.getByTestId('paramsError')).toBeInTheDocument();
-    });
+  await waitFor(() => {
+    expect(toast.error).toHaveBeenCalled();
+    expect(screen.getByTestId('paramsError')).toBeInTheDocument();
   });
 });
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
@@ -210,9 +210,12 @@ function organizationDashboard(): JSX.Element {
                 sm={4}
                 role="button"
                 className="mb-4"
-                onClick={(): void => {
-                  navigate(peopleLink);
-                }}
+                onClick={
+                  /*istanbul ignore next*/
+                  (): void => {
+                    navigate(peopleLink);
+                  }
+                }
               >
                 <DashBoardCard
                   count={data?.organizations[0].admins?.length}