From 647f16b111d93ab35cc7fbdb88a4507394459f82 Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Mon, 21 Jul 2025 15:53:06 -0400
Subject: [PATCH 1/8] Fix aggregations to the top if editable

---
 packages/iris-grid/src/IrisGrid.tsx           | 19 ++++++++++++++++++-
 .../src/sidebar/aggregations/Aggregations.tsx | 10 +++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index e50eb02be3..033270a518 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -213,6 +213,19 @@ const DEFAULT_AGGREGATION_SETTINGS = Object.freeze({
   showOnTop: false,
 });
 
+function getAggregationSettingsForModel(
+  aggregationSettings: AggregationSettings,
+  model: IrisGridModel
+): AggregationSettings {
+  if (isEditableGridModel(model) && model.isEditable) {
+    return {
+      ...aggregationSettings,
+      showOnTop: true,
+    };
+  }
+  return aggregationSettings;
+}
+
 const UNFORMATTED_DATE_PATTERN = `yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS z`;
 
 function isEmptyConfig({
@@ -863,7 +876,10 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
 
       rollupConfig,
       rollupSelectedColumns: [],
-      aggregationSettings,
+      aggregationSettings: getAggregationSettingsForModel(
+        aggregationSettings,
+        model
+      ),
       selectedAggregation: null,
 
       openOptions: [],
@@ -4833,6 +4849,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
             <Aggregations
               settings={aggregationSettings}
               isRollup={isRollup}
+              isEditable={isEditableGridModel(model) && model.isEditable}
               onChange={this.handleAggregationsChange}
               onEdit={this.handleAggregationEdit}
               dh={model.dh}
diff --git a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
index 1b654e13ad..e21a1372e4 100644
--- a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
+++ b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
@@ -40,6 +40,7 @@ export type AggregationSettings = {
 
 export type AggregationsProps = {
   isRollup: boolean;
+  isEditable: boolean;
   settings: AggregationSettings;
   onChange: (
     settings: AggregationSettings,
@@ -52,6 +53,7 @@ export type AggregationsProps = {
 
 function Aggregations({
   isRollup,
+  isEditable,
   settings,
   onChange,
   onEdit,
@@ -219,7 +221,7 @@ function Aggregations({
       const isRollupProhibited = AggregationUtils.isRollupProhibited(
         item.operation
       );
-      const isEditable = !isClone && !isRollupOperation;
+      const isItemEditable = !isClone && !isRollupOperation;
       return (
         <>
           <div
@@ -254,7 +256,7 @@ function Aggregations({
                 icon={vsEdit}
                 tooltip="Edit Columns"
                 onClick={() => onEdit(item)}
-                disabled={!isEditable}
+                disabled={!isItemEditable}
               />
               <Button
                 kind="ghost"
@@ -309,7 +311,9 @@ function Aggregations({
                 value={`${showOnTop}`}
               >
                 <Radio value="true">Top</Radio>
-                <Radio value="false">Bottom</Radio>
+                <Radio value="false" isDisabled={isEditable}>
+                  Bottom
+                </Radio>
               </RadioGroup>
             </div>
           )}

From c765e39d567a53bc24e79905aa619b0ce604d726 Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Tue, 22 Jul 2025 16:38:05 -0400
Subject: [PATCH 2/8] Move positioning logic inline

---
 packages/iris-grid/src/IrisGrid.tsx | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index 033270a518..e8ee3f3e59 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -213,19 +213,6 @@ const DEFAULT_AGGREGATION_SETTINGS = Object.freeze({
   showOnTop: false,
 });
 
-function getAggregationSettingsForModel(
-  aggregationSettings: AggregationSettings,
-  model: IrisGridModel
-): AggregationSettings {
-  if (isEditableGridModel(model) && model.isEditable) {
-    return {
-      ...aggregationSettings,
-      showOnTop: true,
-    };
-  }
-  return aggregationSettings;
-}
-
 const UNFORMATTED_DATE_PATTERN = `yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS z`;
 
 function isEmptyConfig({
@@ -876,10 +863,10 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
 
       rollupConfig,
       rollupSelectedColumns: [],
-      aggregationSettings: getAggregationSettingsForModel(
-        aggregationSettings,
-        model
-      ),
+      aggregationSettings:
+        isEditableGridModel(model) && model.isEditable
+          ? { ...aggregationSettings, showOnTop: true }
+          : aggregationSettings,
       selectedAggregation: null,
 
       openOptions: [],

From 337be3a24691cc62d7c84207773f123b57fd2e03 Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Tue, 22 Jul 2025 16:41:45 -0400
Subject: [PATCH 3/8] Add comment

---
 packages/iris-grid/src/IrisGrid.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index e8ee3f3e59..616a3e5f3c 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -864,6 +864,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
       rollupConfig,
       rollupSelectedColumns: [],
       aggregationSettings:
+        // Fix aggregations to the top if the grid is editable, so that the bottom is reserved for pending rows
         isEditableGridModel(model) && model.isEditable
           ? { ...aggregationSettings, showOnTop: true }
           : aggregationSettings,

From 57f82238aca7074d46756b8a2e420376e9463ac8 Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Fri, 25 Jul 2025 10:13:05 -0400
Subject: [PATCH 4/8] Change prop to available placements

---
 packages/iris-grid/src/IrisGrid.tsx              |  6 +++++-
 .../src/sidebar/aggregations/Aggregations.tsx    | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index 616a3e5f3c..3962285826 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -4837,7 +4837,11 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
             <Aggregations
               settings={aggregationSettings}
               isRollup={isRollup}
-              isEditable={isEditableGridModel(model) && model.isEditable}
+              availablePlacements={
+                isEditableGridModel(model) && model.isEditable
+                  ? ['top']
+                  : ['top', 'bottom']
+              }
               onChange={this.handleAggregationsChange}
               onEdit={this.handleAggregationEdit}
               dh={model.dh}
diff --git a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
index e21a1372e4..aa82c13b7c 100644
--- a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
+++ b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
@@ -40,7 +40,7 @@ export type AggregationSettings = {
 
 export type AggregationsProps = {
   isRollup: boolean;
-  isEditable: boolean;
+  availablePlacements: ('top' | 'bottom')[];
   settings: AggregationSettings;
   onChange: (
     settings: AggregationSettings,
@@ -53,7 +53,7 @@ export type AggregationsProps = {
 
 function Aggregations({
   isRollup,
-  isEditable,
+  availablePlacements,
   settings,
   onChange,
   onEdit,
@@ -310,8 +310,16 @@ function Aggregations({
                 onChange={handleShowOnTopChange}
                 value={`${showOnTop}`}
               >
-                <Radio value="true">Top</Radio>
-                <Radio value="false" isDisabled={isEditable}>
+                <Radio
+                  value="true"
+                  isDisabled={!availablePlacements.includes('top')}
+                >
+                  Top
+                </Radio>
+                <Radio
+                  value="false"
+                  isDisabled={!availablePlacements.includes('bottom')}
+                >
                   Bottom
                 </Radio>
               </RadioGroup>

From 72ab16da523912375a3203653aec0ee35816d46f Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Fri, 25 Jul 2025 10:16:15 -0400
Subject: [PATCH 5/8] Revert naming

---
 packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
index aa82c13b7c..b45340e83f 100644
--- a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
+++ b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
@@ -221,7 +221,7 @@ function Aggregations({
       const isRollupProhibited = AggregationUtils.isRollupProhibited(
         item.operation
       );
-      const isItemEditable = !isClone && !isRollupOperation;
+      const isEditable = !isClone && !isRollupOperation;
       return (
         <>
           <div
@@ -256,7 +256,7 @@ function Aggregations({
                 icon={vsEdit}
                 tooltip="Edit Columns"
                 onClick={() => onEdit(item)}
-                disabled={!isItemEditable}
+                disabled={!isEditable}
               />
               <Button
                 kind="ghost"

From 81b3932ad982a2b617cec17162270d66d7423199 Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Fri, 25 Jul 2025 10:29:46 -0400
Subject: [PATCH 6/8] Add default available placements

---
 packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
index b45340e83f..cfe62d92e4 100644
--- a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
+++ b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
@@ -53,8 +53,8 @@ export type AggregationsProps = {
 
 function Aggregations({
   isRollup,
-  availablePlacements,
   settings,
+  availablePlacements = ['top', 'bottom'],
   onChange,
   onEdit,
   dh,

From 081217ea949c9c2c8f79df410820a559d14b84b6 Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Fri, 25 Jul 2025 10:33:39 -0400
Subject: [PATCH 7/8] Cleanup

---
 packages/iris-grid/src/IrisGrid.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index 3962285826..1a871a4941 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -864,7 +864,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
       rollupConfig,
       rollupSelectedColumns: [],
       aggregationSettings:
-        // Fix aggregations to the top if the grid is editable, so that the bottom is reserved for pending rows
+        // Pin aggregations to the top if the grid is editable, so that the bottom is reserved for pending rows
         isEditableGridModel(model) && model.isEditable
           ? { ...aggregationSettings, showOnTop: true }
           : aggregationSettings,

From 003737bb1b1599593dc92a0f20a68cbbb2468f3a Mon Sep 17 00:00:00 2001
From: gzh2003 <germainzhanghoule@deephaven.io>
Date: Fri, 25 Jul 2025 10:49:48 -0400
Subject: [PATCH 8/8] Make availablePlacements optional in type definition

---
 packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
index cfe62d92e4..760a4e163f 100644
--- a/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
+++ b/packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
@@ -40,7 +40,7 @@ export type AggregationSettings = {
 
 export type AggregationsProps = {
   isRollup: boolean;
-  availablePlacements: ('top' | 'bottom')[];
+  availablePlacements?: ('top' | 'bottom')[];
   settings: AggregationSettings;
   onChange: (
     settings: AggregationSettings,