@@ -175,9 +176,9 @@ const Home: FC = () => {
)
: (
-
+
Login to CRDC Submission Portal
-
+
Please login with a Login.gov account to make a data submission request or to upload data for approved submissions
diff --git a/src/content/organizations/ListView.tsx b/src/content/organizations/ListView.tsx
index c9078570..bf26bc8c 100644
--- a/src/content/organizations/ListView.tsx
+++ b/src/content/organizations/ListView.tsx
@@ -1,8 +1,7 @@
import React, { ElementType, FC, useEffect, useMemo, useState } from "react";
import {
- Alert, Box, Button, CircularProgress,
- Container, FormControl, MenuItem,
- OutlinedInput,
+ Alert, Box, Button,
+ Container, FormControl, MenuItem, OutlinedInput,
Select, Stack, Table, TableBody, TableCell,
TableContainer, TableHead, TablePagination, TableRow,
TableSortLabel, Typography, styled,
@@ -12,6 +11,7 @@ import { Controller, useForm } from 'react-hook-form';
import PageBanner from "../../components/PageBanner";
import Tooltip from '../../components/Tooltip';
import { useOrganizationListContext, Status } from '../../components/Contexts/OrganizationListContext';
+import SuspenseLoader from '../../components/SuspenseLoader';
type T = Partial
;
@@ -338,15 +338,15 @@ const ListingView: FC = () => {
- Organization
+ Organization
-
+
- Study
+ Study
-
+
- Status
+ Status
{
defaultValue="All"
value={field.value || "All"}
MenuProps={{ disablePortal: true }}
+ inputProps={{ id: "status-filter" }}
>
@@ -391,22 +392,7 @@ const ListingView: FC = () => {
{status === Status.LOADING && (
-
-
-
+
)}
@@ -461,6 +447,7 @@ const ListingView: FC = () => {
|| emptyRows > 0
|| status === Status.LOADING,
}}
+ SelectProps={{ inputProps: { "aria-label": "rows per page" }, native: true }}
backIconButtonProps={{ disabled: page === 0 || status === Status.LOADING }}
/>
diff --git a/src/content/organizations/OrganizationView.tsx b/src/content/organizations/OrganizationView.tsx
index 9ff4ee15..f4a956d7 100644
--- a/src/content/organizations/OrganizationView.tsx
+++ b/src/content/organizations/OrganizationView.tsx
@@ -308,7 +308,7 @@ const OrganizationView: FC = ({ _id }: Props) => {
spacing={2}
>
-
+
{_id !== "new" ? "Edit" : "Add"}
{" "}
Organization
@@ -323,11 +323,16 @@ const OrganizationView: FC = ({ _id }: Props) => {
)}
- {_id !== "new" ? "Organization" : "Name"}
-
+ {_id !== "new" ? "Organization" : "Name"}
+
- Primary Contact
+ Primary Contact
= ({ _id }: Props) => {
{...field}
value={field.value || ""}
MenuProps={{ disablePortal: true }}
+ inputProps={{ "aria-labelledby": "primaryContactLabel" }}
>
{activeCurators?.listActiveCurators?.map(({ userID, firstName, lastName }) => (
@@ -349,7 +355,7 @@ const OrganizationView: FC = ({ _id }: Props) => {
- Studies
+ Studies
= ({ _id }: Props) => {
{...field}
value={field.value || []}
MenuProps={{ disablePortal: true }}
+ inputProps={{ "aria-labelledby": "studiesLabel" }}
multiple
>
{approvedStudies?.listApprovedStudies?.map(({ studyName, studyAbbreviation }) => (
@@ -374,7 +381,7 @@ const OrganizationView: FC = ({ _id }: Props) => {
/>
- Status
+ Status
= ({ _id }: Props) => {
value={field.value || ""}
disabled={_id === "new"}
MenuProps={{ disablePortal: true }}
+ inputProps={{ "aria-labelledby": "statusLabel" }}
>
diff --git a/src/content/questionnaire/ListView.tsx b/src/content/questionnaire/ListView.tsx
index f23b2231..842aa37a 100644
--- a/src/content/questionnaire/ListView.tsx
+++ b/src/content/questionnaire/ListView.tsx
@@ -5,7 +5,7 @@ import {
Table, TableBody, TableCell,
TableContainer, TableHead,
TablePagination, TableRow,
- TableSortLabel, Typography, Box, CircularProgress,
+ TableSortLabel, Typography,
} from "@mui/material";
import { LoadingButton } from '@mui/lab';
import { useMutation, useQuery } from '@apollo/client';
@@ -15,6 +15,7 @@ import PageBanner from '../../components/PageBanner';
import { FormatDate } from '../../utils';
import { useAuthContext } from '../../components/Contexts/AuthContext';
import { mutation as SAVE_APP, Response as SaveAppResp } from '../../graphql/saveApplication';
+import SuspenseLoader from '../../components/SuspenseLoader';
type T = Omit;
@@ -296,22 +297,7 @@ const ListingView: FC = () => {
{loading && (
-
-
-
+
)}
@@ -365,6 +351,7 @@ const ListingView: FC = () => {
|| emptyRows > 0
|| loading
}}
+ SelectProps={{ inputProps: { "aria-label": "rows per page" }, native: true }}
backIconButtonProps={{ disabled: page === 0 || loading }}
/>
diff --git a/src/content/questionnaire/sections/A.tsx b/src/content/questionnaire/sections/A.tsx
index 2210a63a..b219c7fe 100644
--- a/src/content/questionnaire/sections/A.tsx
+++ b/src/content/questionnaire/sections/A.tsx
@@ -220,6 +220,7 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection
name="piAsPrimaryContact"
data-type="boolean"
value={piAsPrimaryContact?.toString()}
+ aria-label="Same as Principal Investigator"
checked
readOnly
/>
diff --git a/src/content/questionnaire/sections/B.tsx b/src/content/questionnaire/sections/B.tsx
index 7a2ca015..b5c6740b 100644
--- a/src/content/questionnaire/sections/B.tsx
+++ b/src/content/questionnaire/sections/B.tsx
@@ -333,6 +333,7 @@ const FormSectionB: FC = ({ SectionOption, refs }: FormSection
name="program[notApplicable]"
type="checkbox"
data-type="boolean"
+ aria-labelledby="section-b-program"
checked
readOnly={readOnlyProgram}
/>
@@ -343,6 +344,7 @@ const FormSectionB: FC = ({ SectionOption, refs }: FormSection
name="program[isCustom]"
type="checkbox"
data-type="boolean"
+ aria-labelledby="section-b-program"
checked
readOnly={readOnlyProgram}
/>
diff --git a/src/content/questionnaire/sections/D.tsx b/src/content/questionnaire/sections/D.tsx
index 7fd15493..6320f9d7 100644
--- a/src/content/questionnaire/sections/D.tsx
+++ b/src/content/questionnaire/sections/D.tsx
@@ -252,7 +252,7 @@ const FormSectionD: FC = ({ SectionOption, refs }: FormSection
required
error={dataTypesErrorMsg}
>
-
+
= ({ SectionOption, refs }: FormSection
name={`files[${idx}][count]`}
value={fileData.count ?? ""}
placeholder="Enter file count"
+ inputProps={{ "aria-label": "File count" }}
pattern="^[1-9]\d*$"
filter={filterPositiveIntegerString}
patternValidityMessage="Please enter a whole number greater than 0"
@@ -487,6 +488,7 @@ const FormSectionD: FC = ({ SectionOption, refs }: FormSection
name={`files[${idx}][amount]`}
value={fileData.amount}
placeholder="E.g. 500 GB"
+ inputProps={{ "aria-label": "File size" }}
maxLength={50}
required
/>
@@ -501,6 +503,7 @@ const FormSectionD: FC = ({ SectionOption, refs }: FormSection
startIcon={}
iconColor="#E74040"
disabled={readOnlyInputs || status === FormStatus.SAVING}
+ aria-label="Remove File Type"
sx={{ minWidth: "0px !important" }}
/>