Merge branch 'main' into DH-18171-resize-all-columns-option-in-web-ui

deephaven · Feb 12, 2025 · 125c58a · 125c58a
2 parents fbece99 + 77c620f
commit 125c58a
Show file tree

Hide file tree

Showing 267 changed files with 659 additions and 157 deletions.
diff --git a/packages/chart/src/Chart.tsx b/packages/chart/src/Chart.tsx
@@ -45,8 +45,8 @@ const log = Log.module('Chart');
 
 type ChartSettings = ColumnFormatSettings &
   DateTimeFormatSettings & {
-    decimalFormatOptions?: DecimalColumnFormatterOptions;
-    integerFormatOptions?: IntegerColumnFormatterOptions;
+    defaultDecimalFormatOptions?: DecimalColumnFormatterOptions;
+    defaultIntegerFormatOptions?: IntegerColumnFormatterOptions;
     webgl?: boolean;
   };
 
@@ -531,6 +531,14 @@ class Chart extends Component<ChartProps, ChartState> {
         this.setState({ shownBlocker: null });
         break;
       }
+      case ChartModel.EVENT_LAYOUT_UPDATED: {
+        const newLayout = detail as Partial<Layout>;
+        this.setState(({ layout, revision }) => ({
+          layout: { ...layout, ...newLayout },
+          revision: revision + 1,
+        }));
+        break;
+      }
       default:
         log.debug('Unknown event type', type, event);
     }
@@ -651,18 +659,21 @@ class Chart extends Component<ChartProps, ChartState> {
     const columnFormats = FormatterUtils.getColumnFormats(settings);
     const dateTimeFormatterOptions =
       FormatterUtils.getDateTimeFormatterOptions(settings);
-    const { decimalFormatOptions = {}, integerFormatOptions = {} } = settings;
+    const {
+      defaultDecimalFormatOptions = {},
+      defaultIntegerFormatOptions = {},
+    } = settings;
 
     if (
       !deepEqual(this.columnFormats, columnFormats) ||
       !deepEqual(this.dateTimeFormatterOptions, dateTimeFormatterOptions) ||
-      !deepEqual(this.decimalFormatOptions, decimalFormatOptions) ||
-      !deepEqual(this.integerFormatOptions, integerFormatOptions)
+      !deepEqual(this.decimalFormatOptions, defaultDecimalFormatOptions) ||
+      !deepEqual(this.integerFormatOptions, defaultIntegerFormatOptions)
     ) {
       this.columnFormats = FormatterUtils.getColumnFormats(settings);
       this.dateTimeFormatterOptions = dateTimeFormatterOptions;
-      this.decimalFormatOptions = decimalFormatOptions;
-      this.integerFormatOptions = integerFormatOptions;
+      this.decimalFormatOptions = defaultDecimalFormatOptions;
+      this.integerFormatOptions = defaultIntegerFormatOptions;
       this.updateFormatter();
     }
 

diff --git a/packages/chart/src/ChartModel.ts b/packages/chart/src/ChartModel.ts
@@ -50,6 +50,8 @@ class ChartModel {
 
   static EVENT_BLOCKER_CLEAR = 'ChartModel.EVENT_BLOCKER_CLEAR';
 
+  static EVENT_LAYOUT_UPDATED = 'ChartModel.EVENT_LAYOUT_UPDATED';
+
   constructor(dh: typeof DhType) {
     this.dh = dh;
     this.listeners = [];
@@ -205,6 +207,12 @@ class ChartModel {
   fireBlockerClear(): void {
     this.fireEvent(new CustomEvent(ChartModel.EVENT_BLOCKER_CLEAR));
   }
+
+  fireLayoutUpdated(detail: Partial<Layout>): void {
+    this.fireEvent(
+      new CustomEvent(ChartModel.EVENT_LAYOUT_UPDATED, { detail })
+    );
+  }
 }
 
 export default ChartModel;
diff --git a/packages/chart/src/ChartTheme.module.scss b/packages/chart/src/ChartTheme.module.scss
@@ -21,4 +21,9 @@
   ocean-color: var(--dh-color-chart-geo-ocean);
   lake-color: var(--dh-color-chart-geo-lake);
   river-color: var(--dh-color-chart-geo-river);
+
+  /* Indicator */
+  indicator-increasing: var(--dh-color-chart-indicator-increase);
+  indicator-decreasing: var(--dh-color-chart-indicator-decrease);
+  indicator-gauge: var(--dh-color-chart-indicator-gauge);
 }
diff --git a/packages/chart/src/ChartTheme.ts b/packages/chart/src/ChartTheme.ts
@@ -28,6 +28,11 @@ export interface ChartTheme {
   ocean_color: string;
   lake_color: string;
   river_color: string;
+
+  // Indicator
+  indicator_increasing: string;
+  indicator_decreasing: string;
+  indicator_gauge: string;
 }
 
 export function defaultChartTheme(): Readonly<ChartTheme> {
@@ -65,6 +70,10 @@ export function defaultChartTheme(): Readonly<ChartTheme> {
     ocean_color: chartTheme['ocean-color'],
     lake_color: chartTheme['lake-color'],
     river_color: chartTheme['river-color'],
+    // Indicator
+    indicator_increasing: chartTheme['indicator-increasing'],
+    indicator_decreasing: chartTheme['indicator-decreasing'],
+    indicator_gauge: chartTheme['indicator-gauge'],
   });
 }
 

diff --git a/packages/chart/src/ChartUtils.ts b/packages/chart/src/ChartUtils.ts
@@ -17,6 +17,7 @@ import type {
   AxisType as PlotlyAxisType,
   MarkerSymbol,
   Template,
+  Delta,
 } from 'plotly.js';
 import { assertNotNull, bindAllMethods, type Range } from '@deephaven/utils';
 import { type ChartTheme } from './ChartTheme';
@@ -2038,6 +2039,9 @@ class ChartUtils {
       ohlc_increasing,
       ohlc_decreasing,
       title_color,
+      indicator_increasing,
+      indicator_decreasing,
+      indicator_gauge,
     } = theme;
 
     return {
@@ -2075,6 +2079,20 @@ class ChartUtils {
             },
           },
         ],
