Merge branch 'main' into improv/O2B-1549/Migrate-AnchoredSimulationPassesOverviewModel-and-SimulationPassesPerLhcPeriodOverviewModel-to-use-FilteringModel-pattern

Author: NarrowsProjects

Dockerfile

@@ -22,7 +22,7 @@ RUN apk add --no-cache \
     freetype=2.13.2-r0 \
     freetype-dev=2.13.2-r0 \
     harfbuzz=8.5.0-r0 \
-    ca-certificates=20250911-r0
+    ca-certificates=20260413-r0
 
 # Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true

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

@@ -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
                     {

lib/public/components/Filters/LhcFillsFilter/fillNumberFilter.js

@@ -51,4 +51,16 @@ export class AuthorFilterModel extends RawTextFilterModel {
 
         this.notify();
     }
+
+    /**
+     * Reset the filter to its default value and notify the observers if the reset changed anything.
+     *
+     * @return {void}
+     */
+    clear() {
+        if (!this.isEmpty) {
+            super.reset();
+            this.notify();
+        }
+    }
 }

lib/public/components/Filters/LhcFillsFilter/schemeNameFilter.js

@@ -22,11 +22,8 @@ import { rawTextFilter } from '../../common/filters/rawTextFilter.js';
  * @param {AuthorFilterModel} authorFilterModel The author filter model object
  * @return {Component} A button that can be used to reset the author filter
  */
-const resetAuthorFilterButton = (authorFilterModel) => h(
-    '.btn.btn-pill.f7',
-    { disabled: authorFilterModel.isEmpty, onclick: () => authorFilterModel.reset() },
-    iconX(),
-);
+const resetAuthorFilterButton = (authorFilterModel) =>
+    h('.btn.btn-pill.f7', { disabled: authorFilterModel.isEmpty, onclick: () => authorFilterModel.clear() }, iconX());
 
 /**
  * Returns a toggle that can be used to exclude anonymous authors
@@ -43,16 +40,11 @@ export const excludeAnonymousLogAuthorToggle = (authorFilterModel) => switchInpu
 /**
  * Returns a authorFilter component with text input, reset button, and anonymous exclusion button.
  *
- * @param {LogsOverviewModel} logsOverviewModel the log overview model
- * @param {FilteringModel} logsOverviewModel.filteringModel the runs overview model
- * @return {Component} the filter component
+ * @param {AuthorFilterModel} authorFilterModel the authorFilterModel
+ * @return {Component} the author filter component
  */
-export const authorFilter = ({ filteringModel }) => h('.flex-row.items-center.g3', [
-    rawTextFilter(filteringModel.get('author'), {
-        classes: ['w-40'],
-        id: 'authorFilterText',
-        value: filteringModel.get('author').raw,
-    }),
-    resetAuthorFilterButton(filteringModel.get('author')),
-    excludeAnonymousLogAuthorToggle(filteringModel.get('author')),
+export const authorFilter = (authorFilterModel) => h('.flex-row.items-center.g3', [
+    rawTextFilter(authorFilterModel, { classes: ['w-50'], id: 'authorFilterText', value: authorFilterModel.raw, placeholder: 'e.g. John Doe' }),
+    resetAuthorFilterButton(authorFilterModel),
+    excludeAnonymousLogAuthorToggle(authorFilterModel),
 ]);