From 5ad5bd232d6d73a428b4b7d3b84a1de52267a3d3 Mon Sep 17 00:00:00 2001 From: Bill Wallace Date: Tue, 21 Mar 2023 14:25:56 -0400 Subject: [PATCH] fix(tmtv): hanging protocol state sync (#3269) * fix: TMTV mode and message on drag and drop/toggle MPR * Tweaked some packages to force a rebuild --- .../default/src/Panels/PanelStudyBrowser.tsx | 2 +- extensions/default/src/commandsModule.ts | 2 +- package.json | 2 +- platform/ui/package.json | 2 +- .../contextProviders/getPresentationIds.ts | 2 +- yarn.lock | 34 +++++++------------ 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/extensions/default/src/Panels/PanelStudyBrowser.tsx b/extensions/default/src/Panels/PanelStudyBrowser.tsx index 9eb75aa95..3e7a072cd 100644 --- a/extensions/default/src/Panels/PanelStudyBrowser.tsx +++ b/extensions/default/src/Panels/PanelStudyBrowser.tsx @@ -51,7 +51,7 @@ function PanelStudyBrowser({ uiNotificationService.show({ title: 'Thumbnail Double Click', message: - 'The selected display sets could not be added to the viewport due to a mismatch in the Hanging Protocol rules.', + 'The selected display sets could not be added to the viewport.', type: 'info', duration: 3000, }); diff --git a/extensions/default/src/commandsModule.ts b/extensions/default/src/commandsModule.ts index 5582dd5a8..58c3e3797 100644 --- a/extensions/default/src/commandsModule.ts +++ b/extensions/default/src/commandsModule.ts @@ -192,7 +192,7 @@ const commandsModule = ({ servicesManager, commandsManager }) => { actions.toggleHpTools(hangingProtocolService.getActiveProtocol()); uiNotificationService.show({ title: 'Apply Hanging Protocol', - message: `The hanging protocol could not be applied due to ${e}`, + message: 'The hanging protocol could not be applied.', type: 'error', duration: 3000, }); diff --git a/package.json b/package.json index 3b5918b6f..c5287de03 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@types/jest": "^27.5.0", "@typescript-eslint/eslint-plugin": "^4.19.0", "@typescript-eslint/parser": "^4.19.0", - "autoprefixer": "10.4.4", + "autoprefixer": "^10.4.4", "babel-eslint": "9.x", "babel-loader": "^8.2.4", "babel-plugin-inline-react-svg": "1.1.0", diff --git a/platform/ui/package.json b/platform/ui/package.json index 9f11e280f..68d73cd20 100644 --- a/platform/ui/package.json +++ b/platform/ui/package.json @@ -57,7 +57,7 @@ "@storybook/manager-webpack5": "^6.4.9", "@storybook/react": "^6.4.9", "@storybook/source-loader": "^6.4.9", - "autoprefixer": "9.7.4", + "autoprefixer": ">=9.7.4", "babel-loader": "^8.2.2", "dotenv-webpack": "6.0.4", "postcss": "^8.3.5", diff --git a/platform/ui/src/contextProviders/getPresentationIds.ts b/platform/ui/src/contextProviders/getPresentationIds.ts index e5a41d7c9..b34b6badc 100644 --- a/platform/ui/src/contextProviders/getPresentationIds.ts +++ b/platform/ui/src/contextProviders/getPresentationIds.ts @@ -31,7 +31,7 @@ const addUniqueIndex = (arr, key, viewports) => { const getLutId = (ds): string => { if (!ds || !ds.options) return DEFAULT; if (ds.options.id) return ds.options.id; - const arr = Object.entries(ds.options).map(([key, val]) => `${key}=${value}`); + const arr = Object.entries(ds.options).map(([key, val]) => `${key}=${val}`); if (!arr.length) return DEFAULT; return arr.join(JOIN_STR); }; diff --git a/yarn.lock b/yarn.lock index 8d7ec3330..dbc9e8400 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6638,31 +6638,18 @@ attr-accept@^2.0.0: resolved "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== -autoprefixer@10.4.4: - version "10.4.4" - resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e" - integrity sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA== +autoprefixer@>=9.7.4, autoprefixer@^10.4.4: + version "10.4.14" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d" + integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ== dependencies: - browserslist "^4.20.2" - caniuse-lite "^1.0.30001317" + browserslist "^4.21.5" + caniuse-lite "^1.0.30001464" fraction.js "^4.2.0" normalize-range "^0.1.2" picocolors "^1.0.0" postcss-value-parser "^4.2.0" -autoprefixer@9.7.4: - version "9.7.4" - resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378" - integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g== - dependencies: - browserslist "^4.8.3" - caniuse-lite "^1.0.30001020" - chalk "^2.4.2" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.26" - postcss-value-parser "^4.0.2" - autoprefixer@^10.4.12, autoprefixer@^10.4.13, autoprefixer@^10.4.7: version "10.4.13" resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8" @@ -7314,7 +7301,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.20.2, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.8.3: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: version "4.21.5" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== @@ -7622,11 +7609,16 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449: version "1.0.30001455" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001455.tgz#3a2c24bcbbb5ff73e3f347e11d71a22d023798cc" integrity sha512-h5n7WkDmyHlvHhVFDMC1OFUuWKoht7xuom/kL8b8uJzfMmB068adJgj3B0/n5PtnrK6rEqY8FE/D9m38aRdWhw== +caniuse-lite@^1.0.30001464: + version "1.0.30001469" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001469.tgz#3dd505430c8522fdc9f94b4a19518e330f5c945a" + integrity sha512-Rcp7221ScNqQPP3W+lVOYDyjdR6dC+neEQCttoNr5bAyz54AboB4iwpnWgyi8P4YUsPybVzT4LgWiBbI3drL4g== + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"