Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/frontend/storybook/m…
Browse files Browse the repository at this point in the history 
…anager-webpack5-6.5.16
  • Loading branch information
@johanna-skylight
johanna-skylight authored Jul 3, 2023
2 parents 331d17c + b9f5e69 commit e29630d
Show file tree
Hide file tree
Showing 4 changed files with 314 additions and 32 deletions.
2 changes: 1 addition & 1 deletion cypress/e2e/01-organization_sign_up.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe("Organization sign up",() => {
cy.injectSRAxe();
cy.checkA11y();

cy.contains("Organizations pending identify verification").click();
cy.contains("Identify verification").click();
cy.get("[data-cy=pending-orgs-title]").should("be.visible");

cy.contains("td", `${organization.name}`);
Expand Down
25 changes: 25 additions & 0 deletions frontend/src/app/supportAdmin/SupportAdmin.test.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { render } from "@testing-library/react";
import { MemoryRouter } from "react-router-dom";
import * as flaggedMock from "flagged";

import SupportAdmin from "./SupportAdmin";

describe("SupportAdming", () => {
const renderWithRouter = () =>
render(
<MemoryRouter>
<SupportAdmin />
</MemoryRouter>
);

it("loads menu categories", () => {
const { container } = renderWithRouter();
expect(container).toMatchSnapshot();
});

it("loads menu categories including Beta", () => {
jest.spyOn(flaggedMock, "useFeature").mockReturnValueOnce(true);
const { container } = renderWithRouter();
expect(container).toMatchSnapshot();
});
});
85 changes: 54 additions & 31 deletions frontend/src/app/supportAdmin/SupportAdmin.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@ import { useFeature } from "flagged";
import { LinkWithQuery } from "../commonComponents/LinkWithQuery";
import { useDocumentTitle } from "../utils/hooks";

type CategoryMenuProps = {
heading: string;
children: React.ReactNode;
};

const CategoryMenu: React.FC<CategoryMenuProps> = ({
heading,
children,
}: CategoryMenuProps) => (
<div className="desktop:grid-col-4 tablet:grid-col-4 mobile:grid-col-1">
<h2 className="font-heading-md margin-bottom-0 margin-top-2">{heading}</h2>
<ul className="usa-list padding-left-2">{children}</ul>
</div>
);

const SupportAdmin = () => {
useDocumentTitle("Support admin");
const hivEnabled = useFeature("hivEnabled") as boolean;
Expand All @@ -20,38 +35,46 @@ const SupportAdmin = () => {
</div>
</div>
<div className="usa-card__body">
<div>
<LinkWithQuery to={`/admin/pending-organizations`}>
Organizations pending identify verification
</LinkWithQuery>
</div>
<div>
<LinkWithQuery to="/admin/add-organization-admin">
Add organization admin
</LinkWithQuery>
</div>
<div>
<LinkWithQuery to="/admin/create-device-type">
Add a new testing device
</LinkWithQuery>
</div>
<div>
<LinkWithQuery to="/admin/manage-devices">
Edit existing testing device
</LinkWithQuery>
</div>
<div>
<LinkWithQuery to="/admin/tenant-data-access">
Organization data
</LinkWithQuery>
<div className="grid-row grid-gap">
<CategoryMenu heading="Organization">
<li>
<LinkWithQuery to={`/admin/pending-organizations`}>
Identify verification
</LinkWithQuery>
</li>
<li>
<LinkWithQuery to="/admin/add-organization-admin">
Add organization admin
</LinkWithQuery>
</li>
<li>
<LinkWithQuery to="/admin/tenant-data-access">
Organization data
</LinkWithQuery>
</li>
</CategoryMenu>
<CategoryMenu heading="Test Devices">
<li>
<LinkWithQuery to="/admin/create-device-type">
Add a new testing device
</LinkWithQuery>
</li>
<li>
<LinkWithQuery to="/admin/manage-devices">
Edit existing testing device
</LinkWithQuery>
</li>
</CategoryMenu>
{hivEnabled && (
<CategoryMenu heading="Beta">
<li>
<LinkWithQuery to="/admin/hiv-csv-upload">
Beta - HIV CSV Upload
</LinkWithQuery>
</li>
</CategoryMenu>
)}
</div>
{hivEnabled && (
<div>
<LinkWithQuery to="/admin/hiv-csv-upload">
Beta - HIV CSV Upload
</LinkWithQuery>
</div>
)}
</div>
</div>
</div>
Expand Down
234 changes: 234 additions & 0 deletions frontend/src/app/supportAdmin/__snapshots__/SupportAdmin.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`SupportAdming loads menu categories 1`] = `
<div>
<div
class="prime-home flex-1"
>
<div
class="grid-container"
>
<div
class="grid-row"
>
<div
class="prime-container card-container"
>
<div
class="usa-card__header"
>
<div>
<h1
class="font-heading-lg margin-top-0 margin-bottom-0"
>
Support admin
</h1>
</div>
</div>
<div
class="usa-card__body"
>
<div
class="grid-row grid-gap"
>
<div
class="desktop:grid-col-4 tablet:grid-col-4 mobile:grid-col-1"
>
<h2
class="font-heading-md margin-bottom-0 margin-top-2"
>
Organization
</h2>
<ul
class="usa-list padding-left-2"
>
<li>
<a
class=""
href="/admin/pending-organizations"
>
Identify verification
</a>
</li>
<li>
<a
class=""
href="/admin/add-organization-admin"
>
Add organization admin
</a>
</li>
<li>
<a
class=""
href="/admin/tenant-data-access"
>
Organization data
</a>
</li>
</ul>
</div>
<div
class="desktop:grid-col-4 tablet:grid-col-4 mobile:grid-col-1"
>
<h2
class="font-heading-md margin-bottom-0 margin-top-2"
>
Test Devices
</h2>
<ul
class="usa-list padding-left-2"
>
<li>
<a
class=""
href="/admin/create-device-type"
>
Add a new testing device
</a>
</li>
<li>
<a
class=""
href="/admin/manage-devices"
>
Edit existing testing device
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
`;

exports[`SupportAdming loads menu categories including Beta 1`] = `
<div>
<div
class="prime-home flex-1"
>
<div
class="grid-container"
>
<div
class="grid-row"
>
<div
class="prime-container card-container"
>
<div
class="usa-card__header"
>
<div>
<h1
class="font-heading-lg margin-top-0 margin-bottom-0"
>
Support admin
</h1>
</div>
</div>
<div
class="usa-card__body"
>
<div
class="grid-row grid-gap"
>
<div
class="desktop:grid-col-4 tablet:grid-col-4 mobile:grid-col-1"
>
<h2
class="font-heading-md margin-bottom-0 margin-top-2"
>
Organization
</h2>
<ul
class="usa-list padding-left-2"
>
<li>
<a
class=""
href="/admin/pending-organizations"
>
Identify verification
</a>
</li>
<li>
<a
class=""
href="/admin/add-organization-admin"
>
Add organization admin
</a>
</li>
<li>
<a
class=""
href="/admin/tenant-data-access"
>
Organization data
</a>
</li>
</ul>
</div>
<div
class="desktop:grid-col-4 tablet:grid-col-4 mobile:grid-col-1"
>
<h2
class="font-heading-md margin-bottom-0 margin-top-2"
>
Test Devices
</h2>
<ul
class="usa-list padding-left-2"
>
<li>
<a
class=""
href="/admin/create-device-type"
>
Add a new testing device
</a>
</li>
<li>
<a
class=""
href="/admin/manage-devices"
>
Edit existing testing device
</a>
</li>
</ul>
</div>
<div
class="desktop:grid-col-4 tablet:grid-col-4 mobile:grid-col-1"
>
<h2
class="font-heading-md margin-bottom-0 margin-top-2"
>
Beta
</h2>
<ul
class="usa-list padding-left-2"
>
<li>
<a
class=""
href="/admin/hiv-csv-upload"
>
Beta - HIV CSV Upload
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
`;

0 comments on commit e29630d

Please sign in to comment.