testilo 33.0.3 → 33.2.0

package/README.md

@@ -875,11 +875,12 @@ A user can invoke `track()` in one of these ways:
 ```javaScript
 node call track ttp99a 'main competitors'
 node call track ttp99a 'main competitors' 241016
+node call track ttp99a 'main competitors' '' 'ABC Foundation'
 node call track ttp99a 'main competitors' 241016 'ABC Foundation'
 ```
 
 When a user invokes `track()` in this example, the `call` module:
-- gets the summary report from the last file in the `summarized` subdirectory of the `REPORTDIR` directory, or if the third argument to `call()` exists the last one whose name begins with `'241016'`.
+- gets the summary report from the last file in the `summarized` subdirectory of the `REPORTDIR` directory, or if the third argument to `call()` exists and is not empty the last one whose name begins with `'241016'`.
 - selects the summarized data for all results in the summary report, or if the fourth argument to `call()` exists from all results whose `target.what` property has the value `'ABC Foundation'`.
 - uses tracker `ttp99a` to create a tracking report that identifies “main competitors” as its subject.
 - assigns an ID to the tracking report.

package/call.js

@@ -60,18 +60,24 @@ const getSummaryReport = async selector => {
   const summaryReportNames = await fs.readdir(summaryDir);
   let summaryReportName;
   if (summaryReportNames && summaryReportNames.length) {
-    summaryReportName = summaryReportNames.findLast(reportName => reportName.startsWith(selector));
-  }
-  else {
-    summaryReportName = summaryReportNames.pop();
-  }
-  if (summaryReportName) {
-    const summaryReportJSON = await fs.readFile(`${summaryDir}/${summaryReportName}`, 'utf8');
-    const summaryReport = JSON.parse(summaryReportJSON);
-    return summaryReport;
+    if (selector) {
+      summaryReportName = summaryReportNames
+      .findLast(reportName => reportName.startsWith(selector));
+    }
+    else {
+      summaryReportName = summaryReportNames.pop();
+    }
+    if (summaryReportName) {
+      const summaryReportJSON = await fs.readFile(`${summaryDir}/${summaryReportName}`, 'utf8');
+      const summaryReport = JSON.parse(summaryReportJSON);
+      return summaryReport;
+    }
+    else {
+      throw new Error('ERROR: Requested summary report not found');
+    }
   }
   else {
-    throw new Error(`ERROR: No summary report name starts with ${selector}`);
+    throw new Error('ERROR: No summary reports exist');
   }
 };
 // Converts a target list to a batch.
@@ -518,7 +524,7 @@ else if (fn === 'compare' && fnArgs.length === 3) {
     console.log('Execution completed');
   });
 }
-else if (fn === 'track' && fnArgs.length > 2 && fnArgs.length < 6) {
+else if (fn === 'track' && fnArgs.length > 1 && fnArgs.length < 5) {
   callTrack(... fnArgs)
   .then(() => {
     console.log('Execution completed');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "33.0.3",
+  "version": "33.2.0",
   "description": "Prepares and processes Testaro reports",
   "main": "call.js",
   "scripts": {

package/procs/track/ttp40/index.html

@@ -33,7 +33,8 @@
         const graphData = [];
         summaryReport.summaries.forEach(result => {
           graphData.push({
-            target: result.sources.target.what,
+            targetID: result.sources.target.id,
+            targetWhat: result.sources.target.what,
             time: new Date(`20${result.endTime}Z`),
             score: result.score
           });
@@ -46,15 +47,36 @@
             Plot.lineY(graphData, {
               x: 'time',
               y: 'score',
-              stroke: 'target'
+              stroke: 'targetWhat'
             }),
+            Plot.dot(graphData, {
+              x: 'time',
+              y: 'score',
+              z: 'targetID',
+              r: 9
+            }),
+            Plot.text(graphData, {
+              x: 'time',
+              y: 'score',
+              z: 'targetID',
+              text: 'targetID',
+              textAnchor: 'middle'
+            }),
+            Plot.text(graphData, Plot.selectFirst({
+              x: 'time',
+              y: 'score',
+              z: 'targetID',
+              text: 'targetWhat',
+              textAnchor: 'start',
+              dx: 15
+            })),
             Plot.text(graphData, Plot.selectLast({
               x: 'time',
               y: 'score',
-              z: 'target',
-              text: 'target',
+              z: 'targetID',
+              text: 'targetWhat',
               textAnchor: 'start',
-              dx: 3
+              dx: 15
             }))
           ]
         });

package/procs/track/ttp40/index.js

@@ -28,11 +28,8 @@ const populateQuery = async (id, what, summaryReport, query) => {
   query.tp = trackerID;
   query.dateISO = getNowDate();
   query.dateSlash = getNowDateSlash();
-  // JSON of pruned summary report.
+  // JSON of summary report.
   const {summaries} = summaryReport;
-  summaries.forEach(result => {
-    delete result.sources.target.id;
-  });
   query.summaryReportJSON = JSON.stringify(summaryReport);
   // For each score:
   const rows = [];