Merge branch 'main' of github.com:twentyhq/twenty into update-blocknote

Author: ijreilly

.yarn/releases/yarn-4.0.2.cjs

@@ -2,4 +2,4 @@ enableInlineHunks: true
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.3.1.cjs

.yarn/releases/yarn-4.3.1.cjs

@@ -348,7 +348,7 @@
   },
   "license": "AGPL-3.0",
   "name": "twenty",
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.3.1",
   "resolutions": {
     "graphql": "16.8.0",
     "type-fest": "4.10.1",

.yarnrc.yml

@@ -5,7 +5,7 @@ if [ "${ENABLE_DB_MIGRATIONS}" = "true" ] && [ ! -f /app/docker-data/db_status ]
     echo "Running database setup and migrations..."
 
     # Run setup and migration scripts
-    npx ts-node ./scripts/setup-db.ts
+    NODE_OPTIONS="--max-old-space-size=1500" npx ts-node ./scripts/setup-db.ts
     yarn database:migrate:prod
 
     # Mark initialization as done

package.json

@@ -7,6 +7,7 @@ import { scrollPositionState } from '@/ui/utilities/scroll/states/scrollPosition
 import { isDefined } from '~/utils/isDefined';
 
 /**
+ * @deprecated We should now use useScrollToPosition instead
  * Note that `location.key` is used in the cache key, not `location.pathname`,
  * so the same path navigated to at different points in the history stack will
  * not share the same scroll position.

packages/twenty-docker/twenty/entrypoint.sh

@@ -5,6 +5,7 @@ import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { useSetRecordValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { isDefined } from 'twenty-ui';
 
 export const EventFieldDiffValueEffect = ({
   diffArtificialRecordStoreId,
@@ -23,7 +24,7 @@ export const EventFieldDiffValueEffect = ({
   const setRecordValue = useSetRecordValue();
 
   useEffect(() => {
-    if (!diffRecord) return;
+    if (!isDefined(diffRecord)) return;
 
     const forgedObjectRecord = {
       __typename: mainObjectMetadataItem.nameSingular,

packages/twenty-front/src/hooks/useScrollRestoration.ts

@@ -0,0 +1,15 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const SORTABLE_FIELD_METADATA_TYPES = [
+  FieldMetadataType.DateTime,
+  FieldMetadataType.Date,
+  FieldMetadataType.Number,
+  FieldMetadataType.Text,
+  FieldMetadataType.Boolean,
+  FieldMetadataType.Select,
+  FieldMetadataType.Phone,
+  FieldMetadataType.Email,
+  FieldMetadataType.FullName,
+  FieldMetadataType.Rating,
+  FieldMetadataType.Currency,
+];

packages/twenty-front/src/modules/activities/timelineActivities/rows/main-object/components/EventFieldDiffValueEffect.tsx

@@ -0,0 +1,20 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useMemo } from 'react';
+
+export const useActiveFieldMetadataItems = ({
+  objectMetadataItem,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+}) => {
+  const activeFieldMetadataItems = useMemo(
+    () =>
+      objectMetadataItem
+        ? objectMetadataItem.fields.filter(
+            ({ isActive, isSystem }) => isActive && !isSystem,
+          )
+        : [],
+    [objectMetadataItem],
+  );
+
+  return { activeFieldMetadataItems };
+};

packages/twenty-front/src/modules/object-metadata/constants/SortableFieldMetadataTypes.ts

@@ -1,6 +1,6 @@
 import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
 
+import { SORTABLE_FIELD_METADATA_TYPES } from '@/object-metadata/constants/SortableFieldMetadataTypes';
 import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
 
 export const formatFieldMetadataItemsAsSortDefinitions = ({
@@ -9,20 +9,7 @@ export const formatFieldMetadataItemsAsSortDefinitions = ({
   fields: Array<ObjectMetadataItem['fields'][0]>;
 }): SortDefinition[] =>
   fields.reduce((acc, field) => {
-    if (
-      ![
-        FieldMetadataType.DateTime,
-        FieldMetadataType.Date,
-        FieldMetadataType.Number,
-        FieldMetadataType.Text,
-        FieldMetadataType.Boolean,
-        FieldMetadataType.Select,
-        FieldMetadataType.Phone,
-        FieldMetadataType.Email,
-        FieldMetadataType.FullName,
-        FieldMetadataType.Rating,
-      ].includes(field.type)
-    ) {
+    if (!SORTABLE_FIELD_METADATA_TYPES.includes(field.type)) {
       return acc;
     }
 

packages/twenty-front/src/modules/object-metadata/hooks/useActiveFieldMetadataItems.ts

@@ -1,8 +1,8 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
+import { getOrderByForFieldMetadataType } from '@/object-metadata/utils/getOrderByForFieldMetadataType';
 import { RecordGqlOperationOrderBy } from '@/object-record/graphql/types/RecordGqlOperationOrderBy';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { isDefined } from '~/utils/isDefined';
 
 export const getOrderByFieldForObjectMetadataItem = (
@@ -13,23 +13,10 @@ export const getOrderByFieldForObjectMetadataItem = (
     getLabelIdentifierFieldMetadataItem(objectMetadataItem);
 
   if (isDefined(labelIdentifierFieldMetadata)) {
-    switch (labelIdentifierFieldMetadata.type) {
-      case FieldMetadataType.FullName:
-        return [
-          {
-            [labelIdentifierFieldMetadata.name]: {
-              firstName: orderBy ?? 'AscNullsLast',
-              lastName: orderBy ?? 'AscNullsLast',
-            },
-          },
-        ];
-      default:
-        return [
-          {
-            [labelIdentifierFieldMetadata.name]: orderBy ?? 'AscNullsLast',
-          },
-        ];
-    }
+    return getOrderByForFieldMetadataType(
+      labelIdentifierFieldMetadata,
+      orderBy,
+    );
   } else {
     return [
       {

packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts

@@ -0,0 +1,35 @@
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { OrderBy } from '@/object-metadata/types/OrderBy';
+import { RecordGqlOperationOrderBy } from '@/object-record/graphql/types/RecordGqlOperationOrderBy';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const getOrderByForFieldMetadataType = (
+  field: Pick<FieldMetadataItem, 'id' | 'name' | 'type'>,
+  direction: OrderBy | null | undefined,
+): RecordGqlOperationOrderBy => {
+  switch (field.type) {
+    case FieldMetadataType.FullName:
+      return [
+        {
+          [field.name]: {
+            firstName: direction ?? 'AscNullsLast',
+            lastName: direction ?? 'AscNullsLast',
+          },
+        },
+      ];
+    case FieldMetadataType.Currency:
+      return [
+        {
+          [field.name]: {
+            amountMicros: direction ?? 'AscNullsLast',
+          },
+        },
+      ];
+    default:
+      return [
+        {
+          [field.name]: direction ?? 'AscNullsLast',
+        },
+      ];
+  }
+};

packages/twenty-front/src/modules/object-metadata/utils/getObjectOrderByField.ts

@@ -209,15 +209,16 @@ export const useFetchMoreRecordsWithPagination = <
 
   const totalCount = data?.[objectMetadataItem.namePlural]?.totalCount;
 
+  const recordConnection = data?.[objectMetadataItem.namePlural];
+
   const records = useMemo(
     () =>
-      data?.[objectMetadataItem.namePlural]
+      isDefined(recordConnection)
         ? getRecordsFromRecordConnection<T>({
-            recordConnection: data?.[objectMetadataItem.namePlural],
+            recordConnection,
           })
-        : ([] as T[]),
-
-    [data, objectMetadataItem.namePlural],
+        : [],
+    [recordConnection],
   );
 
   return {

packages/twenty-front/src/modules/object-metadata/utils/getOrderByForFieldMetadataType.ts

@@ -7,7 +7,9 @@ import { FieldRatingValue } from '@/object-record/record-field/types/FieldMetada
 import { RatingInput } from '@/ui/field/input/components/RatingInput';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 
-const convertFieldRatingValueToNumber = (rating: FieldRatingValue): string => {
+const convertFieldRatingValueToNumber = (
+  rating: Exclude<FieldRatingValue, null>,
+): string => {
   return rating.split('_')[1];
 };
 
@@ -51,6 +53,10 @@ export const ObjectFilterDropdownRatingInput = () => {
         <RatingInput
           value={selectedFilter?.value as FieldRatingValue}
           onChange={(newValue: FieldRatingValue) => {
+            if (!newValue) {
+              return;
+            }
+
             selectFilter?.({
               id: selectedFilter?.id ? selectedFilter.id : v4(),
               fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,

packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts

@@ -2,20 +2,23 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { hasPositionField } from '@/object-metadata/utils/hasPositionField';
 import { RecordGqlOperationOrderBy } from '@/object-record/graphql/types/RecordGqlOperationOrderBy';
-import { Field, FieldMetadataType } from '~/generated/graphql';
 import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
 import { isDefined } from '~/utils/isDefined';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { getOrderByForFieldMetadataType } from '@/object-metadata/utils/getOrderByForFieldMetadataType';
 import { Sort } from '../types/Sort';
 
 export const turnSortsIntoOrderBy = (
   objectMetadataItem: ObjectMetadataItem,
   sorts: Sort[],
 ): RecordGqlOperationOrderBy => {
-  const fields: Pick<Field, 'id' | 'name' | 'type'>[] =
+  const fields: Pick<FieldMetadataItem, 'id' | 'name' | 'type'>[] =
     objectMetadataItem?.fields ?? [];
+
   const fieldsById = mapArrayToObject(fields, ({ id }) => id);
+
   const sortsOrderBy = sorts
     .map((sort) => {
       const correspondingField = fieldsById[sort.fieldMetadataId];
@@ -32,26 +35,14 @@ export const turnSortsIntoOrderBy = (
     .filter(isDefined);
 
   if (hasPositionField(objectMetadataItem)) {
-    return [...sortsOrderBy, { position: 'AscNullsFirst' }];
-  }
+    const positionOrderBy = [
+      {
+        position: 'AscNullsFirst',
+      },
+    ] satisfies RecordGqlOperationOrderBy;
 
-  return sortsOrderBy;
-};
-
-const getOrderByForFieldMetadataType = (
-  field: Pick<Field, 'id' | 'name' | 'type'>,
-  direction: OrderBy,
-) => {
-  switch (field.type) {
-    case FieldMetadataType.FullName:
-      return {
-        [field.name]: {
-          firstName: direction,
-          lastName: direction,
-        },
-      };
-
-    default:
-      return { [field.name]: direction };
+    return [...sortsOrderBy, ...positionOrderBy].flat();
   }
+
+  return sortsOrderBy.flat();
 };

packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput.tsx

@@ -136,7 +136,6 @@ export const useRecordActionBar = ({
               accent: 'danger',
               onClick: () => {
                 setIsDeleteRecordsModalOpen(true);
-                handleDeleteClick();
               },
               ConfirmationModal: (
                 <ConfirmationModal

packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts

@@ -25,9 +25,11 @@ export type RecordBoardProps = {
 
 const StyledContainer = styled.div`
   border-top: 1px solid ${({ theme }) => theme.border.color.light};
+  overflow: auto;
   display: flex;
   flex: 1;
   flex-direction: row;
+  min-height: calc(100% - 1px);
 `;
 
 const StyledWrapper = styled.div`

packages/twenty-front/src/modules/object-record/record-action-bar/hooks/useRecordActionBar.tsx

@@ -13,7 +13,7 @@ import {
   RecordUpdateHookParams,
 } from '@/object-record/record-field/contexts/FieldContext';
 import { getFieldButtonIcon } from '@/object-record/record-field/utils/getFieldButtonIcon';
-import { RecordIndexRecordChip } from '@/object-record/record-index/components/RecordIndexRecordChip';
+import { RecordIdentifierChip } from '@/object-record/record-index/components/RecordIndexRecordChip';
 import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
 import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
 import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect';
@@ -222,7 +222,7 @@ export const RecordBoardCard = () => {
         }}
       >
         <StyledBoardCardHeader showCompactView={isCompactModeActive}>
-          <RecordIndexRecordChip
+          <RecordIdentifierChip
             objectNameSingular={objectMetadataItem.nameSingular}
             record={record}
             variant={AvatarChipVariant.Transparent}

packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx

@@ -4,7 +4,8 @@ import { BooleanFieldDisplay } from '@/object-record/record-field/meta-types/dis
 import { LinksFieldDisplay } from '@/object-record/record-field/meta-types/display/components/LinksFieldDisplay';
 import { RatingFieldDisplay } from '@/object-record/record-field/meta-types/display/components/RatingFieldDisplay';
 import { RelationFromManyFieldDisplay } from '@/object-record/record-field/meta-types/display/components/RelationFromManyFieldDisplay';
-import { isFieldChipDisplay } from '@/object-record/record-field/meta-types/display/utils/isFieldChipDisplay';
+
+import { isFieldIdentifierDisplay } from '@/object-record/record-field/meta-types/display/utils/isFieldIdentifierDisplay';
 import { isFieldBoolean } from '@/object-record/record-field/types/guards/isFieldBoolean';
 import { isFieldDisplayedAsPhone } from '@/object-record/record-field/types/guards/isFieldDisplayedAsPhone';
 import { isFieldLinks } from '@/object-record/record-field/types/guards/isFieldLinks';
@@ -46,7 +47,10 @@ import { isFieldUuid } from '../types/guards/isFieldUuid';
 export const FieldDisplay = () => {
   const { fieldDefinition, isLabelIdentifier } = useContext(FieldContext);
 
-  const isChipDisplay = isFieldChipDisplay(fieldDefinition, isLabelIdentifier);
+  const isChipDisplay = isFieldIdentifierDisplay(
+    fieldDefinition,
+    isLabelIdentifier,
+  );
 
   return isChipDisplay ? (
     <ChipFieldDisplay />

packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx

@@ -1,6 +1,6 @@
 import { RecordChip } from '@/object-record/components/RecordChip';
 import { useChipFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useChipFieldDisplay';
-import { RecordIndexRecordChip } from '@/object-record/record-index/components/RecordIndexRecordChip';
+import { RecordIdentifierChip } from '@/object-record/record-index/components/RecordIndexRecordChip';
 
 export const ChipFieldDisplay = () => {
   const { recordValue, objectNameSingular, isLabelIdentifier } =
@@ -11,7 +11,7 @@ export const ChipFieldDisplay = () => {
   }
 
   return isLabelIdentifier ? (
-    <RecordIndexRecordChip
+    <RecordIdentifierChip
       objectNameSingular={objectNameSingular}
       record={recordValue}
     />

packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx

@@ -1,7 +1,7 @@
 import { isNonEmptyString } from '@sniptt/guards';
 
 import { useFullNameFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useFullNameFieldDisplay';
-import { TextDisplay } from '@/ui/field/display/components/TextDisplay';
+import { OverflowingTextWithTooltip } from 'twenty-ui';
 
 export const FullNameFieldDisplay = () => {
   const { fieldValue } = useFullNameFieldDisplay();
@@ -10,5 +10,5 @@ export const FullNameFieldDisplay = () => {
     .filter(isNonEmptyString)
     .join(' ');
 
-  return <TextDisplay text={content} />;
+  return <OverflowingTextWithTooltip text={content} />;
 };

packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/ChipFieldDisplay.tsx

@@ -2,7 +2,7 @@ import { useTextFieldDisplay } from '@/object-record/record-field/meta-types/hoo
 import { TextDisplay } from '@/ui/field/display/components/TextDisplay';
 
 export const TextFieldDisplay = () => {
-  const { fieldValue, maxWidth } = useTextFieldDisplay();
+  const { fieldValue } = useTextFieldDisplay();
 
-  return <TextDisplay text={fieldValue} maxWidth={maxWidth} />;
+  return <TextDisplay text={fieldValue} />;
 };