[ORCT-192] update legacy endpoint to handle migrated flags

app/lib/database/views/flags_view.js

@@ -12,24 +12,33 @@
  * or submit itself to any jurisdiction.
  */
 
-
-const handleArray = (data, field, escape) => {
-    let sqlLogicClause = undefined;
-    if (Array.isArray(data)) {
-        sqlLogicClause = data.map((d) => escape ? `'${d}'` : d).join(',');
-    } else if (typeof(data) === 'string' || !data) {
-        sqlLogicClause = escape ? `'${data}'` : data;
-    } else {
-        throw `incorrect format <${data}> for ${field}`;
+/**
+ * Build part of sql where clause like 'FIELD_NAME in (...DATA...)';
+ * @param {Array<String>|String} data - data to be used to build logical clause
+ * @param {String} fieldName - field name in database
+ * @param {Boolean} isString - if true values from data are wrapped with single quote
+ * @returns {String|undefined} - logical clause
+ */
+const dataFieldToSQLBelongsLogicalClause = (data, fieldName, isString) => {
+    if (!data) {
+        return undefined;
     }
-    sqlLogicClause = sqlLogicClause ? `${field} in (${sqlLogicClause})` : undefined;
-
-    return sqlLogicClause;
+    if (!Array.isArray(data)) {
+        data = [data];
+    }
+    const rightOperand = (isString ? data.map((value) => `'${value}'`) : data).join(',');
+    return rightOperand ? `${fieldName} in (${rightOperand})` : undefined;
 }
 
+/**
+ * Build sql query to fetch quality control flags for
+ * one data pass and (if provided) given runs and detector subsystems
+ * @param {Object} query containing data_pass_name (single name), run_numbers (list), detector (list)
+ * @returns {String} sql query
+ */
 const flags_view = (query) => {
-    run_selection_sql = handleArray(query.run_numbers, 'r.run_number')
-    detector_selection_sql = handleArray(query.detector, 'ds.name', true)
+    run_selection_sql = dataFieldToSQLBelongsLogicalClause(query.run_numbers, 'r.run_number')
+    detector_selection_sql = dataFieldToSQLBelongsLogicalClause(query.detector, 'ds.name', true)
 
     const data_pass_sql = `dp.name = '${query.data_pass_name}'`;
     const whereClause = [data_pass_sql, run_selection_sql, detector_selection_sql]

app/lib/database/views/runs_views.js

@@ -20,8 +20,6 @@
 const queryForRunsFields = `
         --p.name, 
         r.run_number,
-        EXTRACT(EPOCH FROM COALESCE(r.time_trg_start, r.time_o2_start)) * 1000 as time_start, 
-        EXTRACT(EPOCH FROM COALESCE(r.time_trg_end, r.time_o2_end)) * 1000 as time_end, 
         extract( epoch from r.time_o2_start ) * 1000 as time_o2_start,
         extract( epoch from r.time_o2_end ) * 1000 as time_o2_end,
         extract( epoch from r.time_trg_start ) * 1000 as time_trg_start,

app/public/components/detectors/detectorIcon.js

@@ -19,11 +19,11 @@
 export default function detectorIcon(navigation, item, index, detectorName, timeBased = false, qualityChangePossible = false) {
     const runDetectorId = `${index}-${item.run_number}-${detectorName}`;
     const runBasedQcModalId = `${runDetectorId}-qc-modal`;
     const runDetectorQualityControlFlag = item[`${detectorName.toLowerCase()}_detector`];
 
     const { qcf, qcf_bkp } = runDetectorQualityControlFlag;
     const quality = qcf?.quality || qcf_bkp?.quality;
     const qcFromBookkeeping = ! qcf?.quality && qcf_bkp?.quality;
 
     return [
         qualityChangePossible
@@ -35,7 +35,7 @@
                 }, item, index, detectorName, runDetectorId, timeBased)))
             : '',
 
-        h(`button.btn.pointer.run-quality.${quality ?? 'NoData'}`, {
+        h(`button.btn.pointer.run-quality.${quality ?? 'no-data'}`, {
             id: runDetectorId,
             onclick: () => {
                 if (qualityChangePossible) {

app/public/components/flags/flagsVisualization.js

@@ -23,7 +23,9 @@
 }
 
 export default function flagsVisualization(runData, flagsData) {
-    const { time_start, time_end } = runData;
+    const { time_o2_start, time_o2_end, time_trg_start, time_trg_end } = runData;
+    const time_start = time_trg_start ?? time_o2_start;
+    const time_end = time_trg_end ?? time_o2_end;
 
     const distinctFlagReasons = filterDistinct(flagsData.map((flag) => flag.flag_reason.replace(/\s+/g, '')));
 
@@ -38,7 +40,7 @@
             case 'Mixed':
                 return flagReasonColors.limitedAcceptance;
             case 'Good':
                 return flagReasonColors.good;
             case 'Notbad':
                 return flagReasonColors.neutral;
             case 'CertifiedbyExpert':

app/public/styles/rct/custom/components/run-quality.css

@@ -27,7 +27,7 @@
     color: var(--white);
 }
 
-.rct .run-quality.NoData {
+.rct .run-quality.no-data {
     background-color: var(--dark-blue) !important;
     color: var(--white);
 }

app/public/styles/rct/custom/tables/flags.css

@@ -63,8 +63,12 @@
 }
 
 /* Verification time */
-.rct .flags-table .flags-ver_time-cell,
-.rct .flags-table .flags-ver_time-header {
+.rct .flags-table .flags-verification_time-cell,
+.rct .flags-table .flags-verification_time-header {
     min-width: 10em;
     text-align: left;
 }
+
+.verification-border {
+    border-bottom: solid;
+}

app/public/views/flags/Flags.js

@@ -40,7 +40,7 @@ export default class Flags extends Observable {
         const allFlags = this.getAllFlags();
         const flags = !Array.isArray(allFlags) ? [] : allFlags.map((flag) => {
             const { verifications } = flag;
-            flag.ver_time = verifications?.map(({ verification_time }) => verification_time);
+            flag.verification_time = verifications?.map(({ verification_time }) => verification_time);
             flag.by = verifications?.map(({ by }) => by);
             return flag;
         });

app/public/views/flags/table/fields.js

@@ -46,7 +46,7 @@ const fields = [
         display: true,
     },
     {
-        name: 'ver_time',
+        name: 'verification_time',
         display: true,
     },
 ];

app/public/views/userView/data/headersSpecials.js

@@ -61,7 +61,7 @@ const flagFields = {
     flag_reason: 'Reason',
     comment: 'Comment',
     by: 'Verified by',
-    ver_time: 'Verification time',
+    verification_time: 'Verification time',
 };
 
 const headersSpecials = {

app/public/views/userView/data/pagesCellsSpecials.js

@@ -106,22 +106,16 @@ pagesCellsSpecials[PN.runsPerPeriod] = {
     }, item.fill_number, h('.external-link-15-blue')),
 };
 
-const linerUnderVerifier = '--------';
 pagesCellsSpecials[PN.flags] = {
     time_start: (item) => dateFormatter(item.time_start),
     time_end: (item) => dateFormatter(item.time_end),
-    by: (item) => ! item.by?.length
-        ? 'unverified'
-        : item.by.map((verifier) => h('', verifier, h('.skinny', linerUnderVerifier))),
-    ver_time: (item) => ! item.ver_time?.length
-        ? 'unverified'
-        : item.ver_time.map((e) => {
-            if (!e) {
-                return 'unverified';
-            }
-            const date = new Date(e);
-            return dateFormatter(date.getTime());
-        }),
+    by: (item) => ! item.verifications?.length ?
+        'unverified'
+        : item.verifications.map(({ by: verifier }) => h('.verification-border', h('', verifier, h('.skinny.hidden', '.')))),
+    verification_time: (item) => ! item.verifications?.length ?
+        'unverified'
+        : item.verifications.map(({ verification_time }) =>
+            h('.verification-border', dateFormatter(new Date(verification_time).getTime()))),
 };
 
 pagesCellsSpecials[PN.runsPerDataPass] = pagesCellsSpecials[PN.runsPerPeriod];