Merge remote-tracking branch 'upstream/main' into ui-widget-plugins

.github/workflows/e2e.yml

@@ -20,6 +20,9 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
+      - name: Check installed fonts
+        run: 'fc-list : family'
+
       - name: Run core server:${{ env.DOCKER_TAG }}
         run: |
           docker pull --quiet ghcr.io/deephaven/server:${{ env.DOCKER_TAG }}
@@ -52,6 +55,9 @@ jobs:
       - name: Install Playwright dependencies
         run: PLAYWRIGHT_BROWSERS_PATH=0 npx playwright install --with-deps
 
+      - name: Playwright version
+        run: npx playwright --version
+
       - name: Run Playwright tests
         run: PLAYWRIGHT_BROWSERS_PATH=0 npx playwright test --config=playwright-ci.config.ts
 

README.md

@@ -112,6 +112,12 @@ Snapshots are used by end-to-end tests to visually verify the output. Snapshots
 
 Once you are satisfied with the snapshots and everything is passing locally, you need to use the docker image to update snapshots for CI (unless you are running the same platform as CI (Ubuntu)). Run `npm run e2e:update-ci-snapshots` to update the CI snapshots. The snapshots will be written to your local directories. The Linux snapshots should be committed to git (non-Linux snapshots should be automatically ignored by git).
 
