Merge remote-tracking branch 'origin/main' into 412_combo_box

.pre-commit-config.yaml

@@ -1,3 +1,5 @@
+# templates cannot be properly checked for formatting due to the substitution syntax
+exclude: templates
 repos:
   - repo: https://github.com/adamchainz/blacken-docs
     rev: 1.15.0

README.md

@@ -57,6 +57,7 @@ pre-commit run --all-files
 All steps should pass.
 
 To bypass the pre-commit hook, you can commit with the `--no-verify` flag, for example:
+
 ```shell
 git commit --no-verify -m "commit message"`
 ```
@@ -67,7 +68,7 @@ We use [Playwright](https://playwright.dev/) for end-to-end tests. We test again
 
 You should be able to pass arguments to these commands as if you were running Playwright via CLI directly. For example, to test only `matplotlib.spec.ts` you could run `npm run e2e:docker -- ./tests/matplotlib.spec.ts`, or to test only `matplotlib.spec.ts` in Firefox, you could run `npm run e2e:docker -- --project firefox ./tests/matplotlib.spec.ts`. See [Playwright CLI](https://playwright.dev/docs/test-cli) for more details.
 
-It is highly recommended to use `npm run e2e:docker` (instead of `npm run e2e`) as CI also uses the same environment. You can also use `npm run e2e:update-snapshots` to regenerate snapshots in said environment.
+It is highly recommended to use `npm run e2e:docker` (instead of `npm run e2e`) as CI also uses the same environment. You can also use `npm run e2e:update-snapshots` to regenerate snapshots in said environment. Run Playwright in [UI Mode](https://playwright.dev/docs/test-ui-mode) with `npm run e2e:ui` when creating new tests or debugging, as this will allow you to run each test individually, see the browser as it runs it, inspect the console, evaluate locators, etc.
 
 ### Running Python tests
 
@@ -229,6 +230,6 @@ After you have successfully run `tools/release.sh` once, you should be able to d
 
 As part of the release process, `cog` will, per our `cog.toml` configuration, invoke `tools/update_version.sh <packageName> <newVersion>`, which is a script that uses `sed` to update a plugin's version number in whatever source file we happen to use as the source of truth for version information in the given plugin.
 
-*[WARNING]* If you change where the source of truth for a plugin's version is located, you must update `tools/update_version.sh` to update the correct file with a new version number.
+_[WARNING]_ If you change where the source of truth for a plugin's version is located, you must update `tools/update_version.sh` to update the correct file with a new version number.
 
 We use `tools/update_version.sh` to remove any `.dev0` "developer version" suffix before creating a release, and to put the `.dev0` version suffix back after completing the release.

package.json

@@ -16,7 +16,9 @@
     "test:ci": "run-p test:ci:*",
     "test:ci:unit": "jest --config jest.config.unit.cjs --ci --cacheDirectory $PWD/.jest-cache",
     "test:ci:lint": "jest --config jest.config.lint.cjs --ci --cacheDirectory $PWD/.jest-cache",
-    "e2e:docker": "./tools/run_docker.sh e2e-tests",
+    "e2e": "playwright test",
+    "e2e:ui": "playwright test --ui",
+    "e2e:docker": "DEEPHAVEN_PORT=10001 ./tools/run_docker.sh e2e-tests",
     "e2e:update-snapshots": "./tools/run_docker.sh update-snapshots",
     "update-dh-packages": "lerna run --concurrency 1 update-dh-packages",
     "update-dh-packages:ui": "npm run update-dh-packages -- --scope=@deephaven/js-plugin-ui --"

plugins/plotly-express/src/deephaven/plot/express/plots/bar.py

@@ -274,9 +274,9 @@ def timeline(
       table: Table | None:  (Default value = None)
         A table to pull data from.
       x_start: str | None:  (Default value = None)
-        A column that contains starting x-axis values.
+        A column that contains starting x-axis values. Must be a `java.time.Instant` column.
       x_end: str | None:  (Default value = None)
-        A column that contains ending x-axis values.
+        A column that contains ending x-axis values. Must be a `java.time.Instant` column.
       by: str | list[str] | None:  (Default value = None)
         A column or list of columns that contain values to plot the figure traces by.
         All values or combination of values map to a unique design. The variable

plugins/plotly-express/src/deephaven/plot/express/preprocess/TimePreprocessor.py

@@ -4,9 +4,10 @@
 
 from ..shared import get_unique_names
 
-from deephaven.time import to_j_instant
 from deephaven.table import Table
 
+NANOS_PER_MILLI = 1_000_000
+
 
 class TimePreprocessor:
     """
@@ -45,12 +46,13 @@ def preprocess_partitioned_tables(
         x_diff = get_unique_names(table, ["x_diff"])["x_diff"]
 
         for table in tables:
+            # Times are assumed to be Instants which have nanosecond precision
+            # We convert them to milliseconds for plotly express
             yield table.update_view(
                 [
-                    f"{x_start} = (Instant) to_j_instant({x_start})",
-                    f"{x_end} = (Instant) to_j_instant({x_end})",
-                    f"{x_diff} = ((Instant) to_j_instant({x_end}) - "
-                    f"(Instant) to_j_instant({x_start})) / 1000000",
+                    f"{x_start} = {x_start}",
+                    f"{x_end} = {x_end}",
+                    f"{x_diff} = ({x_end} - {x_start}) / NANOS_PER_MILLI",
                     f"{y}",
                 ]
             ), {"x_diff": x_diff}