Merge branch 'main' into move-trends-inside-custom

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.6.22] - 2023-03-19
+
+### 🐛 Bug Fixes
+
+- Add experiment_rev into payload for share experiment to Studio [#3499](https://github.com/iterative/vscode-dvc/pull/3499) by [@mattseddon](https://github.com/mattseddon)
+
 ## [0.6.21] - 2023-03-17
 
 ### 🚀 New Features and Enhancements

extension/package.json

@@ -9,7 +9,7 @@
   "extensionDependencies": [
     "vscode.git"
   ],
-  "version": "0.6.21",
+  "version": "0.6.22",
   "license": "Apache-2.0",
   "readme": "./README.md",
   "repository": {
@@ -1635,7 +1635,7 @@
     "vscode-languageclient": "8.1.0"
   },
   "devDependencies": {
-    "@swc/core": "1.3.39",
+    "@swc/core": "1.3.40",
     "@swc/jest": "0.2.24",
     "@types/chai": "4.3.4",
     "@types/chai-as-promised": "7.1.5",
@@ -1659,8 +1659,8 @@
     "@types/vscode": "1.64.0",
     "@vscode/test-electron": "2.3.0",
     "@vscode/vsce": "2.18.0",
-    "@wdio/cli": "8.5.8",
-    "@wdio/local-runner": "8.5.8",
+    "@wdio/cli": "8.5.9",
+    "@wdio/local-runner": "8.5.9",
     "@wdio/mocha-framework": "8.5.6",
     "@wdio/spec-reporter": "8.4.0",
     "chai": "4.3.7",
@@ -1675,13 +1675,13 @@
     "mock-require": "3.0.3",
     "process-exists": "4.1.0",
     "shx": "0.3.4",
-    "sinon": "15.0.1",
+    "sinon": "15.0.2",
     "sinon-chai": "3.7.0",
     "ts-loader": "9.4.2",
     "vscode-uri": "3.0.7",
     "wdio-vscode-service": "5.0.0",
-    "webdriverio": "8.5.8",
-    "webpack": "5.76.0",
+    "webdriverio": "8.5.9",
+    "webpack": "5.76.1",
     "webpack-cli": "5.0.1"
   },
   "peerDependencies": {

extension/src/patch.ts

@@ -19,6 +19,7 @@ export const STUDIO_ENDPOINT = 'https://studio.iterative.ai/api/live'
 
 type ExperimentDetails = {
   baselineSha: string
+  sha: string
   metrics: ValueTreeRoot | undefined
   name: string
   params: ValueTreeRoot
@@ -29,6 +30,7 @@ type RequestBody = {
   repo_url: string
   name: string
   baseline_sha: string
+  experiment_rev: string
   metrics: ValueTreeRoot
   params: ValueTreeRoot
   type: 'done'
@@ -50,22 +52,23 @@ const collectExperiment = (data: ExperimentFields) => {
 
 const findExperimentByName = (
   name: string,
-  sha: string,
+  baselineSha: string,
   experimentsObject: ExperimentsCommitOutput
 ) => {
-  for (const experiment of Object.values(experimentsObject)) {
-    if (experiment.data?.name !== name) {
+  for (const [sha, { data }] of Object.entries(experimentsObject)) {
+    if (data?.name !== name) {
       continue
     }
 
-    if (experiment?.data) {
-      const { metrics, params } = collectExperiment(experiment.data)
+    if (data) {
+      const { metrics, params } = collectExperiment(data)
 
       return {
-        baselineSha: sha,
+        baselineSha,
         metrics,
         name,
-        params
+        params,
+        sha
       }
     }
   }
@@ -114,7 +117,7 @@ const shareWithProgress = (
   studioAccessToken: string
 ): Thenable<unknown> =>
   Toast.showProgress('Sharing Experiment', async progress => {
-    const { metrics, params, baselineSha, name } = experimentDetails
+    const { metrics, params, baselineSha, sha, name } = experimentDetails
 
     progress.report({
       increment: 0,
@@ -125,6 +128,7 @@ const shareWithProgress = (
     const response = await sendPostRequest(studioAccessToken, {
       baseline_sha: baselineSha,
       client: 'vscode',
+      experiment_rev: sha,
       metrics: metrics || {},
       name,
       params: params || {},

extension/src/test/suite/patch.test.ts

@@ -68,6 +68,7 @@ suite('Patch Test Suite', () => {
         body: JSON.stringify({
           baseline_sha: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77',
           client: 'vscode',
+          experiment_rev: '4fb124aebddb2adf1545030907687fa9a4c80e70',
           metrics,
           name,
           params: {
@@ -133,6 +134,7 @@ suite('Patch Test Suite', () => {
         body: JSON.stringify({
           baseline_sha: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77',
           client: 'vscode',
+          experiment_rev: '4fb124aebddb2adf1545030907687fa9a4c80e70',
           metrics,
           name,
           params: {

languageServer/package.json

@@ -25,7 +25,7 @@
     "test": "jest --collect-coverage"
   },
   "devDependencies": {
-    "@swc/core": "1.3.39",
+    "@swc/core": "1.3.40",
     "@swc/jest": "0.2.24",
     "@types/jest": "29.4.0",
     "clean-webpack-plugin": "4.0.0",
@@ -34,7 +34,7 @@
     "ts-loader": "9.4.2",
     "lint-staged": "13.2.0",
     "jest": "29.5.0",
-    "webpack": "5.76.0",
+    "webpack": "5.76.1",
     "webpack-cli": "5.0.1",
     "jest-environment-node": "29.5.0"
   }

package.json

@@ -37,7 +37,7 @@
     "@typescript-eslint/eslint-plugin": "5.54.1",
     "@typescript-eslint/parser": "5.54.1",
     "@vscode/codicons": "0.0.32",
-    "eslint": "8.35.0",
+    "eslint": "8.36.0",
     "eslint-config-prettier": "8.7.0",
     "eslint-config-prettier-standard": "4.0.1",
     "eslint-config-standard": "17.0.0",

webview/package.json

@@ -47,7 +47,7 @@
     "@storybook/react": "6.5.16",
     "@storybook/testing-library": "0.0.13",
     "@svgr/cli": "6.5.1",
-    "@swc/core": "1.3.39",
+    "@swc/core": "1.3.40",
     "@swc/jest": "0.2.24",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "14.0.0",
@@ -70,13 +70,13 @@
     "jest-environment-jsdom": "29.5.0",
     "lint-staged": "13.2.0",
     "raw-loader": "4.0.2",
-    "sass": "1.58.3",
+    "sass": "1.59.2",
     "sass-loader": "13.2.0",
     "storybook-addon-designs": "6.3.1",
     "storybook-addon-themes": "6.1.0",
     "style-loader": "3.3.1",
     "ts-loader": "9.4.2",
-    "webpack": "5.76.0",
+    "webpack": "5.76.1",
     "webpack-cli": "5.0.1",
     "webpack-dev-server": "4.11.1"
   },