[O2B-1546] Added deleted QC flag, adjust seed file and tests

Added a new deleted QC flag (id 103).

Update API, service and public tests to account for the additional flag and adjust selectors and counters in the UI test.

Also fix several test title typos.

Author: isaachilly

lib/database/seeders/20240404100811-qc-flags.js

@@ -253,7 +253,7 @@ module.exports = {
                     // Run : 56, FT0
                     {
                         id: 100,
-                        deleted: true,
+                        deleted: false,
                         from: null,
                         to: '2019-08-08 20:50:00',
                         comment: 'first part good',
@@ -281,6 +281,21 @@ module.exports = {
                         created_at: '2024-08-12 12:00:10',
                         updated_at: '2024-08-12 12:00:10',
                     },
+                    {
+                        id: 103,
+                        deleted: true,
+                        from: null,
+                        to: '2019-08-08 20:50:00',
+                        comment: 'deleted flag',
+
+                        run_number: 56,
+                        flag_type_id: 13, // Bad
+                        created_by_id: 2,
+                        detector_id: 7, // FT0
+
+                        created_at: '2024-08-12 12:00:15',
+                        updated_at: '2024-08-12 12:00:15',
+                    },
 
                     // Run : 56, ITS
                     {
@@ -394,6 +409,12 @@ module.exports = {
                         from: '2019-08-08 20:50:00',
                         to: null,
                     },
+                    {
+                        id: 103,
+                        flag_id: 103,
+                        from: null,
+                        to: '2019-08-08 20:50:00',
+                    },
 
                     // Run : 56, ITS
                     {

test/api/qcFlags.test.js

@@ -743,20 +743,20 @@ module.exports = () => {
             const response = await request(server).get(`/api/qcFlags/synchronous?runNumber=${runNumber}&detectorId=${detectorId}`);
             expect(response.status).to.be.equal(200);
             const { data: flags, meta } = response.body;
-            expect(meta).to.be.eql({ page: { totalCount: 2, pageCount: 1 } });
-            expect(flags.map(({ id }) => id)).to.have.all.ordered.members([101, 100]);
+            expect(meta).to.be.eql({ page: { totalCount: 3, pageCount: 1 } });
+            expect(flags.map(({ id }) => id)).to.have.all.ordered.members([103, 101, 100]);
         });
 
         it('should successfully fetch synchronous flags with pagination', async () => {
             const runNumber = 56;
             const detectorId = 7;
             {
                 const response = await request(server)
-                    .get(`/api/qcFlags/synchronous?runNumber=${runNumber}&detectorId=${detectorId}&page[limit]=1&page[offset]=1`);
+                    .get(`/api/qcFlags/synchronous?runNumber=${runNumber}&detectorId=${detectorId}&page[limit]=1&page[offset]=2`);
 
                 expect(response.status).to.be.equal(200);
                 const { data: flags, meta } = response.body;
-                expect(meta).to.be.eql({ page: { totalCount: 2, pageCount: 2 } });
+                expect(meta).to.be.eql({ page: { totalCount: 3, pageCount: 3 } });
                 expect(flags).to.be.lengthOf(1);
                 const [flag] = flags;
                 expect(flag.id).to.be.equal(100);
@@ -770,7 +770,7 @@ module.exports = () => {
             {
                 const response = await request(server)
                     .get(`/api/qcFlags/synchronous?runNumber=${runNumber}&detectorId=${detectorId}&filter[createdBy][names]=Jan%20Jansen&filter[createdBy][operator]=or`);
-                expect(response.body.data).to.be.lengthOf(2);
+                expect(response.body.data).to.be.lengthOf(3);
             }
 
             {

test/lib/server/services/qualityControlFlag/QcFlagService.test.js

@@ -142,15 +142,15 @@ module.exports = () => {
             const detectorId = 7;
             {
                 const { rows: flags, count } = await qcFlagService.getAllSynchronousPerRunAndDetector({ runNumber, detectorId });
-                expect(count).to.be.equal(2);
-                expect(flags.map(({ id }) => id)).to.have.all.ordered.members([101, 100]);
+                expect(count).to.be.equal(3);
+                expect(flags.map(({ id }) => id)).to.have.all.ordered.members([103, 101, 100]);
             }
             {
                 const { rows: flags, count } = await qcFlagService.getAllSynchronousPerRunAndDetector(
                     { runNumber, detectorId },
-                    { limit: 1, offset: 1 },
+                    { limit: 1, offset: 2 },
                 );
-                expect(count).to.be.equal(2);
+                expect(count).to.be.equal(3);
                 expect(flags).to.be.lengthOf(1);
                 const [flag] = flags;
                 expect(flag.id).to.be.equal(100);
@@ -2124,10 +2124,10 @@ module.exports = () => {
         });
     });
 
-    it('should successfult fiter sync flags by created by name', async () => {
+    it('should successfully filter sync flags by created by name', async () => {
         {
             const { rows } = await qcFlagService.getAllSynchronousPerRunAndDetector({ runNumber: 56, detectorId: 7 }, {}, { createdBy: { names: ['Jan Jansen'], operator: 'or' }});
-            expect(rows).to.be.lengthOf(2);
+            expect(rows).to.be.lengthOf(3);
         }
 
         {
@@ -2136,7 +2136,7 @@ module.exports = () => {
         }
     });
 
-    it('should successfult fiter data pass flags by created by name', async () => {
+    it('should successfully filter data pass flags by created by name', async () => {
         {
             const { rows } = await qcFlagService.getAllPerDataPassAndRunAndDetector({ dataPassId: 1, runNumber: 107, detectorId: 1 }, {}, { createdBy: { names: ['John Doe'], operator: 'or' }});
             expect(rows).to.be.lengthOf(2);
@@ -2148,7 +2148,7 @@ module.exports = () => {
         }
     });
 
-    it('should successfult fiter simulation pass flags by created by name', async () => {
+    it('should successfully filter simulation pass flags by created by name', async () => {
         {
             const { rows } = await qcFlagService.getAllPerSimulationPassAndRunAndDetector({ simulationPassId: 1, runNumber: 106, detectorId: 1 }, {}, { createdBy: { names: ['Jan Jansen'], operator: 'or' }});
             expect(rows).to.be.lengthOf(2);

test/public/qcFlags/synchronousOverview.test.js

@@ -84,8 +84,8 @@ module.exports = () => {
 
     it('Should display the correct items counter at the bottom of the page', async () => {
         await expectInnerText(page, '#firstRowIndex', '1');
-        await expectInnerText(page, '#lastRowIndex', '2');
-        await expectInnerText(page, '#totalRowsCount', '2');
+        await expectInnerText(page, '#lastRowIndex', '3');
+        await expectInnerText(page, '#totalRowsCount', '3');
     });
 
     it('should display Comment tooltip with full information', async () => {
@@ -105,7 +105,7 @@ module.exports = () => {
     });
 
     it('should display correct Deleted text colour', async () => {
-        const deletedCell = await page.$('#row100-deleted-text:nth-child(1)');
+        const deletedCell = await page.$('#row103-deleted-text:nth-child(1)');
 
         const deletedCellText = await page.evaluate(cell => cell.textContent.trim(), deletedCell);
         expect(deletedCellText).to.equal('Yes');