Merge branch 'xsalonx/gaq/O2B-1365/just-gaq-views' into xsalonx/gaq/O2B-1365/disable-gaq-if-detector-is-missing

Author: xsalonx

.eslintrc

@@ -22,9 +22,7 @@
     "rules": {
         "array-bracket-newline": [
             "error",
-            {
-                "multiline": true
-            }
+            "consistent"
         ],
         "array-bracket-spacing": [
             "error",
@@ -87,7 +85,7 @@
         ],
         "function-paren-newline": [
             "error",
-            "multiline"
+            "multiline-arguments"
         ],
         "indent": [
             "error",

.github/dependabot.yml

@@ -38,5 +38,3 @@ updates:
       update-types: ["version-update:semver-major"]
     - dependency-name: "chai"
       update-types: ["version-update:semver-major"]
-  reviewers:
-      - "graduta"

.github/workflows/bookkeeping.yml

@@ -91,7 +91,7 @@ jobs:
       - name: Setup NodeJS
         uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: '22.x'
       - name: Installing dependencies
         run: npm ci
       - name: Running linter

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: '18.x'
+        node-version: '22.x'
         registry-url: 'https://registry.npmjs.org'
     - name: Check released tag matches ALICE O2 naming pattern
       run: |
@@ -42,7 +42,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: '18.x'
+        node-version: '22.x'
         registry-url: 'https://registry.npmjs.org'
     - name: Install production dependencies
       run: npm install --only=production

CHANGELOG.md

@@ -2,6 +2,103 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.9.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.9.0)
+* Notable changes for users:
+  * QC flags boundaries can be null and will automatically be coalesced to run boundaries
+  * Fixed the bug of QC flags chart height increasing on every rendering
+  * Added possibility to lock data passes
+* Notable changes for developers:
+  * QcFlagsChartComponent uses qcTimeStart and qcTimeEnd as x-axis boundaries
+  * Simplified the remote data management for QC flag creation buttons
+  * The binding of gRPC controllers has been slightly refactored to make it easier to maintain
+  * Added possibility to provide authenticated gRPC API
+
+## [1.8.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.8.0)
+* Notable changes for users:
+  * Luminosity information has been added to run details page
+
+## [1.7.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.7.0)
+* Notable changes for users:
+  * Clicking on button to delete a flag actually mark it as deleted and remove its effective periods instead of removing it from database
+  * Added a button to discard all QC flags for a given data pass
+  * Fixed de-selection of runs/detectors in runs per data-pass
+* Notable changes for developers:
+  * Kafka client will retry indefinitely when retryable errors occurs
+
+## [1.6.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.6.0)
+* Notable changes for users:
+  * Log template `key`, `issueDescription`, `detectorOrSubsystem` can be provided in the URL when creating a log to pre-fill on-call logs
+  * Several runs and detectors can be selected to create multiple QC flags at once
+  * runNumber filter now accepts ranges as well
+  * Tag colours will now update when looking at run details
+  * Add CTP host to flp roles if CTP is enabled
+  * Display run that started/stopped run in run details
+  * A simplified and reusable frontend filtering system has been set-up
+  * Radio buttons are displayed in selection dropdown when options are exclusives
+  * Display trigger configuration in a dedicated tab in run details page
+  * Trigger counters has been renamed to CTP trigger counters
+* Notable changes for developers:
+  * Group migrations per version to avoid having too crowded directories
+  * Improved home page frontend tests to make them more robust
+  * Encode URI components in buildUrl utility function, to handle parameters with `=` sign in keys/values
+  * Fixed error spamming server logs when trying to handle lost runs and envs
+  * Fix randomly failing QC flag types tests
+  * Custom selector can be applied in selection dropdown options for values that are not CSS valid
+  * Refactored runs overview filters for:
+    * detectors
+    * run type
+    * EoR reason
+    * start/stop
+    * definition
+    * fill number
+    * LHC period
+    * duration
+  * Updates min supported Node.js to 22 to cover next year of Beam Operations
+  * Disables usage of GPU on puppeteer as it hangs on docker-alpine (known issue on their repository)
+  * Updates docker alpine version as otherwise node 22 was not available
+  * Updates dependencies for puppeteer as needed due to alpine update
+  * Moves to using headless: true instead of headless: 'new' with the new puppeteer version
+  * Improve runs overview magnets filter
+  * Added c++ API to update runs raw trigger configuration
+  * Improved runs inelastic interaction rate filter
+  * Improve run numbers filters in run overview
+  * Trigger counters has been renamed to CTP trigger counters everywhere:
+    * triggerCounters.proto has been renamed to ctpTriggerCounters.proto
+    * c++ API has been updated accordingly
+  * Renamed trigger_counters to ctp_trigger_counters
+
+## [1.5.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.5.0)
+* Notable changes for users:
+  * Added nTF orbits to runs updated runs API endpoints accordingly
+  * Added a global error page, displaying amongst other 404 error
+* Notable changes for developers:
+  * Fixed randomly failing runs test based on timerange selection (start/stop)
+  * Fixed randomly failing QC tests
+  * Updated docker ca-certificate dependency
+  * Allow to prefill of on-call template through URL parameters:
+    * In log creation page, query parameters `templateKey`, `issueDescription`, `detectorOrSubsystem` allow
+      respectively to pre-chose a log template and define the issue description and detector or subsystem in the
+      case of on-call template
+
+## [1.4.1](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.4.1)
+* Notable changes for developers:
+  * Fixed the runs start/stop extraction from AliECS kafka messages
+  * Added more logs to external service synchronization (CCDB, MonALISA)
+
+## [1.4.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.4.0)
+* Notable changes for users:
+  * Fixed tag color not being updated when switching to run details after updating a tag
+  * Environment variable ENABLE_HOUSEKEEPING must be set to true (case-insensitive) to actually enable housekeeping
+  * Use time range picker for runs start & stop filtering
+  * Run details page has been modernized
+* Notable changes for developers:
+  * Runs and QC flags timestamps now store milliseconds
+  * Fixed users that start/stop runs not being extracted from kafka message
+  * Fixed TF timestamps being ignored when creating QC flags
+  * Fixed randomly failing test in FLP frontend tests
+  * Use coalesced run time in raw SQL querries
+  * Removed the max number of retries for kafka connection
+
 ## [1.3.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.3.0)
 * Notable changes for users:
   * Fixed physical constants values which resulted in wrong AVG center of mass energy

Dockerfile

@@ -1,6 +1,6 @@
 #
 # ---- Base ----
-FROM node:18-alpine3.18 as base
+FROM node:22-alpine3.20 as base
 
 # Create app directory
 WORKDIR /usr/src/app
@@ -9,7 +9,7 @@ WORKDIR /usr/src/app
 EXPOSE 4000
 
 RUN apk add --no-cache \
-    bash=5.2.15-r5
+    bash=5.2.26-r0
 
 #
 # ---- Development Dependencies ----
@@ -18,11 +18,11 @@ FROM base AS developmentdependencies
 # Installs Git and packages required for Puppeteer
 # https://pkgs.alpinelinux.org/packages
 RUN apk add --no-cache \
-    chromium=119.0.6045.159-r0 \
-    freetype=2.13.0-r5 \
-    freetype-dev=2.13.0-r5 \
-    harfbuzz=7.3.0-r0 \
-    ca-certificates=20240226-r0
+    chromium=131.0.6778.108-r0 \
+    freetype=2.13.2-r0 \
+    freetype-dev=2.13.2-r0 \
+    harfbuzz=8.5.0-r0 \
+    ca-certificates=20241121-r1
 
 # Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true

cxx-client/CMakeLists.txt

@@ -26,7 +26,7 @@ add_library(BookkeepingProtos OBJECT
         ${PROTO_DIR}/run.proto
         ${PROTO_DIR}/dplProcessExecution.proto
         ${PROTO_DIR}/qcFlag.proto
-        ${PROTO_DIR}/triggerCounters.proto
+        ${PROTO_DIR}/ctpTriggerCounters.proto
 )
 
 target_link_libraries(BookkeepingProtos
@@ -64,9 +64,12 @@ add_library(BookkeepingApi SHARED
         include/BookkeepingApi/QcFlag.h
         src/grpc/services/GrpcQcFlagServiceClient.cxx
         src/grpc/services/GrpcQcFlagServiceClient.h
-        include/BookkeepingApi/TriggerCountersServiceClient.h
-        src/grpc/services/GrpcTriggerCountersServiceClient.h
-        src/grpc/services/GrpcTriggerCountersServiceClient.cxx
+        include/BookkeepingApi/CtpTriggerCountersServiceClient.h
+        src/grpc/services/GrpcCtpTriggerCountersServiceClient.h
+        src/grpc/services/GrpcCtpTriggerCountersServiceClient.cxx
+        include/BookkeepingApi/RunServiceClient.h
+        src/grpc/services/GrpcRunServiceClient.h
+        src/grpc/services/GrpcRunServiceClient.cxx
 )
 
 target_include_directories(BookkeepingApi
@@ -112,7 +115,7 @@ install(FILES
         ${PROTO_OUT_DIR}/run.pb.h
         ${PROTO_OUT_DIR}/dplProcessExecution.pb.h
         ${PROTO_OUT_DIR}/qcFlag.pb.h
-        ${PROTO_OUT_DIR}/triggerCounters.pb.h
+        ${PROTO_OUT_DIR}/ctpTriggerCounters.pb.h
         DESTINATION "include"
 )
 

cxx-client/README.md

@@ -48,15 +48,15 @@ target_link_libraries(${EXECUTABLE_NAME} PRIVATE AliceO2::BookkeepingApi)
 ```
 ### C++ usage
 
-The bookkeeping API's client can be requested from the provided factory by passing it the gRPC endpoint's URI:
+The bookkeeping API's client can be requested from the provided factory by passing it the gRPC endpoint's URI and an authentication token:
 
 #### Use-case specific services
 
 ```cpp
 #include <BookkeepingApi/BkpClientFactory.h>
 using namespace o2::bkp::api;
 
-auto client = BkpClientFactory::create("[host][:port]");
+auto client = BkpClientFactory::create("[host][:port]", "[token]");
 ```
 
 If you have a local bookkeeping running, the URI should be `127.0.0.1:4001` (note the **absence** of protocol such
@@ -71,7 +71,7 @@ For example to update readout FLP's counters using a local JSON file you can use
 #include <BookkeepingApi/BkpClientFactory.h>
 using namespace o2::bkp::api;
 
-auto client = BkpClientFactory::create("[grpc-endpoint-url]");
+auto client = BkpClientFactory::create("[grpc-endpoint-url]", "[token]");
 client->flp()->updateReadoutCountersByFlpNameAndRunNumber("FLP-NAME", runNumber, nSubtimeframes, nEquipmentBytes, nRecordingBytes, nFairMQBytes);
 ```
 

cxx-client/example/exampleSpecificServices.cxx

@@ -18,12 +18,14 @@ using namespace o2::bkp::api;
 int main(int argc, char** argv)
 {
   if (argc < 2) {
-    std::cerr << "You need to provide the gRPC URI as first argument" << std::endl;
+    std::cerr << "You need to provide the gRPC URI as first argument and eventually authentication token as second argument" << std::endl;
     exit(1);
   }
 
   try {
-    auto client = BkpClientFactory::create(argv[1]);
+    auto client = argc == 2
+      ? BkpClientFactory::create(argv[1])
+      : BkpClientFactory::create(argv[1], argv[2]);
 
     // Test of FLP counters update
     client->flp()->updateReadoutCountersByFlpNameAndRunNumber("FLP-TPC-1", 1, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF);
@@ -36,7 +38,7 @@ int main(int argc, char** argv)
     // Test QC flag creation
     auto dataPassQcFlagIds = client->qcFlag()->createForDataPass(
       55,
-      "LHC22b_apass2",
+      "skimming",
       "FT0",
       { { 2, 1565280000000, 1565287200000, "FT0/Check" },
         { .flagTypeId = 11, .origin = "FT0/task" } });
@@ -61,10 +63,14 @@ int main(int argc, char** argv)
     std::cout << simulationPassQcFlagIds[simulationPassQcFlagIds.size() - 1] << std::endl;
 
     // Test trigger counters registration
-    client->triggerCounters()->createOrUpdateForRun(108, "CLASS-NAME", 123, 1, 2, 3, 4, 5, 6);
+    client->ctpTriggerCounters()->createOrUpdateForRun(108, "CLASS-NAME", 123, 1, 2, 3, 4, 5, 6);
     std::cout << "Successfully created trigger counters" << std::endl;
-    client->triggerCounters()->createOrUpdateForRun(108, "CLASS-NAME", 1234, 10, 20, 30, 40, 50, 60);
+    client->ctpTriggerCounters()->createOrUpdateForRun(108, "CLASS-NAME", 1234, 10, 20, 30, 40, 50, 60);
     std::cout << "Successfully updated trigger counters" << std::endl;
+
+    // Test run update
+    client->run()->setRawCtpTriggerConfiguration(1, "A\nnew raw\nCTP trigger configuration");
+    std::cout << "Successfully updated run raw CTP trigger configuration" << std::endl;
   } catch (std::runtime_error& error) {
     std::cerr << "An error occurred: " << error.what() << std::endl;
     exit(2);

cxx-client/include/BookkeepingApi/BkpClient.h

@@ -16,7 +16,8 @@
 #include "FlpServiceClient.h"
 #include "DplProcessExecutionClient.h"
 #include "QcFlagServiceClient.h"
-#include "TriggerCountersServiceClient.h"
+#include "CtpTriggerCountersServiceClient.h"
+#include "RunServiceClient.h"
 
 namespace o2::bkp::api
 {
@@ -35,8 +36,15 @@ class BkpClient
   /// Returns the client for QcFlag service
   virtual const std::unique_ptr<QcFlagServiceClient>& qcFlag() const = 0;
 
-  virtual const std::unique_ptr<TriggerCountersServiceClient>& triggerCounters() const = 0;
+  /// Returns the client for trigger counters
+  virtual const std::unique_ptr<CtpTriggerCountersServiceClient>& ctpTriggerCounters() const = 0;
+
+  /// @deprecated use `ctpTriggerCounters` instead
+  virtual const std::unique_ptr<CtpTriggerCountersServiceClient>& triggerCounters() const = 0;
+
+  /// Returns the client for runs
+  virtual const std::unique_ptr<RunServiceClient>& run() const = 0;
 };
 } // namespace o2::bkp::api
 
-#endif // CXX_CLIENT_BOOKKEEPINGAPI_BKPCLIENT_H_
+#endif // CXX_CLIENT_BOOKKEEPINGAPI_BKPCLIENT_H_