+        indicator: [
+          {
+            title: { font: { color: title_color } },
+            delta: {
+              decreasing: {
+                color: indicator_decreasing,
+              } as Delta['increasing'],
+              increasing: {
+                color: indicator_increasing,
+              } as Delta['decreasing'],
+            },
+            gauge: { bar: { color: indicator_gauge } },
+          },
+        ],
       },
       /* eslint-enable camelcase */
       layout: this.makeDefaultLayout(theme),

diff --git a/packages/chart/src/__snapshots__/ChartTheme.test.ts.snap b/packages/chart/src/__snapshots__/ChartTheme.test.ts.snap
@@ -6,6 +6,9 @@ exports[`defaultChartTheme should create the default chart theme 1`] = `
   "colorway": "chartTheme['colorway']",
   "error_band_line_color": "chartTheme['error-band-line-color']",
   "gridcolor": "chartTheme['gridcolor']",
+  "indicator_decreasing": "chartTheme['indicator-decreasing']",
+  "indicator_gauge": "chartTheme['indicator-gauge']",
+  "indicator_increasing": "chartTheme['indicator-increasing']",
   "lake_color": "chartTheme['lake-color']",
   "land_color": "chartTheme['land-color']",
   "legend_color": "chartTheme['legend-color']",

diff --git a/packages/chart/src/__snapshots__/ChartUtils.test.ts.snap b/packages/chart/src/__snapshots__/ChartUtils.test.ts.snap
@@ -12,6 +12,28 @@ exports[`makeDefaultTemplate should create a default template 1`] = `
         },
       },
     ],
