From ea5621e1aeafafdda986e56596a9ea0db629c609 Mon Sep 17 00:00:00 2001 From: mattseddon <37993418+mattseddon@users.noreply.github.com> Date: Thu, 29 Sep 2022 06:39:47 +1000 Subject: [PATCH 1/7] Do not walk unnecessary keys in truncate titles (#2487) --- extension/src/plots/vega/util.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extension/src/plots/vega/util.ts b/extension/src/plots/vega/util.ts index 8244d4f687..fd6be2f7ac 100644 --- a/extension/src/plots/vega/util.ts +++ b/extension/src/plots/vega/util.ts @@ -255,6 +255,11 @@ export const truncateTitles = ( const specCopy: Record = {} for (const [key, value] of Object.entries(spec)) { + if (['data', 'color', 'strokeDash', 'shape', 'detail'].includes(key)) { + specCopy[key] = value + continue + } + const valueType = typeof value if (key === 'y') { vertical = true From b24f2db0e05a87708ccfc3e903583e050ca41872 Mon Sep 17 00:00:00 2001 From: mattseddon <37993418+mattseddon@users.noreply.github.com> Date: Thu, 29 Sep 2022 07:12:09 +1000 Subject: [PATCH 2/7] Remove erroneous shape from vertical on hover line when shape dimension is added (#2486) * remove erroneous shape from vertical on hover line when shape dimension is added * add test for spec update * revert min cli version --- extension/src/plots/vega/util.test.ts | 28 ++++- extension/src/plots/vega/util.ts | 108 +++++++++++------- .../plotsDiff/templates/multiSource.ts | 75 ++++++++++++ 3 files changed, 162 insertions(+), 49 deletions(-) create mode 100644 extension/src/test/fixtures/plotsDiff/templates/multiSource.ts diff --git a/extension/src/plots/vega/util.test.ts b/extension/src/plots/vega/util.test.ts index 8179f71c78..30bdca8828 100644 --- a/extension/src/plots/vega/util.test.ts +++ b/extension/src/plots/vega/util.test.ts @@ -1,6 +1,7 @@ import { Text as VegaText, Title as VegaTitle } from 'vega' import { TopLevelSpec } from 'vega-lite' import merge from 'lodash.merge' +import cloneDeep from 'lodash.clonedeep' import { isMultiViewPlot, isMultiViewByCommitPlot, @@ -15,6 +16,7 @@ import defaultTemplate from '../../test/fixtures/plotsDiff/templates/default' import linearTemplate from '../../test/fixtures/plotsDiff/templates/linear' import scatterTemplate from '../../test/fixtures/plotsDiff/templates/scatter' import smoothTemplate from '../../test/fixtures/plotsDiff/templates/smooth' +import multiSourceTemplate from '../../test/fixtures/plotsDiff/templates/multiSource' import { copyOriginalColors } from '../../experiments/model/status/colors' import { PlotSize } from '../webview/contract' @@ -264,6 +266,25 @@ describe('extendVegaSpec', () => { expect(updatedSpecString).not.toContain(repeatedTitle) expect(updatedSpecString).toContain(truncatedTitle) }) + + it('should update the multi-source template to remove erroneous shape encoding from the vertical line displayed on hover', () => { + const updatedSpec = extendVegaSpec(multiSourceTemplate, PlotSize.LARGE, { + color: { domain: [], range: [] }, + shape: { + field: 'field', + scale: { domain: [], range: [] } + } + }) + + expect(updatedSpec.encoding).not.toBeUndefined() + expect(updatedSpec.layer[1].layer[0].encoding.shape).toBeNull() + + const updatedSpecCopy = cloneDeep(updatedSpec) + delete updatedSpecCopy.layer[1].layer[0].encoding.shape + delete updatedSpecCopy.encoding + + expect(updatedSpecCopy).toStrictEqual(multiSourceTemplate) + }) }) describe('reverseOfLegendSuppressionUpdate', () => { @@ -282,17 +303,14 @@ describe('reverseOfLegendSuppressionUpdate', () => { shape: { field: 'shape-field', legend: { - disable: true, - symbolFillColor: 'blue' + disable: true }, scale: { domain: [], range: [] } }, strokeDash: { field: 'strokeDash-field', legend: { - disable: true, - symbolFillColor: 'blue', - symbolStrokeColor: 'red' + disable: true }, scale: { domain: [], range: [] } } diff --git a/extension/src/plots/vega/util.ts b/extension/src/plots/vega/util.ts index fd6be2f7ac..cce14a7e75 100644 --- a/extension/src/plots/vega/util.ts +++ b/extension/src/plots/vega/util.ts @@ -19,6 +19,7 @@ import { RepeatMapping } from 'vega-lite/build/src/spec/repeat' import { TopLevelUnitSpec } from 'vega-lite/build/src/spec/unit' +import isEqual from 'lodash.isequal' import { ColorScale, PlotSize, Revision } from '../webview/contract' import { ShapeEncoding, StrokeDashEncoding } from '../multiSource/constants' @@ -99,44 +100,61 @@ export const getColorScale = ( return acc.domain.length > 0 ? acc : undefined } -export type Encoding = { - strokeDash?: StrokeDashEncoding & { - legend: { - disable: boolean - symbolFillColor: string - symbolStrokeColor: string - } - } - shape?: ShapeEncoding & { - legend: { - disable: boolean - symbolFillColor: string - } - } - detail?: { - field: string - } - color?: { - legend: { - disable: boolean - } - scale: ColorScale +type LegendDisabled = { + legend: { + disable: boolean } } +export type Encoding = { + strokeDash?: StrokeDashEncoding & LegendDisabled + shape?: ShapeEncoding & LegendDisabled + detail?: { field: string } + color?: { scale: ColorScale } & LegendDisabled +} + +type ShapePatchUpdate = { + layer?: { layer: [{ encoding: Record }] }[] +} + type EncodingUpdate = { encoding: Encoding +} & ShapePatchUpdate + +const specHasVerticalLineOnHover = ( + spec: any +): spec is { layer: { layer: [{ encoding: Record }] }[] } => + spec.layer?.[1]?.layer?.[0]?.encoding?.x && + isEqual(spec.layer[1].layer[0].mark, { + color: 'gray', + type: 'rule' + }) + +const patchShapeEncoding = (spec: TopLevelSpec, encoding: Encoding) => { + const update: EncodingUpdate = { + encoding + } + + if (encoding.shape && specHasVerticalLineOnHover(spec)) { + update.layer = spec.layer + update.layer[1].layer[0].encoding.shape = null + } + + return update } -export const getSpecEncodingUpdate = ({ - color, - shape, - strokeDash -}: { - color?: ColorScale - shape?: ShapeEncoding - strokeDash?: StrokeDashEncoding -}): EncodingUpdate => { +const getSpecEncodingUpdate = ( + spec: TopLevelSpec, + { + color, + shape, + strokeDash + }: { + color?: ColorScale + shape?: ShapeEncoding + strokeDash?: StrokeDashEncoding + } +): EncodingUpdate => { const encoding: Encoding = {} if (color) { encoding.color = { @@ -149,9 +167,7 @@ export const getSpecEncodingUpdate = ({ encoding.strokeDash = { ...strokeDash, legend: { - disable: true, - symbolFillColor: 'transparent', - symbolStrokeColor: 'grey' + disable: true } } } @@ -160,16 +176,13 @@ export const getSpecEncodingUpdate = ({ encoding.shape = { ...shape, legend: { - disable: true, - symbolFillColor: 'grey' + disable: true } } - encoding.detail = shape + encoding.detail = { field: shape.field } } - return { - encoding - } + return patchShapeEncoding(spec, encoding) } const mergeUpdate = (spec: TopLevelSpec, update: EncodingUpdate) => { @@ -299,7 +312,7 @@ export const extendVegaSpec = ( return updatedSpec } - const update = getSpecEncodingUpdate(encoding) + const update = getSpecEncodingUpdate(updatedSpec, encoding) return mergeUpdate(updatedSpec, update) } @@ -307,15 +320,22 @@ export const extendVegaSpec = ( export const reverseOfLegendSuppressionUpdate = () => ({ spec: { encoding: { - color: { legend: { disable: false } }, - shape: { + color: { legend: { disable: false } }, + shape: { + legend: { + disable: false, + symbolFillColor: 'grey' + } + }, strokeDash: { legend: { - disable: false + disable: false, + symbolFillColor: 'transparent', + symbolStrokeColor: 'grey' } } } diff --git a/extension/src/test/fixtures/plotsDiff/templates/multiSource.ts b/extension/src/test/fixtures/plotsDiff/templates/multiSource.ts new file mode 100644 index 0000000000..f830fdaa8c --- /dev/null +++ b/extension/src/test/fixtures/plotsDiff/templates/multiSource.ts @@ -0,0 +1,75 @@ +import { TopLevelSpec } from 'vega-lite' + +const data = { + $schema: 'https://vega.github.io/schema/vega-lite/v5.json', + data: '', + title: '', + width: 300, + height: 300, + layer: [ + { + encoding: { + x: { + field: '', + type: 'quantitative', + title: '' + }, + y: { + field: '', + type: 'quantitative', + title: '', + scale: { zero: false } + }, + color: { + field: 'rev' + } + }, + layer: [ + { mark: 'line' }, + { + selection: { + label: { + type: 'single', + nearest: true, + on: 'mouseover', + encodings: [''], + empty: 'none', + clear: 'mouseout' + } + }, + mark: 'point', + encoding: { + opacity: { + condition: { selection: 'label', value: 1 }, + value: 0 + } + } + } + ] + }, + { + transform: [{ filter: { selection: 'label' } }], + layer: [ + { + mark: { type: 'rule', color: 'gray' }, + encoding: { x: { field: '', type: 'quantitative' } } + }, + { + encoding: { + text: { type: 'quantitative', field: '' }, + x: { field: '', type: 'quantitative' }, + y: { field: '', type: 'quantitative' } + }, + layer: [ + { + mark: { type: 'text', align: 'left', dx: 5, dy: -5 }, + encoding: { color: { type: 'nominal', field: 'rev' } } + } + ] + } + ] + } + ] +} as unknown as TopLevelSpec + +export default data From cb9ecc1fb53afedcb6e2e23c04de35fa9651c27f Mon Sep 17 00:00:00 2001 From: mattseddon <37993418+mattseddon@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:35:27 +1000 Subject: [PATCH 3/7] Bump min tested version of DVC to 2.28.0 (#2488) * Bump min tested version of DVC to 2.28.0 --- demo/requirements.txt | 2 +- extension/src/cli/dvc/constants.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index 3aa2f9f454..2a27d7b0e5 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -1,3 +1,3 @@ -dvc[s3]==2.27.2 +dvc[s3]==2.28.0 torch==1.12.0 torchvision==0.13.0 \ No newline at end of file diff --git a/extension/src/cli/dvc/constants.ts b/extension/src/cli/dvc/constants.ts index 29f554eac3..2a26701226 100644 --- a/extension/src/cli/dvc/constants.ts +++ b/extension/src/cli/dvc/constants.ts @@ -1,5 +1,5 @@ export const MIN_CLI_VERSION = '2.24.0' -export const LATEST_TESTED_CLI_VERSION = '2.27.2' +export const LATEST_TESTED_CLI_VERSION = '2.28.0' export const MAX_CLI_VERSION = '3' export const UNEXPECTED_ERROR_CODE = 255 From 3a10f146764053d35799d5aaf7dd51efc1ef7e02 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 14:34:54 +1000 Subject: [PATCH 4/7] chore(deps): update dependency turbo to v1.5.1 (#2492) --- package.json | 2 +- yarn.lock | 128 ++++++++++++++++----------------------------------- 2 files changed, 41 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index 9e6c761c9f..51ab1b4041 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "prettier": "2.7.1", "prettier-config-standard": "5.0.0", "ts-node": "10.9.1", - "turbo": "1.4.7", + "turbo": "1.5.1", "typescript": "4.8.3" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index 6066084712..04e5dd16bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17340,95 +17340,47 @@ tunnel@0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -turbo-android-arm64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-android-arm64/-/turbo-android-arm64-1.4.7.tgz#553f68a1f475495549fb8a260461239c90f40410" - integrity sha512-BtWtH8e8w1GhtYpGQmkcDS/AUzVZhQ4ZZN+qtUFei1wZD7VAdtJ9Wcsfi3WD+mXA6vtpIpRJVfQMcShr8l8ErA== - -turbo-darwin-64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.4.7.tgz#c23e2452a01115136e631dc06aa6a9bb379d2d32" - integrity sha512-bMvZaAz5diec9feZ0XpQosYI8U0kiOQM2tj2sv0Y2WZbe227wodVMCQMyUowmcotO8nr6NF76Xo5E+H+dnY6LQ== - -turbo-darwin-arm64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.4.7.tgz#4212917f4892159033cfa88bafa662f6e865fe49" - integrity sha512-AyfxYfKgh1EigQKjypbnDoMLuy4e/n/go+KYiWKKIpOaWXWLBokrBWzYN/aI3NMDRUJWK5ExdlWI9Nleelq8uQ== - -turbo-freebsd-64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-freebsd-64/-/turbo-freebsd-64-1.4.7.tgz#7d60d44a623bd000f53673a0db0205a16d8815e6" - integrity sha512-T5/osfbCh0rL53MFS5byFFfsR3vPMHIKIJ4fMMCNkoHsmFj2R0Pv53nqhEItogt0FJwCDHPyt7oBqO83H/AWQQ== - -turbo-freebsd-arm64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-freebsd-arm64/-/turbo-freebsd-arm64-1.4.7.tgz#35e5b23313d42aab074e69c1d1c44cab17f438ac" - integrity sha512-PL+SaO78AUCas+YKj01UiS2rpmGcxz8XPmLdFWmq6PYjPX6GL5UBAc3pkBphIm0aTLZtsikoEul+JrwAuAy6UA== - -turbo-linux-32@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-linux-32/-/turbo-linux-32-1.4.7.tgz#2861539d767cdfca058224f284991d918d7b1965" - integrity sha512-dK94UwDzySMALoQtjBVVPbWJZP6xw3yHGuytM3q5p4kfMZPSA+rgNBn5T5Af2Rc7jxlLAsu5ODJ0SgIbWSF5Hg== - -turbo-linux-64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.4.7.tgz#5ff0e648a1d0b0053ad2f3c6a4fc735744cadc16" - integrity sha512-F6IM23zgTYo9gYJaNp17gVvQBt0hMIvz52OF91DpPYSLpV2h9OSlzPJ3j5TGaWueS/bc/YCV23+VojXX/MauGQ== - -turbo-linux-arm64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.4.7.tgz#c5cb63db0ab59dd2ea37be4e44efef119a289ad1" - integrity sha512-kFe5jzj3FoY6jAEwyNEswndj1t/fPl0qyxfcQv6aNPz7Nb2Lh7mY/EEse+CG3ydIo5RZKba7ppQoBSDmHx7JsA== - -turbo-linux-arm@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-linux-arm/-/turbo-linux-arm-1.4.7.tgz#93ed9e43a95760e660a42dbf65cbfd430e558e89" - integrity sha512-FTh4itdMNZ7IxGKknFnQ6iPO9vGGKqyySkCYLR01lnw6BTnKL9KuM9XUCBRyn7dNmHhAnqu1ZtVsBkH7CE7DEw== - -turbo-linux-mips64le@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-linux-mips64le/-/turbo-linux-mips64le-1.4.7.tgz#77357165c3ae0102fd5924dd85229676938dd717" - integrity sha512-756nG8dnPQVcnl9s70S4NQ43aJjpsnc2h0toktPO+9u2ayv9XTbIPvZLFsS55bDeYhodDGvxoB96W6Xnx01hyQ== - -turbo-linux-ppc64le@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-linux-ppc64le/-/turbo-linux-ppc64le-1.4.7.tgz#2a7399d6ee31d894d48aea393ed1f9addc4a310c" - integrity sha512-VS2ofGN/XsafNGJdZ21UguURHb7KRG879yWLj59hO1d+0xXXQbx7ljsmEPOhiE4UjEdx4Ur6P44BhztTgDx9Og== - -turbo-windows-32@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-windows-32/-/turbo-windows-32-1.4.7.tgz#e93233d8681886dc0b609c897447991afa378340" - integrity sha512-M5GkZdA0CbJAOcR8SScM63CBV+NtX7qjhoNNOl0F99nGJ+rO3dH71CcM/rbhlz9SQzKQoX8rcuwZHe4r2HZAug== - -turbo-windows-64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.4.7.tgz#da9fe6b6bf2b6fd1f85ecdc186fc7a49b8411d22" - integrity sha512-ftZUtZ1BX1vi8MbxKr+a7riIkhwvGnNTtWGprVu+aDJ8PnV+lNqbkrLJGvKP7Cn22hGTfzcjNNPcJ5PBZpQEQw== - -turbo-windows-arm64@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.4.7.tgz#c60a772aab36c45ce461e3305e35d1c22a00e516" - integrity sha512-mZ79XeJFfaeVKdBV3w0eoGaqAxFnwxrme0jZtSWemAbeDSCF/13wcbLGwtq0+Lu0LxEGweeQ5AqsCIc9t9i6sA== - -turbo@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.4.7.tgz#859989a5dce2a7b1fa51f17ac4fb1e34dbfd455d" - integrity sha512-oIk7PAISPidDOkTM5M+ydEe5GDQ/+TahDgIbaYKeAAy2Qpmur4s0HybSDWHIdxLqI96OPD/mOKymRLrjh3Mdhg== +turbo-darwin-64@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.5.1.tgz#33438bd141d4cd8c331eefd72a595c0fae2167fc" + integrity sha512-63vbObfUOR26UNjwCEKLxrWiJFJE0XNSFNt2/CFF0nhx0I9RqNf21KCZk2FwcbHLSM/ca0Yqr/nJV9Wu+yo1Tg== + +turbo-darwin-arm64@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.5.1.tgz#54a8ba3ec55316f2d6434ba31ed8d7dabfd30337" + integrity sha512-VVrJdOvAXw17qKFdC5PlsoJ6Jupp5yCGUN+OJVWG/BvDVdcWJw3n0m3jpcvZ0JVKhGnjW4pRJudKLD1vR879Ng== + +turbo-linux-64@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.5.1.tgz#9c63aa521d1a3af20386756f189f86e074533d85" + integrity sha512-0PKkribBtjcuOllSbpA9rtLbyLdCJSAXO6G2TpZye6HUj/zRMeTVh3hpGwJJLsiaN/wCbF1g8uLtcrbEU0CcOw== + +turbo-linux-arm64@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.5.1.tgz#42314931f36d7e2d4d2265013ebad8902eeb9600" + integrity sha512-EzGwaNs1cHLlyYKNzJ1X2yvBE8ulFlVymW8lmllEwgXU801XlA8OEv8gfZOhtugvNr0F9eK3x0c30tGL/wco1w== + +turbo-windows-64@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.5.1.tgz#a6279fd6311b559480a3a9671d973f9213d880a9" + integrity sha512-XX/0SB3cSpSGg33z4t0H3O0McHkqu5iIxmSZwqrrCG4h65ZUTVzr4AHG4cKF/vYYs4RRaPj9LaByveoh+AcZkA== + +turbo-windows-arm64@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.5.1.tgz#a327d265619435d63c79a66519f345a33ea5614d" + integrity sha512-dKGKvCHiooCRv3liETY67XA5skrOYhjt1scEeVQ1dMRfb2ePq2NypldPRrVF/ykMoTPrVHul7N5+SJa/NoGXvQ== + +turbo@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.5.1.tgz#92a886d07de9d259e1b0cf6441ed88f0d6227025" + integrity sha512-AM6t4BBFt6ek96bRDr/UqF+zxlYjagPc29P4q/5phMKOH8SRNEb43MXjM2to8NwRhiaoPqNyct0gwgGM2rSRvA== optionalDependencies: - turbo-android-arm64 "1.4.7" - turbo-darwin-64 "1.4.7" - turbo-darwin-arm64 "1.4.7" - turbo-freebsd-64 "1.4.7" - turbo-freebsd-arm64 "1.4.7" - turbo-linux-32 "1.4.7" - turbo-linux-64 "1.4.7" - turbo-linux-arm "1.4.7" - turbo-linux-arm64 "1.4.7" - turbo-linux-mips64le "1.4.7" - turbo-linux-ppc64le "1.4.7" - turbo-windows-32 "1.4.7" - turbo-windows-64 "1.4.7" - turbo-windows-arm64 "1.4.7" + turbo-darwin-64 "1.5.1" + turbo-darwin-arm64 "1.5.1" + turbo-linux-64 "1.5.1" + turbo-linux-arm64 "1.5.1" + turbo-windows-64 "1.5.1" + turbo-windows-arm64 "1.5.1" type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" From 522c82a9e465e0b32da35be227f4b69c4049eea0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 15:15:20 +1000 Subject: [PATCH 5/7] chore(deps): update dependency sass to v1.55.0 (#2494) --- webview/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webview/package.json b/webview/package.json index 2d69cd502d..a5631ae98c 100644 --- a/webview/package.json +++ b/webview/package.json @@ -75,7 +75,7 @@ "jest-environment-jsdom": "29.0.3", "lint-staged": "13.0.3", "raw-loader": "4.0.2", - "sass": "1.54.9", + "sass": "1.55.0", "sass-loader": "13.0.2", "storybook-addon-designs": "6.3.1", "storybook-addon-themes": "6.1.0", diff --git a/yarn.lock b/yarn.lock index 04e5dd16bc..08056e4852 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15780,10 +15780,10 @@ sass-loader@13.0.2: klona "^2.0.4" neo-async "^2.6.2" -sass@1.54.9: - version "1.54.9" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.9.tgz#b05f14ed572869218d1a76961de60cd647221762" - integrity sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q== +sass@1.55.0: + version "1.55.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c" + integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 625f719b3fa5b7dad5f6233dc15c17e35abb202b Mon Sep 17 00:00:00 2001 From: mattseddon <37993418+mattseddon@users.noreply.github.com> Date: Thu, 29 Sep 2022 15:48:19 +1000 Subject: [PATCH 6/7] Stabilize e2e tests (#2493) * remove experiments from previous commit * switch to stable release of VS Code --- extension/src/test/e2e/extension.test.ts | 3 +++ extension/src/test/e2e/wdio.conf.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/extension/src/test/e2e/extension.test.ts b/extension/src/test/e2e/extension.test.ts index 008794a235..8cb4370a6a 100644 --- a/extension/src/test/e2e/extension.test.ts +++ b/extension/src/test/e2e/extension.test.ts @@ -17,6 +17,9 @@ suite('DVC Extension For Visual Studio Code', () => { before('should finish loading the extension', async function () { this.timeout(240000) await waitForViewContainerToLoad() + const workbench = await browser.getWorkbench() + await workbench.executeCommand('DVC: Garbage Collect Experiments') + await browser.keys('Enter') return dismissAllNotifications() }) diff --git a/extension/src/test/e2e/wdio.conf.ts b/extension/src/test/e2e/wdio.conf.ts index a9c14490a6..b40ba1daa8 100644 --- a/extension/src/test/e2e/wdio.conf.ts +++ b/extension/src/test/e2e/wdio.conf.ts @@ -33,7 +33,7 @@ export const config: Options.Testrunner = { capabilities: [ { browserName: 'vscode', - browserVersion: 'insiders', + browserVersion: 'stable', 'wdio:vscodeOptions': { extensionPath, userSettings: { From 1953b6ee672df8a6cb3dedc147a48d86c539d91e Mon Sep 17 00:00:00 2001 From: Stephanie Roy Date: Thu, 29 Sep 2022 02:09:33 -0400 Subject: [PATCH 7/7] Add tooltip to comparison table row path (#2490) --- .../components/comparisonTable/ComparisonTableRow.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webview/src/plots/components/comparisonTable/ComparisonTableRow.tsx b/webview/src/plots/components/comparisonTable/ComparisonTableRow.tsx index 09bfea23f0..9ea17b081b 100644 --- a/webview/src/plots/components/comparisonTable/ComparisonTableRow.tsx +++ b/webview/src/plots/components/comparisonTable/ComparisonTableRow.tsx @@ -11,6 +11,7 @@ import { ChevronDown, ChevronRight } from '../../../shared/components/icons' import { PlotsState } from '../../store' import { CopyButton } from '../../../shared/components/copyButton/CopyButton' import { isSelecting } from '../../../util/strings' +import Tooltip from '../../../shared/components/tooltip/Tooltip' export interface ComparisonTableRowProps { path: string @@ -44,7 +45,13 @@ export const ComparisonTableRow: React.FC = ({