Skip to content

Commit 9e3bc30

Browse files
authored
Merge branch 'main' into feature/O2B-1505/lhcfills-beam-duration-filter
2 parents bd1b836 + 75d9853 commit 9e3bc30

12 files changed

Lines changed: 434 additions & 455 deletions

.github/workflows/release.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: release
2-
permissions:
3-
contents: write
4-
packages: write
5-
actions: write
62
on:
73
release:
84
types: [created]
95
workflow_dispatch:
6+
7+
permissions:
8+
contents: write
9+
id-token: write
10+
1011
jobs:
1112
deploy-npm-module:
1213
runs-on: ubuntu-latest
@@ -16,7 +17,7 @@ jobs:
1617
- uses: actions/checkout@v6
1718
- uses: actions/setup-node@v6
1819
with:
19-
node-version: '22.x'
20+
node-version: '24.x'
2021
registry-url: 'https://registry.npmjs.org'
2122
- name: Check released tag matches ALICE O2 naming pattern
2223
run: |
@@ -35,8 +36,6 @@ jobs:
3536
echo "version=$VERSION" >> $GITHUB_OUTPUT
3637
echo "PROJECT=$PROJECT" >> $GITHUB_ENV
3738
- run: npm publish
38-
env:
39-
NODE_AUTH_TOKEN: ${{ secrets.NPM_DEPLOY_TOKEN }}
4039
upload-asset:
4140
runs-on: ubuntu-latest
4241
needs: deploy-npm-module

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { qcFlagsBreadcrumbs } from '../../../components/qcFlags/qcFlagsBreadcrum
2424
import errorAlert from '../../../components/common/errorAlert.js';
2525
import spinner from '../../../components/common/spinner.js';
2626
import { remoteDplDetectorUserHasAccessTo } from '../../../services/detectors/remoteDplDetectorUserHasAccessTo.js';
27+
import { paginationComponent } from '../../../components/Pagination/paginationComponent.js';
2728

2829
const TABLEROW_HEIGHT = 35;
2930
// Estimate of the navbar and pagination elements height total; Needs to be updated in case of changes;
@@ -45,6 +46,7 @@ export const QcFlagsForDataPassOverviewPage = ({
4546
dplDetector: remoteDplDetector,
4647
items: remoteQcFlags,
4748
sortModel,
49+
pagination: paginationModel,
4850
} = qcFlagsForDataPassOverviewModel;
4951

5052
qcFlagsForDataPassOverviewModel.pagination.provideDefaultItemsPerPage(estimateDisplayableRowsCount(
@@ -101,6 +103,7 @@ export const QcFlagsForDataPassOverviewPage = ({
101103
null,
102104
{ sort: sortModel },
103105
),
106+
paginationComponent(paginationModel),
104107
]),
105108
],
106109
Loading: () => spinner(),

lib/public/views/QcFlags/Overview/QcFlagsOverviewModel.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ export class QcFlagsOverviewModel extends OverviewPageModel {
4646
super.load();
4747
}
4848

49-
/**
50-
* @inheritdoc
51-
*/
52-
getLoadParameters() {
53-
return {};
54-
}
55-
5649
/**
5750
* Fetch DPL detector which QC flags should be fetched
5851
* @return {void}

0 commit comments

Comments
 (0)