The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Select records in list views with cmd+click and shift+click (#27174)
Félix Malfait747eab9fa4a1
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsxindex 328317d1a62..6a7c5423024 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx@@ -4,6 +4,7 @@ import { RecordListFieldTooltip } from '@/object-record/record-list/components/Rimport { RecordListRecordGroupsBody } from '@/object-record/record-list/components/RecordListRecordGroupsBody';import { RecordListResponsiveFieldsEffect } from '@/object-record/record-list/components/RecordListResponsiveFieldsEffect';import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';+import { RecordSelectionEscapeHotkeyEffect } from '@/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';@@ -35,6 +36,7 @@ export const RecordList = () => {return (<StyledContainer ref={setContainerElement}><RecordListResponsiveFieldsEffect containerElement={containerElement} />+ <RecordSelectionEscapeHotkeyEffect /><RecordListFieldTooltip><ScrollWrappercomponentInstanceId={`scroll-wrapper-record-list-${recordListId}`}diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsxindex 59ca7cef337..eb93448c2c2 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx@@ -2,6 +2,7 @@ import { useRecordIndexTableQuery } from '@/object-record/record-index/hooks/useimport { RecordListEmptyState } from '@/object-record/record-list/components/RecordListEmptyState';import { RecordListRecords } from '@/object-record/record-list/components/RecordListRecords';import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';+import { RecordSelectionRecordIdsEffect } from '@/object-record/record-selection/components/RecordSelectionRecordIdsEffect';import { styled } from '@linaria/react';import { isDefined } from 'twenty-shared/utils';@@ -24,6 +25,9 @@ export const RecordListBody = () => {return (<StyledBody>+ {!isDefined(error) && (+ <RecordSelectionRecordIdsEffect records={records} />+ )}<RecordListRecordsrecords={records}loading={loading}diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsxindex 838dc125e29..1da9f5acbf0 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx@@ -1,6 +1,5 @@import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';import { RecordChip } from '@/object-record/components/RecordChip';-import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';import { isFieldValueEmpty } from '@/object-record/record-field/ui/utils/isFieldValueEmpty';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';@@ -11,14 +10,19 @@ import { RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH } from '@/object-record/recordimport { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';import { recordListRowWidthComponentState } from '@/object-record/record-list/states/recordListRowWidthComponentState';import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';+import { useToggleRecordSelection } from '@/object-record/record-selection/hooks/useToggleRecordSelection';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { styled } from '@linaria/react';import { plural, t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';+import { type MouseEvent } from 'react';import { isDefined } from 'twenty-shared/utils';import { Chip } from 'twenty-ui/primitives/data-display';import { themeCssVariables } from 'twenty-ui/theme';@@ -31,7 +35,8 @@ const StyledRowContainer = styled.div`background: ${themeCssVariables.background.transparent.lighter};}- &:active > div {+ &:active > div,+ &[data-selected='true'] > div {background: ${themeCssVariables.accent.quaternary};}`;@@ -92,6 +97,13 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {const { openRecordFromIndexView } = useOpenRecordFromIndexView();+ const isRecordSelected = useAtomComponentFamilyStateValue(+ isRecordSelectedComponentFamilyState,+ recordId,+ );+ const { toggleRecordSelection } = useToggleRecordSelection();+ const { resetRecordSelection } = useResetRecordSelection();+if (!isDefined(recordStore)) {return null;}@@ -133,7 +145,20 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {const hiddenFieldCount =nonEmptyRecordFields.length - displayedRecordFields.length;- const openRecord = () => openRecordFromIndexView({ recordId });+ const openRecord = () => {+ resetRecordSelection();+ openRecordFromIndexView({ recordId });+ };++ const handleClickCapture = (event: MouseEvent<HTMLDivElement>) => {+ if (!event.metaKey && !event.ctrlKey && !event.shiftKey) {+ return;+ }++ event.preventDefault();+ event.stopPropagation();+ toggleRecordSelection({ recordId, shouldSelectRange: event.shiftKey });+ };const linkToRecord = getLinkToShowPage(objectNameSingular, recordStore);@@ -148,6 +173,14 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {role="button"tabIndex={0}aria-label={t`Open record`}+ data-selected={isRecordSelected}+ onClickCapture={handleClickCapture}+ onMouseDown={(event) => {+ // Shift+click selects a range of records, not the text in between+ if (event.shiftKey) {+ event.preventDefault();+ }+ }}onClick={openRecord}onKeyDown={(event) => {if (event.target !== event.currentTarget) {@@ -162,17 +195,15 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {><StyledRow><StyledRecordChipContainer>- <StopPropagationContainer>- <RecordChip- objectNameSingular={objectNameSingular}- record={recordStore}- to={linkToRecord}- variant="ghost"- isBold- onClick={openRecord}- triggerEvent={'CLICK'}- />- </StopPropagationContainer>+ <RecordChip+ objectNameSingular={objectNameSingular}+ record={recordStore}+ to={linkToRecord}+ variant="ghost"+ isBold+ onClick={openRecord}+ triggerEvent={'CLICK'}+ /></StyledRecordChipContainer><StyledFieldsContainer>{displayedRecordFields.map(({ recordField, fieldDefinition }) => (diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsxindex b139d5f1f9c..bd52c528884 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx@@ -1,5 +1,5 @@import { type Meta, type StoryObj } from '@storybook/react-vite';-import { expect, userEvent, within } from 'storybook/test';+import { expect, fireEvent, userEvent, waitFor, within } from 'storybook/test';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';@@ -86,3 +86,27 @@ export const ResponsiveFields: Story = {await body.findByRole('tooltip', {}, { timeout: 3000 });},};++export const SelectsRecordsWithModifierClicks: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ await canvas.findByText(+ mockedCompanyRecords[0].name,+ {},+ { timeout: 3000 },+ );++ const rows = canvas.getAllByRole('button', { name: 'Open record' });++ fireEvent.click(rows[0], { metaKey: true });+ fireEvent.click(rows[2], { shiftKey: true });++ await waitFor(() =>+ expect(rows[2]).toHaveAttribute('data-selected', 'true'),+ );+ await expect(rows[0]).toHaveAttribute('data-selected', 'true');+ await expect(rows[1]).toHaveAttribute('data-selected', 'true');+ await expect(rows[3]).toHaveAttribute('data-selected', 'false');+ },+};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect.tsxsimilarity index 95%rename from packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsxrename to packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect.tsxindex ce6a66add5e..08f70da7f02 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect.tsx@@ -6,7 +6,7 @@ import { PageFocusId } from '@/types/PageFocusId';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';-export const RecordTableBodyEscapeHotkeyEffect = () => {+export const RecordSelectionEscapeHotkeyEffect = () => {const { resetRecordSelection } = useResetRecordSelection();const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffectsWrapper.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffectsWrapper.tsxindex 60f994d39e1..fba78d1c517 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffectsWrapper.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyEffectsWrapper.tsx@@ -1,6 +1,6 @@import { RecordTableDeactivateRecordTableRowEffect } from '@/object-record/record-table/components/RecordTableDeactivateRecordTableRowEffect';import { RecordTableEmptyHasNewRecordEffect } from '@/object-record/record-table/components/RecordTableEmptyHasNewRecordEffect';-import { RecordTableBodyEscapeHotkeyEffect } from '@/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect';+import { RecordSelectionEscapeHotkeyEffect } from '@/object-record/record-selection/components/RecordSelectionEscapeHotkeyEffect';import { RecordTableBodyFocusClickOutsideEffect } from '@/object-record/record-table/record-table-body/components/RecordTableBodyFocusClickOutsideEffect';import { RecordTableBodyFocusKeyboardEffect } from '@/object-record/record-table/record-table-body/components/RecordTableBodyFocusKeyboardEffect';import { RecordTableRecordGroupBodyEffects } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects';@@ -29,7 +29,7 @@ export const RecordTableBodyEffectsWrapper = ({<RecordTableVirtualizedFieldMetadataUpdateEffect /></>)}- <RecordTableBodyEscapeHotkeyEffect />+ <RecordSelectionEscapeHotkeyEffect /><RecordTableBodyFocusKeyboardEffect /><RecordTableBodyFocusClickOutsideEffect tableBodyRef={tableBodyRef} /><RecordTableDeactivateRecordTableRowEffect />