Merge branch 'main' into sticky-section-headers

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.6.19] - 2023-03-15
+
+### 🚀 New Features and Enhancements
+
+- Make the plot sizing sliders sticky [#3443](https://github.com/iterative/vscode-dvc/pull/3443) by [@sroy3](https://github.com/sroy3)
+- Add a slider to resize plots vertically [#3428](https://github.com/iterative/vscode-dvc/pull/3428) by [@sroy3](https://github.com/sroy3)
+- Move Connect to Studio into Setup webview [#3452](https://github.com/iterative/vscode-dvc/pull/3452) by [@mattseddon](https://github.com/mattseddon)
+- Provide option to open and focus relevant Setup section through UI [#3462](https://github.com/iterative/vscode-dvc/pull/3462) by [@mattseddon](https://github.com/mattseddon)
+- Add show experiments button to final experiments screen [#3463](https://github.com/iterative/vscode-dvc/pull/3463) by [@mattseddon](https://github.com/mattseddon)
+
+### 🐛 Bug Fixes
+
+- Make className optional in SectionContainer [#3464](https://github.com/iterative/vscode-dvc/pull/3464) by [@sroy3](https://github.com/sroy3)
+
+### 🔨 Maintenance
+
+- Update demo project and latest tested CLI version (2.47.2) [#3451](https://github.com/iterative/vscode-dvc/pull/3451) by [@mattseddon](https://github.com/mattseddon)
+- Update demo project and latest tested CLI version (2.48.0) [#3457](https://github.com/iterative/vscode-dvc/pull/3457) by [@mattseddon](https://github.com/mattseddon)
+- Fix flaky integration tests [#3461](https://github.com/iterative/vscode-dvc/pull/3461) by [@mattseddon](https://github.com/mattseddon)
+
 ## [0.6.18] - 2023-03-12
 
 ### 🚀 New Features and Enhancements

extension/package.json

@@ -9,7 +9,7 @@
   "extensionDependencies": [
     "vscode.git"
   ],
-  "version": "0.6.18",
+  "version": "0.6.19",
   "license": "Apache-2.0",
   "readme": "./README.md",
   "repository": {
@@ -399,16 +399,6 @@
         "command": "dvc.showCommands",
         "category": "DVC"
       },
-      {
-        "title": "Connect to Studio",
-        "command": "dvc.showConnect",
-        "category": "DVC"
-      },
-      {
-        "title": "Open Studio Settings",
-        "command": "dvc.showStudioSettings",
-        "category": "DVC"
-      },
       {
         "title": "Show Experiments",
         "command": "dvc.showExperiments",
@@ -819,14 +809,6 @@
           "command": "dvc.stopQueuedExperiments",
           "when": "dvc.commands.available && dvc.project.available"
         },
-        {
-          "command": "dvc.showConnect",
-          "when": "dvc.commands.available && dvc.project.available && !dvc.studio.connected"
-        },
-        {
-          "command": "dvc.showStudioSettings",
-          "when": "dvc.commands.available && dvc.project.available && dvc.studio.connected"
-        },
         {
           "command": "dvc.selectForCompare",
           "when": "false"
@@ -1416,17 +1398,17 @@
       },
       {
         "view": "dvc.views.studio",
-        "contents": "[$(plug) Connect](command:dvc.showConnect)",
+        "contents": "[$(plug) Connect](command:dvc.showStudioSetup)",
         "when": "!dvc.studio.connected"
       },
       {
         "view": "dvc.views.studio",
-        "contents": "[$(settings-gear) Open Settings](command:dvc.showConnect)",
+        "contents": "[$(settings-gear) Open Settings](command:dvc.showStudioSetup)",
         "when": "dvc.studio.connected"
       },
       {
         "view": "dvc.views.welcome",
-        "contents": "New to the extension?\n[Show Walkthrough](command:dvc.getStarted)\n\nThe extension is currently unable to initialize.\n[Show Setup](command:dvc.showSetup)",
+        "contents": "New to the extension?\n[Show Walkthrough](command:dvc.getStarted)\n\nThe extension is currently unable to initialize.\n[Show Setup](command:dvc.showExperimentsSetup)",
         "when": "true"
       },
       {
@@ -1468,7 +1450,7 @@
           {
             "id": "dvc.installDVC",
             "title": "Install DVC",
-            "description": "This extension requires DVC to be installed.\n\n[Show Setup](command:dvc.showSetup)\n",
+            "description": "This extension requires DVC to be installed.\n\n[Show Setup](command:dvc.showExperimentsSetup)\n",
             "media": {
               "markdown": "resources/walkthrough/install-dvc.md"
             },
@@ -1654,8 +1636,8 @@
     "@types/vscode": "1.64.0",
     "@vscode/test-electron": "2.3.0",
     "@vscode/vsce": "2.18.0",
-    "@wdio/cli": "8.5.6",
-    "@wdio/local-runner": "8.5.6",
+    "@wdio/cli": "8.5.7",
+    "@wdio/local-runner": "8.5.7",
     "@wdio/mocha-framework": "8.5.6",
     "@wdio/spec-reporter": "8.4.0",
     "chai": "4.3.7",
@@ -1675,8 +1657,8 @@
     "ts-loader": "9.4.2",
     "vscode-uri": "3.0.7",
     "wdio-vscode-service": "5.0.0",
-    "webdriverio": "8.5.6",
-    "webpack": "5.75.0",
+    "webdriverio": "8.5.7",
+    "webpack": "5.76.0",
     "webpack-cli": "5.0.1"
   },
   "peerDependencies": {

extension/resources/walkthrough/install-dvc.md

@@ -16,7 +16,7 @@ DVC icon like this in the status bar:
 </p>
 
 If you see instead the crossed circle icon, click on the icon or follow the
-[Setup](command:dvc.showSetup) wizard.
+[Setup](command:dvc.showExperimentsSetup) wizard.
 
 > **Note**: The correct Python interpreter must be set for the current workspace
 > when relying on the Python extension for auto environment activation.

extension/resources/walkthrough/setup-project.md

@@ -56,4 +56,5 @@ live.log("roc_auc", metrics.roc_auc_score(labels, predictions))
 💡 View
 [Instant Experiment Tracking: Just Add DVC!](https://iterative.ai/blog/exp-tracking-dvc-python)
 for a quick-start guide on migrating an existing project. Use
-[Setup](command:dvc.showSetup) to be guided through the onboarding process.
+[Setup](command:dvc.showExperimentsSetup) to be guided through the onboarding
+process.

extension/src/cli/dvc/discovery.ts

@@ -15,6 +15,7 @@ import {
 import { getPythonBinPath } from '../../extensions/python'
 import { getFirstWorkspaceFolder } from '../../vscode/workspaceFolders'
 import { delay } from '../../util/time'
+import { Section } from '../../setup/webview/contract'
 
 export const warnUnableToVerifyVersion = () =>
   Toast.warnWithOptions(
@@ -52,7 +53,7 @@ const warnUserCLIInaccessible = async (
 
   switch (response) {
     case Response.SHOW_SETUP:
-      return setup.showSetup()
+      return setup.showSetup(Section.EXPERIMENTS)
     case Response.NEVER:
       return setUserConfigValue(ConfigKey.DO_NOT_SHOW_CLI_UNAVAILABLE, true)
   }

extension/src/commands/external.ts

@@ -94,10 +94,10 @@ export enum RegisteredCommands {
   TRACKED_EXPLORER_SELECT_FOR_COMPARE = 'dvc.selectForCompare',
 
   SETUP_SHOW = 'dvc.showSetup',
+  SETUP_SHOW_EXPERIMENTS = 'dvc.showExperimentsSetup',
+  SETUP_SHOW_STUDIO = 'dvc.showStudioSetup',
   SELECT_FOCUSED_PROJECTS = 'dvc.selectFocusedProjects',
 
-  CONNECT_SHOW = 'dvc.showConnect',
-  OPEN_STUDIO_SETTINGS = 'dvc.showStudioSettings',
   ADD_STUDIO_ACCESS_TOKEN = 'dvc.addStudioAccessToken',
   UPDATE_STUDIO_ACCESS_TOKEN = 'dvc.updateStudioAccessToken',
   REMOVE_STUDIO_ACCESS_TOKEN = 'dvc.removeStudioAccessToken',

extension/src/commands/util.ts

@@ -7,5 +7,5 @@ export const showSetupOrExecuteCommand =
   <T>(setup: Setup, callback: (context: Context) => Promise<T | undefined>) =>
   (context: Context) =>
     setup.shouldBeShown()
-      ? commands.executeCommand(RegisteredCommands.SETUP_SHOW)
+      ? commands.executeCommand(RegisteredCommands.SETUP_SHOW_EXPERIMENTS)
       : callback(context)