Skip to content

Commit

Permalink
Merge pull request #409 from AliceO2Group/newNPM
Browse files Browse the repository at this point in the history
New npm version
  • Loading branch information
DimitrySteenkamer authored Sep 17, 2021
2 parents 12709c6 + c093260 commit e0d4d67
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 36 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/bookkeeping.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 16.9.1
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '16.9.1'
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
- name: Installing dependencies
run: npm ci
- name: Running linter
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 16.9.1
- name: Use Node.js '14.x'
uses: actions/setup-node@v1
with:
node-version: '16.9.1'
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
- name: Running validator
run: |
npm ci
Expand All @@ -28,10 +29,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 16.9.1
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: '16.9.1'
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
- name: Running validator
run: |
npx @openapitools/openapi-generator-cli validate -i spec/openapi.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '16.9.1'
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
- name: Install production deps
run: npm install --only=production
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [0.17.6]
* Add more information to run entries. [#406] (https://github.com/AliceO2Group/Bookkeeping/pull/406)
* Hide/change existing Run Statistics fields. [#408] (https://github.com/AliceO2Group/Bookkeeping/pull/408)
* Changes made to the database. Changes are registerd in the CHANGELOG.md file in the database folder.

* New fields to be added to the RUNS table:
- dd_flp
- dcs
- epn

* Changed a field to another name in the RUNS table:
- activity_id is changed to environment_id

## [0.17.4]

* Added text and made the UI more clear. Log create and run detail was unclear on how the tags were implemented. [#398](https://github.com/AliceO2Group/Bookkeeping/pull/398)
Expand Down
9 changes: 9 additions & 0 deletions database/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## [0.17.6]

* New fields to be added to the RUNS table:
- dd_flp
- dcs
- epn

* Changed a field to another name in the RUNS table:
- activity_id is changed to environment_id
58 changes: 32 additions & 26 deletions lib/public/components/RunDetail/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,23 @@ const activeFields = () => ({
date ? new Date(date).toLocaleString('en-GB', { timeStyle: 'medium', dateStyle: 'short' }) : '-',
},
environmentId: {
name: 'EnvironmentId Id',
name: 'Environment Id',
visible: true,
size: 'cell-m',
},
// runType: {
// name: 'Run Type',
// visible: false,
// size: 'cell-l',
// },
// runQuality: {
// name: 'Run Quality',
// visible: false,
// size: 'cell-m',
// },

/*
* RunType: {
* name: 'Run Type',
* visible: false,
* size: 'cell-l',
* },
* runQuality: {
* name: 'Run Quality',
* visible: false,
* size: 'cell-m',
* },
*/
nDetectors: {
name: 'Number of Detectors',
visible: true,
Expand All @@ -87,21 +90,24 @@ const activeFields = () => ({
visible: true,
size: 'cell-s',
},
// nEpns: {
// name: 'Number of Epns',
// visible: false,
// size: 'cell-s',
// },
// nSubtimeframes: {
// name: 'Number of STFs',
// visible: false,
// size: 'cell-s',
// },
// bytesReadOut: {
// name: 'Readout Data',
// visible: false,
// size: 'cell-m',
// },

/*
* NEpns: {
* name: 'Number of Epns',
* visible: false,
* size: 'cell-s',
* },
* nSubtimeframes: {
* name: 'Number of STFs',
* visible: false,
* size: 'cell-s',
* },
* bytesReadOut: {
* name: 'Readout Data',
* visible: false,
* size: 'cell-m',
* },
*/
dd_flp: {
name: 'Data Distrubution (FLP)',
visible: true,
Expand Down
2 changes: 1 addition & 1 deletion lib/public/views/About/Overview/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import table from '../../../components/Table/index.js';
const aboutOverview = (model) => {
const data = [
{ type: 'Bookkeeping', version: '1', hostname: 'localhost', port: '4000' },
{ type: 'NPM', version: '0.17.4', hostname: '', port: '' },
{ type: 'NPM', version: '0.17.6', hostname: '', port: '' },
];

const aboutColumns = {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aliceo2/bookkeeping",
"version": "0.17.5",
"version": "0.17.6",
"author": "CERN",
"license": "GPL-3.0",
"scripts": {
Expand Down

0 comments on commit e0d4d67

Please sign in to comment.