Revert "WIP revert old changes"

This reverts commit 1601d84.
deephaven · Jul 16, 2024 · ee26629 · ee26629
1 parent 21d966c
commit ee26629
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
@@ -1789,9 +1789,9 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
  const { advancedFilters, quickFilters, partitionConfig } = this.state;
  const { columns, formatter } = model;
 
- if (advancedFilters.size === 0 && quickFilters.size === 0) {
- return;
- }
+ // if (advancedFilters.size === 0 && quickFilters.size === 0) {
+ //  return;
+ // }
 
  const newAdvancedFilters = new Map();
  const newQuickFilters = new Map();
@@ -4262,7 +4262,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
  gotoValueSelectedFilter,
  partitionConfig,
  } = this.state;
- if (!isReady || partitionConfig?.mode === 'loading') {
+ if (!isReady || partitionConfig?.mode === 'empty') {
  return null;
  }
 

diff --git a/packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx b/packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx
@@ -505,7 +505,11 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
  },
  });
 
- if (isPartitionedGridModel(model) && !model.isPartitionAwareSourceTable) {
+ if (
+ isPartitionedGridModel(model) &&
+ !model.isPartitionAwareSourceTable &&
+ model.isPartitionRequired
+ ) {
  actions.push({
  title: 'View Constituent Table',
  group: IrisGridContextMenuHandler.GROUP_VIEW_CONTENTS,