Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test run page & replace renderer's iframe #315

Merged
merged 51 commits into from
Sep 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
aac0c9d
added all buttons to interact with minus iframe (some missing functio…
howard-e Aug 2, 2021
bc6b8d6
addressing key conflicts during render; adding testPlanReport to be l…
howard-e Aug 2, 2021
419dfc5
updated common components; updated conflictsResolver for testPlanReport
howard-e Aug 4, 2021
bf23a3d
review conflicts and raise issue modal tweaks
howard-e Aug 6, 2021
0554e3c
Merge branch 'develop' into new-test-run-frontend
howard-e Aug 6, 2021
c723015
status bar css fix
howard-e Aug 6, 2021
53550d9
review reviewconflicts modal
howard-e Aug 9, 2021
0353e4b
further revisions to account for modals
howard-e Aug 9, 2021
8b0712d
open as functionality fix
howard-e Aug 9, 2021
9e47946
lint fix
howard-e Aug 9, 2021
0625245
base component of new testrenderer
howard-e Aug 12, 2021
90142d6
base component of new testrenderer
howard-e Aug 13, 2021
765e28e
results view for renderer
howard-e Aug 13, 2021
be4bd73
graphql schema changes to support removal of serializedForm, remainin…
howard-e Aug 14, 2021
18d4bf1
misc
howard-e Aug 14, 2021
4ab0567
misc cleanups
howard-e Aug 16, 2021
dc62f00
misc cleanup
howard-e Aug 16, 2021
132fbe9
import harness files locally until module resolution is sorted
howard-e Aug 16, 2021
f83b183
addressed close test window hook issue
howard-e Aug 17, 2021
82048dc
passing setup scripts to test renderer
howard-e Aug 17, 2021
d083333
revised button labels to follow APA Title Case standard; revised test…
howard-e Aug 19, 2021
22b877c
lint fix
howard-e Aug 19, 2021
9a279db
axios and sequelize version updates; addressed github action build er…
howard-e Aug 19, 2021
a57994c
updated github action to pull stable "pre-build", "post-build" and "c…
howard-e Aug 19, 2021
bb99fb0
fix for flicker when creating GitHub Issue, misc styling changes for …
howard-e Aug 19, 2021
239c24c
shadowing functionality edge case
howard-e Aug 20, 2021
84b1e3c
filtered tests by ats
howard-e Aug 20, 2021
8490470
misc
howard-e Aug 20, 2021
4f6efb4
updated test mocks
howard-e Aug 20, 2021
5a07ebe
focus improvements
howard-e Aug 20, 2021
1bc626e
updated migration scripts
howard-e Aug 20, 2021
0918d29
updated migration scripts
howard-e Aug 20, 2021
63d9c21
relaxed constraints for TestPlanTarget and connected At/Browser Versions
howard-e Aug 20, 2021
d6343b7
focus input on error
howard-e Aug 22, 2021
6ded740
aria adjustments
howard-e Aug 23, 2021
86c6410
refined focus when navigating between pages, addressed TestRenderer v…
howard-e Aug 24, 2021
ffa3e12
focus on edit and submit
howard-e Aug 24, 2021
c020d1c
misc
howard-e Aug 24, 2021
e650630
conditional heading focus on submit
howard-e Aug 24, 2021
2bb0d41
lint fix
howard-e Aug 24, 2021
c3345b6
re-push
howard-e Aug 24, 2021
13d10a4
Fix seeders for old environments
alflennik Aug 24, 2021
5f33c4b
Merge branch 'new-test-run-frontend' of https://github.com/w3c/aria-a…
alflennik Aug 24, 2021
2905c20
Merge branch 'develop' into new-test-run-frontend
alflennik Aug 24, 2021
747a822
Fix incorrect merge resolutions
alflennik Aug 24, 2021
769a3a2
predicatable sorting for TestPlanReport and TestPlanVersion resolvers
howard-e Aug 24, 2021
f0aecb0
Add IsaDC and SinaBahram to testers.txt
jscholes Aug 26, 2021
56195d2
Merge pull request #316 from w3c/testers-file-updates
jscholes Aug 26, 2021
dc32966
Merge branch 'develop' into new-test-run-frontend
alflennik Aug 27, 2021
04f8ee1
updating renderer resources
howard-e Sep 1, 2021
6ece285
Merge remote-tracking branch 'origin/new-test-run-frontend' into new-…
howard-e Sep 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/runtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
- run: yarn --version
- name: Install PostgreSQL 12
run: |
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" |sudo tee /etc/apt/sources.list.d/pgdg.list
sudo apt-get -y update
sudo apt-get -y install postgresql-12
sudo apt-get -y install postgresql-client-12
- name: before_install
Expand All @@ -34,6 +37,7 @@ jobs:
yarn sequelize:test db:seed:all
yarn workspace server db-import-tests:test -c ${IMPORT_ARIA_AT_TESTS_COMMIT_1}
yarn workspace server db-import-tests:test -c ${IMPORT_ARIA_AT_TESTS_COMMIT_2}
yarn workspace server db-import-tests:test
yarn workspace server db-populate-sample-data:test
- name: test
run: yarn test
Expand Down
35 changes: 15 additions & 20 deletions client/components/App/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import { Link, useLocation } from 'react-router-dom';
import { Container, Navbar, Nav } from 'react-bootstrap';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
import { ME_QUERY } from '../TestQueue/queries';
import { ME_QUERY } from './queries';
import routes from '../../routes';
import useSigninUrl from './useSigninUrl';
import './App.css';

const App = ({ auth, dispatch }) => {
const { client, error, loading, data } = useQuery(ME_QUERY);
const { client, loading, data } = useQuery(ME_QUERY);
const signinUrl = useSigninUrl();
const location = useLocation();

const { isSignedIn, isSignOutCalled, isTester, isAdmin, username } = auth;
const { isSignedIn, isSignOutCalled, isTester, username } = auth;

const signOut = async () => {
dispatch(signOutAction());
Expand All @@ -36,11 +36,6 @@ const App = ({ auth, dispatch }) => {
if (!isSignOutCalled && !username && data && data.me)
dispatch(signInAction(data.me));

if (error) {
// TODO: Display error message / page for failed user auth attempt
// dispatch(signInFailAction());
}

return (
<Fragment>
<Container fluid>
Expand Down Expand Up @@ -101,18 +96,18 @@ const App = ({ auth, dispatch }) => {
Test Queue
</Nav.Link>
)}
{isAdmin && (
<Nav.Link
as={Link}
to="/admin/configure-runs"
aria-current={
location.pathname ===
'/admin/configure-runs'
}
>
Test Configuration
</Nav.Link>
)}
{/*{isAdmin && (*/}
{/* <Nav.Link*/}
{/* as={Link}*/}
{/* to="/admin/configure-runs"*/}
{/* aria-current={*/}
{/* location.pathname ===*/}
{/* '/admin/configure-runs'*/}
{/* }*/}
{/* >*/}
{/* Test Configuration*/}
{/* </Nav.Link>*/}
{/*)}*/}
<Nav.Link
as={Link}
to="/account/settings"
Expand Down
11 changes: 11 additions & 0 deletions client/components/App/queries.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { gql } from '@apollo/client';

export const ME_QUERY = gql`
query {
me {
id
username
roles
}
}
`;
13 changes: 3 additions & 10 deletions client/components/Home/Home.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { gql, useQuery } from '@apollo/client';
import { useQuery } from '@apollo/client';
import { Helmet } from 'react-helmet';
import { Button, Container } from 'react-bootstrap';
import testConfigurationScreenshot from '../../assets/home-page/config-test.jpg';
Expand All @@ -14,17 +14,10 @@ import iconReviewTests from '../../assets/review-tests.jpg';
import iconFixIssue from '../../assets/fix-issue.jpg';
import heroImage from '../../assets/hero-illustration.png';
import useSigninUrl from '../App/useSigninUrl';

const HOME_QUERY = gql`
query {
me {
username
}
}
`;
import { ME_QUERY } from '../App/queries';

const Home = () => {
const { loading, data } = useQuery(HOME_QUERY);
const { loading, data } = useQuery(ME_QUERY);
const signinUrl = useSigninUrl();

if (loading) return null;
Expand Down
Loading