merge latest

Author: dgodinez-dh

@types/memoize-one/index.d.ts

@@ -1,12 +1,9 @@
-export declare type EqualityFn = (
-  newArgs: unknown[],
-  lastArgs: unknown[]
-) => boolean;
+export declare type EqualityFn<P> = (newArgs: P, lastArgs: P) => boolean;
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 declare function memoizeOne<ResultFn extends Function>(
   resultFn: ResultFn,
-  isEqual?: EqualityFn
+  isEqual?: EqualityFn<Parameters<ResultFn>>
 ): ResultFn;
 
 export default memoizeOne;

packages/console/src/console-history/ConsoleHistoryResultErrorMessage.tsx

@@ -121,13 +121,15 @@ class ConsoleHistoryResultErrorMessage extends PureComponent<
     const { isExpanded, isTriggerHovered } = this.state;
     const { message: messageProp } = this.props;
     assertNotNull(messageProp);
-    const lineBreakIndex = messageProp.indexOf('\n');
+    // Trim trailing whitespace to avoid unnecessary empty lines
+    const message = messageProp.trimEnd();
+    const lineBreakIndex = message.indexOf('\n');
     const isMultiline = lineBreakIndex > -1;
-    let topLineOfMessage = messageProp;
+    let topLineOfMessage = message;
     if (isMultiline) {
-      topLineOfMessage = messageProp.slice(0, lineBreakIndex);
+      topLineOfMessage = message.slice(0, lineBreakIndex);
     }
-    const remainderOfMessage = messageProp.slice(lineBreakIndex);
+    const remainderOfMessage = message.slice(lineBreakIndex);
     const arrowBtnClasses = isTriggerHovered
       ? 'error-btn-link error-btn-link--active'
       : 'error-btn-link';

packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx

