From cec92bdb094a1549d4850d5c9a900c1b8cad0d39 Mon Sep 17 00:00:00 2001 From: ek-hystax <33006768+ek-hystax@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:03:27 +0400 Subject: [PATCH 1/2] OS-7184. Update vite libs to the latest version --- jira_ui/ui/package-lock.json | 48 ++++++++++++++++++------------------ jira_ui/ui/package.json | 5 ++-- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/jira_ui/ui/package-lock.json b/jira_ui/ui/package-lock.json index 5a43e0afe..72e3a1ae2 100644 --- a/jira_ui/ui/package-lock.json +++ b/jira_ui/ui/package-lock.json @@ -27,8 +27,8 @@ "react-markdown": "^9.0.1", "react-router-dom": "^6.19.0", "remark-gfm": "^4.0.0", - "vite": "^5.0.2", - "vite-tsconfig-paths": "^4.2.1" + "vite": "^5.0.10", + "vite-tsconfig-paths": "^4.2.2" }, "devDependencies": { "eslint": "^8.54.0", @@ -8067,9 +8067,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", + "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", "funding": [ { "type": "opencollective", @@ -8085,7 +8085,7 @@ } ], "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -9585,12 +9585,12 @@ } }, "node_modules/vite": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.2.tgz", - "integrity": "sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g==", + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.10.tgz", + "integrity": "sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==", "dependencies": { "esbuild": "^0.19.3", - "postcss": "^8.4.31", + "postcss": "^8.4.32", "rollup": "^4.2.0" }, "bin": { @@ -9639,9 +9639,9 @@ } }, "node_modules/vite-tsconfig-paths": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.1.tgz", - "integrity": "sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.2.tgz", + "integrity": "sha512-dq0FjyxHHDnp0uS3P12WEOX2W7NeuLzX9AWP38D7Zw2CTbFErapwQVlCiT5DMJcVWKQ1MMdTe92PZl/rBQ7qcw==", "dependencies": { "debug": "^4.1.1", "globrex": "^0.1.2", @@ -15327,11 +15327,11 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" }, "postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", + "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", "requires": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -16368,20 +16368,20 @@ } }, "vite": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.2.tgz", - "integrity": "sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g==", + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.10.tgz", + "integrity": "sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==", "requires": { "esbuild": "^0.19.3", "fsevents": "~2.3.3", - "postcss": "^8.4.31", + "postcss": "^8.4.32", "rollup": "^4.2.0" } }, "vite-tsconfig-paths": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.1.tgz", - "integrity": "sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.2.tgz", + "integrity": "sha512-dq0FjyxHHDnp0uS3P12WEOX2W7NeuLzX9AWP38D7Zw2CTbFErapwQVlCiT5DMJcVWKQ1MMdTe92PZl/rBQ7qcw==", "requires": { "debug": "^4.1.1", "globrex": "^0.1.2", diff --git a/jira_ui/ui/package.json b/jira_ui/ui/package.json index aef615e16..656daf960 100644 --- a/jira_ui/ui/package.json +++ b/jira_ui/ui/package.json @@ -2,6 +2,7 @@ "name": "ui", "version": "0.1.0", "private": true, + "type": "module", "dependencies": { "@atlaskit/badge": "^15.1.16", "@atlaskit/button": "^16.17.1", @@ -22,8 +23,8 @@ "react-markdown": "^9.0.1", "react-router-dom": "^6.19.0", "remark-gfm": "^4.0.0", - "vite": "^5.0.2", - "vite-tsconfig-paths": "^4.2.1" + "vite": "^5.0.10", + "vite-tsconfig-paths": "^4.2.2" }, "scripts": { "start": "vite", From 94678bf58209613ed412249b8fec53b11e365451 Mon Sep 17 00:00:00 2001 From: ek-hystax <33006768+ek-hystax@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:04:49 +0400 Subject: [PATCH 2/2] OS-7192. Use leaderboard dataset id to identify if LeaderboardDatasetCard is selected --- .../MlModelLeaderboard/components/LeaderboardDatasets.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngui/ui/src/components/MlModelLeaderboard/components/LeaderboardDatasets.tsx b/ngui/ui/src/components/MlModelLeaderboard/components/LeaderboardDatasets.tsx index be247e4ae..d6c93b5fc 100644 --- a/ngui/ui/src/components/MlModelLeaderboard/components/LeaderboardDatasets.tsx +++ b/ngui/ui/src/components/MlModelLeaderboard/components/LeaderboardDatasets.tsx @@ -61,7 +61,7 @@ const LeaderboardDatasetsListSection = ({ > {selectedLeaderboardDataset && leaderboardDatasets.map((leaderboardDataset) => { - const isSelected = leaderboardDataset.name === selectedLeaderboardDataset.name; + const isSelected = leaderboardDataset.id === selectedLeaderboardDataset.id; return (