From 11c648f8c17173d76bfa2d2b0f9c399b228ded8d Mon Sep 17 00:00:00 2001 From: George Raduta Date: Tue, 20 Aug 2024 11:23:17 +0200 Subject: [PATCH] [OGUI-1539] Request entire file via jsroot and update webui dependency (#2558) * uses the `+` parameter in JSROOT to request entire file * updates web-ui version which improves sever logging * Bumps patch version of QCG for release --- .../lib/services/QcObject.service.js | 2 +- QualityControl/package-lock.json | 28 +++++++++---------- QualityControl/package.json | 4 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/QualityControl/lib/services/QcObject.service.js b/QualityControl/lib/services/QcObject.service.js index 559b778f6..c91bc9f6d 100644 --- a/QualityControl/lib/services/QcObject.service.js +++ b/QualityControl/lib/services/QcObject.service.js @@ -178,7 +178,7 @@ export class QcObjectService { * @returns {Promise} - JSON version of the object */ async _getJsRootFormat(url) { - const file = await this._rootService.openFile(url); + const file = await this._rootService.openFile(`${url}+`); const root = await file.readObject('ccdb_object'); root['_typename'] = root['mTreatMeAs'] || root['_typename']; diff --git a/QualityControl/package-lock.json b/QualityControl/package-lock.json index 695f84772..234d1b11f 100644 --- a/QualityControl/package-lock.json +++ b/QualityControl/package-lock.json @@ -1,12 +1,12 @@ { "name": "@aliceo2/qc", - "version": "3.8.3", + "version": "3.8.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@aliceo2/qc", - "version": "3.8.3", + "version": "3.8.4", "bundleDependencies": [ "@aliceo2/web-ui", "jsroot", @@ -14,7 +14,7 @@ ], "license": "GPL-3.0", "dependencies": { - "@aliceo2/web-ui": "2.7.0", + "@aliceo2/web-ui": "2.7.1", "joi": "17.13.3", "jsroot": "7.7.2" }, @@ -35,9 +35,9 @@ } }, "node_modules/@aliceo2/web-ui": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@aliceo2/web-ui/-/web-ui-2.7.0.tgz", - "integrity": "sha512-/e2UGRMEG3/I7ckWTQXLoDCALG8jG3PJeL0VKYWr8GSyODVMiHtDyL1yXTPzHyH845+/GctjRMtpxUT/AIVMbQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/@aliceo2/web-ui/-/web-ui-2.7.1.tgz", + "integrity": "sha512-mYVVpc15t8FX1Q3mHL/CDhghCEEjYcmjA4SEOa3BEPUBYv7rKgYF9xFei98AkXhmFyH3I4QGSDHiLdBPkw+bsA==", "inBundle": true, "dependencies": { "express": "^4.19.2", @@ -47,7 +47,7 @@ "mithril": "1.1.7", "mysql": "^2.18.1", "openid-client": "^5.6.0", - "winston": "3.13.0", + "winston": "3.14.1", "ws": "^8.18.0" }, "engines": { @@ -1539,9 +1539,9 @@ } }, "node_modules/async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", "inBundle": true }, "node_modules/asynckit": { @@ -7671,16 +7671,16 @@ } }, "node_modules/winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz", + "integrity": "sha512-CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA==", "inBundle": true, "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", diff --git a/QualityControl/package.json b/QualityControl/package.json index f9c1debc4..59f2cafd0 100644 --- a/QualityControl/package.json +++ b/QualityControl/package.json @@ -1,6 +1,6 @@ { "name": "@aliceo2/qc", - "version": "3.8.3", + "version": "3.8.4", "description": "O2 Quality Control Web User Interface", "author": "George Raduta", "contributors": [ @@ -34,7 +34,7 @@ "index.js" ], "dependencies": { - "@aliceo2/web-ui": "2.7.0", + "@aliceo2/web-ui": "2.7.1", "joi": "17.13.3", "jsroot": "7.7.2" },