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

* added all buttons to interact with minus iframe (some missing functionality to be added) * addressing key conflicts during render; adding testPlanReport to be linked from TestPlanRun * updated common components; updated conflictsResolver for testPlanReport * review conflicts and raise issue modal tweaks * status bar css fix * review reviewconflicts modal * further revisions to account for modals * open as functionality fix * lint fix * base component of new testrenderer * base component of new testrenderer * results view for renderer * graphql schema changes to support removal of serializedForm, remaining functionality added for test run page * misc * misc cleanups * misc cleanup * import harness files locally until module resolution is sorted * addressed close test window hook issue * passing setup scripts to test renderer * revised button labels to follow APA Title Case standard; revised tests; addressed authentication edge cases; addressed edge cases around test run page's variables * lint fix * axios and sequelize version updates; addressed github action build error for postgres install by including v12 GPG key * updated github action to pull stable "pre-build", "post-build" and "current-build" commits for the import tests action from aria-at * fix for flicker when creating GitHub Issue, misc styling changes for TestRenderer * shadowing functionality edge case * filtered tests by ats * misc * updated test mocks * focus improvements * updated migration scripts * updated migration scripts * relaxed constraints for TestPlanTarget and connected At/Browser Versions * focus input on error * aria adjustments * refined focus when navigating between pages, addressed TestRenderer visual flicker, minor QOL changes * focus on edit and submit * misc * conditional heading focus on submit * lint fix * re-push * Fix seeders for old environments * Fix incorrect merge resolutions * predicatable sorting for TestPlanReport and TestPlanVersion resolvers * Add IsaDC and SinaBahram to testers.txt * updating renderer resources Co-authored-by: alflennik <[email protected]> Co-authored-by: James Scholes <[email protected]>
w3c · Sep 7, 2021 · c8cc93a · c8cc93a
1 parent 042f124
commit c8cc93a
Show file tree

Hide file tree

Showing 89 changed files with 8,575 additions and 2,014 deletions.
diff --git a/.github/workflows/runtest.yml b/.github/workflows/runtest.yml
@@ -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
@@ -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

diff --git a/client/components/App/App.jsx b/client/components/App/App.jsx
@@ -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());
@@ -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>
@@ -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"

diff --git a/client/components/App/queries.js b/client/components/App/queries.js
@@ -0,0 +1,11 @@
+import { gql } from '@apollo/client';
+
+export const ME_QUERY = gql`
+    query {
+        me {
+            id
+            username
+            roles
+        }
+    }
+`;
diff --git a/client/components/Home/Home.jsx b/client/components/Home/Home.jsx
@@ -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';
@@ -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;