Merge branch 'main' into refactor-header

extension/package.json

@@ -1728,18 +1728,18 @@
     "@types/vega": "3.2.0",
     "@types/vscode": "1.64.0",
     "@vscode/test-electron": "2.3.3",
-    "@vscode/vsce": "2.19.0",
-    "@wdio/cli": "8.13.12",
-    "@wdio/local-runner": "8.13.12",
-    "@wdio/mocha-framework": "8.12.1",
+    "@vscode/vsce": "2.20.0",
+    "@wdio/cli": "8.13.13",
+    "@wdio/local-runner": "8.13.13",
+    "@wdio/mocha-framework": "8.13.13",
     "@wdio/spec-reporter": "8.12.2",
     "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
     "clean-webpack-plugin": "4.0.0",
     "copy-webpack-plugin": "11.0.0",
     "fork-ts-checker-webpack-plugin": "8.0.0",
-    "jest": "29.6.1",
-    "jest-environment-node": "29.6.1",
+    "jest": "29.6.2",
+    "jest-environment-node": "29.6.2",
     "lint-staged": "13.2.3",
     "mocha": "10.2.0",
     "mock-require": "3.0.3",
@@ -1749,7 +1749,7 @@
     "ts-loader": "9.4.4",
     "vscode-uri": "3.0.7",
     "wdio-vscode-service": "5.2.1",
-    "webdriverio": "8.13.12",
+    "webdriverio": "8.13.13",
     "webpack": "5.88.2",
     "webpack-cli": "5.1.4"
   },

extension/src/plots/paths/collect.ts

@@ -51,19 +51,10 @@ const collectType = (plots: Plot[]) => {
       ? type.add(PathType.TEMPLATE_MULTI)
       : type.add(PathType.TEMPLATE_SINGLE)
   }
-
   return type
 }
 
-const getType = (
-  data: PlotsData,
-  hasChildren: boolean,
-  path: string
-): Set<PathType> | undefined => {
-  if (hasChildren) {
-    return
-  }
-
+const getType = (data: PlotsData, path: string): Set<PathType> | undefined => {
   const plots = data[path]
   if (!definedAndNonEmpty(plots)) {
     return
@@ -118,6 +109,46 @@ const collectPathRevisions = (data: PlotsData, path: string): Set<string> => {
   return revisions
 }
 
+const collectPlotPathType = (
+  plotPath: PlotPath,
+  data: PlotsData,
+  hasChildren: boolean,
+  path: string
+) => {
+  if (hasChildren) {
+    return
+  }
+
+  const type = getType(data, path)
+
+  if (type) {
+    plotPath.type = type
+  }
+}
+
+const updateExistingPlotPath = (
+  acc: PlotPath[],
+  data: PlotsData,
+  hasChildren: boolean,
+  revisions: Set<string>,
+  path: string
+) =>
+  acc.map(existing => {
+    const plotPath = { ...existing }
+
+    if (existing.path !== path) {
+      return plotPath
+    }
+
+    plotPath.revisions = new Set([...existing.revisions, ...revisions])
+
+    if (!plotPath.type) {
+      collectPlotPathType(plotPath, data, hasChildren, path)
+    }
+
+    return plotPath
+  })
+
 const collectOrderedPath = (
   acc: PlotPath[],
   data: PlotsData,
@@ -126,31 +157,20 @@ const collectOrderedPath = (
   idx: number
 ): PlotPath[] => {
   const path = getPath(pathArray, idx)
+  const hasChildren = idx !== pathArray.length
 
   if (acc.some(({ path: existingPath }) => existingPath === path)) {
-    return acc.map(existing =>
-      existing.path === path
-        ? {
-            ...existing,
-            revisions: new Set([...existing.revisions, ...revisions])
-          }
-        : existing
-    )
+    return updateExistingPlotPath(acc, data, hasChildren, revisions, path)
   }
 
-  const hasChildren = idx !== pathArray.length
-
   const plotPath: PlotPath = {
     hasChildren,
     parentPath: getParent(pathArray, idx),
     path,
     revisions
   }
 
-  const type = getType(data, hasChildren, path)
-  if (type) {
-    plotPath.type = type
-  }
+  collectPlotPathType(plotPath, data, hasChildren, path)
 
   acc.push(plotPath)
   return acc
@@ -228,7 +248,6 @@ export const collectPaths = (
   if (errors?.length) {
     acc = collectErrorPaths(acc, data, errors)
   }
-
   return acc
 }
 

languageServer/package.json

@@ -33,9 +33,9 @@
     "fork-ts-checker-webpack-plugin": "8.0.0",
     "ts-loader": "9.4.4",
     "lint-staged": "13.2.3",
-    "jest": "29.6.1",
+    "jest": "29.6.2",
     "webpack": "5.88.2",
     "webpack-cli": "5.1.4",
-    "jest-environment-node": "29.6.1"
+    "jest-environment-node": "29.6.2"
   }
 }

package.json

@@ -38,7 +38,7 @@
     "@typescript-eslint/parser": "6.2.0",
     "@vscode/codicons": "0.0.33",
     "eslint": "8.45.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint-config-prettier": "8.9.0",
     "eslint-config-prettier-standard": "4.0.1",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-check-file": "2.5.0",
@@ -57,7 +57,7 @@
     "eslint-plugin-testing-library": "5.11.0",
     "eslint-plugin-unicorn": "48.0.1",
     "husky": "8.0.3",
-    "jest": "29.6.1",
+    "jest": "29.6.2",
     "lint-staged": "13.2.3",
     "npm-run-all": "4.1.5",
     "nyc": "15.1.0",

webview/package.json

@@ -69,9 +69,9 @@
     "file-loader": "6.2.0",
     "fork-ts-checker-webpack-plugin": "8.0.0",
     "identity-obj-proxy": "3.0.0",
-    "jest": "29.6.1",
+    "jest": "29.6.2",
     "jest-canvas-mock": "2.5.2",
-    "jest-environment-jsdom": "29.6.1",
+    "jest-environment-jsdom": "29.6.2",
     "lint-staged": "13.2.3",
     "raw-loader": "4.0.2",
     "sass": "1.64.1",

webview/src/experiments/components/table/header/TableHeaderCellContents.tsx

@@ -10,11 +10,7 @@ import {
   DragFunction
 } from '../../../../shared/components/dragDrop/Draggable'
 import { IconMenu } from '../../../../shared/components/iconMenu/IconMenu'
-import {
-  ArrowDown,
-  ListFilter,
-  ArrowUp
-} from '../../../../shared/components/icons'
+import { ArrowDown, ArrowUp, Filter } from '../../../../shared/components/icons'
 
 const getIconMenuItems = (
   sortEnabled: boolean,
@@ -28,7 +24,7 @@ const getIconMenuItems = (
   },
   {
     hidden: !hasFilter,
-    icon: ListFilter,
+    icon: Filter,
     tooltip: 'Table Filtered By'
   }
 ]