@jrpool/kilotest 59.1.4 → 60.0.1

package/web/listDiagnoses/listDiagnoses.test.ts

@@ -64,7 +64,7 @@ after(() => {
 // TESTS
 
 test('listDiagnoses returns an ok status with valid HTML for catalogIndex 0, linkNoText, in the mixed report', async () => {
-  const result = await answer('linkNoText/260101T0000/mix/0');
+  const result = await answer('linkNoText/260101T0000-mix/0');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage);
   const html = parse(result.answerPage);
@@ -72,34 +72,34 @@ test('listDiagnoses returns an ok status with valid HTML for catalogIndex 0, lin
 });
 
 test('listDiagnoses includes the issue summary in the HTML', async () => {
-  const result = await answer('linkNoText/260101T0000/mix/0');
+  const result = await answer('linkNoText/260101T0000-mix/0');
   assert.ok(result.answerPage.includes('link not named'));
 });
 
 test('listDiagnoses includes the element tag name and text from the catalog', async () => {
-  const result = await answer('linkNoText/260101T0000/mix/0');
+  const result = await answer('linkNoText/260101T0000-mix/0');
   assert.ok(result.answerPage.includes('About Us'));
 });
 
 test('listDiagnoses includes diagnosis descriptions from the rule engines', async () => {
-  const result = await answer('linkNoText/260101T0000/mix/0');
+  const result = await answer('linkNoText/260101T0000-mix/0');
   assert.ok(result.answerPage.includes('The link does not have an accessible name'));
 });
 
 test('listDiagnoses excludes cantTell instances from the diagnoses list', async () => {
-  const result = await answer('focusIndicationBad/260101T0000/mix/0');
+  const result = await answer('focusIndicationBad/260101T0000-mix/0');
   assert.equal(result.status, 'ok');
   assert.ok(!result.answerPage.includes('Focus Visible'));
 });
 
 
 test('listDiagnoses returns an error status for a nonexistent report', async () => {
-  const result = await answer('linkNoText/999999T9999/xyz/0');
+  const result = await answer('linkNoText/999999T9999-xyz/0');
   assert.equal(result.status, 'error');
 });
 
 test('listDiagnoses returns ok with no diagnoses for a nonexistent catalog index', async () => {
-  const result = await answer('linkNoText/260101T0000/mix/999');
+  const result = await answer('linkNoText/260101T0000-mix/999');
   assert.equal(result.status, 'ok');
   const html = parse(result.answerPage);
   const diagnosisItems = html.querySelectorAll('li');
@@ -112,7 +112,7 @@ test('listDiagnoses returns an error when getReport fails', async () => {
   getReportCallCount = 0;
   failGetReportOnCall = 1;
   try {
-    const result = await answer('linkNoText/260101T0000/mix/0');
+    const result = await answer('linkNoText/260101T0000-mix/0');
     assert.equal(result.status, 'error');
     assert.ok(result.message.includes('invalid'));
   }
@@ -124,7 +124,7 @@ test('listDiagnoses returns an error when getReport fails', async () => {
 test('listDiagnoses returns an error when getPageDataStrings fails after getReport succeeds', async () => {
   pageDataStringsOverride = {error: 'Page data strings error'};
   try {
-    const result = await answer('linkNoText/260101T0000/mix/0');
+    const result = await answer('linkNoText/260101T0000-mix/0');
     assert.equal(result.status, 'error');
     assert.equal(result.message, 'Page data strings error');
   }
@@ -183,7 +183,7 @@ test('listDiagnoses includes a take-me-there link for a text-linkable catalog it
       checkpoints: []
     };
     await fs.writeFile(reportPath, JSON.stringify(report, null, 2));
-    const result = await answer('linkNoText/260101T0003/tlk/0');
+    const result = await answer('linkNoText/260101T0003-tlk/0');
     assert.equal(result.status, 'ok');
     assert.ok(result.answerPage.includes('Take me there'));
   }
@@ -193,7 +193,7 @@ test('listDiagnoses includes a take-me-there link for a text-linkable catalog it
 });
 
 test('listDiagnoses returns an error for an unknown issue with a valid report', async () => {
-  const result = await answer('nonexistentIssue/260101T0000/mix/0');
+  const result = await answer('nonexistentIssue/260101T0000-mix/0');
   assert.equal(result.status, 'error');
   assert.equal(result.message, 'Issue not found');
 });
@@ -205,7 +205,7 @@ test('listDiagnoses returns an error when report facts are not obtained', async
     urlLink: '<a href="https://example.com/mixed">https://example.com/mixed</a>'
   };
   try {
-    const result = await answer('linkNoText/260101T0000/mix/0');
+    const result = await answer('linkNoText/260101T0000-mix/0');
     assert.equal(result.status, 'error');
     assert.equal(result.message, 'Report facts not obtained');
   }
@@ -248,7 +248,7 @@ test('listDiagnoses handles acts with no standardResult instances gracefully', a
   };
   await fs.writeFile(reportPath, JSON.stringify(report));
   try {
-    const result = await answer('linkNoText/260101T0004/nst/0');
+    const result = await answer('linkNoText/260101T0004-nst/0');
     assert.equal(result.status, 'ok');
   }
   finally {

package/web/listIssues/index.ts

@@ -125,15 +125,14 @@ const getIssuesData = (report: UsableReport): ResultsSummary & Record<string, an
 };
 // Returns data and HTML lines about the history of the reports about the page of a report.
 const getHistory = async (
-  timeStamp: string, jobID: string, description: string, margin: string = ''
+  reportID: string, description: string, margin: string = ''
 ): Promise<{isLatest: boolean, lines: string[]}> => {
   // Get extracts of all reports about the page, from oldest to latest.
   const pageExtracts = await getPageReportExtracts(description);
   // The report's own extract may be absent if the report was quarantined between the
   // report read and the extract listing, so an empty list means "not latest".
   const lastExtract = pageExtracts[pageExtracts.length - 1];
-  const isLatest = lastExtract !== undefined
-  && lastExtract.timeStamp === timeStamp && lastExtract.jobID === jobID;
+  const isLatest = lastExtract !== undefined && lastExtract.id === reportID;
   // Initialize the history.
   const history = {
     isLatest,
@@ -142,7 +141,7 @@ const getHistory = async (
   // For each report about the page, from oldest to latest:
   pageExtracts.forEach((extract, index) => {
     // Get whether it is this report.
-    const isThis = extract.timeStamp === timeStamp && extract.jobID === jobID;
+    const isThis = extract.id === reportID;
     // Get the tags that identify its position and whether it is this report.
     const tags = [
       index === 0 ? 'oldest' : '',
@@ -158,7 +157,7 @@ const getHistory = async (
       content = label;
     }
     else {
-      const href = `/listIssues.html/${extract.timeStamp}/${extract.jobID}`;
+      const href = `/listIssues.html/${extract.id}`;
       content = `<a href="${href}">${label}</a>`;
     }
     // Add a list item describing the report, linked if not this report, to the history.
@@ -172,7 +171,7 @@ const getHistory = async (
   if (isLatest) {
     // Add a link to the form for requesting a retest to the lines.
     lines.push(
-      `${margin}<p><a href="/requestRetestForm.html/${timeStamp}/${jobID}">Request a retest</a></p>`
+      `${margin}<p><a href="/requestRetestForm.html/${reportID}">Request a retest</a></p>`
     );
   }
   // Replace the bare list items with the assembled section lines.
@@ -181,9 +180,9 @@ const getHistory = async (
   return history;
 };
 // Adds parameters to a query for the answer page.
-const populateQuery = async (timeStamp: string, jobID: string, query: Record<string, any>) => {
+const populateQuery = async (reportID: string, query: Record<string, any>) => {
   // Get the report.
-  const report = await getReport(timeStamp, jobID);
+  const report = await getReport(reportID);
   // If this failed:
   if (isReportError(report)) {
     // Populate the query with the reason.
@@ -207,7 +206,7 @@ const populateQuery = async (timeStamp: string, jobID: string, query: Record<str
   query.target = description;
   query.testInfo = testInfo;
   const margin = ' '.repeat(6);
-  const history = await getHistory(timeStamp, jobID, description, ' '.repeat(8));
+  const history = await getHistory(reportID, description, ' '.repeat(8));
   // Add a warning if the report is not the latest about the page.
   query.oldWarn = history.isLatest
   ? ''
@@ -248,7 +247,7 @@ const populateQuery = async (timeStamp: string, jobID: string, query: Record<str
         detailsLines.push(`${margin}    <ul class="nav">`);
         const whereQuestionString = 'Where was the issue found?';
         const labelString = `Where was the ${summary} issue found on the ${description} page?`;
-        const href = `href="/listViolators.html/${issueID}/${timeStamp}/${jobID}"`;
+        const href = `href="/listViolators.html/${issueID}/${reportID}"`;
         const label = `aria-label="${labelString}"`;
         const whereLink = `<a ${href} ${label}>${whereQuestionString}</a>`;
         // Add a violations link to the lines.
@@ -269,10 +268,10 @@ const populateQuery = async (timeStamp: string, jobID: string, query: Record<str
 };
 // Returns a page answering the target-issues question.
 export const answer = async (pageArgs: string) => {
-  const [timeStamp, jobID] = pageArgs.split('/') as [string, string];
+  const reportID = pageArgs;
   const query: Record<string, any> = {};
   // Create a query to replace the placeholders.
-  await populateQuery(timeStamp, jobID, query);
+  await populateQuery(reportID, query);
   // If this failed:
   if (query.error) {
     // Return the error.

package/web/listIssues/listIssues.test.ts

@@ -49,7 +49,7 @@ after(() => {
 // TESTS
 
 test('listIssues returns an ok status with valid HTML for the mixed report', async () => {
-  const result = await answer('260101T0000/mix');
+  const result = await answer('260101T0000-mix');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage);
   const html = parse(result.answerPage);
@@ -57,12 +57,12 @@ test('listIssues returns an ok status with valid HTML for the mixed report', asy
 });
 
 test('listIssues includes the page description in the HTML for the mixed report', async () => {
-  const result = await answer('260101T0000/mix');
+  const result = await answer('260101T0000-mix');
   assert.ok(result.answerPage.includes('Mixed Outcomes'));
 });
 
 test('listIssues interpolates the page description into the AI prompt block quote', async () => {
-  const result = await answer('260101T0000/mix');
+  const result = await answer('260101T0000-mix');
   const html = parse(result.answerPage);
   const blockQuote = html.querySelector('blockquote');
   assert.ok(blockQuote);
@@ -74,7 +74,7 @@ test('listIssues interpolates the page description into the AI prompt block quot
 });
 
 test('listIssues includes links to listViolators for issues in the mixed report', async () => {
-  const result = await answer('260101T0000/mix');
+  const result = await answer('260101T0000-mix');
   const html = parse(result.answerPage);
   const violatorLinks = html.querySelectorAll('a[href*="listViolators.html"]');
   assert.ok(violatorLinks.length >= 2);
@@ -84,12 +84,12 @@ test('listIssues includes links to listViolators for issues in the mixed report'
 });
 
 test('listIssues returns an error status for a nonexistent report', async () => {
-  const result = await answer('999999T9999/xyz');
+  const result = await answer('999999T9999-xyz');
   assert.equal(result.status, 'error');
 });
 
 test('listIssues for the all-cantTell report shows no issue links', async () => {
-  const result = await answer('260101T0001/ct');
+  const result = await answer('260101T0001-ct');
   assert.equal(result.status, 'ok');
   const html = parse(result.answerPage);
   const violatorLinks = html.querySelectorAll('a[href*="listViolators.html"]');
@@ -97,7 +97,7 @@ test('listIssues for the all-cantTell report shows no issue links', async () =>
 });
 
 test('listIssues for the empty report shows no issue links', async () => {
-  const result = await answer('260101T0005/emp');
+  const result = await answer('260101T0005-emp');
   assert.equal(result.status, 'ok');
   const html = parse(result.answerPage);
   const violatorLinks = html.querySelectorAll('a[href*="listViolators.html"]');
@@ -106,7 +106,7 @@ test('listIssues for the empty report shows no issue links', async () => {
 
 
 test('listIssues counts the prevented rule engine as called but not able to test', async () => {
-  const result = await answer('260101T0006/prv');
+  const result = await answer('260101T0006-prv');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage.includes('<li>Called: 2</li>'));
   assert.ok(result.answerPage.includes('<li>Were able to test: 1</li>'));
@@ -114,7 +114,7 @@ test('listIssues counts the prevented rule engine as called but not able to test
 });
 
 test('listIssues counts a rule engine that reported no violations as called and able to test', async () => {
-  const result = await answer('260101T0005/emp');
+  const result = await answer('260101T0005-emp');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage.includes('<li>Called: 1</li>'));
   assert.ok(result.answerPage.includes('<li>Were able to test: 1</li>'));
@@ -129,7 +129,7 @@ test('listIssues counts an unknown prevented engine as called but not able to te
   const reportPath = path.join(realUtil.reportsPath(), '260103T0000-unk.json');
   await fs.writeFile(reportPath, JSON.stringify(report));
   try {
-    const result = await answer('260103T0000/unk');
+    const result = await answer('260103T0000-unk');
     assert.equal(result.status, 'ok');
     assert.ok(result.answerPage.includes('<li>Called: 3</li>'));
     assert.ok(result.answerPage.includes('<li>Were able to test: 1</li>'));
@@ -142,7 +142,7 @@ test('listIssues counts an unknown prevented engine as called but not able to te
 test('listIssues returns an error when getPageDataStrings fails after getReport succeeds', async () => {
   pageDataStringsOverride = {error: 'Page data strings error'};
   try {
-    const result = await answer('260101T0000/mix');
+    const result = await answer('260101T0000-mix');
     assert.equal(result.status, 'error');
     assert.equal(result.message, 'Page data strings error');
   }
@@ -158,7 +158,7 @@ test('listIssues returns an error when report facts are not obtained', async ()
     urlLink: '<a href="https://example.com/mixed">https://example.com/mixed</a>'
   };
   try {
-    const result = await answer('260101T0000/mix');
+    const result = await answer('260101T0000-mix');
     assert.equal(result.status, 'error');
     assert.equal(result.message, 'Report facts not obtained');
   }
@@ -169,7 +169,7 @@ test('listIssues returns an error when report facts are not obtained', async ()
 
 test('listIssues shows violation and violator counts for an issue with multiple violators', async () => {
   // The mul report has linkNoText with 4 violations by 3 violators.
-  const result = await answer('260101T0008/mul');
+  const result = await answer('260101T0008-mul');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage.includes('<li>Violations: 4</li>'));
   assert.ok(result.answerPage.includes('<li>Violators: 3</li>'));
@@ -198,7 +198,7 @@ test('listIssues handles acts with no standardResult instances', async () => {
   };
   await fs.writeFile(reportPath, JSON.stringify(report));
   try {
-    const result = await answer('260101T0004/nsi');
+    const result = await answer('260101T0004-nsi');
     assert.equal(result.status, 'ok');
   }
   finally {
@@ -223,38 +223,38 @@ const getHistoryItems = (history: ReturnType<typeof parse>) => history
 }));
 
 test('listIssues History of an older report lists all reports, with this one unlinked and no retest question', async () => {
-  const result = await answer('260101T0000/mix');
+  const result = await answer('260101T0000-mix');
   const history = getHistory(result.answerPage);
   const items = getHistoryItems(history);
   assert.equal(items.length, 2);
   assert.match(items[0]!.text, /^\d+ days? ago \(oldest; this report\)$/);
   assert.equal(items[0]!.href, null);
   assert.match(items[1]!.text, /^\d+ days? ago \(latest\)$/);
-  assert.equal(items[1]!.href, '/listIssues.html/260202T0000/new');
+  assert.equal(items[1]!.href, '/listIssues.html/260202T0000-new');
   assert.ok(!result.answerPage.includes('Request a retest'));
 });
 
 test('listIssues History of the latest report ends with the retest question', async () => {
-  const result = await answer('260202T0000/new');
+  const result = await answer('260202T0000-new');
   const history = getHistory(result.answerPage);
   const items = getHistoryItems(history);
   assert.equal(items.length, 2);
   assert.match(items[0]!.text, /^\d+ days? ago \(oldest\)$/);
-  assert.equal(items[0]!.href, '/listIssues.html/260101T0000/mix');
+  assert.equal(items[0]!.href, '/listIssues.html/260101T0000-mix');
   assert.match(items[1]!.text, /^\d+ days? ago \(latest; this report\)$/);
   assert.equal(items[1]!.href, null);
   const retestLink = history.querySelector('ol + p > a');
   assert.equal(retestLink?.text, 'Request a retest');
-  assert.equal(retestLink?.getAttribute('href'), '/requestRetestForm.html/260202T0000/new');
+  assert.equal(retestLink?.getAttribute('href'), '/requestRetestForm.html/260202T0000-new');
 });
 
 test('listIssues History of the only report about a page says so and asks about retesting', async () => {
-  const result = await answer('260101T0001/ct');
+  const result = await answer('260101T0001-ct');
   const history = getHistory(result.answerPage);
   assert.equal(getHistoryItems(history).length, 0);
   const paragraphs = history.querySelectorAll('p');
   assert.equal(paragraphs[0]?.text, 'This is the only available report about the page.');
-  assert.equal(paragraphs[1]?.querySelector('a')?.getAttribute('href'), '/requestRetestForm.html/260101T0001/ct');
+  assert.equal(paragraphs[1]?.querySelector('a')?.getAttribute('href'), '/requestRetestForm.html/260101T0001-ct');
 });
 
 test('listIssues History tags only the ends of a list of 3 reports and the current report', async () => {
@@ -266,16 +266,16 @@ test('listIssues History tags only the ends of a list of 3 reports and the curre
   await fs.writeFile(reportPath, JSON.stringify(report));
   try {
     // From the middle report:
-    let items = getHistoryItems(getHistory((await answer('260115T0000/mid')).answerPage));
+    let items = getHistoryItems(getHistory((await answer('260115T0000-mid')).answerPage));
     assert.equal(items.length, 3);
     assert.match(items[0]!.text, /\(oldest\)$/);
     assert.match(items[1]!.text, /^\d+ days? ago \(this report\)$/);
     assert.equal(items[1]!.href, null);
     assert.match(items[2]!.text, /\(latest\)$/);
     // From the latest report:
-    items = getHistoryItems(getHistory((await answer('260202T0000/new')).answerPage));
+    items = getHistoryItems(getHistory((await answer('260202T0000-new')).answerPage));
     assert.match(items[1]!.text, /^\d+ days? ago$/);
-    assert.equal(items[1]!.href, '/listIssues.html/260115T0000/mid');
+    assert.equal(items[1]!.href, '/listIssues.html/260115T0000-mid');
   }
   finally {
     await fs.unlink(reportPath);

package/web/listPages/index.ts

@@ -69,9 +69,9 @@ const populateQuery = async (query: Record<string, any>) => {
   const pageCount = latestExtracts.length;
   // For each tested page:
   for (const extract of latestExtracts) {
-    const {jobID, timeStamp, description} = extract;
+    const {id, description} = extract;
     // Add a link to the issues in the latest report about it to the lines.
-    const link = `<a href="listIssues.html/${timeStamp}/${jobID}" aria-label="Get test results for ${description}">${description}</a>`;
+    const link = `<a href="listIssues.html/${id}" aria-label="Get test results for ${description}">${description}</a>`;
     lines.tested.push(`${margin}  <li>${link}</li>`);
   }
   // Add the lines to the query, as an introduced list if there are any, or else a no-pages message.

package/web/listPages/listPages.test.ts

@@ -76,9 +76,9 @@ test('listPages links each page to the issues in its latest report', async () =>
   const result: any = await answer();
   const links = getPageLinks(result.answerPage);
   const mixedLink = links.find(a => a.text === 'Mixed Outcomes');
-  assert.equal(mixedLink?.getAttribute('href'), 'listIssues.html/260202T0000/new');
+  assert.equal(mixedLink?.getAttribute('href'), 'listIssues.html/260202T0000-new');
   const canttellLink = links.find(a => a.text === 'All CantTell Page');
-  assert.equal(canttellLink?.getAttribute('href'), 'listIssues.html/260101T0001/ct');
+  assert.equal(canttellLink?.getAttribute('href'), 'listIssues.html/260101T0001-ct');
 });
 
 test('listPages contains no report summaries', async () => {

package/web/listTopIssues/index.ts

@@ -36,9 +36,9 @@ const getIssuesSummary = async () => {
   const latestReportExtracts = await getReportExtracts(true);
   // For each of them:
   for (const reportExtract of latestReportExtracts) {
-    const {timeStamp, jobID} = reportExtract;
+    const {id} = reportExtract;
     // Get the corresponding report.
-    const report = await getReport(timeStamp, jobID);
+    const report = await getReport(id);
     // If this failed:
     if (isReportError(report)) {
       // Populate the summary with the reason.

package/web/listViolators/index.ts

@@ -27,12 +27,11 @@ import {issues as issueSpecs} from 'testaro-issues';
 // Adds parameters to a query for the answer page.
 const populateQuery = async (
   issueID: string,
-  timeStamp: string,
-  jobID: string,
+  reportID: string,
   query: Record<string, any>
 ) => {
   // Get the report.
-  const report = await getReport(timeStamp, jobID);
+  const report = await getReport(reportID);
   // If this failed:
   if (isReportError(report)) {
     // Populate the query with the reason.
@@ -110,7 +109,7 @@ const populateQuery = async (
       }
     }
     const href
-    = `/listDiagnoses.html/${issueID}/${timeStamp}/${jobID}/${catalogIndex}?pathID=${pathID}`;
+    = `/listDiagnoses.html/${issueID}/${reportID}/${catalogIndex}?pathID=${pathID}`;
     const questionString = 'What diagnoses were reported';
     const labelString = `${questionString} for violator ${index + 1}?`;
     lines.push(
@@ -130,10 +129,10 @@ const populateQuery = async (
 };
 // Returns a page answering the violators question.
 export const answer = async (pageArgs: string) => {
-  const [issueID, timeStamp, jobID] = pageArgs.split('/') as [string, string, string];
+  const [issueID, reportID] = pageArgs.split('/') as [string, string];
   const query: Record<string, any> = {};
   // Create a query to replace the placeholders.
-  await populateQuery(issueID, timeStamp, jobID, query);
+  await populateQuery(issueID, reportID, query);
   // If this failed:
   if (query.error) {
     // Return the error.

package/web/listViolators/listViolators.test.ts

@@ -64,7 +64,7 @@ after(() => {
 // TESTS
 
 test('listViolators returns an ok status with valid HTML for linkNoText in the mixed report', async () => {
-  const result = await answer('linkNoText/260101T0000/mix');
+  const result = await answer('linkNoText/260101T0000-mix');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage);
   const html = parse(result.answerPage);
@@ -72,19 +72,19 @@ test('listViolators returns an ok status with valid HTML for linkNoText in the m
 });
 
 test('listViolators includes the issue summary in the HTML', async () => {
-  const result = await answer('linkNoText/260101T0000/mix');
+  const result = await answer('linkNoText/260101T0000-mix');
   assert.ok(result.answerPage.includes('link not named'));
 });
 
 test('listViolators includes links to listDiagnoses for violators', async () => {
-  const result = await answer('linkNoText/260101T0000/mix');
+  const result = await answer('linkNoText/260101T0000-mix');
   const html = parse(result.answerPage);
   const diagnosisLinks = html.querySelectorAll('a[href*="listDiagnoses.html"]');
   assert.ok(diagnosisLinks.length > 0);
 });
 
 test('listViolators excludes cantTell instances from the violator count', async () => {
-  const result = await answer('focusIndicationBad/260101T0000/mix');
+  const result = await answer('focusIndicationBad/260101T0000-mix');
   assert.equal(result.status, 'ok');
   assert.ok(result.answerPage.includes('<li>Violators: 0</li>'));
   assert.ok(!result.answerPage.includes('<h3>Element'));
@@ -92,12 +92,12 @@ test('listViolators excludes cantTell instances from the violator count', async
 
 
 test('listViolators returns an error status for a nonexistent report', async () => {
-  const result = await answer('linkNoText/999999T9999/xyz');
+  const result = await answer('linkNoText/999999T9999-xyz');
   assert.equal(result.status, 'error');
 });
 
 test('listViolators returns an error status for an unknown issue', async () => {
-  const result = await answer('nonexistentIssue/260101T0000/mix');
+  const result = await answer('nonexistentIssue/260101T0000-mix');
   assert.equal(result.status, 'error');
 });
 
@@ -105,7 +105,7 @@ test('listViolators returns an error when getReport fails', async () => {
   getReportCallCount = 0;
   failGetReportOnCall = 1;
   try {
-    const result = await answer('linkNoText/260101T0000/mix');
+    const result = await answer('linkNoText/260101T0000-mix');
     assert.equal(result.status, 'error');
     assert.ok(result.message.includes('invalid'));
   }
@@ -117,7 +117,7 @@ test('listViolators returns an error when getReport fails', async () => {
 test('listViolators returns an error when getPageDataStrings fails after getReport succeeds', async () => {
   pageDataStringsOverride = {error: 'Page data strings error'};
   try {
-    const result = await answer('linkNoText/260101T0000/mix');
+    const result = await answer('linkNoText/260101T0000-mix');
     assert.equal(result.status, 'error');
     assert.equal(result.message, 'Page data strings error');
   }
@@ -176,7 +176,7 @@ test('listViolators includes take-me-there links for text-linkable violators', a
       checkpoints: []
     };
     await fs.writeFile(reportPath, JSON.stringify(report, null, 2));
-    const result = await answer('linkNoText/260101T0003/tlk');
+    const result = await answer('linkNoText/260101T0003-tlk');
     assert.equal(result.status, 'ok');
     assert.ok(result.answerPage.includes('Take me there'));
     assert.ok(result.answerPage.includes('Take me there</q> links will open'));
@@ -193,7 +193,7 @@ test('listViolators returns an error when report facts are not obtained', async
     urlLink: '<a href="https://example.com/mixed">https://example.com/mixed</a>'
   };
   try {
-    const result = await answer('linkNoText/260101T0000/mix');
+    const result = await answer('linkNoText/260101T0000-mix');
     assert.equal(result.status, 'error');
     assert.equal(result.message, 'Report facts not obtained');
   }
@@ -269,7 +269,7 @@ test('listViolators handles instances with missing catalogIndex and acts with no
   };
   await fs.writeFile(reportPath, JSON.stringify(report));
   try {
-    const result = await answer('linkNoText/260101T0004/nvi');
+    const result = await answer('linkNoText/260101T0004-nvi');
     assert.equal(result.status, 'ok');
     // Should show plural violator count.
     assert.ok(result.answerPage.includes('<li>Violators: 2</li>'));
@@ -336,7 +336,7 @@ test('listViolators uses HTML fallback when catalog has no tagName and pathID is
   };
   await fs.writeFile(reportPath, JSON.stringify(report));
   try {
-    const result = await answer('linkNoText/260101T0005/htm');
+    const result = await answer('linkNoText/260101T0005-htm');
     assert.equal(result.status, 'ok');
     // The tagName should fall back to HTML.
     assert.ok(result.answerPage.includes('HTML'));

package/web/reannotate/index.ts

@@ -31,9 +31,9 @@ export const answer = async (authCode: string) => {
     if (reportFileNames.length) {
       // For each report file:
       for (const reportFileName of reportFileNames) {
-        const [timeStamp, jobID] = reportFileName.slice(0, -5).split('-') as [string, string];
+        const reportID = reportFileName.slice(0, -5);
         // Get the report.
-        const report = await getReport(timeStamp, jobID);
+        const report = await getReport(reportID);
         // If this failed:
         if (isReportError(report)) {
           // Return an error page.
@@ -45,7 +45,7 @@ export const answer = async (authCode: string) => {
         // Otherwise, i.e. if it succeeded, reannotate it in place.
         await annotateReportObject(report);
         // Save the reannotated report.
-        await fs.writeFile(getReportPath(timeStamp, jobID), getJSON(report));
+        await fs.writeFile(getReportPath(reportID), getJSON(report));
       }
     }
     // Otherwise, i.e. if it failed:

package/web/reannotateForm/index.ts

@@ -20,9 +20,8 @@ const populateQuery = async (query: Record<string, any>) => {
   const reportExtracts = await getReportExtracts();
   // For each report:
   for (const reportExtract of reportExtracts) {
-    const {jobID, timeStamp} = reportExtract;
     // Get it.
-    const report = await getReport(timeStamp, jobID);
+    const report = await getReport(reportExtract.id);
     // If this failed:
     if (isReportError(report)) {
       // Populate the query with the reason.

package/web/reportDeletion.ts

@@ -25,8 +25,7 @@ import path from 'node:path';
 
 // A summary of an available report, as shown in a deletion form.
 type ReportSpec = {
-  timeStamp: string;
-  jobID: string;
+  id: string;
   issueCount: number;
   preventedEngineCount: number;
   url: string;
@@ -91,9 +90,9 @@ export const reportDeletionForm = async (
   const reportSpecs: ReportSpec[] = [];
   // For each report:
   for (const reportName of reportNames) {
-    const [timeStamp, jobID] = reportName.slice(0, -5).split('-') as [string, string];
+    const reportID = reportName.slice(0, -5);
     // Get the report.
-    const report = await getReport(timeStamp, jobID);
+    const report = await getReport(reportID);
     // If this failed:
     if (isReportError(report)) {
       // Return why.
@@ -107,29 +106,27 @@ export const reportDeletionForm = async (
     const {issueCount, preventedEngineCount, url} = reportFacts;
     // Otherwise, i.e. if it succeeded, add the summary to the array.
     reportSpecs.push({
-      timeStamp,
-      jobID,
+      id: reportID,
       issueCount,
       preventedEngineCount,
       url
     });
   }
-  // Sort the summaries primarily by URL and secondarily by time stamp.
-  objectSort(reportSpecs, 'timeStamp', 'alpha');
+  // Sort the summaries primarily by URL and secondarily by report identifier.
+  objectSort(reportSpecs, 'id', 'alpha');
   objectSort(reportSpecs, 'url', 'alpha');
   const lines: string[] = [];
   const margin = ' '.repeat(12);
   let anyDeletable = false;
   // For each summary:
   reportSpecs.forEach((reportSpec, index) => {
-    const {timeStamp, jobID, issueCount, preventedEngineCount, url} = reportSpec;
-    const jobName = `${timeStamp}-${jobID}`;
-    const specString = `<code>${url}</code> (<code>${jobName}</code>): preventions ${preventedEngineCount}, issues ${issueCount}`;
+    const {id, issueCount, preventedEngineCount, url} = reportSpec;
+    const specString = `<code>${url}</code> (<code>${id}</code>): preventions ${preventedEngineCount}, issues ${issueCount}`;
     // If its report is deletable:
     if (isDeletable(reportSpecs, index)) {
       // Add a line with a deletion checkbox.
       lines.push(
-        `${margin}<p><input type="checkbox" name="report" value="${jobName}"> ${specString}</p>`
+        `${margin}<p><input type="checkbox" name="report" value="${id}"> ${specString}</p>`
       );
       anyDeletable = true;
     }