PR feedback

deephaven · Jul 5, 2023 · a6b9e03 · a6b9e03
1 parent 00de9ce
commit a6b9e03
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/packages/iris-grid/src/AdvancedFilterCreator.test.tsx b/packages/iris-grid/src/AdvancedFilterCreator.test.tsx
@@ -54,7 +54,7 @@ function makeAdvancedFilterCreatorWrapper(
       selectedValues: [],
     },
     model: irisGridTestUtils.makeModel(),
-    column: irisGridTestUtils.makeColumn(),
+    column: irisGridTestUtils.makeColumn('0'), // needs to match column name in makeModel so that columnIndex can be found when rendering
     formatter: new Formatter(dh),
   }
 ) {

diff --git a/packages/iris-grid/src/AdvancedFilterCreator.tsx b/packages/iris-grid/src/AdvancedFilterCreator.tsx
@@ -214,11 +214,7 @@ class AdvancedFilterCreator extends PureComponent<
     );
     this.valuesTablePromise
       .then(valuesTable => {
-        const columnIndex = model.getColumnIndexByName(
-          valuesTable.columns[0].name
-        );
-        assertNotNull(columnIndex);
-        if (model.isColumnSortable(columnIndex)) {
+        if (valuesTable.columns[0].isSortable ?? true) {
           const sort = valuesTable.columns[0].sort().asc();
           valuesTable.applySort([sort]);
         }

diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
@@ -2401,16 +2401,17 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     log.info('Toggling sort for column', columnIndex);
 
     const { model } = this.props;
-    const { sorts: currentSorts } = this.state;
     const modelColumn = this.getModelColumn(columnIndex);
     assertNotNull(modelColumn);
-    const sorts = TableUtils.toggleSortForColumn(
-      currentSorts,
-      model.columns,
-      modelColumn,
-      addToExisting
-    );
-    if (model.columns[columnIndex].isSortable ?? false) {
+    if (model.isColumnSortable(columnIndex)) {
+      const { sorts: currentSorts } = this.state;
+      const sorts = TableUtils.toggleSortForColumn(
+        currentSorts,
+        model.columns,
+        modelColumn,
+        addToExisting
+      );
+
       this.updateSorts(sorts);
     } else {
       log.debug('Column type was not sortable', model.columns[columnIndex]);