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

Migrate date management from momentjs to dayjs #483

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d83957b
Update some major dependencies, webpack config and proxy management f…
howard-e Jan 5, 2023
7afe41b
Update icon packs
howard-e Jan 5, 2023
512ada5
webpack config changes
howard-e Jan 6, 2023
420c822
Update bootstrap
howard-e Jan 8, 2023
6ab5746
Update eslint & jest
howard-e Jan 9, 2023
d5c71f3
More dependency updates
howard-e Jan 9, 2023
c9ff257
Update connect-pg-simple
howard-e Jan 9, 2023
2e72491
Update dependencies and css
howard-e Jan 9, 2023
8f87f12
Update css
howard-e Jan 9, 2023
e6f15f3
Remove query-string dependency
howard-e Jan 9, 2023
c786f57
Update React
howard-e Jan 10, 2023
787a473
jest.setup.js update
howard-e Jan 10, 2023
9a916e6
Fix attempt for @react-hook/resize-observer library import
howard-e Jan 10, 2023
944130e
Revert "Update React"
howard-e Jan 24, 2023
fce646d
Update runtest.yml to use Node v18
howard-e Jan 24, 2023
8aed201
Updating form text (#485)
evmiguel Feb 8, 2023
7f2c2b2
Update dependencies test (#484)
evmiguel Feb 8, 2023
f922a69
Update React
howard-e Jan 10, 2023
56c2208
Revert "Update React"
howard-e Jan 24, 2023
e436a2d
Remove nodegit dependency
alflennik Feb 8, 2023
b7f2012
Address PR feedback
alflennik Feb 8, 2023
0ccd643
Fix files affected by revert on source branch
howard-e Feb 13, 2023
f9bac4a
Update React
howard-e Jan 10, 2023
944c873
Revert "Update React"
howard-e Jan 24, 2023
5e45a58
Fix fake data seeder
alflennik Feb 8, 2023
d7b9fff
Fix files affected by revert on source branch
howard-e Feb 13, 2023
e8d03fa
Merge pull request #487 from w3c/update-dependencies-fake-data
alflennik Feb 13, 2023
9717984
Merge pull request #486 from w3c/update-dependencies-nodegit
alflennik Feb 13, 2023
40d759f
Fix misspellings in the readme (#490)
alflennik Feb 13, 2023
d6b7dd1
Shift date management from momentjs to dayjs
howard-e Jan 11, 2023
b6b444e
Remove leftover artifacts from before React revert
howard-e Feb 13, 2023
7bdaae9
Update yarn.lock
howard-e Feb 15, 2023
663d8c2
Merge branch 'main' into move-to-dayjs
howard-e Mar 8, 2023
6dd2767
Update yarn.lock
howard-e Mar 8, 2023
3860102
Remove sass-loader dependency after incorrect merge
howard-e Mar 8, 2023
eebb667
Fix result of bad merge
howard-e Mar 8, 2023
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
9 changes: 5 additions & 4 deletions .github/workflows/runtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ jobs:
steps:
- name: Checkout the repository
uses: actions/checkout@v2
- name: Install NodeJS 14
uses: actions/setup-node@v2
- name: Install NodeJS 18
uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '18'
cache: 'npm'
- run: yarn --version
- name: Install PostgreSQL 12
run: |
Expand Down Expand Up @@ -42,5 +43,5 @@ jobs:
run: yarn test
- name: lighthouseci
run: |
npm install -g @lhci/cli@0.8.x
npm install -g @lhci/cli@0.10.0
yarn workspace client lighthouse
File renamed without changes.
22 changes: 19 additions & 3 deletions client/components/App/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ nav.navbar {

.nav-link:hover {
color: #000;
text-decoration: none;
}

a.nav-link {
color: #0b60ab;
}

.nav-link[aria-current='true'] {
Expand Down Expand Up @@ -107,10 +112,12 @@ nav .logo.navbar-brand {

a {
color: #0b60ab;
text-decoration: none;
}

a:hover {
color: #214e86;
text-decoration: underline;
}

h1 {
Expand Down Expand Up @@ -148,9 +155,6 @@ button {

.table thead th {
border-bottom: 0;
}

table thead th {
background: #e9ebee;
}

Expand All @@ -172,6 +176,10 @@ table tbody tr:nth-of-type(odd),
border: 1px solid #d2d5d9;
}

.table td {
padding: 0.75rem;
}

table.table-hover tbody tr:hover,
table tbody tr:hover {
background-color: #f6f8fa;
Expand Down Expand Up @@ -298,6 +306,10 @@ ul li {
color: #d52a49;
}

.form-group {
margin-bottom: 1rem;
}

/* STATUS LABELS */

.status-wrapper {
Expand Down Expand Up @@ -444,6 +456,10 @@ img {
padding-bottom: 2em;
}

ol.breadcrumb {
padding: 0.75rem 1rem;
}

@media (min-width: 700px) {
nav.navbar {
padding: 0.5rem 3rem;
Expand Down
8 changes: 5 additions & 3 deletions client/components/App/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import React, { useEffect, useState } from 'react';
import { useQuery } from '@apollo/client';
import { renderRoutes } from 'react-router-config';
import { Link, useLocation } from 'react-router-dom';
import { Container, Navbar, Nav } from 'react-bootstrap';
import Container from 'react-bootstrap/Container';
import Navbar from 'react-bootstrap/Navbar';
import Nav from 'react-bootstrap/Nav';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
import { evaluateAuth } from '../../utils/evaluateAuth';
Expand Down Expand Up @@ -57,7 +59,7 @@ const App = () => {
id="basic-navbar-nav"
className="justify-content-end"
>
<ul>
<Nav>
<li>
<Nav.Link
as={Link}
Expand Down Expand Up @@ -157,7 +159,7 @@ const App = () => {
</Nav.Link>
</li>
)}
</ul>
</Nav>
</Navbar.Collapse>
</Navbar>
</Container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
.radio-text {
padding-bottom: 10px;
color: #656565;
display: block;
}

.sr-only {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { useState } from 'react';
import BasicModal from '../../../common/BasicModal';
import PropTypes from 'prop-types';
import { Form, FormCheck } from 'react-bootstrap';
import Form from 'react-bootstrap/Form';
import FormCheck from 'react-bootstrap/FormCheck';
import '../common.css';
import './ProvideFeedbackModal.css';
import FeedbackListItem from '../../FeedbackListItem';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
padding: 1em;
}

.results-container {
padding: 0;
}

.options-feedback {
top: 35px;
}
Expand All @@ -146,7 +150,7 @@
}

.viewed-badge {
background-color: #e5e5e5;
background-color: #e5e5e5 !important;
color: black;
font-size: 15px;
font-weight: 400;
Expand Down
10 changes: 7 additions & 3 deletions client/components/CandidateTests/CandidateTestPlanRun/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import {
CANDIDATE_REPORTS_QUERY,
PROMOTE_VENDOR_REVIEW_STATUS_REPORT_MUTATION
} from './queries';
import { Badge, Container, Row, Col, Button } from 'react-bootstrap';
import Badge from 'react-bootstrap/Badge';
import Container from 'react-bootstrap/Container';
import Row from 'react-bootstrap/Row';
import Col from 'react-bootstrap/Col';
import Button from 'react-bootstrap/Button';
import { useParams, Redirect, useHistory } from 'react-router-dom';
import { Helmet } from 'react-helmet';
import './CandidateTestPlanRun.css';
Expand Down Expand Up @@ -456,7 +460,7 @@ const CandidateTestPlanRun = () => {
);

const results = (
<>
<div className="results-container">
<h1 className="current-test-title">{currentTest.title}</h1>
<DisclosureComponent
componentId="test-instructions-and-results"
Expand Down Expand Up @@ -508,7 +512,7 @@ const CandidateTestPlanRun = () => {
]}
stacked
></DisclosureComponent>
</>
</div>
);

const requestChangesUrl = generateGithubUrl(true, 'changes-requested');
Expand Down
42 changes: 18 additions & 24 deletions client/components/ManageTestQueue/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -508,12 +508,11 @@ const ManageTestQueue = ({
versions in the ARIA-AT App
</span>
<div className="disclosure-row-manage-ats">
<Form.Group className="ats-container">
<Form.Group className="ats-container form-group">
<Form.Label className="disclosure-form-label">
Assistive Technology
</Form.Label>
<Form.Control
as="select"
<Form.Select
value={selectedManageAtId}
onChange={onManageAtChange}
>
Expand All @@ -525,15 +524,14 @@ const ManageTestQueue = ({
{item.name}
</option>
))}
</Form.Control>
</Form.Select>
</Form.Group>
<div className="at-versions-container">
<Form.Group>
<Form.Group className="form-group">
<Form.Label className="disclosure-form-label">
Available Versions
</Form.Label>
<Form.Control
as="select"
<Form.Select
value={selectedManageAtVersionId}
onChange={onManageAtVersionChange}
>
Expand All @@ -545,7 +543,7 @@ const ManageTestQueue = ({
{item.name}
</option>
))}
</Form.Control>
</Form.Select>
</Form.Group>
<div className="disclosure-buttons-row">
<button
Expand Down Expand Up @@ -584,12 +582,11 @@ const ManageTestQueue = ({
Technology and Browser to add it to the Test Queue
</span>
<div className="disclosure-row-test-plans">
<Form.Group>
<Form.Group className="form-group">
<Form.Label className="disclosure-form-label">
Test Plan
</Form.Label>
<Form.Control
as="select"
<Form.Select
onChange={e => {
const { value } = e.target;
updateMatchingTestPlanVersions(
Expand All @@ -610,14 +607,13 @@ const ManageTestQueue = ({
`"${item.testPlan.directory}"`}
</option>
))}
</Form.Control>
</Form.Select>
</Form.Group>
<Form.Group>
<Form.Group className="form-group">
<Form.Label className="disclosure-form-label">
Test Plan Version
</Form.Label>
<Form.Control
as="select"
<Form.Select
value={selectedTestPlanVersionId}
onChange={onTestPlanVersionChange}
>
Expand All @@ -633,14 +629,13 @@ const ManageTestQueue = ({
{item.gitSha.substring(0, 7)})
</option>
))}
</Form.Control>
</Form.Select>
</Form.Group>
<Form.Group>
<Form.Group className="form-group">
<Form.Label className="disclosure-form-label">
Assistive Technology
</Form.Label>
<Form.Control
as="select"
<Form.Select
value={selectedAtId}
onChange={onAtChange}
>
Expand All @@ -655,14 +650,13 @@ const ManageTestQueue = ({
{item.name}
</option>
))}
</Form.Control>
</Form.Select>
</Form.Group>
<Form.Group>
<Form.Group className="form-group">
<Form.Label className="disclosure-form-label">
Browser
</Form.Label>
<Form.Control
as="select"
<Form.Select
value={selectedBrowserId}
onChange={onBrowserChange}
>
Expand All @@ -677,7 +671,7 @@ const ManageTestQueue = ({
{item.name}
</option>
))}
</Form.Control>
</Form.Select>
</Form.Group>
</div>
<Button
Expand Down
6 changes: 5 additions & 1 deletion client/components/Reports/SummarizeTestPlanReport.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ const SummarizeTestPlanReport = ({ testPlanReport }) => {
>
<FontAwesomeIcon
icon={faExclamationCircle}
color="#94979b"
/>
Raise an Issue
</Button>
Expand All @@ -175,7 +176,10 @@ const SummarizeTestPlanReport = ({ testPlanReport }) => {
href={modifiedRenderedUrl}
variant="secondary"
>
<FontAwesomeIcon icon={faExternalLinkAlt} />
<FontAwesomeIcon
icon={faExternalLinkAlt}
color="#94979b"
/>
Open Test
</Button>
</div>
Expand Down
4 changes: 4 additions & 0 deletions client/components/TestQueue/TestQueue.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ main.container-fluid table .col-md-3 {
margin-top: 0.75em;
}

.test-queue.table th {
padding: 0.75rem;
}

.test-queue.table th.testers {
width: 225px;
}
Expand Down
3 changes: 1 addition & 2 deletions client/components/TestQueue/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ const TestQueue = () => {
<Table
className="test-queue"
aria-labelledby={tableId}
striped
bordered
hover
responsive
>
<thead>
<tr>
Expand Down
3 changes: 1 addition & 2 deletions client/components/TestQueueRow/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { Button, Dropdown } from 'react-bootstrap';
import { Link } from 'react-router-dom';
import ATAlert from '../ATAlert';
import { capitalizeEachWord } from '../../utils/formatter';
import './TestQueueRow.css';
import {
TEST_PLAN_REPORT_QUERY,
ASSIGN_TESTER_MUTATION,
Expand All @@ -25,7 +24,7 @@ import { gitUpdatedDateToString } from '../../utils/gitUtils';
import TestPlanUpdaterModal from '../TestPlanUpdater/TestPlanUpdaterModal';
import BasicThemedModal from '../common/BasicThemedModal';
import { LoadingStatus, useTriggerLoad } from '../common/LoadingStatus';

import './TestQueueRow.css';
const TestQueueRow = ({
user = {},
testers = [],
Expand Down
1 change: 1 addition & 0 deletions client/components/TestRenderer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ const Fieldset = styled.fieldset`
> legend {
display: block;

float: inherit;
width: auto;
margin: 0;
font-size: initial;
Expand Down
2 changes: 1 addition & 1 deletion client/components/TestRun/OptionButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const OptionButton = ({
}) => {
return (
<Button
className="btn-block"
className="btn-options"
variant="secondary"
onClick={onClick}
disabled={disabled}
Expand Down
Loading