Skip to content

fix: DH-19601: Pin aggregations to the top in input tables #2502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 28, 2025
Merged

fix: DH-19601: Pin aggregations to the top in input tables #2502

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
647f16b
Fix aggregations to the top if editable
gzh2003 Jul 21, 2025
c765e39
Move positioning logic inline
gzh2003 Jul 22, 2025
337be3a
Add comment
gzh2003 Jul 22, 2025
57f8223
Change prop to available placements
gzh2003 Jul 25, 2025
72ab16d
Revert naming
gzh2003 Jul 25, 2025
81b3932
Add default available placements
gzh2003 Jul 25, 2025
081217e
Cleanup
gzh2003 Jul 25, 2025
003737b
Make availablePlacements optional in type definition
gzh2003 Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/iris-grid/src/IrisGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,11 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {

rollupConfig,
rollupSelectedColumns: [],
aggregationSettings,
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,
selectedAggregation: null,

openOptions: [],
Expand Down Expand Up @@ -4833,6 +4837,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}
Expand Down
10 changes: 7 additions & 3 deletions packages/iris-grid/src/sidebar/aggregations/Aggregations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export type AggregationSettings = {

export type AggregationsProps = {
isRollup: boolean;
isEditable: boolean;
settings: AggregationSettings;
onChange: (
settings: AggregationSettings,
Expand All @@ -52,6 +53,7 @@ export type AggregationsProps = {

function Aggregations({
isRollup,
isEditable,
settings,
onChange,
onEdit,
Expand Down Expand Up @@ -219,7 +221,7 @@ function Aggregations({
const isRollupProhibited = AggregationUtils.isRollupProhibited(
item.operation
);
const isEditable = !isClone && !isRollupOperation;
const isItemEditable = !isClone && !isRollupOperation;
return (
<>
<div
Expand Down Expand Up @@ -254,7 +256,7 @@ function Aggregations({
icon={vsEdit}
tooltip="Edit Columns"
onClick={() => onEdit(item)}
disabled={!isEditable}
disabled={!isItemEditable}
/>
<Button
kind="ghost"
Expand Down Expand Up @@ -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>
)}
Expand Down
Loading