[O2B-1361] Remove DPL notion from detectors

lib/database/adapters/QcFlagAdapter.js

@@ -61,7 +61,7 @@ class QcFlagAdapter {
             comment: comment ?? null,
             origin,
             runNumber,
-            dplDetectorId: detectorId,
+            detectorId,
             flagTypeId,
             flagType: flagType ? this.qcFlagTypeAdapter.toMinifiedEntity(flagType) : null,
             createdById,

lib/database/adapters/RunAdapter.js

@@ -293,8 +293,8 @@ class RunAdapter {
 
         const adaptedQcFlags = qcFlags ? qcFlags.map(this.qcFlagAdapter.toEntity) : [];
         entityObject.qcFlags = adaptedQcFlags.reduce((acc, qcFlag) => {
-            acc[qcFlag.dplDetectorId] = acc[qcFlag.dplDetectorId] ?? [];
-            acc[qcFlag.dplDetectorId].push(qcFlag);
+            acc[qcFlag.detectorId] = acc[qcFlag.detectorId] ?? [];
+            acc[qcFlag.detectorId].push(qcFlag);
             return acc;
         }, {});
 

lib/database/models/typedefs/SequelizeGaqDetector.js

@@ -16,7 +16,7 @@
  *
  * @property {number} dataPassId
  * @property {number} runNumber
- * @property {number} dplDetectorId
+ * @property {number} detectorId
  * @property {Date} createdAt
  * @property {Date} updatedAt
  */

lib/database/models/typedefs/SequelizeQcFlag.js

@@ -23,7 +23,7 @@
  * @property {number} createdById
  * @property {number} flagTypeId
  * @property {number} runNumber
- * @property {number} dplDetectorId
+ * @property {number} detectorId
  * @property {number} createdAt
  * @property {number} updatedAt
  * @property {SequelizeQcFlagType|null} flagType

lib/database/repositories/QcFlagEffectivePeriodRepository.js

@@ -36,7 +36,7 @@ class QcFlagEffectivePeriodRepository extends Repository {
      * @param {number} [monalisaProduction.dataPassId] id of data pass, which the QC flag belongs to
      * @param {number} [monalisaProduction.simulationPassId] id of simulation pass, which the QC flags belongs to
      * @param {number} monalisaProduction.runNumber runNumber of run, which the QC flags belongs to
-     * @param {number} monalisaProduction.detectorId id of DPL detector, which the QC flags belongs to
+     * @param {number} monalisaProduction.detectorId id of detector, which the QC flags belongs to
      * @return {Promise<SequelizeQcFlagEffectivePeriod[]>} effective periods promise
      */
     async findOverlappingPeriodsCreatedBeforeLimit(period, createdAtUpperLimit, { dataPassId, simulationPassId, runNumber, detectorId }) {

lib/domain/entities/DataPassQcFlag.js

@@ -22,7 +22,7 @@
  * @property {number} createdById
  * @property {number} flagTypeId
  * @property {number} runNumber
- * @property {number} dplDetectorId
+ * @property {number} detectorId
  * @property {number} createdAt
  * @property {number} updatedAt
  * @property {DataPass|null} dataPass

lib/domain/entities/QcFlag.js

@@ -24,7 +24,7 @@
  * @property {number} flagTypeId
  * @property {number} runNumber
  * @property {number} dataPassId
- * @property {number} dplDetectorId
+ * @property {number} detectorId
  * @property {number} createdAt
  * @property {number} updatedAt
  * @property {User|null} createdBy

lib/domain/entities/SimulationPassQcFlag.js

@@ -22,7 +22,7 @@
  * @property {number} createdById
  * @property {number} flagTypeId
  * @property {number} runNumber
- * @property {number} dplDetectorId
+ * @property {number} detectorId
  * @property {number} createdAt
  * @property {number} updatedAt
  * @property {SimulationPass|null} simulationPass

lib/domain/entities/dpl/DplDetector.js

@@ -22,6 +22,6 @@
 
 /**
  * @typedef DplDetectorIdentifier object to uniquely identify a DPL detector
- * @property {number} [dplDetectorId] the id of the DPL detector
+ * @property {number} [detectorId] the id of the DPL detector
  * @property {string} [dplDetectorName] the name of the DPL detector
  */

lib/public/Model.js

@@ -402,11 +402,11 @@ export default class Model extends Observable {
     }
 
     /**
-     * Get dpl detector which user can manage QC flags for
+     * Get detector which user can manage QC flags for
      *
-     * @return {RemoteData<DplDetector[]>} dpl detectors remote data
+     * @return {RemoteData<Detector[]>} detectors remote data
      */
-    get dplDetectorsUserHasAccessTo() {
+    get detectorsUserHasAccessTo() {
         return this._qcDetectorsUserHasAccessTo.getCurrent();
     }
 

lib/public/components/qcFlags/qcFlagCreationPanelLink.js

@@ -22,7 +22,7 @@ import { getRunQcExclusionReason } from './getRunQcExclusionReason.js';
  * @param {DataPass} [production.dataPass] data pass - exclusive with simulationPassId parameter
  * @param {SimulationPass} [production.simulationPass] simulation pass - exclusive with dataPassId parameter
  * @param {Run} run run
- * @param {Detector|null} detector DPL detector if user has access to it, null if not
+ * @param {Detector|null} detector detector if user has access to it, null if not
  * @param {object} [options] display options
  * @param {Component} [options.noPermissionContent] a display in case user has no permission to manage QC flags for given detector
  * @param {string[]} [options.linkClasses] css classes to apply to the link (in addition to the default ones)

lib/public/components/qcFlags/qcFlagOverviewPanelLink.js

@@ -21,11 +21,11 @@ import { frontLink } from '../common/navigation/frontLink.js';
  * @param {number} [scope.dataPassId] data pass id - exclusive with simulationPassId parameter
  * @param {number} [scope.simulationPassId] simulation pass id - exclusive with dataPassId parameter
  * @param {number} scope.runNumber run number
- * @param {number} scope.dplDetectorId DPL detector id
+ * @param {number} scope.detectorId detector id
  * @param {object} [attributes] attributes @see frontLink attributes parameter
  * @return {Component} link
  */
-export const qcFlagOverviewPanelLink = (content, { dataPassId, simulationPassId, runNumber, dplDetectorId }, attributes = {}) => {
+export const qcFlagOverviewPanelLink = (content, { dataPassId, simulationPassId, runNumber, detectorId }, attributes = {}) => {
     let options = {};
     let pageName = '';
     if (dataPassId) {
@@ -41,7 +41,7 @@ export const qcFlagOverviewPanelLink = (content, { dataPassId, simulationPassId,
     return frontLink(
         content,
         pageName,
-        { runNumber, dplDetectorId, ...options },
+        { runNumber, detectorId, ...options },
         { title: 'QC flags overview', ...attributes },
     );
 };

lib/public/components/qcFlags/qcFlagsBreadcrumbs.js

@@ -10,7 +10,7 @@ import { RunQualities } from '../../domain/enums/RunQualities.js';
  * @param {DataPass} [qcBreadcrumbsElements.dataPass] data pass -- exclusive with `remoteSimulationPass`
  * @param {SimulationPass} [qcBreadcrumbsElements.simulationPass] simulation pass -- exclusive with `remoteDataPass`
  * @param {Run} qcBreadcrumbsElements.run run
- * @param {Detector} [qcBreadcrumbsElements.detector] dpl detector
+ * @param {Detector} [qcBreadcrumbsElements.detector] detector
  * @param {string} [header = 'QC'] header text
  * @return {Component} breadcrumbs
  */

lib/public/models/UserRoleSelectionModel.js

@@ -35,7 +35,7 @@ export class UserRoleSelectionModel extends SelectionDropdownModel {
      */
     _initialize() {
         /**
-         * Update dropdown model options with DPL detector provider remote data
+         * Update dropdown model options with detector provider remote data
          * @return {void}
          */
         const update = () => this.setAvailableOptions(detectorsProvider.qc$.getCurrent().match({

lib/public/services/detectors/remoteDplDetectorUserHasAccessTo.js → lib/public/services/detectors/remoteDetectorUserHasAccessTo.js

@@ -17,10 +17,10 @@
  * If the user do not have access to the given detector, remote data will be success with null payload
  *
  * @param {number} detectorId id of the detector that should be returned
- * @param {RemoteData<DplDetector[]>} remoteDplDetectorsUserHasAccessTo dpl detectors list remote data
+ * @param {RemoteData<Detector[]>} remoteDetectorsUserHasAccessTo detectors list remote data
  * @return {RemoteData} remote data of the detector
  */
-export const remoteDplDetectorUserHasAccessTo = (detectorId, remoteDplDetectorsUserHasAccessTo) => remoteDplDetectorsUserHasAccessTo.apply({
+export const getRemoteDetectorUserHasAccessTo = (detectorId, remoteDetectorsUserHasAccessTo) => remoteDetectorsUserHasAccessTo.apply({
     Success: (detectors) => detectors.find(({ id }) => id === detectorId) ?? null,
     Failure: () => `An error has occurred, unable to check if the user has access to the detector ${detectorId}`,
 });

lib/public/views/QcFlags/ActiveColumns/gaqFlagsActiveColumns.js

@@ -63,8 +63,8 @@ const formatGeneralQuality = (contributingFlags, gaqDetectors) => {
  * @param {number} scope.detectorId id of detector for which a QC flag is assigned
  * @return {Component} display of QC flag
  */
-const formatGaqDetectorQuality = (contributingFlags, { dataPassId, runNumber, detectorId }) => {
-    const flag = contributingFlags.find(({ dplDetectorId }) => dplDetectorId === detectorId);
+const formatGaqDetectorQuality = (contributingFlags, { dataPassId, runNumber, detectorId: targetDetectorId }) => {
+    const flag = contributingFlags.find(({ detectorId }) => detectorId === targetDetectorId);
     if (!flag) {
         return h('.gray-darker.m2.badge', tooltip(iconBan(), 'No flag is assigned'));
     }
@@ -86,15 +86,15 @@ const formatGaqDetectorQuality = (contributingFlags, { dataPassId, runNumber, de
             id: flag.id,
             dataPassId,
             runNumber,
-            dplDetectorId: detectorId,
+            detectorId: targetDetectorId,
         },
     );
 };
 
 /**
  * Factory for GAQ detectors related active columns configuration
  *
- * @param {Detector[]|DplDetector[]} gaqDetectors detectors list
+ * @param {Detector[]} gaqDetectors detectors list
  * @param {object} scope scope of GAQ flags
  * @param {number} scope.dataPassId id of data pass for which a QC flag is assigned
  * @param {number} scope.runNumber run number for which a QC flag is assigned

lib/public/views/QcFlags/ForDataPass/QcFlagsForDataPassOverviewModel.js

@@ -39,8 +39,8 @@ export class QcFlagsForDataPassOverviewModel extends QcFlagsOverviewModel {
         return buildUrl('/api/qcFlags/perDataPass', {
             dataPassId: this._dataPassId,
             runNumber: this._runNumber,
-            dplDetectorId: this._dplDetectorId,
-            filter: this.dplDetector.match({
+            detectorId: this._detectorId,
+            filter: this.detector.match({
                 Success: ({ type }) => [DetectorType.AOT_GLO, DetectorType.AOT_EVENT, DetectorType.MUON_GLO].includes(type)
                     ? { createdBy: { names: 'Anonymous', operator: 'none' } }
                     : {},

lib/public/views/QcFlags/ForDataPass/QcFlagsForDataPassOverviewPage.js

@@ -23,7 +23,7 @@ import { mergeRemoteData } from '../../../utilities/mergeRemoteData.js';
 import { qcFlagsBreadcrumbs } from '../../../components/qcFlags/qcFlagsBreadcrumbs.js';
 import errorAlert from '../../../components/common/errorAlert.js';
 import spinner from '../../../components/common/spinner.js';
-import { remoteDplDetectorUserHasAccessTo } from '../../../services/detectors/remoteDplDetectorUserHasAccessTo.js';
+import { getRemoteDetectorUserHasAccessTo } from '../../../services/detectors/remoteDetectorUserHasAccessTo.js';
 
 const TABLEROW_HEIGHT = 35;
 // Estimate of the navbar and pagination elements height total; Needs to be updated in case of changes;
@@ -36,13 +36,13 @@ const PAGE_USED_HEIGHT = 215;
  */
 export const QcFlagsForDataPassOverviewPage = ({
     qcFlags: { forDataPassOverviewModel: qcFlagsForDataPassOverviewModel },
-    dplDetectorsUserHasAccessTo: remoteDplDetectorsUserHasAccessTo,
+    detectorsUserHasAccessTo: remoteDetectorsUserHasAccessTo,
 }) => {
     const {
         dataPass: remoteDataPass,
         run: remoteRun,
-        dplDetectorId,
-        dplDetector: remoteDplDetector,
+        detectorId,
+        detector: remoteDetector,
         items: remoteQcFlags,
         sortModel,
     } = qcFlagsForDataPassOverviewModel;
@@ -56,11 +56,11 @@ export const QcFlagsForDataPassOverviewPage = ({
         qcFlagId: {
             name: 'Id',
             visible: true,
-            format: (qcFlagId, { dataPassId, dplDetectorId, runNumber }) =>
+            format: (qcFlagId, { dataPassId, detectorId, runNumber }) =>
                 frontLink(
                     h('.btn.btn-primary.white', qcFlagId),
                     'qc-flag-details-for-data-pass',
-                    { id: qcFlagId, dataPassId, runNumber, dplDetectorId },
+                    { id: qcFlagId, dataPassId, runNumber, detectorId },
                 ),
             classes: 'w-5',
         },
@@ -73,8 +73,8 @@ export const QcFlagsForDataPassOverviewPage = ({
         mergeRemoteData([
             remoteDataPass,
             remoteRun,
-            remoteDplDetector,
-            remoteDplDetectorUserHasAccessTo(dplDetectorId, remoteDplDetectorsUserHasAccessTo),
+            remoteDetector,
+            getRemoteDetectorUserHasAccessTo(detectorId, remoteDetectorsUserHasAccessTo),
             remoteQcFlags,
         ]).match({
             NotAsked: () => null,

lib/public/views/QcFlags/ForSimulationPass/QcFlagsForSimulationPassOverviewModel.js

@@ -38,7 +38,7 @@ export class QcFlagsForSimulationPassOverviewModel extends QcFlagsOverviewModel
         return buildUrl('/api/qcFlags/perSimulationPass', {
             simulationPassId: this._simulationPassId,
             runNumber: this._runNumber,
-            dplDetectorId: this._dplDetectorId,
+            detectorId: this._detectorId,
         });
     }
 

lib/public/views/QcFlags/ForSimulationPass/QcFlagsForSimulationPassOverviewPage.js

@@ -20,7 +20,7 @@ import { table } from '../../../components/common/table/table.js';
 import { paginationComponent } from '../../../components/Pagination/paginationComponent.js';
 import { qcFlagCreationPanelLink } from '../../../components/qcFlags/qcFlagCreationPanelLink.js';
 import { qcFlagsBreadcrumbs } from '../../../components/qcFlags/qcFlagsBreadcrumbs.js';
-import { remoteDplDetectorUserHasAccessTo } from '../../../services/detectors/remoteDplDetectorUserHasAccessTo.js';
+import { getRemoteDetectorUserHasAccessTo } from '../../../services/detectors/remoteDetectorUserHasAccessTo.js';
 import { mergeRemoteData } from '../../../utilities/mergeRemoteData.js';
 import errorAlert from '../../../components/common/errorAlert.js';
 import spinner from '../../../components/common/spinner.js';
@@ -36,13 +36,13 @@ const PAGE_USED_HEIGHT = 215;
  */
 export const QcFlagsForSimulationPassOverviewPage = ({
     qcFlags: { forSimulationPassOverviewModel: qcFlagsForSimulationPassOverviewModel },
-    dplDetectorsUserHasAccessTo: remoteDplDetectorsUserHasAccessTo,
+    detectorsUserHasAccessTo: remoteDetectorsUserHasAccessTo,
 }) => {
     const {
         simulationPass: remoteSimulationPass,
         run: remoteRun,
-        dplDetectorId,
-        dplDetector: remoteDplDetector,
+        detectorId,
+        detector: remoteDetector,
         items: remoteQcFlags,
         sortModel,
         pagination: paginationModel,
@@ -57,11 +57,11 @@ export const QcFlagsForSimulationPassOverviewPage = ({
         qcFlagId: {
             name: 'Id',
             visible: true,
-            format: (qcFlagId, { simulationPassId, dplDetectorId, runNumber }) =>
+            format: (qcFlagId, { simulationPassId, detectorId, runNumber }) =>
                 frontLink(
                     h('.btn.btn-primary.white', qcFlagId),
                     'qc-flag-details-for-simulation-pass',
-                    { id: qcFlagId, simulationPassId, runNumber, dplDetectorId },
+                    { id: qcFlagId, simulationPassId, runNumber, detectorId },
                 ),
             classes: 'w-5',
         },
@@ -74,8 +74,8 @@ export const QcFlagsForSimulationPassOverviewPage = ({
         mergeRemoteData([
             remoteSimulationPass,
             remoteRun,
-            remoteDplDetector,
-            remoteDplDetectorUserHasAccessTo(dplDetectorId, remoteDplDetectorsUserHasAccessTo),
+            remoteDetector,
+            getRemoteDetectorUserHasAccessTo(detectorId, remoteDetectorsUserHasAccessTo),
         ])
             .match({
                 NotAsked: () => null,

lib/public/views/QcFlags/GaqFlags/GaqFlagsOverviewModel.js

@@ -140,7 +140,7 @@ export class GaqFlagsOverviewModel extends OverviewPageModel {
             await jsonPost('/api/gaqDetectors', {
                 dataPassId: this._dataPassId,
                 runNumbers: [this._runNumber],
-                dplDetectorIds: this._gaqDetectorPickerModel.selected,
+                detectorIds: this._gaqDetectorPickerModel.selected,
             });
 
             this._setGaqDetectorsRequestResult.setCurrent(RemoteData.success(null));
@@ -191,8 +191,8 @@ export class GaqFlagsOverviewModel extends OverviewPageModel {
     }
 
     /**
-     * Get list of DPL detectors which flags contributes to GAQ
-     * @return {RemoteData<DplDetector[]>} dpl detectors remote data
+     * Get list of detectors which flags contributes to GAQ
+     * @return {RemoteData<Detector[]>} detectors remote data
      */
     get gaqDetectors() {
         return this._gaqDetectors$.getCurrent();