+### Differences in CI vs Local Docker Environments
+Note that while both the GH actions and docker configuration use Ubuntu 22.04 images, their configurations are not identical. One known difference is the available system fonts. In some cases this can cause snapshots to differ when running locally vs in CI such as when rendering unicode characters. To mitigate this, some of our e2e tests have been configured to ensure a consistent unicode font fallback.
+
+- The `DejaVu Sans` font gets installed via the [Dockerfile](tests/docker-scripts/Dockerfile). It already exists in the CI environment.
+- Font family stacks that involve unicode characters can explicitly fallback to `DejaVu Sans` if they impact snapshots. e.g We do so in [Grids.tsx](packages/code-studio/src/styleguide/Grids.tsx) by setting the canvas font to `12px Arial, "DejaVu Sans", sans-serif`
+
 ### Local
 
 These scripts are recommended while developing your tests as they will be quicker to iterate and offer headed mode for debugging. You will need to run `npx playwright install` before using these scripts. You may also need to update the browsers with the same command any time the Playwright version is updated. See [Playwright Browsers](https://playwright.dev/docs/browsers) for more details.

packages/chart/src/MockChartModel.ts

@@ -16,6 +16,8 @@ interface Series {
 
 /** Displays a basic random chart */
 class MockChartModel extends ChartModel {
+  static random: () => number = Math.random.bind(Math);
+
   static smoothing = 1.5;
 
   static _theme: ChartTheme;
@@ -50,7 +52,7 @@ class MockChartModel extends ChartModel {
         ((Math.sin((i / steps) * offset) * steps) / 3 +
           (Math.cos(i * 0.2) * steps) / 6 +
           (Math.sin(i * 0.5) * steps) / 10 +
-          (Math.random() * steps) / 5 +
+          (MockChartModel.random() * steps) / 5 +
           i * MockChartModel.smoothing) *
         scale;
       v = Math.round(v * 100) / 100; // 2 decimals only
@@ -61,7 +63,7 @@ class MockChartModel extends ChartModel {
       linear.push(40 + i * MockChartModel.smoothing);
       smooth.push(
         (Math.sin((i / steps) * offset) * steps) / 3 +
-          (Math.random() * steps) / 10 +
+          (MockChartModel.random() * steps) / 10 +
           i * MockChartModel.smoothing
       ); // push a smoother version of the same thing
     }

packages/code-studio/README.md

@@ -63,7 +63,7 @@ When new functions are added to the API, ideally stubs returning a generic succe
 
 ## Styleguide/Component Development
 
-When running in development mode (`npm run start`), a style guide is served up at http://localhost:4000/styleguide. Styleguide can be used to develop components. The styleguide displays many common components and how to use them. When creating a new component, it should be added to the [styleguide](./src/styleguide/).
+When running in development mode (`npm run start`), a style guide is served up at http://localhost:4000/ide/styleguide. Styleguide can be used to develop components. The styleguide displays many common components and how to use them. When creating a new component, it should be added to the [styleguide](./src/styleguide/). Note that the styleguide is lazy loaded in [AppRouter](packages/code-studio/src/main/AppRouter.tsx), so it should not increase the main app bundle size.
 
 ## Architecture
 

packages/code-studio/src/main/AppRouter.tsx

@@ -7,16 +7,20 @@ import {
 } from 'react-router-dom';
 import AppInit from './AppInit';
 
-const basename = document.location.pathname;
+const StyleGuideRoot = React.lazy(() => import('../styleguide/StyleGuideRoot'));
+
+const baseURI = new URL(document.baseURI).pathname.replace(/\/$/, '');
+
 function AppRouter(): ReactElement {
   return (
-    <Router basename={basename}>
+    <Router basename={baseURI}>
       <Switch>
         <Route exact path="/" component={AppInit} />
         <Route
           path={`/${import.meta.env.VITE_ROUTE_NOTEBOOKS}:notebookPath+`}
           component={AppInit}
         />
+        <Route path="/styleguide" component={StyleGuideRoot} />
         <Redirect from="*" to="/" />
       </Switch>
     </Router>

packages/code-studio/src/settings/ColumnSpecificSectionContent.tsx

@@ -10,7 +10,7 @@ import memoize from 'memoizee';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import debounce from 'lodash.debounce';
 import classNames from 'classnames';
-import { Button, ThemeExport } from '@deephaven/components';
+import { Button, Select, ThemeExport } from '@deephaven/components';
 import {
   DateTimeColumnFormatter,
   IntegerColumnFormatter,
@@ -362,8 +362,8 @@ export class ColumnSpecificSectionContent extends PureComponent<
       this.handleFormatRuleChange(i, 'columnName', e.target.value);
     const onNameBlur = (): void =>
       this.handleFormatRuleChange(i, 'isNewRule', false);
-    const onTypeChange = (e: ChangeEvent<HTMLSelectElement>): void =>
-      this.handleFormatRuleChange(i, 'columnType', e.target.value);
+    const onTypeChange = (eventTargetValue: string): void =>
+      this.handleFormatRuleChange(i, 'columnType', eventTargetValue);
 
     const ruleError = this.getRuleError(rule);
 
@@ -396,14 +396,14 @@ export class ColumnSpecificSectionContent extends PureComponent<
             />
 
             <label htmlFor={columnTypeId}>Column Type</label>
-            <select
+            <Select
               id={columnTypeId}
               className="custom-select"
               value={rule.columnType}
               onChange={onTypeChange}
             >
               {columnTypeOptions}
-            </select>
+            </Select>
           </div>
         </div>
         <div className="form-row">
@@ -478,14 +478,14 @@ export class ColumnSpecificSectionContent extends PureComponent<
 
     const value = format.formatString ?? '';
     return (
-      <select
+      <Select
         className={classNames('custom-select', { 'is-invalid': isInvalid })}
         value={value}
         id={formatId}
-        onChange={e => {
+        onChange={eventTargetValue => {
           const selectedFormat = DateTimeColumnFormatter.makeFormat(
             '',
-            e.target.value,
+            eventTargetValue,
             DateTimeColumnFormatter.TYPE_GLOBAL
           );
           this.handleFormatRuleChange(i, 'format', selectedFormat);
@@ -499,7 +499,7 @@ export class ColumnSpecificSectionContent extends PureComponent<
           showTimeZone,
           showTSeparator
         )}
-      </select>
+      </Select>
     );
   }
 

packages/code-studio/src/settings/FormattingSectionContent.tsx

@@ -9,7 +9,7 @@ import { vsRefresh } from '@deephaven/icons';
 import memoize from 'memoizee';
 import debounce from 'lodash.debounce';
 import classNames from 'classnames';
-import { Button, Checkbox } from '@deephaven/components';
+import { Button, Checkbox, Select } from '@deephaven/components';
 import {
   IntegerColumnFormatter,
   DecimalColumnFormatter,
@@ -170,12 +170,10 @@ export class FormattingSectionContent extends PureComponent<
     this.debouncedCommitChanges();
   }
 
-  handleDefaultDateTimeFormatChange(
-    event: ChangeEvent<HTMLSelectElement>
-  ): void {
-    log.debug('handleDefaultDateTimeFormatChange', event.target.value);
+  handleDefaultDateTimeFormatChange(value: string): void {
+    log.debug('handleDefaultDateTimeFormatChange', value);
     const update = {
-      defaultDateTimeFormat: event.target.value,
+      defaultDateTimeFormat: value,
     };
     this.setState(update);
     this.queueUpdate(update);
@@ -233,8 +231,8 @@ export class FormattingSectionContent extends PureComponent<
     this.queueUpdate(update);
   }
 
-  handleTimeZoneChange(event: ChangeEvent<HTMLSelectElement>): void {
-    const update = { timeZone: event.target.value };
+  handleTimeZoneChange(value: string): void {
+    const update = { timeZone: value };
     this.setState(update);
     this.queueUpdate(update);
   }
@@ -364,14 +362,14 @@ export class FormattingSectionContent extends PureComponent<
               Time zone
             </label>
             <div className="col pr-0">
-              <select
+              <Select
                 className="custom-select"
                 value={timeZone}
                 onChange={this.handleTimeZoneChange}
                 id="select-reset-timezone"
               >
                 <TimeZoneOptions />
-              </select>
+              </Select>
             </div>
             <div className="col-1 btn-col">
               <Button
@@ -393,7 +391,7 @@ export class FormattingSectionContent extends PureComponent<
               DateTime
             </label>
             <div className="col pr-0">
-              <select
+              <Select
                 className="custom-select"
                 value={defaultDateTimeFormat}
                 onChange={this.handleDefaultDateTimeFormatChange}
@@ -406,7 +404,7 @@ export class FormattingSectionContent extends PureComponent<
                   true,
                   defaultDateTimeFormat
                 )}
-              </select>
+              </Select>
             </div>
             <div className="col-1 btn-col">
               <Button

packages/code-studio/src/styleguide/Alerts.tsx

@@ -1,5 +1,7 @@
+/* eslint-disable react/jsx-props-no-spreading */
 import React, { Component, ReactElement } from 'react';
 import classNames from 'classnames';
+import { sampleSectionIdAndClasses } from './utils';
 
 class Alerts extends Component {
   static renderAlert(brand: string): ReactElement {
@@ -16,7 +18,7 @@ class Alerts extends Component {
       Alerts.renderAlert(brand)
     );
     return (
-      <div>
+      <div {...sampleSectionIdAndClasses('alerts')}>
         <h2 className="ui-title">Alerts</h2>
         <div style={{ padding: '1rem 0' }}>{alerts}</div>
       </div>

packages/code-studio/src/styleguide/Buttons.tsx

@@ -1,8 +1,10 @@
+/* eslint-disable react/jsx-props-no-spreading */
 import React, { Component, ReactElement } from 'react';
 import classNames from 'classnames';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { ButtonOld, SocketedButton } from '@deephaven/components';
 import { dhTruck } from '@deephaven/icons';
+import { sampleSectionIdAndClasses } from './utils';
 
 interface ButtonsState {
   toggle: boolean;
@@ -27,7 +29,12 @@ class Buttons extends Component<Record<string, never>, ButtonsState> {
     );
 
     return (
-      <div key={type}>
+      <div
+        key={type}
+        {...sampleSectionIdAndClasses(
+          `buttons-${type.length ? 'outline' : 'regular'}`
+        )}
+      >
         <h5>{type.length ? 'Outline' : 'Regular'}</h5>
         {brands}
       </div>
@@ -36,7 +43,7 @@ class Buttons extends Component<Record<string, never>, ButtonsState> {
 
   static renderSocketedButtons(): ReactElement {
     return (
-      <div>
+      <div {...sampleSectionIdAndClasses('buttons-socketed')}>
         <h5>Socketed Buttons (for linker)</h5>
         <SocketedButton style={{ marginBottom: '1rem', marginRight: '1rem' }}>
           Unlinked
@@ -82,7 +89,10 @@ class Buttons extends Component<Record<string, never>, ButtonsState> {
     const { toggle } = this.state;
 
     return (
-      <div style={{ padding: '1rem 0' }}>
+      <div
+        {...sampleSectionIdAndClasses('buttons-inline')}
+        style={{ padding: '1rem 0' }}
+      >
         <h5>Inline Buttons</h5>
         Regular btn-inline:
         <ButtonOld className="btn-inline mx-2">

packages/code-studio/src/styleguide/Charts.tsx

@@ -1,13 +1,21 @@
+/* eslint-disable react/jsx-props-no-spreading */
 import React, { ReactElement, useState } from 'react';
 import { Chart, ChartModel, MockChartModel } from '@deephaven/chart';
 import { useApi } from '@deephaven/jsapi-bootstrap';
+import {
+  sampleSectionIdAndClasses,
+  useSeededRandomNumberCallback,
+} from './utils';
 
 function Charts(): ReactElement {
   const dh = useApi();
+
+  MockChartModel.random = useSeededRandomNumberCallback();
+
   const [model] = useState(() => new MockChartModel(dh));
 
   return (
-    <div>
+    <div {...sampleSectionIdAndClasses('charts')}>
       <h2 className="ui-title">Chart</h2>
       <div style={{ height: 500 }}>
         <Chart model={model as ChartModel} />

packages/code-studio/src/styleguide/Colors.tsx

@@ -1,5 +1,7 @@
+/* eslint-disable react/jsx-props-no-spreading */
 import React from 'react';
 import classNames from 'classnames';
+import { sampleSectionIdAndClasses } from './utils';
 
 function Colors(): React.ReactElement {
   const graySwatches = [
@@ -16,8 +18,8 @@ function Colors(): React.ReactElement {
     ['900', '75'],
   ].map(([swatch, dh]) => (
     <div
-      key={swatch}
       className={classNames('swatch', 'gray-swatch', `gray-swatch-${swatch}`)}
+      key={swatch}
     >
       <span>
         Gray-
@@ -50,7 +52,7 @@ function Colors(): React.ReactElement {
   ));
 
   return (
-    <div>
+    <div {...sampleSectionIdAndClasses('colors')}>
       <h2 className="ui-title">Colors</h2>
       <div className="row">
         <div className="col">{graySwatches}</div>

packages/code-studio/src/styleguide/ContextMenus.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-props-no-spreading */
 /* eslint no-alert: "off" */
 /* eslint no-console: "off" */
 import React, { Component } from 'react';
@@ -15,6 +16,7 @@ import {
   vsQuestion,
   IconDefinition,
 } from '@deephaven/icons';
+import { sampleSectionIdAndClasses } from './utils';
 
 interface ContextMenuItem {
   title: string;
@@ -106,7 +108,7 @@ class ContextMenus extends Component {
       });
 
     return (
-      <div>
+      <div {...sampleSectionIdAndClasses('context-menus')}>
         <h2 className="ui-title">Context Menu</h2>
         <Button
           kind="primary"