admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: added countTrue and countFalse (#10741)

Browse Source 
fix: #10603 


https://www.loom.com/share/cebc8a19bd8e4ae684a5a215d0fd1f94?sid=cadaa395-285c-45c9-b3ce-2ae6d1330a3c

---------

Co-authored-by: Félix Malfait <felix@twenty.com>
Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
This commit is contained in:
Paribesh Nepal
2025-03-14 12:04:21 +05:30
committed by GitHub
parent 7f8ab6dda5
commit 1bffe57f6b
15 changed files with 386 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationLabel.ts
View File

@ -31,6 +31,10 @@ export const getAggregateOperationLabel = (
return t`Earliest date`;
case DATE_AGGREGATE_OPERATIONS.latest:
return t`Latest date`;
case AGGREGATE_OPERATIONS.countTrue:
return t`Count true`;
case AGGREGATE_OPERATIONS.countFalse:
return t`Count false`;
default:
throw new Error(`Unknown aggregate operation: ${operation}`);
}

4
packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationShortLabel.ts
View File

@ -29,6 +29,10 @@ export const getAggregateOperationShortLabel = (
return msg`Earliest`;
case DATE_AGGREGATE_OPERATIONS.latest:
return msg`Latest`;
case AGGREGATE_OPERATIONS.countTrue:
return msg`True`;
case AGGREGATE_OPERATIONS.countFalse:
return msg`False`;
default:
throw new Error(`Unknown aggregate operation: ${operation}`);
}

2
packages/twenty-front/src/modules/object-record/record-table/constants/AggregateOperations.ts
View File

@ -9,4 +9,6 @@ export enum AGGREGATE_OPERATIONS {
countUniqueValues = 'COUNT_UNIQUE_VALUES',
percentageEmpty = 'PERCENTAGE_EMPTY',
percentageNotEmpty = 'PERCENTAGE_NOT_EMPTY',
countTrue = 'COUNT_TRUE',
countFalse = 'COUNT_FALSE',
}

2
packages/twenty-front/src/modules/object-record/record-table/constants/FieldTypesAvailableForNonStandardAggregateOperation.ts
View File

@ -19,6 +19,8 @@ export const FIELD_TYPES_AVAILABLE_FOR_NON_STANDARD_AGGREGATE_OPERATION = {
FieldMetadataType.NUMBER,
FieldMetadataType.CURRENCY,
],
[AGGREGATE_OPERATIONS.countFalse]: [FieldMetadataType.BOOLEAN],
[AGGREGATE_OPERATIONS.countTrue]: [FieldMetadataType.BOOLEAN],
[DATE_AGGREGATE_OPERATIONS.earliest]: [
FieldMetadataType.DATE_TIME,
FieldMetadataType.DATE,

2
packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/countAggregateOperationOptions.tsx
View File

@ -5,4 +5,6 @@ export const COUNT_AGGREGATE_OPERATION_OPTIONS = [
AGGREGATE_OPERATIONS.countEmpty,
AGGREGATE_OPERATIONS.countNotEmpty,
AGGREGATE_OPERATIONS.countUniqueValues,
AGGREGATE_OPERATIONS.countTrue,
AGGREGATE_OPERATIONS.countFalse,
];

17
packages/twenty-front/src/modules/object-record/utils/__tests__/getAvailableFieldsIdsForAggregationFromObjectFields.test.ts
View File

@ -9,17 +9,23 @@ import { FieldMetadataType } from '~/generated/graphql';
const AMOUNT_FIELD_ID = '7d2d7b5e-7b3e-4b4a-8b0a-7b3e4b4a8b0a';
const PRICE_FIELD_ID = '9d2d7b5e-7b3e-4b4a-8b0a-7b3e4b4a8b0b';
const NAME_FIELD_ID = '5d2d7b5e-7b3e-4b4a-8b0a-7b3e4b4a8b0c';
const ACTIVE_FIELD_ID = '0825d011-6006-49a2-99c5-8d67bed77e55';
const FIELDS_MOCKS = [
{ id: AMOUNT_FIELD_ID, type: FieldMetadataType.NUMBER, name: 'amount' },
{ id: PRICE_FIELD_ID, type: FieldMetadataType.CURRENCY, name: 'price' },
{ id: NAME_FIELD_ID, type: FieldMetadataType.TEXT, name: 'name' },
{ id: ACTIVE_FIELD_ID, type: FieldMetadataType.BOOLEAN, name: 'active' },
];
jest.mock(
'@/object-record/utils/getAvailableAggregationsFromObjectFields',
() => ({
getAvailableAggregationsFromObjectFields: jest.fn().mockReturnValue({
active: {
[AGGREGATE_OPERATIONS.countTrue]: 'countTrueActive',
[AGGREGATE_OPERATIONS.countFalse]: 'CountFalseActive',
},
amount: {
[AGGREGATE_OPERATIONS.sum]: 'sumAmount',
[AGGREGATE_OPERATIONS.avg]: 'avgAmount',
@ -78,13 +84,16 @@ describe('getAvailableFieldsIdsForAggregationFromObjectFields', () => {
COUNT_AGGREGATE_OPERATION_OPTIONS,
);
COUNT_AGGREGATE_OPERATION_OPTIONS.forEach((operation) => {
expect(result[operation]).toEqual([
expect(result.COUNT).toEqual(
expect.arrayContaining([
AMOUNT_FIELD_ID,
PRICE_FIELD_ID,
NAME_FIELD_ID,
]);
});
]),
);
expect(result.COUNT_TRUE).toContain(ACTIVE_FIELD_ID);
expect(result.COUNT_FALSE).toContain(ACTIVE_FIELD_ID);
PERCENT_AGGREGATE_OPERATION_OPTIONS.forEach((operation) => {
expect(result[operation]).toBeUndefined();

8
packages/twenty-front/src/modules/object-record/utils/getAvailableAggregationsFromObjectFields.ts
View File

@ -62,6 +62,14 @@ export const getAvailableAggregationsFromObjectFields = (
};
}
if (field.type === FieldMetadataType.BOOLEAN) {
acc[field.name] = {
...acc[field.name],
[AGGREGATE_OPERATIONS.countTrue]: `countTrue${capitalize(field.name)}`,
[AGGREGATE_OPERATIONS.countFalse]: `countFalse${capitalize(field.name)}`,
};
}
if (isFieldMetadataDateKind(field.type) === true) {
acc[field.name] = {
...acc[field.name],