This is an automated email from the ASF dual-hosted git repository. vogievetsky pushed a commit to branch sod in repository https://gitbox.apache.org/repos/asf/druid.git
commit 5f92d19df6147a0803ed73c84c4134adba3d9bff Author: Vadim Ogievetsky <[email protected]> AuthorDate: Thu Apr 25 08:50:18 2024 -0700 change to using measure name --- .../components/generic-output-table/generic-output-table.tsx | 8 ++++---- web-console/src/views/explore-view/modules/table-react-module.tsx | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web-console/src/views/explore-view/modules/components/generic-output-table/generic-output-table.tsx b/web-console/src/views/explore-view/modules/components/generic-output-table/generic-output-table.tsx index 255a3a9b6fa..654a03a7f82 100644 --- a/web-console/src/views/explore-view/modules/components/generic-output-table/generic-output-table.tsx +++ b/web-console/src/views/explore-view/modules/components/generic-output-table/generic-output-table.tsx @@ -94,7 +94,7 @@ function columnNester(columns: TableColumn[], groupHints: string[] | undefined): export interface GenericOutputTableProps { queryResult: QueryResult; onQueryAction(action: QueryAction): void; - onOrderByChange?(columnIndex: number, desc: boolean): void; + onOrderByChange?(columnName: string, desc: boolean): void; onExport?(): void; runeMode: boolean; showTypeIcons: boolean; @@ -159,7 +159,7 @@ export const GenericOutputTable = React.memo(function GenericOutputTable( icon={reverseOrderByDirection === 'ASC' ? IconNames.SORT_ASC : IconNames.SORT_DESC} text={`Order ${reverseOrderByDirection === 'ASC' ? 'ascending' : 'descending'}`} onClick={() => { - onOrderByChange(headerIndex, reverseOrderByDirection !== 'ASC'); + onOrderByChange(header, reverseOrderByDirection !== 'ASC'); }} />, ); @@ -170,7 +170,7 @@ export const GenericOutputTable = React.memo(function GenericOutputTable( icon={IconNames.SORT_DESC} text="Order descending" onClick={() => { - onOrderByChange(headerIndex, true); + onOrderByChange(header, true); }} />, <MenuItem @@ -178,7 +178,7 @@ export const GenericOutputTable = React.memo(function GenericOutputTable( icon={IconNames.SORT_ASC} text="Order ascending" onClick={() => { - onOrderByChange(headerIndex, false); + onOrderByChange(header, false); }} />, ); diff --git a/web-console/src/views/explore-view/modules/table-react-module.tsx b/web-console/src/views/explore-view/modules/table-react-module.tsx index 2f20a44b112..9880d58dccd 100644 --- a/web-console/src/views/explore-view/modules/table-react-module.tsx +++ b/web-console/src/views/explore-view/modules/table-react-module.tsx @@ -447,12 +447,12 @@ function TableModule(props: TableModuleProps) { queryResult={resultData.result} groupHints={resultData.groupHints} showTypeIcons={false} - onOrderByChange={(headerIndex, desc) => { - const idx = SqlLiteral.index(headerIndex); - if (orderBy && String(orderBy.expression) === String(idx)) { + onOrderByChange={(columnName, desc) => { + const column = C(columnName); + if (orderBy && orderBy.expression.equals(column)) { setOrderBy(orderBy.reverseDirection()); } else { - setOrderBy(idx.toOrderByExpression(desc ? 'DESC' : 'ASC')); + setOrderBy(column.toOrderByExpression(desc ? 'DESC' : 'ASC')); } }} onQueryAction={action => { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
