feat: Partitioned Table UI Enhancements

packages/iris-grid/src/IrisGridPartitionSelector.tsx

@@ -322,7 +322,7 @@ class IrisGridPartitionSelector extends Component<
                 ? null
                 : (partitionConfig.partitions[index] as ItemKey)
             }
-            placeholder={'Select an option' as string}
+            placeholder={'Select a key' as string}
             labelColumn={partitionTables[index].columns[index].name}
             onChange={this.getCachedChangeCallback(index)}
             isDisabled={isLoading}
@@ -339,7 +339,11 @@ class IrisGridPartitionSelector extends Component<
           <Button
             onClick={this.handlePartitionTableClick}
             kind="inline"
-            tooltip="View keys as table"
+            tooltip={
+              model.isPartitionAwareSourceTable
+                ? 'View keys as table'
+                : 'View underlying partition table'
+            }
             icon={vsKey}
             active={partitionConfig.mode === 'keys'}
             disabled={isLoading}
@@ -354,7 +358,7 @@ class IrisGridPartitionSelector extends Component<
             active={partitionConfig.mode === 'merged'}
             disabled={isLoading}
           >
-            {model.isPartitionAwareSourceTable ? 'Merge' : 'Coalesce'}
+            {model.isPartitionAwareSourceTable ? 'Coalesce' : 'Merge'}
           </Button>
         </div>
         {partitionSelectors}

packages/iris-grid/src/IrisGridProxyModel.ts

@@ -317,7 +317,7 @@ class IrisGridProxyModel extends IrisGridModel implements PartitionedGridModel {
     ) {
       if (partitionConfig.mode === 'keys') {
         modelPromise = this.originalModel
-          .partitionBaseTable()
+          .partitionKeysTable()
           .then(table => makeModel(this.dh, table, this.formatter));
       } else if (partitionConfig.mode === 'merged') {
         modelPromise = this.originalModel
@@ -340,13 +340,6 @@ class IrisGridProxyModel extends IrisGridModel implements PartitionedGridModel {
     return this.originalModel.partitionKeysTable();
   }
 
-  partitionBaseTable(): Promise<DhType.Table> {
-    if (!isPartitionedGridModelProvider(this.originalModel)) {
-      throw new Error('Partitions are not available');
-    }
-    return this.originalModel.partitionBaseTable();
-  }
-
   partitionMergedTable(): Promise<DhType.Table> {
     if (!isPartitionedGridModelProvider(this.originalModel)) {
       throw new Error('Partitions are not available');
@@ -441,54 +434,6 @@ class IrisGridProxyModel extends IrisGridModel implements PartitionedGridModel {
       : false;
   }
 
-  get isPartitionAwareSourceTable(): boolean {
-    return isPartitionedGridModelProvider(this.originalModel)
-      ? this.originalModel.isPartitionAwareSourceTable
-      : false;
-  }
-
-  get isEditable(): boolean {
-    return isEditableGridModel(this.model) && this.model.isEditable;
-  }
-
-  get isDeletable(): boolean {
-    return isDeletableGridModel(this.model) && this.model.isDeletable;
-  }
-
-  get isViewportPending(): boolean {
-    return this.model.isViewportPending;
-  }
-
-  isEditableRange: IrisGridTableModel['isEditableRange'] = (
-    ...args
-  ): boolean => {
-    if (isEditableGridModel(this.model)) {
-      return this.model.isEditableRange(...args);
-    }
-    return false;
-  };
-
-  isDeletableRange: IrisGridTableModel['isDeletableRange'] = (
-    ...args
-  ): boolean => {
-    if (isDeletableGridModel(this.model)) {
-      return this.model.isDeletableRange(...args);
-    }
-    return false;
-  };
-
-  isDeletableRanges: IrisGridTableModel['isDeletableRanges'] = (
-    ...args
-  ): boolean => {
-    if (isDeletableGridModel(this.model)) {
-      return this.model.isDeletableRanges(...args);
-    }
-    return false;
-  };
-
-  isFilterable: IrisGridTableModel['isFilterable'] = (...args) =>
-    this.model.isFilterable(...args);
-
   setViewport = (
     top: number,
     bottom: number,

packages/iris-grid/src/IrisGridTableModel.ts

@@ -213,7 +213,7 @@ class IrisGridTableModel
   }
 
   async partitionBaseTable(): Promise<DhType.Table> {
-    return this.valuesTable(this.columns);
+    return this.partitionKeysTable();
   }
 
   async partitionTable(partitions: unknown[]): Promise<DhType.Table> {