deephaven · mofojed · Jan 18, 2024 · Oct 23, 2023 · Nov 2, 2023 · Nov 6, 2023
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/code-studio/src/styleguide/MockIrisGridTreeModel.ts b/packages/code-studio/src/styleguide/MockIrisGridTreeModel.ts
@@ -222,6 +222,22 @@ class MockIrisGridTreeModel
     // Ignore for mock
   }
 
+  get partition(): never[] {
+    return [];
+  }
+
+  set partition(partition: never[]) {
+    // Ignore for mock
+  }
+
+  get partitionColumns(): never[] {
+    return [];
+  }
+
+  set partitionColumns(partitionColumns: never[]) {
+    // Ignore for mock
+  }
+
   set formatter(formatter: Formatter) {
     // Ignore for mock
   }

diff --git a/packages/components/src/Option.tsx b/packages/components/src/Option.tsx
@@ -1,23 +1,13 @@
-import React from 'react';
+import React, { OptionHTMLAttributes } from 'react';
 
-export type OptionProps = {
+export type OptionProps = OptionHTMLAttributes<HTMLOptionElement> & {
   children: React.ReactNode;
-  disabled?: boolean;
-  value: string;
   'data-testid'?: string;
 };
 
-function Option({
-  children,
-  disabled,
-  value,
-  'data-testid': dataTestId,
-}: OptionProps): JSX.Element {
-  return (
-    <option value={value} disabled={disabled} data-testid={dataTestId}>
-      {children}
-    </option>
-  );
+function Option({ children, ...props }: OptionProps): JSX.Element {
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return <option {...props}>{children}</option>;
 }
 
 export default Option;
diff --git a/packages/console/src/common/ConsoleUtils.ts b/packages/console/src/common/ConsoleUtils.ts
@@ -56,7 +56,8 @@ class ConsoleUtils {
     return (
       type === dh.VariableType.TABLE ||
       type === dh.VariableType.TREETABLE ||
-      type === dh.VariableType.HIERARCHICALTABLE
+      type === dh.VariableType.HIERARCHICALTABLE ||
+      type === dh.VariableType.PARTITIONEDTABLE
     );
   }
 

diff --git a/packages/console/src/common/ObjectIcon.tsx b/packages/console/src/common/ObjectIcon.tsx
@@ -14,6 +14,7 @@ function ObjectIcon({ type }: ObjectIconProps): JSX.Element {
     case dh.VariableType.TABLEMAP:
     case dh.VariableType.TREETABLE:
     case dh.VariableType.HIERARCHICALTABLE:
+    case dh.VariableType.PARTITIONEDTABLE:
       return <FontAwesomeIcon icon={dhTable} />;
     case dh.VariableType.FIGURE:
       return <FontAwesomeIcon icon={vsGraph} />;

diff --git a/packages/dashboard-core-plugins/src/GridPluginConfig.ts b/packages/dashboard-core-plugins/src/GridPluginConfig.ts
@@ -9,7 +9,12 @@ const GridPluginConfig: WidgetPlugin = {
   type: PluginType.WIDGET_PLUGIN,
   component: GridWidgetPlugin,
   panelComponent: GridPanelPlugin,
-  supportedTypes: ['Table', 'TreeTable', 'HierarchicalTable'],
+  supportedTypes: [
+    'Table',
+    'TreeTable',
+    'HierarchicalTable',
+    'PartitionedTable',
+  ],
   icon: dhTable,
 };
 

diff --git a/packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx b/packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx
@@ -43,6 +43,7 @@ import {
   ColumnHeaderGroup,
   IrisGridContextMenuData,
   IrisGridTableModel,
+  PartitionConfig,
 } from '@deephaven/iris-grid';
 import {
   AdvancedFilterOptions,
@@ -126,9 +127,7 @@ export interface PanelState {
 type LoadedPanelState = PanelState & {
   irisGridPanelState: PanelState['irisGridPanelState'] & {
     partitions?: (string | null)[];
-    partitionColumns?: ColumnName[];
     partition?: string | null;
-    partitionColumn?: ColumnName | null;
   };
 };
 
@@ -190,7 +189,7 @@ interface IrisGridPanelState {
   movedRows: readonly MoveOperation[];
   isSelectingPartition: boolean;
   partitions: (string | null)[];
-  partitionColumns: Column[];
+  partitionConfig?: PartitionConfig;
   rollupConfig?: UIRollupConfig;
   showSearchBar: boolean;
   searchValue: string;
@@ -296,7 +295,6 @@ export class IrisGridPanel extends PureComponent<
       movedRows: [],
       isSelectingPartition: false,
       partitions: [],
-      partitionColumns: [],
       rollupConfig: undefined,
       showSearchBar: false,
       searchValue: '',
@@ -466,13 +464,11 @@ export class IrisGridPanel extends PureComponent<
       model: IrisGridModel,
       isSelectingPartition: boolean,
       partitions: (string | null)[],
-      partitionColumns: Column[],
       advancedSettings: Map<AdvancedSettingsType, boolean>
     ) =>
       IrisGridUtils.dehydrateIrisGridPanelState(model, {
         isSelectingPartition,
         partitions,
-        partitionColumns,
         advancedSettings,
       })
   );
@@ -499,7 +495,8 @@ export class IrisGridPanel extends PureComponent<
       pendingDataMap: PendingDataMap<UIRow>,
       frozenColumns: readonly ColumnName[],
       conditionalFormats: readonly SidebarFormattingRule[],
-      columnHeaderGroups: readonly ColumnHeaderGroup[]
+      columnHeaderGroups: readonly ColumnHeaderGroup[],
+      partitionConfig: PartitionConfig | undefined
     ) => {
       assertNotNull(this.irisGridUtils);
       return this.irisGridUtils.dehydrateIrisGridState(model, {
@@ -525,6 +522,7 @@ export class IrisGridPanel extends PureComponent<
         frozenColumns,
         conditionalFormats,
         columnHeaderGroups,
+        partitionConfig,
       });
     }
   );
@@ -1035,12 +1033,8 @@ export class IrisGridPanel extends PureComponent<
             }[]
           );
       }
