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.

Sign up for GitHub

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

feat: Group required reports in test plan report status dialog #1337

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
+26 −18
Open

feat: Group required reports in test plan report status dialog #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
142a7aa
feat: test plan report statuses sorted with required first
stalgiag Mar 12, 2025
be27dcd
update snaps
stalgiag Mar 12, 2025
ded395d
simplify sorting line
stalgiag Mar 12, 2025
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
22 changes: 16 additions & 6 deletions client/components/TestPlanReportStatusDialog/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useMemo } from 'react';
import PropTypes from 'prop-types';
import AddTestToQueueWithConfirmation from '../AddTestToQueueWithConfirmation';
import { useQuery } from '@apollo/client';
Expand Down Expand Up @@ -26,9 +26,21 @@ const TestPlanReportStatusDialog = ({

const { testPlanReportStatuses } = testPlanVersion;

let requiredReports = 0;
const { requiredReportsCount, sortedStatuses } = useMemo(() => {
let requiredCount = 0;

const tableRows = testPlanReportStatuses.map(status => {
const sorted = [...testPlanReportStatuses].sort(
(a, b) => Number(b.isRequired) - Number(a.isRequired)
);

sorted.forEach(status => {
if (status.isRequired) requiredCount += 1;
});

return { requiredReportsCount: requiredCount, sortedStatuses: sorted };
}, [testPlanReportStatuses]);

const tableRows = sortedStatuses.map(status => {
const {
isRequired,
at,
Expand All @@ -38,8 +50,6 @@ const TestPlanReportStatusDialog = ({
testPlanReport
} = status;

if (isRequired) requiredReports += 1;

const key =
`${at.name}-${browser.name}-` +
`${minimumAtVersion?.id ?? exactAtVersion?.id}-` +
Expand Down Expand Up @@ -105,7 +115,7 @@ const TestPlanReportStatusDialog = ({
{phase[0] + phase.slice(1).toLowerCase()}
</span>
&nbsp;{reviewDescription}.&nbsp;
<strong>{requiredReports} AT/browser&nbsp;</strong>
<strong>{requiredReportsCount} AT/browser&nbsp;</strong>
pairs {requirementNeedsDescription}.
</p>
)}
Expand Down
4 changes: 1 addition & 3 deletions client/tests/e2e/snapshots/saved/_account_settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ <h2>Admin Actions</h2>
<button type="button" class="btn btn-primary">
Import Latest Test Plan Versions
</button>
<p>
Date of latest test plan version: February 13, 2025 01:40 UTC
</p>
<p>Date of latest test plan version: March 6, 2025 19:25 UTC</p>
</section>
</div>
</main>
Expand Down
18 changes: 9 additions & 9 deletions client/tests/e2e/snapshots/saved/_data-management.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ <h3>
element)
</option>
<option value="49">Main Landmark</option>
<option value="60">Media Seek Slider</option>
<option value="93">Media Seek Slider</option>
<option value="54">Meter</option>
<option value="90">Modal Dialog Example</option>
<option value="89">Navigation Menu Button</option>
Expand All @@ -274,10 +274,10 @@ <h3>
Radio Group Example Using aria-activedescendant
</option>
<option value="59">Rating Slider</option>
<option value="39">Select Only Combobox Example</option>
<option value="7">Select Only Combobox Example</option>
<option value="61">Switch Example</option>
<option value="62">Tabs with Manual Activation</option>
<option value="93">Toggle Button</option>
<option value="94">Toggle Button</option>
<option value="64">Vertical Temperature Slider</option>
</select>
</div>
Expand Down Expand Up @@ -1192,7 +1192,7 @@ <h2>Test Plans Status Summary</h2>
<span
class="full-width auto-width css-36z7cz"
role="listitem"
><a href="/test-review/93"
><a href="/test-review/94"
><span
><svg
aria-hidden="true"
Expand Down Expand Up @@ -1740,7 +1740,7 @@ <h2>Test Plans Status Summary</h2>
<td>
<div class="css-bpz90">
<span class="rd full-width css-be9e2a">R&amp;D</span>
<p class="review-text">Complete <b>Oct 10, 2024</b></p>
<p class="review-text">Complete <b>Mar 6, 2025</b></p>
</div>
</td>
<td>
Expand All @@ -1763,7 +1763,7 @@ <h2>Test Plans Status Summary</h2>
<path
fill="currentColor"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
><b>V24.10.10</b></span
><b>V25.03.06</b></span
></a
></span
><button
Expand Down Expand Up @@ -2210,15 +2210,15 @@ <h2>Test Plans Status Summary</h2>
<td>
<div class="css-bpz90">
<span class="rd full-width css-be9e2a">R&amp;D</span>
<p class="review-text">Complete <b>Mar 17, 2022</b></p>
<p class="review-text">Complete <b>Mar 6, 2025</b></p>
</div>
</td>
<td>
<div role="list" aria-setsize="2" class="css-1bj5ml9">
<span
class="full-width auto-width css-36z7cz"
role="listitem"
><a href="/test-review/60"
><a href="/test-review/93"
><span
><svg
aria-hidden="true"
Expand All @@ -2233,7 +2233,7 @@ <h2>Test Plans Status Summary</h2>
<path
fill="currentColor"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
><b>V22.03.17-1</b></span
><b>V25.03.06</b></span
></a
></span
><button
Expand Down
Loading