@@ -21,6 +21,7 @@ import {
   IrisGrid,
   type IrisGridType,
   IrisGridModel,
+  IrisGridCacheUtils,
   IrisGridUtils,
   isIrisGridTableModelTemplate,
   type ColumnName,
@@ -103,11 +104,11 @@ export interface PanelState {
   gridState: {
     isStuckToBottom: boolean;
     isStuckToRight: boolean;
-    movedColumns: {
+    movedColumns: readonly {
       from: string | ModelIndex | [string, string] | [ModelIndex, ModelIndex];
       to: string | ModelIndex;
     }[];
-    movedRows: MoveOperation[];
+    movedRows: readonly MoveOperation[];
   };
   irisGridState: DehydratedIrisGridState;
   irisGridPanelState: DehydratedIrisGridPanelState;
@@ -368,6 +369,12 @@ export class IrisGridPanel extends PureComponent<
 
   private irisGridUtils: IrisGridUtils | null;
 
+  private gridStateDehydrator =
+    IrisGridCacheUtils.makeMemoizedGridStateDehydrator();
+
+  private irisGridStateDehydrator =
+    IrisGridCacheUtils.makeMemoizedIrisGridStateDehydrator();
+
   getTableName(): string {
     const { metadata } = this.props;
     return getTableNameFromMetadata(metadata);
@@ -461,76 +468,6 @@ export class IrisGridPanel extends PureComponent<
       })
   );
 
-  getDehydratedIrisGridState = memoize(
-    (
-      model: IrisGridModel,
-      sorts: readonly dh.Sort[],
-      advancedFilters: ReadonlyAdvancedFilterMap,
-      customColumnFormatMap: Map<ColumnName, FormattingRule>,
-      isFilterBarShown: boolean,
-      quickFilters: ReadonlyQuickFilterMap,
-      customColumns: readonly ColumnName[],
-      reverse: boolean,
-      rollupConfig: UIRollupConfig | undefined,
-      showSearchBar: boolean,
-      searchValue: string,
-      selectDistinctColumns: readonly ColumnName[],
-      selectedSearchColumns: readonly ColumnName[],
-      invertSearchColumns: boolean,
-      userColumnWidths: ModelSizeMap,
-      userRowHeights: ModelSizeMap,
-      aggregationSettings: AggregationSettings,
-      pendingDataMap: PendingDataMap<UIRow>,
-      frozenColumns: readonly ColumnName[],
-      conditionalFormats: readonly SidebarFormattingRule[],
-      columnHeaderGroups: readonly ColumnHeaderGroup[],
-      partitionConfig: PartitionConfig | undefined
-    ) => {
-      assertNotNull(this.irisGridUtils);
-      return this.irisGridUtils.dehydrateIrisGridState(model, {
-        advancedFilters,
-        aggregationSettings,
-        customColumnFormatMap,
-        isFilterBarShown,
-        metrics: {
-          userColumnWidths,
-          userRowHeights,
-        },
-        quickFilters,
-        customColumns,
-        reverse,
-        rollupConfig,
-        showSearchBar,
-        searchValue,
-        selectDistinctColumns,
-        selectedSearchColumns,
-        sorts,
-        invertSearchColumns,
-        pendingDataMap,
-        frozenColumns,
-        conditionalFormats,
-        columnHeaderGroups,
-        partitionConfig,
-      });
-    }
-  );
-
-  getDehydratedGridState = memoize(
-    (
-      model: IrisGridModel,
-      movedColumns: readonly MoveOperation[],
-      movedRows: readonly MoveOperation[],
-      isStuckToBottom: boolean,
-      isStuckToRight: boolean
-    ) =>
-      IrisGridUtils.dehydrateGridState(model, {
-        isStuckToBottom,
-        isStuckToRight,
-        movedColumns,
-        movedRows,
-      })
-  );
-
   getCachedPanelState = memoize(
     (
       irisGridPanelState: PanelState['irisGridPanelState'],
@@ -1128,34 +1065,9 @@ export class IrisGridPanel extends PureComponent<
       partitions,
       advancedSettings,
     } = this.state;
-    const {
-      advancedFilters,
-      aggregationSettings,
-      customColumnFormatMap,
-      isFilterBarShown,
-      quickFilters,
-      customColumns,
-      reverse,
-      rollupConfig,
-      showSearchBar,
-      searchValue,
-      selectDistinctColumns,
-      selectedSearchColumns,
-      sorts,
-      invertSearchColumns,
-      metrics,
-      pendingDataMap,
-      frozenColumns,
-      conditionalFormats,
-      columnHeaderGroups,
-      partitionConfig,
-    } = irisGridState;
+    assertNotNull(this.irisGridUtils);
     assertNotNull(model);
-    assertNotNull(metrics);
-    const { userColumnWidths, userRowHeights } = metrics;
     assertNotNull(gridState);
-    const { isStuckToBottom, isStuckToRight, movedColumns, movedRows } =
-      gridState;
 
     const panelState = this.getCachedPanelState(
       this.getDehydratedIrisGridPanelState(
@@ -1164,37 +1076,8 @@ export class IrisGridPanel extends PureComponent<
         partitions,
         advancedSettings
       ),
-      this.getDehydratedIrisGridState(
-        model,
-        sorts,
-        advancedFilters,
-        customColumnFormatMap,
-        isFilterBarShown,
-        quickFilters,
-        customColumns,
-        reverse,
-        rollupConfig,
-        showSearchBar,
-        searchValue,
-        selectDistinctColumns,
-        selectedSearchColumns,
-        invertSearchColumns,
-        userColumnWidths,
-        userRowHeights,
-        aggregationSettings,
-        pendingDataMap,
-        frozenColumns,
-        conditionalFormats,
-        columnHeaderGroups,
-        partitionConfig
-      ),
-      this.getDehydratedGridState(
-        model,
-        movedColumns,
-        movedRows,
-        isStuckToBottom,
-        isStuckToRight
-      ),
+      this.irisGridStateDehydrator(model, irisGridState),
+      this.gridStateDehydrator(model, gridState),
       pluginState
     );