Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[O2B-844] Filter according to B field in runs #1803

Merged
merged 20 commits into from
Dec 11, 2024
Merged

[O2B-844] Filter according to B field in runs #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7568905
show
Jaden505 Nov 29, 2024
4d63ce4
visible to false and removoe unnecessary profiles
Jaden505 Dec 2, 2024
1261383
add dipole and solenoid together test
Jaden505 Dec 2, 2024
54ec626
remove redundant api test
Jaden505 Dec 2, 2024
678fca0
add frontend test
Jaden505 Dec 2, 2024
29d2d53
update logs test to press runs element in navbar instead of using goT…
Jaden505 Dec 4, 2024
0278bf3
fix linter issue
Jaden505 Dec 4, 2024
0f8a06a
fix linter issue
Jaden505 Dec 4, 2024
e1a4b6a
fix linter issue
Jaden505 Dec 4, 2024
de5152e
fix linter issue
Jaden505 Dec 4, 2024
ee3cae6
fix linter issue
Jaden505 Dec 4, 2024
3479136
reverting back to goToPage
Jaden505 Dec 4, 2024
8204e48
reverting back to goToPage
Jaden505 Dec 4, 2024
00b36b1
reverting back to goToPage
Jaden505 Dec 4, 2024
7afb908
fix test result rows
Jaden505 Dec 4, 2024
ba5d13c
test no check after reset an no more gotopage
Jaden505 Dec 4, 2024
8459f62
fix test
Jaden505 Dec 6, 2024
f1fe315
remove unnecessary changes
Jaden505 Dec 9, 2024
ee567e2
comment in tests
Jaden505 Dec 9, 2024
e4c6eb9
Merge branch 'main' into feature/jadenvr/O2B-844/runs-filter-b-easy
Jaden505 Dec 11, 2024
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
2 changes: 1 addition & 1 deletion lib/public/views/Runs/ActiveColumns/runsActiveColumns.js
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
Loading