Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
this.registerDetectorsForQcFlagsDataExport(this._detectors$);
this.registerObervablesQcSummaryDependesOn([this._detectors$]);

this._gaqSummary$ = new ObservableData(RemoteData.notAsked());
this._gaqSummary$.bubbleTo(this);

this._markAsSkimmableRequestResult$ = new ObservableData(RemoteData.notAsked());
this._markAsSkimmableRequestResult$.bubbleTo(this);

Expand Down Expand Up @@ -119,7 +116,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
return;
}

this._fetchGaqSummary();
await this._fetchDataPass().then(() =>
this._dataPass$.getCurrent().match({
Success: ({ skimmingStage, pdpBeamTypes }) => {
Expand Down Expand Up @@ -325,23 +321,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
}
}

/**
* Fetch GAQ summary for given data pass
* @return {Promise<void>} resolves once data are fetched
*/
async _fetchGaqSummary() {
this._gaqSummary$.setCurrent(RemoteData.loading());
try {
const { data: gaqSummary } = await getRemoteData(buildUrl('/api/qcFlags/summary/gaq', {
dataPassId: this._dataPassId,
mcReproducibleAsNotBad: this._mcReproducibleAsNotBad,
}));
this._gaqSummary$.setCurrent(RemoteData.success(gaqSummary));
} catch (error) {
this._gaqSummary$.setCurrent(RemoteData.failure(error));
}
}

/**
* Fetch skimmable runs for given data pass
* @return {Promise<void>} resolves once data are fetched
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { runNumbersFilter } from '../../../components/Filters/RunsFilter/runNumb
import { qcSummaryLegendTooltip } from '../../../components/qcFlags/qcSummaryLegendTooltip.js';
import { isRunNotSubjectToQc } from '../../../components/qcFlags/isRunNotSubjectToQc.js';
import { frontLink } from '../../../components/common/navigation/frontLink.js';
import { getQcSummaryDisplay } from '../ActiveColumns/getQcSummaryDisplay.js';
import errorAlert from '../../../components/common/errorAlert.js';
import { switchInput } from '../../../components/common/form/switchInput.js';
import { PdpBeamType } from '../../../domain/enums/PdpBeamType.js';
Expand Down Expand Up @@ -103,7 +102,6 @@ export const RunsPerDataPassOverviewPage = ({
detectors: remoteDetectors,
dataPass: remoteDataPass,
qcSummary: remoteQcSummary,
gaqSummary: remoteGaqSummary,
displayOptions,
dataPassId,
sortModel,
Expand All @@ -120,10 +118,10 @@ export const RunsPerDataPassOverviewPage = ({

return h(
'.intermediate-flex-column',
mergeRemoteData([remoteDataPass, remoteRuns, remoteDetectors, remoteQcSummary, remoteGaqSummary]).match({
mergeRemoteData([remoteDataPass, remoteRuns, remoteDetectors, remoteQcSummary]).match({
NotAsked: () => null,
Failure: (errors) => errorAlert(errors),
Success: ([dataPass, runs, detectors, qcSummary, gaqSummary]) => {
Success: ([dataPass, runs, detectors, qcSummary]) => {
const activeColumns = {
...runsActiveColumns,
...getInelasticInteractionRateColumns(pdpBeamTypes),
Expand Down Expand Up @@ -162,12 +160,7 @@ export const RunsPerDataPassOverviewPage = ({
),
visible: true,
format: (_, { runNumber }) => {
const runGaqSummary = gaqSummary[runNumber];

const gaqDisplay = runGaqSummary?.undefinedQualityPeriodsCount === 0
? getQcSummaryDisplay(runGaqSummary)
: h('button.btn.btn-primary.w-100', 'GAQ');

const gaqDisplay = h('button.btn.btn-primary.w-100', 'GAQ');
return frontLink(gaqDisplay, 'gaq-flags', { dataPassId, runNumber });
},
filter: ({ filteringModel }) => numericalComparisonFilter(
Expand Down
3 changes: 0 additions & 3 deletions test/public/runs/runsPerDataPass.overview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@ module.exports = () => {

await expectInnerText(page, '#row106-globalAggregatedQuality', 'GAQ');

await expectInnerText(page, '#row107-globalAggregatedQuality', '76');
expect(await getPopoverInnerText(await page.waitForSelector('#row107-globalAggregatedQuality .popover-trigger')))
.to.be.equal('Missing 3 verifications');
});

it('should ignore QC flags created by services in QC summaries of AOT and MUON ', async () => {
Expand Down
Loading