Skip to content

Commit

Permalink
Merge branch 'main' into mboulais/O2B-1415/fix-enable-housekeeping-en…
Browse files Browse the repository at this point in the history
…v-var
  • Loading branch information
martinboulais authored Dec 11, 2024
2 parents 947162d + 0e891c6 commit 3d74d8f
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 23 deletions.
2 changes: 1 addition & 1 deletion lib/public/views/Runs/ActiveColumns/runsActiveColumns.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,6 @@ export const runsActiveColumns = {
name: 'L3 / Dipole',
visible: false,
filter: ({ aliceL3AndDipoleCurrentFilter }) => selectionDropdown(aliceL3AndDipoleCurrentFilter, { selectorPrefix: 'l3-dipole-current' }),
profiles: ['runsPerLhcPeriod', 'runsPerDataPass', 'runsPerSimulationPass'],
profiles: ['runsPerLhcPeriod', 'runsPerDataPass', 'runsPerSimulationPass', profiles.none],
},
};
71 changes: 51 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 13 additions & 2 deletions test/public/runs/overview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ module.exports = () => {
it('should successfully filter on tags', async () => {
await waitForTableLength(page, 8);

// Open filter toggle
// Open filter toggle and wait for the dropdown to be visible
await pressElement(page, '.tags-filter .dropdown-trigger');
await pressElement(page, '#tag-dropdown-option-FOOD', true);
await pressElement(page, '#tag-dropdown-option-RUN', true);
Expand Down Expand Up @@ -596,6 +596,17 @@ module.exports = () => {
expect(runDurationList.every((runDuration) => runDuration === 'UNKNOWN')).to.be.true;
});

it('should successfully apply alice currents filters', async () => {
await pressElement(page, '#reset-filters');

const popoverSelector = await getPopoverSelector(await page.waitForSelector('.aliceL3AndDipoleCurrent-filter .popover-trigger'));
await pressElement(page, `${popoverSelector} .dropdown-option:last-child`, true); // Select 30003kA/0kA

await expectColumnValues(page, 'runNumber', ['54', '53', '52']);

await pressElement(page, '#reset-filters');
});

it('Should successfully filter runs by their run quality', async () => {
await goToPage(page, 'run-overview');
const filterInputSelectorPrefix = '#runQualityCheckbox';
Expand Down Expand Up @@ -1116,7 +1127,7 @@ module.exports = () => {
await waitForNavigation(page, () => pressElement(page, 'a#home'));
await waitForNavigation(page, () => pressElement(page, 'a#run-overview'));

// Not running run
// Not running run, wait for popover to be visible
await pressElement(page, '#row104-runNumber-text .popover-trigger');
let popoverSelector = await getPopoverSelector(await page.waitForSelector('#row104-runNumber-text .popover-trigger'));
await page.waitForSelector(popoverSelector);
Expand Down

0 comments on commit 3d74d8f

Please sign in to comment.