Skip to content
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

Jump to bottom

Lookup gouping #1559

Merged
merged 2 commits into from May 12, 2023
Merged

Lookup gouping #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec9fea9
FIX: Grouping failed
JindrichSusen May 11, 2023
044e17b
FIX: Groups were not refreshed after changing aggregations
JindrichSusen May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 11 additions & 14 deletions backend/Origam.DA.Service/Generators/AbstractSqlCommandGenerator.cs
View file
Open in desktop
Expand Up @@ -1004,15 +1004,6 @@ internal void SelectParameterDeclarationsSetSql(StringBuilder result, Hashtable
.OfType<LookupField>()
.Any(field =>
selectParameters.ColumnsInfo.ColumnNames.Contains(field.Name));
bool wrapInGroupingSelect = hasLookupField &&
customGrouping != null;
if (wrapInGroupingSelect)
{
ColumnData groupColumn = selectParameters.ColumnsInfo.Columns
.FirstOrDefault(column => column.Name == ColumnData.GroupByCountColumn.Name);
selectParameters.ColumnsInfo.Columns.Remove(groupColumn);
selectParameters.CustomGrouping = null;
}

if (!(entity.EntityDefinition is TableMappingItem))
{
Expand Down Expand Up @@ -1263,15 +1254,21 @@ internal void SelectParameterDeclarationsSetSql(StringBuilder result, Hashtable
finalString += $" OFFSET {rowOffset} ROWS FETCH NEXT {rowLimit} ROWS ONLY;";
}

if (wrapInGroupingSelect)
if (hasLookupField && customGrouping != null)
{
string columnNames = string.Join(", ",
selectParameters.ColumnsInfo.ColumnNames.Select(
var columnNames = selectParameters.ColumnsInfo.ColumnNames;
if (selectParameters.AggregatedColumns.Count > 0)
{
columnNames.AddRange(
selectParameters.AggregatedColumns.Select(x => x.SqlQueryColumnName));
}
string sqlColumnNames = string.Join(", ",
columnNames.Select(
col => sqlRenderer.NameLeftBracket + col + sqlRenderer.NameRightBracket));
finalString = $"SELECT {columnNames}, {sqlRenderer.CountAggregate()}(*) AS {ColumnData.GroupByCountColumn} FROM (\n"+
finalString = $"SELECT {sqlColumnNames}, {sqlRenderer.CountAggregate()}(*) AS {ColumnData.GroupByCountColumn} FROM (\n"+
finalString + "\n" +
") as Query\n"+
$"GROUP BY {columnNames}";
$"GROUP BY {sqlColumnNames}";
}

return finalString;
Expand Down
10 changes: 7 additions & 3 deletions frontend-html/src/model/entities/TablePanelView/ColumnConfigurationModel.tsx
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@ import { GroupingUnit, groupingUnitToLabel } from "model/entities/types/Grouping
import { AggregationType, tryParseAggregationType } from "model/entities/types/AggregationType";
import { T } from "utils/translation";
import { IOption } from "@origam/components";
import _ from "lodash";

export interface IColumnOptions {
canGroup: boolean;
Expand Down Expand Up @@ -143,11 +144,14 @@ export class ColumnConfigurationModel{

@action.bound
onColumnConfSubmit(configuration: ITableConfiguration): void {
const aggregationsBefore = this.tablePanelView?.aggregations.aggregationList;
const groupingWasOnBefore = this.tablePanelView?.groupingConfiguration.isGrouping;
configuration.apply(this.tablePanelView);
const groupingIsOffNow = !this.tablePanelView?.groupingConfiguration.isGrouping;

if (groupingWasOnBefore && groupingIsOffNow) {
const groupingIsOnNow = this.tablePanelView?.groupingConfiguration.isGrouping;
const aggregationsNow = this.tablePanelView?.aggregations.aggregationList;
if (groupingWasOnBefore && !groupingIsOnNow ||
groupingIsOnNow && !_.isEqual(aggregationsBefore, aggregationsNow))
{
getFormScreenLifecycle(this).loadInitialData();
}
getDialogStack(this).closeDialog(dialogKey);
Expand Down