+    "indicator": [
+      {
+        "delta": {
+          "decreasing": {
+            "color": "ChartTheme['indicator_decreasing']",
+          },
+          "increasing": {
+            "color": "ChartTheme['indicator_increasing']",
+          },
+        },
+        "gauge": {
+          "bar": {
+            "color": "ChartTheme['indicator_gauge']",
+          },
+        },
+        "title": {
+          "font": {
+            "color": "ChartTheme['title_color']",
+          },
+        },
+      },
+    ],
     "ohlc": [
       {
         "decreasing": {

diff --git a/packages/components/src/navigation/NavTab.tsx b/packages/components/src/navigation/NavTab.tsx
@@ -7,6 +7,7 @@ import type { NavTabItem } from './NavTabList';
 import Button from '../Button';
 import ContextActions from '../context-actions/ContextActions';
 import { type ResolvableContextAction } from '../context-actions';
+import { Tooltip } from '../popper';
 
 interface NavTabProps {
   tab: NavTabItem;
@@ -93,7 +94,10 @@ const NavTab = memo(
               }}
             >
               {iconElem}
-              {title}
+              <span className="btn-nav-tab-title">
+                {title}
+                <Tooltip>{title}</Tooltip>
+              </span>
               {isClosable && (
                 <Button
                   kind="ghost"

diff --git a/packages/components/src/navigation/NavTabList.scss b/packages/components/src/navigation/NavTabList.scss
@@ -42,13 +42,17 @@ $tab-control-btn-offset: -8px;
       overflow: hidden;
       padding: 0 $tab-link-side-padding;
       position: relative;
-      text-overflow: ellipsis;
       user-select: none;
-      white-space: nowrap;
       flex-shrink: 0;
       background: none;
       background-clip: padding-box;
 
+      .btn-nav-tab-title {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
       .btn-nav-tab-close {
         position: absolute;
         height: 20px;

diff --git a/packages/components/src/spectrum/comboBox/ComboBox.tsx b/packages/components/src/spectrum/comboBox/ComboBox.tsx
@@ -10,7 +10,7 @@ import type { NormalizedItem } from '../utils';
 import { type PickerPropsT, usePickerProps } from '../picker';
 
 export type ComboBoxProps = PickerPropsT<SpectrumComboBoxProps<NormalizedItem>>;
-export { type MenuTriggerAction } from '@react-types/combobox';
+export type { MenuTriggerAction } from '@react-types/combobox';
 export { SpectrumComboBox };
 
 export const ComboBox = React.forwardRef(function ComboBox(

diff --git a/packages/components/src/theme/theme-dark/theme-dark-semantic-chart.css b/packages/components/src/theme/theme-dark/theme-dark-semantic-chart.css
@@ -47,4 +47,9 @@
   --dh-color-chart-geo-ocean: var(--dh-color-gray-300);
   --dh-color-chart-geo-lake: var(--dh-color-blue-200);
   --dh-color-chart-geo-river: var(--dh-color-blue-200);
+
+  /* Indicator */
+  --dh-color-chart-indicator-increase: var(--dh-color-visual-green);
+  --dh-color-chart-indicator-decrease: var(--dh-color-visual-red);
+  --dh-color-chart-indicator-gauge: var(--dh-color-green-1000);
 }
diff --git a/packages/components/src/theme/theme-light/theme-light-semantic-chart.css b/packages/components/src/theme/theme-light/theme-light-semantic-chart.css
@@ -47,4 +47,9 @@
   --dh-color-chart-geo-ocean: var(--dh-color-gray-300);
   --dh-color-chart-geo-lake: var(--dh-color-blue-400);
   --dh-color-chart-geo-river: var(--dh-color-blue-400);
+
+  /* Indicator */
+  --dh-color-chart-indicator-increase: var(--dh-color-visual-green);
+  --dh-color-chart-indicator-decrease: var(--dh-color-visual-red);
+  --dh-color-chart-indicator-gauge: var(--dh-color-green-1000);
 }
diff --git a/packages/console/src/monaco/MonacoProviders.tsx b/packages/console/src/monaco/MonacoProviders.tsx
@@ -258,7 +258,10 @@ class MonacoProviders extends PureComponent<
         d.end_location.row,
         d.end_location.column
       );
-      return diagnosticRange.intersectRanges(range);
+      return (
+        d.code != null && // Syntax errors have no code and can't be fixed/disabled
+        diagnosticRange.intersectRanges(range)
+      );
     });
 
     const fixActions: monaco.languages.CodeAction[] = diagnostics
@@ -296,8 +299,24 @@ class MonacoProviders extends PureComponent<
         };
       });
 
-    const disableActions: monaco.languages.CodeAction[] = diagnostics
+    const seenCodes = new Set<string>();
+    const duplicateCodes = new Set<string>();
+    diagnostics.forEach(d => {
+      if (d.code == null) {
+        return;
+      }
+      if (seenCodes.has(d.code)) {
+        duplicateCodes.add(d.code);
+      }
+      seenCodes.add(d.code);
+    });
+
+    const disableLineActions: monaco.languages.CodeAction[] = diagnostics
       .map(d => {
+        if (d.code == null) {
+          // The nulls are already filtered out, but TS doesn't know that
+          return [];
+        }
         const line = model.getLineContent(d.location.row);
         const lastToken = monaco.editor
           .tokenize(line, model.getLanguageId())[0]
@@ -327,7 +346,11 @@ class MonacoProviders extends PureComponent<
         }
         return [
           {
-            title: `Disable ${d.code} for this line`,
+            title: `Disable ${d.code} for ${
+              duplicateCodes.has(d.code)
+                ? `line ${d.location.row}`
+                : 'this line'
+            }`,
             kind: 'quickfix',
             edit: {
               edits: [
@@ -339,33 +362,40 @@ class MonacoProviders extends PureComponent<
               ],
             },
           },
+        ];
+      })
+      .flat()
+      .filter(
+        // Remove actions with duplicate titles as you can't disable the same rule on a line twice
+        (action, i, arr) => arr.find(a => a.title === action.title) === action
+      );
+
+    const disableGlobalActions: monaco.languages.CodeAction[] = [
+      ...seenCodes,
+    ].map(code => ({
+      title: `Disable ${code} for this file`,
+      kind: 'quickfix',
+      edit: {
+        edits: [
           {
-            title: `Disable ${d.code} for this file`,
-            kind: 'quickfix',
-            edit: {
-              edits: [
-                {
-                  resource: model.uri,
-                  versionId: model.getVersionId(),
-                  textEdit: {
-                    range: {
-                      startLineNumber: 1,
-                      startColumn: 1,
-                      endLineNumber: 1,
-                      endColumn: 1,
-                    },
-                    text: `# ruff: noqa: ${d.code}\n`,
-                  },
-                },
-              ],
+            resource: model.uri,
+            versionId: model.getVersionId(),
+            textEdit: {
+              range: {
+                startLineNumber: 1,
+                startColumn: 1,
+                endLineNumber: 1,
+                endColumn: 1,
+              },
+              text: `# ruff: noqa: ${code}\n`,
             },
           },
-        ];
-      })
-      .flat();
+        ],
+      },
+    }));
 
     return {
-      actions: [...fixActions, ...disableActions],
+      actions: [...fixActions, ...disableLineActions, ...disableGlobalActions],
       dispose: () => {
         /* no-op */
       },

diff --git a/packages/golden-layout/src/controls/DragProxy.ts b/packages/golden-layout/src/controls/DragProxy.ts
@@ -90,7 +90,7 @@ export default class DragProxy extends EventEmitter {
       'title',
       stripTags(this._contentItem.config.title ?? '')
     );
-    this.element.find('.lm_title').html(this._contentItem.config.title ?? '');
+    this.element.find('.lm_title').text(this._contentItem.config.title ?? '');
     this.childElementContainer = this.element.find('.lm_content');
     this.childElementContainer.append(contentItem.element);
 

diff --git a/packages/golden-layout/src/controls/Tab.ts b/packages/golden-layout/src/controls/Tab.ts
@@ -99,7 +99,7 @@ export default class Tab {
   setTitle(title = '') {
     // Disabling for illumon project, we want to manage our own tooltips
     // this.element.attr( 'title', lm.utils.stripTags( title ) );
-    this.titleElement.html(title);
+    this.titleElement.text(title);
   }
 
   /**