scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-12 07:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add ability to set an aggregate sort on int fields

Browse source
This commit is contained in:
Stephanie Yang 2021-07-30 16:11:06 -05:00
parent 009f4d6d71
commit b0633898a3
3 changed files with 62 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lattice/src/App/QueryBuilder/GroupByBuilder/GroupByBuilder.tsx
View file

@ -157,22 +157,18 @@ export const GroupByBuilder: FC<GroupByBuilderProps> = ({
</div>
<GroupBySort
sort={sort ? sort : []}
onUpdate={(value) => {
onUpdate={(updatedSort) => {
let isInvalid = false;
if (
value.length > 0 &&
value[0].sortValue.includes('sum') &&
!value[0].field
) {
isInvalid = true;
} else if (
value.length > 1 &&
value[1].sortValue.includes('sum') &&
!value[1].field
) {
isInvalid = true;
}
onChange({ ...query, sort: value, isInvalid });
updatedSort.forEach((s) => {
if (
['sum', 'aggregate'].includes(s.sortValue) &&
!s.sum &&
!s.aggregate
) {
isInvalid = true;
}
});
onChange({ ...query, sort: updatedSort, isInvalid });
}}
fields={table.fields
.filter((field) => field.options.type === 'int')

83
lattice/src/App/QueryBuilder/GroupBySort/GroupBySort.tsx
View file

@ -4,7 +4,8 @@ import css from './GroupBySort.module.scss';
export type SortOption = {
sortValue: string;
field?: string;
sum?: string;
aggregate?: string;
};
type GroupBySortProps = {
@ -28,25 +29,23 @@ export const GroupBySort: FC<GroupBySortProps> = ({
{ label: 'Count (desc)', value: 'count desc' },
{ label: 'Count (asc)', value: 'count asc' },
{ label: 'Sum (desc)', value: 'sum desc' },
{ label: 'Sum (asc)', value: 'sum asc' }
{ label: 'Sum (asc)', value: 'sum asc' },
{ label: 'Aggregate (desc)', value: 'aggregate desc' },
{ label: 'Aggregate (asc)', value: 'aggregate asc' }
];
const onPrimaryChange = (value: string) => {
const split = value.split(' ');
const isSum = split[0] === 'sum';
const fieldValue = hasPrimary ? sort[0].field : undefined;
if (!hasSecondary) {
onUpdate([{ sortValue: value, field: isSum ? fieldValue : undefined }]);
} else if (hasSecondary && sort[1].sortValue.includes(split[0])) {
onUpdate([{ sortValue: value, field: isSum ? fieldValue : undefined }]);
onUpdate([{ sortValue: value }]);
} else if (sort[1].sortValue.includes(split[0])) {
onUpdate([{ sortValue: value }]);
} else {
onUpdate([
{ sortValue: value, field: isSum ? fieldValue : undefined },
sort[1]
]);
onUpdate([{ sortValue: value }, sort[1]]);
}
};
const onSecondaryChange = (value: string) => {
let sortOp = { sortValue: value };
@ -56,15 +55,31 @@ export const GroupBySort: FC<GroupBySortProps> = ({
onUpdate([sort[0], sortOp]);
};
const onUpdateSumField = (isPrimary: boolean, value: string) => {
const renderFieldSelect = (
sortFor: 'primary' | 'secondary',
sortType: 'sum' | 'aggregate'
) => {
const sortIdx = sortFor === 'primary' ? 0 : 1;
return (
<Select
className={css.fieldSelect}
label="Field"
value={sort[sortIdx][sortType] ? sort[sortIdx][sortType] : ''}
options={fields}
onChange={(value) => onUpdateField(sortType, sortIdx, value)}
error={showErrors ? !sort[sortIdx][sortType] : false}
/>
);
};
const onUpdateField = (
sortType: 'sum' | 'aggregate',
sortIdx: number,
value: string
) => {
let clone = [...sort];
if (isPrimary) {
clone[0].field = value;
} else {
clone[1].field = value;
}
clone[sortIdx][sortType] = value;
onUpdate(clone);
};
@ -79,16 +94,11 @@ export const GroupBySort: FC<GroupBySortProps> = ({
allowEmpty={true}
/>
{primary.includes('sum') ? (
<Select
className={css.fieldSelect}
label="Field"
value={sort[0].field ? sort[0].field : ''}
options={fields}
onChange={(value) => onUpdateSumField(true, value)}
error={showErrors ? !sort[0].field : false}
/>
) : null}
{primary.includes('sum')
? renderFieldSelect('primary', 'sum')
: primary.includes('aggregate')
? renderFieldSelect('primary', 'aggregate')
: null}
</div>
{hasPrimary ? (
@ -103,16 +113,11 @@ export const GroupBySort: FC<GroupBySortProps> = ({
allowEmpty={true}
/>
{secondary.includes('sum') ? (
<Select
className={css.fieldSelect}
label="Field"
value={sort[1].field ? sort[1].field : ''}
options={fields}
onChange={(value) => onUpdateSumField(false, value)}
error={showErrors ? !sort[1].field : false}
/>
) : null}
{secondary.includes('sum')
? renderFieldSelect('secondary', 'sum')
: secondary.includes('aggregate')
? renderFieldSelect('secondary', 'aggregate')
: null}
</div>
) : null}
</div>

9
lattice/src/App/QueryBuilder/utils.ts
View file

@ -121,12 +121,17 @@ export const stringifyGroupBy = (query: any) => {
if (sort?.length > 0) {
sortString = sort[0].sortValue;
if (sort[0].sortValue.includes('sum')) {
aggregateString = `, aggregate=Sum(field=${sort[0].field})`;
aggregateString = `, aggregate=Sum(field=${sort[0].sum})`;
} else if(sort[0].sortValue.includes('aggregate')) {
aggregateString = `, aggregate=Count(Distinct(field=${sort[0].aggregate}))`;
}
if (sort.length > 1) {
sortString = `${sortString}, ${sort[1].sortValue}`;
if (sort[1].sortValue.includes('sum')) {
aggregateString = `, aggregate=Sum(field=${sort[1].field})`;
aggregateString = `, aggregate=Sum(field=${sort[1].sum})`;
} else if(sort[1].sortValue.includes('aggregate')) {
aggregateString = `, aggregate=Count(Distinct(field=${sort[1].aggregate}))`;
}
}
sortString = `, sort="${sortString}"`;