Skip to content

The open alternative to Salesforce, designed for AI.

Block bulk update while a field input is in error (#28783)

Charles Bochet6e9b49f1804d
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
index f9b0aa59349..6a8422b9ce3 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
@@ -1,3 +1,6 @@
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/ui/states/recordFieldInputIsFieldInErrorComponentState';
+import { getRecordFormFieldInputInstanceId } from '@/object-record/record-form/utils/getRecordFormFieldInputInstanceId';
import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
import { UpdateMultipleRecordsFooter } from '@/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter';
import { UpdateMultipleRecordsForm } from '@/object-record/record-update-multiple/components/UpdateMultipleRecordsForm';
@@ -10,7 +13,8 @@ import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelCont
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
+import { useStore } from 'jotai';
+import { useId, useState } from 'react';
import { useToast } from 'twenty-ui/components/feedback';
import { themeCssVariables } from 'twenty-ui/theme';
@@ -55,6 +59,13 @@ export const UpdateMultipleRecordsContainer = ({
const hasSelectedRecords = contextStoreNumberOfSelectedRecords > 0;
+ const { objectMetadataItem } = useObjectMetadataItem({
+ objectNameSingular,
+ });
+ const store = useStore();
+ const formInstanceId = useId();
+ const contentId = useId();
+
const { t } = useLingui();
const { enqueueToast } = useToast();
const { openDialog } = useDialog();
@@ -65,6 +76,26 @@ export const UpdateMultipleRecordsContainer = ({
);
const handleUpdateClick = () => {
+ const isAnyFieldInputInError = objectMetadataItem.fields.some(
+ (fieldMetadataItem) =>
+ store.get(
+ recordFieldInputIsFieldInErrorComponentState.atomFamily({
+ instanceId: getRecordFormFieldInputInstanceId({
+ formInstanceId,
+ fieldMetadataId: fieldMetadataItem.id,
+ }),
+ }),
+ ),
+ );
+
+ if (isAnyFieldInputInError) {
+ document
+ .getElementById(contentId)
+ ?.querySelector('[role="alert"]')
+ ?.scrollIntoView({ behavior: 'smooth', block: 'center' });
+ return;
+ }
+
openDialog(UPDATE_MULTIPLE_RECORDS_CONFIRMATION_MODAL_ID);
};
@@ -103,8 +134,9 @@ export const UpdateMultipleRecordsContainer = ({
<SidePanelProvider value={{ isInSidePanel: true }}>
<ShowPageContainer>
<StyledShowPageRightContainer>
- <StyledContentContainer>
+ <StyledContentContainer id={contentId}>
<UpdateMultipleRecordsForm
+ formInstanceId={formInstanceId}
disabled={isUpdating}
values={fieldUpdates}
onChange={handleFieldChange}
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx
index 2a514e727e0..67d2e71a229 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx
@@ -8,7 +8,6 @@ import { type UpdateMultipleRecordsState } from '@/object-record/record-update-m
import { isUpdateRecordValueEmpty } from '@/object-record/record-update-multiple/utils/isUpdateRecordValueEmpty';
import { shouldDisplayFormMultiEditField } from '@/object-record/record-update-multiple/utils/shouldDisplayFormMultiEditField';
import { css } from '@linaria/core';
-import { useId } from 'react';
import { FieldMetadataType } from 'twenty-shared/types';
import { computeRelationGqlFieldJoinColumnName } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components/layout';
@@ -23,6 +22,7 @@ const updateMultipleRecordsFormSectionClassName = css`
export type UpdateMultipleRecordsFormProps = {
objectNameSingular: string;
+ formInstanceId: string;
disabled?: boolean;
values: UpdateMultipleRecordsState;
onChange: (fieldName: string, value: any) => void;
@@ -30,6 +30,7 @@ export type UpdateMultipleRecordsFormProps = {
export const UpdateMultipleRecordsForm = ({
objectNameSingular,
+ formInstanceId,
disabled = false,
values,
onChange,
@@ -37,7 +38,6 @@ export const UpdateMultipleRecordsForm = ({
const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular,
});
- const formInstanceId = useId();
const editableFields = objectMetadataItem.fields
.filter(shouldDisplayFormMultiEditField)
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx
index c80a5463d59..3543b5b1504 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx
@@ -139,3 +139,35 @@ export const Default: Story = {
await waitFor(() => expect(applyButton).toHaveFocus());
},
};
+
+export const BlocksApplyWhileAFieldIsInError: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ const nameLabel = await canvas.findByText('Name', {}, { timeout: 10000 });
+
+ await userEvent.type(
+ within(nameLabel.parentElement!).getByRole('textbox'),
+ 'New Name',
+ );
+
+ const linkedinLabel = await canvas.findByText('Linkedin');
+
+ await userEvent.type(
+ within(linkedinLabel.parentElement!).getByRole('textbox'),
+ 'not a url',
+ );
+ await userEvent.tab();
+
+ await expect(await canvas.findByRole('alert')).toHaveTextContent(
+ 'Enter a valid URL',
+ );
+
+ await userEvent.click(canvas.getByRole('button', { name: /Apply/i }));
+
+ await expect(
+ body.queryByRole('dialog', { name: 'Update 3 records' }),
+ ).not.toBeInTheDocument();
+ },
+};