From 10121e3f455d931e31e005bf923d7cc93e323c46 Mon Sep 17 00:00:00 2001 From: dimitry Date: Fri, 17 Sep 2021 11:16:45 +0200 Subject: [PATCH 1/2] New npm version --- .github/workflows/bookkeeping.yml | 4 ++-- .github/workflows/openapi.yml | 8 ++++---- .github/workflows/release.yml | 2 +- lib/public/views/About/Overview/index.js | 2 +- package-lock.json | 2 +- package.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bookkeeping.yml b/.github/workflows/bookkeeping.yml index 9744d06e38..cf2ffbd40e 100644 --- a/.github/workflows/bookkeeping.yml +++ b/.github/workflows/bookkeeping.yml @@ -48,10 +48,10 @@ 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' - name: Installing dependencies run: npm ci - name: Running linter diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index 80586880bf..fa83e007e0 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -13,10 +13,10 @@ 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' - name: Running validator run: | npm ci @@ -28,10 +28,10 @@ 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' - name: Running validator run: | npx @openapitools/openapi-generator-cli validate -i spec/openapi.yaml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 413b5adef8..51e17e4ef2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/lib/public/views/About/Overview/index.js b/lib/public/views/About/Overview/index.js index 6b3f7c9ecb..214178a83a 100644 --- a/lib/public/views/About/Overview/index.js +++ b/lib/public/views/About/Overview/index.js @@ -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 = { diff --git a/package-lock.json b/package-lock.json index 5849041a4d..8465952cb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aliceo2/bookkeeping", - "version": "0.17.5", + "version": "0.17.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 94c56f6aaa..4a32ce3e21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aliceo2/bookkeeping", - "version": "0.17.5", + "version": "0.17.6", "author": "CERN", "license": "GPL-3.0", "scripts": { From c0932608746b58775dfc54006aacbfbd82c4b5e7 Mon Sep 17 00:00:00 2001 From: dimitry Date: Fri, 17 Sep 2021 11:42:19 +0200 Subject: [PATCH 2/2] Changelog.md added --- .github/workflows/bookkeeping.yml | 1 + .github/workflows/openapi.yml | 2 + CHANGELOG.md | 13 ++++++ database/CHANGELOG.md | 9 ++++ lib/public/components/RunDetail/index.js | 58 +++++++++++++----------- 5 files changed, 57 insertions(+), 26 deletions(-) create mode 100644 database/CHANGELOG.md diff --git a/.github/workflows/bookkeeping.yml b/.github/workflows/bookkeeping.yml index cf2ffbd40e..97c8c2e143 100644 --- a/.github/workflows/bookkeeping.yml +++ b/.github/workflows/bookkeeping.yml @@ -52,6 +52,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: '14.x' + registry-url: 'https://registry.npmjs.org' - name: Installing dependencies run: npm ci - name: Running linter diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index fa83e007e0..547fadd62f 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -17,6 +17,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: '14.x' + registry-url: 'https://registry.npmjs.org' - name: Running validator run: | npm ci @@ -32,6 +33,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: '14.x' + registry-url: 'https://registry.npmjs.org' - name: Running validator run: | npx @openapitools/openapi-generator-cli validate -i spec/openapi.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b29b99060..1583a4efa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/database/CHANGELOG.md b/database/CHANGELOG.md new file mode 100644 index 0000000000..3f0afd9440 --- /dev/null +++ b/database/CHANGELOG.md @@ -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 \ No newline at end of file diff --git a/lib/public/components/RunDetail/index.js b/lib/public/components/RunDetail/index.js index 8570c7f92a..1f7752d342 100644 --- a/lib/public/components/RunDetail/index.js +++ b/lib/public/components/RunDetail/index.js @@ -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, @@ -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,