-      const {
-        isSelectingPartition,
-        partitions,
-        partitionColumns,
-        advancedSettings,
-      } = IrisGridUtils.hydrateIrisGridPanelState(model, irisGridPanelState);
+      const { isSelectingPartition, partitions, advancedSettings } =
+        IrisGridUtils.hydrateIrisGridPanelState(model, irisGridPanelState);
       assertNotNull(this.irisGridUtils);
       const {
         advancedFilters,
@@ -1063,6 +1057,7 @@ export class IrisGridPanel extends PureComponent<
         frozenColumns,
         conditionalFormats,
         columnHeaderGroups,
+        partitionConfig,
       } = this.irisGridUtils.hydrateIrisGridState(model, {
         ...irisGridState,
         ...irisGridStateOverrides,
@@ -1084,7 +1079,6 @@ export class IrisGridPanel extends PureComponent<
         movedColumns,
         movedRows,
         partitions,
-        partitionColumns,
         quickFilters,
         reverseType,
         rollupConfig,
@@ -1102,6 +1096,7 @@ export class IrisGridPanel extends PureComponent<
         isStuckToBottom,
         isStuckToRight,
         columnHeaderGroups,
+        partitionConfig,
       });
     } catch (error) {
       log.error('loadPanelState failed to load panelState', panelState, error);
@@ -1117,7 +1112,6 @@ export class IrisGridPanel extends PureComponent<
       panelState: oldPanelState,
       isSelectingPartition,
       partitions,
-      partitionColumns,
       advancedSettings,
     } = this.state;
     const {
@@ -1140,6 +1134,7 @@ export class IrisGridPanel extends PureComponent<
       frozenColumns,
       conditionalFormats,
       columnHeaderGroups,
+      partitionConfig,
     } = irisGridState;
     assertNotNull(model);
     assertNotNull(metrics);
@@ -1153,7 +1148,6 @@ export class IrisGridPanel extends PureComponent<
         model,
         isSelectingPartition,
         partitions,
-        partitionColumns,
         advancedSettings
       ),
       this.getDehydratedIrisGridState(
@@ -1177,7 +1171,8 @@ export class IrisGridPanel extends PureComponent<
         pendingDataMap,
         frozenColumns,
         conditionalFormats,
-        columnHeaderGroups
+        columnHeaderGroups,
+        partitionConfig
       ),
       this.getDehydratedGridState(
         model,
@@ -1241,7 +1236,7 @@ export class IrisGridPanel extends PureComponent<
       movedColumns,
       movedRows,
       partitions,
-      partitionColumns,
+      partitionConfig,
       quickFilters,
       reverseType,
       rollupConfig,
@@ -1322,7 +1317,7 @@ export class IrisGridPanel extends PureComponent<
             movedColumns={movedColumns}
             movedRows={movedRows}
             partitions={partitions}
-            partitionColumns={partitionColumns}
+            partitionConfig={partitionConfig}
             quickFilters={quickFilters}
             reverseType={reverseType}
             rollupConfig={rollupConfig}

diff --git a/packages/embed-grid/src/App.tsx b/packages/embed-grid/src/App.tsx
@@ -23,6 +23,7 @@ const SUPPORTED_TYPES: string[] = [
   dh.VariableType.TREETABLE,
   dh.VariableType.HIERARCHICALTABLE,
   dh.VariableType.PANDAS,
+  dh.VariableType.PARTITIONEDTABLE,
 ];
 
 export type Command = 'filter' | 'sort';

diff --git a/packages/grid/src/DataBarGridModel.ts b/packages/grid/src/DataBarGridModel.ts
@@ -1,7 +1,6 @@
-import { GridThemeType } from '.';
 import { ModelIndex } from './GridMetrics';
 import GridModel from './GridModel';
-import { GridColor } from './GridTheme';
+import { GridColor, type GridTheme as GridThemeType } from './GridTheme';
 
 export type Marker = { value: number; color: string };
 export type AxisOption = 'proportional' | 'middle' | 'directional';

diff --git a/packages/iris-grid/package.json b/packages/iris-grid/package.json
@@ -36,6 +36,7 @@
     "@deephaven/filters": "file:../filters",
     "@deephaven/grid": "file:../grid",
     "@deephaven/icons": "file:../icons",
+    "@deephaven/jsapi-components": "file:../jsapi-components",
     "@deephaven/jsapi-types": "file:../jsapi-types",
     "@deephaven/jsapi-utils": "file:../jsapi-utils",
     "@deephaven/log": "file:../log",