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

16248 follow ups (#16262)

Browse Source 
Follow ups on https://github.com/twentyhq/twenty/pull/16248
This commit is contained in:
Raphaël Bosi
2025-12-02 17:33:39 +01:00
committed by GitHub
parent 5edb5e2d53
commit 900401c101
13 changed files with 100 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isFieldOrNestedFieldDateKind.test.ts
+5 -5
View File
@@ -1,10 +1,10 @@
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { FieldMetadataType } from 'twenty-shared/types';
import { isFieldOrNestedFieldDateKind } from '../isFieldOrNestedFieldDateKind';
import { isFieldOrRelationNestedFieldDateKind } from '../isFieldOrNestedFieldDateKind';
describe('isFieldOrNestedFieldDateKind', () => {
it('returns false when fieldId is null', () => {
const result = isFieldOrNestedFieldDateKind({
const result = isFieldOrRelationNestedFieldDateKind({
fieldId: null,
subFieldName: null,
objectMetadataItem: {} as ObjectMetadataItem,
@@ -18,7 +18,7 @@ describe('isFieldOrNestedFieldDateKind', () => {
fields: [{ id: 'date-field-id', type: FieldMetadataType.DATE }],
} as ObjectMetadataItem;
const result = isFieldOrNestedFieldDateKind({
const result = isFieldOrRelationNestedFieldDateKind({
fieldId: 'date-field-id',
subFieldName: null,
objectMetadataItem,
@@ -32,7 +32,7 @@ describe('isFieldOrNestedFieldDateKind', () => {
fields: [{ id: 'text-field-id', type: FieldMetadataType.TEXT }],
} as ObjectMetadataItem;
const result = isFieldOrNestedFieldDateKind({
const result = isFieldOrRelationNestedFieldDateKind({
fieldId: 'text-field-id',
subFieldName: null,
objectMetadataItem,
@@ -62,7 +62,7 @@ describe('isFieldOrNestedFieldDateKind', () => {
],
} as ObjectMetadataItem;
const result = isFieldOrNestedFieldDateKind({
const result = isFieldOrRelationNestedFieldDateKind({
fieldId: 'relation-field-id',
subFieldName: 'createdAt',
objectMetadataItem,
packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/buildChartGroupByFieldConfigUpdate.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { type ChartConfiguration } from '@/command-menu/pages/page-layout/types/ChartConfiguration';
import { isFieldOrNestedFieldDateKind } from '@/command-menu/pages/page-layout/utils/isFieldOrNestedFieldDateKind';
import { isFieldOrRelationNestedFieldDateKind } from '@/command-menu/pages/page-layout/utils/isFieldOrNestedFieldDateKind';
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { ObjectRecordGroupByDateGranularity } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -50,7 +50,7 @@ export const buildChartGroupByFieldConfigUpdate = <
? configuration.primaryAxisDateGranularity
: null;
const isNewFieldDateType = isFieldOrNestedFieldDateKind({
const isNewFieldDateType = isFieldOrRelationNestedFieldDateKind({
fieldId,
subFieldName,
objectMetadataItem,
packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/isFieldOrNestedFieldDateKind.ts
+7 -7
View File
@@ -1,9 +1,9 @@
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';
export const isFieldOrNestedFieldDateKind = ({
export const isFieldOrRelationNestedFieldDateKind = ({
fieldId,
subFieldName,
objectMetadataItem,
@@ -27,11 +27,11 @@ export const isFieldOrNestedFieldDateKind = ({
}
if (isFieldRelation(field) && isDefined(subFieldName)) {
return isNestedFieldDateType(
field,
subFieldName,
objectMetadataItems ?? [],
);
return isRelationNestedFieldDateKind({
relationField: field,
relationNestedFieldName: subFieldName,
objectMetadataItems: objectMetadataItems ?? [],
});
}
return isFieldMetadataDateKind(field.type);
packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/shouldHideChartSetting.ts
+6 -2
View File
@@ -3,7 +3,7 @@ import { CHART_CONFIGURATION_SETTING_IDS } from '@/command-menu/pages/page-layou
import { type ChartSettingsItem } from '@/command-menu/pages/page-layout/types/ChartSettingsGroup';
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';
@@ -26,7 +26,11 @@ const shouldHideDateGranularityBasedOnFieldType = (
}
if (isFieldRelation(field) && isDefined(subFieldName)) {
return !isNestedFieldDateType(field, subFieldName, objectMetadataItems);
return !isRelationNestedFieldDateKind({
relationField: field,
relationNestedFieldName: subFieldName,
objectMetadataItems: objectMetadataItems ?? [],
});
}
return !isFieldMetadataDateKind(field.type);
packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/transformGroupByDataToBarChartData.ts
+9 -9
View File
@@ -13,7 +13,7 @@ import { type GroupByRawResult } from '@/page-layout/widgets/graph/types/GroupBy
import { type RawDimensionValue } from '@/page-layout/widgets/graph/types/RawDimensionValue';
import { filterGroupByResults } from '@/page-layout/widgets/graph/utils/filterGroupByResults';
import { getFieldKey } from '@/page-layout/widgets/graph/utils/getFieldKey';
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import { type BarDatum } from '@nivo/bar';
import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';
import { GraphType } from '~/generated-metadata/graphql';
@@ -159,11 +159,11 @@ export const transformGroupByDataToBarChartData = ({
const showLegend = configuration.displayLegend ?? true;
const isDateField = isFieldMetadataDateKind(groupByFieldX.type);
const isNestedDateField = isNestedFieldDateType(
groupByFieldX,
primaryAxisSubFieldName,
const isNestedDateField = isRelationNestedFieldDateKind({
relationField: groupByFieldX,
relationNestedFieldName: primaryAxisSubFieldName,
objectMetadataItems,
);
});
const primaryAxisDateGranularity =
isDateField || isNestedDateField
@@ -177,11 +177,11 @@ export const transformGroupByDataToBarChartData = ({
const isSecondaryNestedDateField =
isDefined(groupByFieldY) &&
isNestedFieldDateType(
groupByFieldY,
secondaryAxisSubFieldName ?? undefined,
isRelationNestedFieldDateKind({
relationField: groupByFieldY,
relationNestedFieldName: secondaryAxisSubFieldName,
objectMetadataItems,
);
});
const secondaryAxisDateGranularity =
isSecondaryDateField || isSecondaryNestedDateField
packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/utils/transformGroupByDataToPieChartData.ts
+5 -5
View File
@@ -11,7 +11,7 @@ import { type RawDimensionValue } from '@/page-layout/widgets/graph/types/RawDim
import { buildFormattedToRawLookup } from '@/page-layout/widgets/graph/utils/buildFormattedToRawLookup';
import { computeAggregateValueFromGroupByResult } from '@/page-layout/widgets/graph/utils/computeAggregateValueFromGroupByResult';
import { formatPrimaryDimensionValues } from '@/page-layout/widgets/graph/utils/formatPrimaryDimensionValues';
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import { type ObjectRecordGroupByDateGranularity } from 'twenty-shared/types';
import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';
import { type PieChartConfiguration } from '~/generated/graphql';
@@ -71,11 +71,11 @@ export const transformGroupByDataToPieChartData = ({
}
const isDateField = isFieldMetadataDateKind(groupByField.type);
const isNestedDateField = isNestedFieldDateType(
groupByField,
configuration.groupBySubFieldName ?? undefined,
const isNestedDateField = isRelationNestedFieldDateKind({
relationField: groupByField,
relationNestedFieldName: configuration.groupBySubFieldName ?? undefined,
objectMetadataItems,
);
});
const dateGranularity: ObjectRecordGroupByDateGranularity | undefined =
isDateField || isNestedDateField
packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/isNestedFieldDateType.test.ts → packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/isRelationNestedFieldDateKind.test.ts
+22 -15
View File
@@ -1,7 +1,7 @@
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import { FieldMetadataType } from 'twenty-shared/types';
describe('isNestedFieldDateType', () => {
describe('isRelationNestedFieldDateKind', () => {
const companyObject = {
id: 'company-id',
nameSingular: 'company',
@@ -19,25 +19,30 @@ describe('isNestedFieldDateType', () => {
} as any;
it('returns true for a relation subfield that is a date type', () => {
const result = isNestedFieldDateType(relationField, 'createdAt', [
companyObject,
]);
const result = isRelationNestedFieldDateKind({
relationField: relationField,
relationNestedFieldName: 'createdAt',
objectMetadataItems: [companyObject],
});
expect(result).toBe(true);
});
it('returns false when the nested subfield is not a date type', () => {
const result = isNestedFieldDateType(relationField, 'name', [
companyObject,
]);
const result = isRelationNestedFieldDateKind({
relationField: relationField,
relationNestedFieldName: 'name',
objectMetadataItems: [companyObject],
});
expect(result).toBe(false);
});
it('returns false when subFieldName is missing', () => {
const result = isNestedFieldDateType(relationField, undefined, [
companyObject,
]);
const result = isRelationNestedFieldDateKind({
relationField: relationField,
relationNestedFieldName: undefined as string | undefined,
objectMetadataItems: [companyObject],
});
expect(result).toBe(false);
});
@@ -48,9 +53,11 @@ describe('isNestedFieldDateType', () => {
type: FieldMetadataType.TEXT,
} as any;
const result = isNestedFieldDateType(nonRelationField, 'createdAt', [
companyObject,
]);
const result = isRelationNestedFieldDateKind({
relationField: nonRelationField,
relationNestedFieldName: 'createdAt',
objectMetadataItems: [companyObject],
});
expect(result).toBe(false);
});
packages/twenty-front/src/modules/page-layout/widgets/graph/utils/applyCumulativeTransformToBarChartData.ts
+2 -1
View File
@@ -1,4 +1,5 @@
import { type BarDatum } from '@nivo/bar';
import { isNumber } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
type ApplyCumulativeTransformToBarChartDataOptions = {
@@ -18,7 +19,7 @@ export const applyCumulativeTransformToBarChartData = ({
(accumulator, datum) => {
const value = datum[aggregateKey];
if (typeof value === 'number') {
if (isNumber(value)) {
accumulator.runningTotal += value;
}
packages/twenty-front/src/modules/page-layout/widgets/graph/utils/applyCumulativeTransformToTwoDimensionalBarChartData.ts
+2 -1
View File
@@ -1,4 +1,5 @@
import { type BarDatum } from '@nivo/bar';
import { isNumber } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
type ApplyCumulativeTransformToTwoDimensionalBarChartDataOptions = {
@@ -24,7 +25,7 @@ export const applyCumulativeTransformToTwoDimensionalBarChartData = ({
for (const key of keys) {
const value = datum[key];
if (typeof value === 'number') {
if (isNumber(value)) {
accumulator.runningTotals[key] += value;
}
packages/twenty-front/src/modules/page-layout/widgets/graph/utils/generateGroupByQueryVariablesFromBarOrLineChartConfiguration.ts
+13 -13
View File
@@ -1,7 +1,7 @@
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { GRAPH_DEFAULT_DATE_GRANULARITY } from '@/page-layout/widgets/graph/constants/GraphDefaultDateGranularity.constant';
import { getGroupByOrderBy } from '@/page-layout/widgets/graph/utils/getGroupByOrderBy';
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import {
type AggregateOrderByWithGroupByField,
type ObjectRecordOrderByForCompositeField,
@@ -61,11 +61,11 @@ export const generateGroupByQueryVariablesFromBarOrLineChartConfiguration = ({
const isFieldXDate = isFieldMetadataDateKind(groupByFieldX.type);
const isFieldXNestedDate = isNestedFieldDateType(
groupByFieldX,
groupBySubFieldNameX,
const isFieldXNestedDate = isRelationNestedFieldDateKind({
relationField: groupByFieldX,
relationNestedFieldName: groupBySubFieldNameX,
objectMetadataItems,
);
});
const shouldApplyDateGranularityX = isFieldXDate || isFieldXNestedDate;
@@ -87,11 +87,11 @@ export const generateGroupByQueryVariablesFromBarOrLineChartConfiguration = ({
if (isDefined(groupByFieldY)) {
const isFieldYDate = isFieldMetadataDateKind(groupByFieldY.type);
const isFieldYNestedDate = isNestedFieldDateType(
groupByFieldY,
groupBySubFieldNameY,
const isFieldYNestedDate = isRelationNestedFieldDateKind({
relationField: groupByFieldY,
relationNestedFieldName: groupBySubFieldNameY,
objectMetadataItems,
);
});
const shouldApplyDateGranularityY = isFieldYDate || isFieldYNestedDate;
@@ -137,11 +137,11 @@ export const generateGroupByQueryVariablesFromBarOrLineChartConfiguration = ({
) {
const isFieldYDateForOrderBy = isFieldMetadataDateKind(groupByFieldY.type);
const isFieldYNestedDateForOrderBy = isNestedFieldDateType(
groupByFieldY,
groupBySubFieldNameY,
const isFieldYNestedDateForOrderBy = isRelationNestedFieldDateKind({
relationField: groupByFieldY,
relationNestedFieldName: groupBySubFieldNameY,
objectMetadataItems,
);
});
const shouldApplyDateGranularityYForOrderBy =
isFieldYDateForOrderBy || isFieldYNestedDateForOrderBy;
packages/twenty-front/src/modules/page-layout/widgets/graph/utils/generateGroupByQueryVariablesFromPieChartConfiguration.ts
+5 -5
View File
@@ -1,7 +1,7 @@
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { GRAPH_DEFAULT_DATE_GRANULARITY } from '@/page-layout/widgets/graph/constants/GraphDefaultDateGranularity.constant';
import { getGroupByOrderBy } from '@/page-layout/widgets/graph/utils/getGroupByOrderBy';
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import {
type AggregateOrderByWithGroupByField,
type ObjectRecordOrderByForCompositeField,
@@ -48,11 +48,11 @@ export const generateGroupByQueryVariablesFromPieChartConfiguration = ({
const isFieldDate = isFieldMetadataDateKind(groupByField.type);
const isNestedDate = isNestedFieldDateType(
groupByField,
groupBySubFieldName,
const isNestedDate = isRelationNestedFieldDateKind({
relationField: groupByField,
relationNestedFieldName: groupBySubFieldName,
objectMetadataItems,
);
});
const shouldApplyDateGranularity = isFieldDate || isNestedDate;
packages/twenty-front/src/modules/page-layout/widgets/graph/utils/isNestedFieldDateType.ts → packages/twenty-front/src/modules/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind.ts
+13 -9
View File
@@ -3,21 +3,25 @@ import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataI
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';
export const isNestedFieldDateType = (
field: FieldMetadataItem,
subFieldName: string | undefined,
objectMetadataItems: ObjectMetadataItem[],
): boolean => {
if (!isDefined(subFieldName)) {
export const isRelationNestedFieldDateKind = ({
relationField,
relationNestedFieldName,
objectMetadataItems,
}: {
relationField: FieldMetadataItem;
relationNestedFieldName: string | undefined;
objectMetadataItems: ObjectMetadataItem[];
}): boolean => {
if (!isDefined(relationNestedFieldName)) {
return false;
}
if (!isFieldRelation(field)) {
if (!isFieldRelation(relationField)) {
return false;
}
const targetObjectNameSingular =
field.relation?.targetObjectMetadata?.nameSingular;
relationField.relation?.targetObjectMetadata?.nameSingular;
if (!isDefined(targetObjectNameSingular)) {
return false;
@@ -31,7 +35,7 @@ export const isNestedFieldDateType = (
return false;
}
const nestedFieldName = subFieldName.split('.')[0];
const nestedFieldName = relationNestedFieldName.split('.')[0];
const nestedField = targetObjectMetadataItem.fields.find(
(f) => f.name === nestedFieldName,
);
packages/twenty-front/src/modules/page-layout/widgets/graph/utils/transformGroupByDataToLineChartData.ts
+9 -9
View File
@@ -7,9 +7,9 @@ import { type LineChartSeries } from '@/page-layout/widgets/graph/graphWidgetLin
import { type GroupByRawResult } from '@/page-layout/widgets/graph/types/GroupByRawResult';
import { type RawDimensionValue } from '@/page-layout/widgets/graph/types/RawDimensionValue';
import { filterGroupByResults } from '@/page-layout/widgets/graph/utils/filterGroupByResults';
import { isRelationNestedFieldDateKind } from '@/page-layout/widgets/graph/utils/isRelationNestedFieldDateKind';
import { transformOneDimensionalGroupByToLineChartData } from '@/page-layout/widgets/graph/utils/transformOneDimensionalGroupByToLineChartData';
import { transformTwoDimensionalGroupByToLineChartData } from '@/page-layout/widgets/graph/utils/transformTwoDimensionalGroupByToLineChartData';
import { isNestedFieldDateType } from '@/page-layout/widgets/graph/utils/isNestedFieldDateType';
import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';
import {
AxisNameDisplay,
@@ -127,11 +127,11 @@ export const transformGroupByDataToLineChartData = ({
const showLegend = configuration.displayLegend ?? true;
const isDateField = isFieldMetadataDateKind(groupByFieldX.type);
const isNestedDateField = isNestedFieldDateType(
groupByFieldX,
primaryAxisSubFieldName,
const isNestedDateField = isRelationNestedFieldDateKind({
relationField: groupByFieldX,
relationNestedFieldName: primaryAxisSubFieldName,
objectMetadataItems,
);
});
const primaryAxisDateGranularity =
isDateField || isNestedDateField
@@ -144,11 +144,11 @@ export const transformGroupByDataToLineChartData = ({
const isSecondaryNestedDateField =
isDefined(groupByFieldY) &&
isNestedFieldDateType(
groupByFieldY,
secondaryAxisSubFieldName,
isRelationNestedFieldDateKind({
relationField: groupByFieldY,
relationNestedFieldName: secondaryAxisSubFieldName,
objectMetadataItems,
);
});
const secondaryAxisDateGranularity =
isSecondaryDateField || isSecondaryNestedDateField