The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Move translations to a settings page with one row per language (#26605)
Thomas des Francs8f30a97cc2cc
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsxindex c4dac3abaeb..122f820209b 100644--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx@@ -538,6 +538,14 @@ const SettingsObjectFieldEdit = lazy(() =>),);+const SettingsObjectTranslations = lazy(() =>+ import('~/pages/settings/data-model/SettingsObjectTranslations').then(+ (module) => ({+ default: module.SettingsObjectTranslations,+ }),+ ),+);+const SettingsSecuritySsoIdentifyProvider = lazy(() =>import('~/pages/settings/security/SettingsSecuritySsoIdentifyProvider').then((module) => ({@@ -956,6 +964,16 @@ const createSettingsRouteElements = ({element={<SettingsObjectFieldEdit />}handle={MAIN_AND_SIDE_PANEL_SETTINGS_ROUTE_HANDLE}/>+ <Route+ path={SettingsPath.ObjectTranslations}+ element={<SettingsObjectTranslations />}+ handle={MAIN_AND_SIDE_PANEL_SETTINGS_ROUTE_HANDLE}+ />+ <Route+ path={SettingsPath.ObjectFieldTranslations}+ element={<SettingsObjectTranslations />}+ handle={MAIN_AND_SIDE_PANEL_SETTINGS_ROUTE_HANDLE}+ /></Route><Routeelement={diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsxindex 9fec7769519..1ffc467daac 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx@@ -2,7 +2,6 @@ import { Button } from 'twenty-ui/primitives/input';import { styled } from '@linaria/react';import { themeCssVariables } from 'twenty-ui/theme';import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';-import { useGetIsMetadataItemCustom } from '@/object-metadata/hooks/useGetIsMetadataItemCustom';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';import {@@ -10,16 +9,11 @@ import {useSaveUpdateDataModelObjectAboutForm,} from '@/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm';import { SettingsDataModelObjectAboutForm } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm';-import {- type SettingsDataModelObjectAboutFormValues,- settingsDataModelObjectAboutFormSchema,-} from '@/settings/data-model/validation-schemas/settingsDataModelObjectAboutFormSchema';+import { type SettingsDataModelObjectAboutFormValues } from '@/settings/data-model/validation-schemas/settingsDataModelObjectAboutFormSchema';import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { zodResolver } from '@hookform/resolvers/zod';import { useLingui } from '@lingui/react/macro';-import { FormProvider, useForm } from 'react-hook-form';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { FormProvider, type UseFormReturn } from 'react-hook-form';const StyledCenteredButton = styled(Button)`box-sizing: border-box;@@ -28,46 +22,20 @@ const StyledCenteredButton = styled(Button)`type SettingsUpdateDataModelObjectAboutFormProps = {objectMetadataItem: EnrichedObjectMetadataItem;+ formConfig: UseFormReturn<SettingsDataModelObjectAboutFormValues>;};export const SettingsUpdateDataModelObjectAboutForm = ({objectMetadataItem,+ formConfig,}: SettingsUpdateDataModelObjectAboutFormProps) => {const { t } = useLingui();const isDDLLocked = useAtomStateValue(isDDLLockedState);- const getIsMetadataItemCustom = useGetIsMetadataItemCustom();- const isCustomObject = getIsMetadataItemCustom(objectMetadataItem);const readonly =isObjectMetadataReadOnly({objectMetadataItem,}) || isDDLLocked;- const {- description,- icon,- isLabelSyncedWithName,- labelPlural,- labelSingular,- namePlural,- nameSingular,- } = objectMetadataItem;- const formConfig = useForm<SettingsDataModelObjectAboutFormValues>({- mode: 'onTouched',- resolver: zodResolver(settingsDataModelObjectAboutFormSchema),- defaultValues: {- description,- icon: icon ?? undefined,- isLabelSyncedWithName,- labelPlural,- labelSingular,- namePlural,- nameSingular,- ...(isCustomObject- ? { color: getObjectColorWithFallback(objectMetadataItem) }- : {}),- },- });-const {handleSave,saveAsTranslation,diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsxindex 681b715acc9..1098b699f74 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx@@ -3,19 +3,27 @@ import { useDeleteOneObjectMetadataItem } from '@/object-metadata/hooks/useDeletimport { useGetIsMetadataItemCustom } from '@/object-metadata/hooks/useGetIsMetadataItemCustom';import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';import { SettingsUpdateDataModelObjectAboutForm } from '@/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm';import { SettingsObjectIndexesSection } from '@/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection';import { SettingsObjectSearchSection } from '@/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection';import { SettingsDataModelObjectSettingsFormCard } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard';-import { SettingsTranslationsButton } from '@/settings/translations/components/SettingsTranslationsButton';+import {+ type SettingsDataModelObjectAboutFormValues,+ settingsDataModelObjectAboutFormSchema,+} from '@/settings/data-model/validation-schemas/settingsDataModelObjectAboutFormSchema';+import { SettingsTranslationsCard } from '@/settings/translations/components/SettingsTranslationsCard';import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { zodResolver } from '@hookform/resolvers/zod';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';+import { useForm } from 'react-hook-form';import { SettingsPath } from 'twenty-shared/types';+import { isEmptyObject } from 'twenty-shared/utils';import { Section, useToast } from 'twenty-ui/components';import { IconArchive, IconTrash } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';@@ -62,6 +70,26 @@ export const ObjectSettings = ({const isDDLLocked = useAtomStateValue(isDDLLockedState);+ const aboutFormConfig = useForm<SettingsDataModelObjectAboutFormValues>({+ mode: 'onTouched',+ resolver: zodResolver(settingsDataModelObjectAboutFormSchema),+ defaultValues: {+ description: objectMetadataItem.description,+ icon: objectMetadataItem.icon ?? undefined,+ isLabelSyncedWithName: objectMetadataItem.isLabelSyncedWithName,+ labelPlural: objectMetadataItem.labelPlural,+ labelSingular: objectMetadataItem.labelSingular,+ namePlural: objectMetadataItem.namePlural,+ nameSingular: objectMetadataItem.nameSingular,+ ...(getIsMetadataItemCustom(objectMetadataItem)+ ? { color: getObjectColorWithFallback(objectMetadataItem) }+ : {}),+ },+ });+ const hasUnsavedAboutEdits = !isEmptyObject(+ aboutFormConfig.formState.dirtyFields,+ );+const isReadOnly =isObjectMetadataReadOnly({ objectMetadataItem }) || isDDLLocked;@@ -107,6 +135,7 @@ export const ObjectSettings = ({/><SettingsUpdateDataModelObjectAboutFormobjectMetadataItem={objectMetadataItem}+ formConfig={aboutFormConfig}/></Section.Root></StyledFormSectionContainer>@@ -127,12 +156,9 @@ export const ObjectSettings = ({title={t`Translations`}description={t`What each language displays for this object's labels`}/>- <SettingsTranslationsButton- target={{- metadataName: 'objectMetadata',- recordId: objectMetadataItem.id,- label: objectMetadataItem.labelPlural,- }}+ <SettingsTranslationsCard+ objectNamePlural={objectMetadataItem.namePlural}+ disabled={hasUnsavedAboutEdits}/></Section.Root></StyledFormSectionContainer>diff --git a/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationValueCell.tsx b/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationValueCell.tsxindex 7481bf1db1d..30ccba4cf33 100644--- a/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationValueCell.tsx+++ b/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationValueCell.tsx@@ -10,7 +10,7 @@ const StyledValue = styled.div<{ isInherited: boolean }>`color: ${({ isInherited }) =>isInherited? themeCssVariables.font.color.light- : themeCssVariables.font.color.primary};+ : themeCssVariables.font.color.secondary};cursor: pointer;overflow: hidden;text-overflow: ellipsis;diff --git a/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationsTable.tsx b/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationsTable.tsxnew file mode 100644index 00000000000..64baf3c779b--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationsTable.tsx@@ -0,0 +1,94 @@+import { StyledSettingsDataModelTableBodyContainer } from '@/settings/data-model/components/SettingsDataModelTableBodyContainer';+import { MetadataTranslationsTableRow } from '@/settings/translations/components/MetadataTranslationsTableRow';+import { type MetadataTranslationLanguageRow } from '@/settings/translations/types/MetadataTranslationLanguageRow';+import { type MetadataTranslationRowValue } from '@/settings/translations/types/MetadataTranslationRowValue';+import { Table } from '@/ui/layout/table/components/Table';+import { TableBody } from '@/ui/layout/table/components/TableBody';+import { TableCell } from '@/ui/layout/table/components/TableCell';+import { TableHeader } from '@/ui/layout/table/components/TableHeader';+import { TableRow } from '@/ui/layout/table/components/TableRow';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import Skeleton from 'react-loading-skeleton';+import { isNonEmptyArray } from 'twenty-shared/utils';+import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';++const LANGUAGE_AND_RESET_COLUMNS_WIDTH = 184;+const TRANSLATION_COLUMN_MOBILE_MIN_WIDTH = 150;++const StyledScrollWrapper = styled.div`+ @media (max-width: ${MOBILE_VIEWPORT}px) {+ overflow-x: auto;+ -webkit-overflow-scrolling: touch;+ }+`;++const StyledScrollableContent = styled.div<{ mobileMinWidth: number }>`+ @media (max-width: ${MOBILE_VIEWPORT}px) {+ min-width: ${({ mobileMinWidth }) => `${mobileMinWidth}px`};+ }+`;++type MetadataTranslationsTableProps = {+ columns: { property: string; label: string }[];+ languageRows: MetadataTranslationLanguageRow[];+ loading: boolean;+ onSaveTranslationRows: (+ rowValues: MetadataTranslationRowValue[],+ ) => Promise<void>;+};++export const MetadataTranslationsTable = ({+ columns,+ languageRows,+ loading,+ onSaveTranslationRows,+}: MetadataTranslationsTableProps) => {+ const { t } = useLingui();+ const gridTemplateColumns = `160px repeat(${columns.length}, minmax(0, 1fr)) 24px`;++ const showSkeleton = loading && !isNonEmptyArray(columns);++ return (+ <StyledScrollWrapper>+ <StyledScrollableContent+ mobileMinWidth={+ LANGUAGE_AND_RESET_COLUMNS_WIDTH ++ columns.length * TRANSLATION_COLUMN_MOBILE_MIN_WIDTH+ }+ >+ <Table>+ <TableRow gridTemplateColumns={gridTemplateColumns}>+ <TableHeader>{t`Language`}</TableHeader>+ {columns.map(({ property, label }) => (+ <TableHeader key={property}>{label}</TableHeader>+ ))}+ <TableHeader />+ </TableRow>+ <StyledSettingsDataModelTableBodyContainer>+ <TableBody>+ {showSkeleton+ ? Array.from({ length: 3 }).map((_, index) => (+ <Skeleton height={32} borderRadius={4} key={index} />+ ))+ : languageRows.map(({ locale, label, translations }) => (+ <MetadataTranslationsTableRow+ key={locale}+ gridTemplateColumns={gridTemplateColumns}+ localeLabel={label}+ translations={translations}+ onSaveTranslationRows={onSaveTranslationRows}+ />+ ))}+ {!showSkeleton && !isNonEmptyArray(languageRows) && (+ <TableCell color={themeCssVariables.font.color.tertiary}>+ {t`No languages found`}+ </TableCell>+ )}+ </TableBody>+ </StyledSettingsDataModelTableBodyContainer>+ </Table>+ </StyledScrollableContent>+ </StyledScrollWrapper>+ );+};diff --git a/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationsTableRow.tsx b/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationsTableRow.tsxnew file mode 100644index 00000000000..e6e1fa7fd96--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/components/MetadataTranslationsTableRow.tsx@@ -0,0 +1,74 @@+import { MetadataTranslationValueCell } from '@/settings/translations/components/MetadataTranslationValueCell';+import { type MetadataTranslationRow } from '@/settings/translations/hooks/useMetadataTranslations';+import { type MetadataTranslationRowValue } from '@/settings/translations/types/MetadataTranslationRowValue';+import { TableCell } from '@/ui/layout/table/components/TableCell';+import { TableRow } from '@/ui/layout/table/components/TableRow';+import { useLingui } from '@lingui/react/macro';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { LightIconButton } from 'twenty-ui/components';+import { IconRestore } from 'twenty-ui/icon';+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';+import { themeCssVariables } from 'twenty-ui/theme';+import { MetadataTranslationProvenance } from '~/generated-metadata/graphql';++type MetadataTranslationsTableRowProps = {+ gridTemplateColumns: string;+ localeLabel: string;+ translations: (MetadataTranslationRow | undefined)[];+ onSaveTranslationRows: (+ rowValues: MetadataTranslationRowValue[],+ ) => Promise<void>;+};++export const MetadataTranslationsTableRow = ({+ gridTemplateColumns,+ localeLabel,+ translations,+ onSaveTranslationRows,+}: MetadataTranslationsTableRowProps) => {+ const { t } = useLingui();+ const editedTranslations = translations.filter(+ (translation): translation is MetadataTranslationRow =>+ translation?.provenance === MetadataTranslationProvenance.WORKSPACE,+ );++ const resetEditedTranslations = () =>+ onSaveTranslationRows(+ editedTranslations.map((translation) => ({+ row: translation,+ value: null,+ })),+ );++ return (+ <TableRow gridTemplateColumns={gridTemplateColumns}>+ <TableCell color={themeCssVariables.font.color.primary} overflow="hidden">+ <OverflowingTextWithTooltip text={localeLabel} />+ </TableCell>+ {translations.map((translation, index) => (+ <TableCell key={translation?.property ?? index} overflow="hidden">+ {isDefined(translation) && (+ <MetadataTranslationValueCell+ row={translation}+ onSave={(value) =>+ onSaveTranslationRows([{ row: translation, value }])+ }+ />+ )}+ </TableCell>+ ))}+ <TableCell padding="0">+ {isNonEmptyArray(editedTranslations) && (+ <LightIconButton+ title={t`Reset to default`}+ emphasis="subtle"+ onClick={resetEditedTranslations}+ aria-label={t`Reset to default`}+ >+ <IconRestore />+ </LightIconButton>+ )}+ </TableCell>+ </TableRow>+ );+};diff --git a/packages/twenty-front/src/modules/settings/translations/components/SettingsMetadataTranslationsSection.tsx b/packages/twenty-front/src/modules/settings/translations/components/SettingsMetadataTranslationsSection.tsxnew file mode 100644index 00000000000..27452e395e5--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/components/SettingsMetadataTranslationsSection.tsx@@ -0,0 +1,78 @@+import { MetadataTranslationsTable } from '@/settings/translations/components/MetadataTranslationsTable';+import { useMetadataTranslations } from '@/settings/translations/hooks/useMetadataTranslations';+import { buildMetadataTranslationsTable } from '@/settings/translations/utils/buildMetadataTranslationsTable';+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { useState } from 'react';+import { Section } from 'twenty-ui/components';+import { IconSearch } from 'twenty-ui/icon';+import { themeCssVariables } from 'twenty-ui/theme';+import { type MetadataTranslationsInput } from '~/generated-metadata/graphql';+import { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';+import { normalizeSearchText } from '~/utils/normalizeSearchText';++const StyledSearchInputContainer = styled.div`+ padding-bottom: ${themeCssVariables.spacing[2]};+`;++type SettingsMetadataTranslationsSectionProps = {+ input: MetadataTranslationsInput;+};++export const SettingsMetadataTranslationsSection = ({+ input,+}: SettingsMetadataTranslationsSectionProps) => {+ const { t } = useLingui();+ const [searchTerm, setSearchTerm] = useState('');+ const columnLabelByProperty: Record<string, string> = {+ labelSingular: t`Singular`,+ labelPlural: t`Plural`,+ label: t`Label`,+ description: t`Description`,+ };+ const { metadataTranslations, loading, saveTranslationRows } =+ useMetadataTranslations(input);+ const localeOptions = useLocaleOptions();++ const normalizedSearchTerm = normalizeSearchText(searchTerm);+ const filteredLocaleOptions = localeOptions.filter(+ ({ label, searchKeywords }) =>+ normalizeSearchText(`${label} ${searchKeywords}`).includes(+ normalizedSearchTerm,+ ),+ );++ const { properties, languageRows } = buildMetadataTranslationsTable({+ metadataTranslations,+ localeOptions: filteredLocaleOptions,+ });+ const columns = properties.map((property) => ({+ property,+ label: columnLabelByProperty[property] ?? property,+ }));++ return (+ <Section.Root>+ <Section.Header+ title={t`Languages`}+ description={t`Languages without a translation show the source text.`}+ />+ <StyledSearchInputContainer>+ <SettingsTextInput+ instanceId="settings-metadata-translations-search"+ LeftIcon={IconSearch}+ placeholder={t`Search a language...`}+ value={searchTerm}+ onChange={setSearchTerm}+ />+ </StyledSearchInputContainer>+ <MetadataTranslationsTable+ columns={columns}+ languageRows={languageRows}+ loading={loading}+ onSaveTranslationRows={saveTranslationRows}+ />+ </Section.Root>+ );+};diff --git a/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsButton.tsx b/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsButton.tsxdeleted file mode 100644index ed747da3fc4..00000000000--- a/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsButton.tsx+++ /dev/null@@ -1,41 +0,0 @@-import {- type SettingsTranslationsSidePanelTarget,- settingsTranslationsSidePanelTargetState,-} from '@/settings/translations/states/settingsTranslationsSidePanelTargetState';-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { useLingui } from '@lingui/react/macro';-import { SidePanelPages } from 'twenty-shared/types';-import { IconLanguage } from 'twenty-ui/icon';-import { Button } from 'twenty-ui/primitives/input';--type SettingsTranslationsButtonProps = {- target: SettingsTranslationsSidePanelTarget;-};--export const SettingsTranslationsButton = ({- target,-}: SettingsTranslationsButtonProps) => {- const { t } = useLingui();- const { navigateSidePanel } = useNavigateSidePanel();- const setSettingsTranslationsSidePanelTarget = useSetAtomState(- settingsTranslationsSidePanelTargetState,- );-- return (- <Button- startIcon={<IconLanguage />}- size="sm"- onClick={() => {- setSettingsTranslationsSidePanelTarget(target);- navigateSidePanel({- page: SidePanelPages.SettingsMetadataTranslations,- pageTitle: t`Translations`,- pageIcon: IconLanguage,- resetNavigationStack: true,- });- }}- variant="outline"- >{t`Edit translations`}</Button>- );-};diff --git a/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsCard.tsx b/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsCard.tsxnew file mode 100644index 00000000000..7e5bcfed840--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsCard.tsx@@ -0,0 +1,51 @@+import { SettingsCard } from '@/settings/components/SettingsCard';+import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink/UndecoratedLink';+import { useLingui } from '@lingui/react/macro';+import { SettingsPath } from 'twenty-shared/types';+import { getSettingsPath, isDefined } from 'twenty-shared/utils';+import { IconLanguage } from 'twenty-ui/icon';+import { useTheme } from 'twenty-ui/theme';++type SettingsTranslationsCardProps = {+ objectNamePlural: string;+ fieldName?: string;+ disabled?: boolean;+};++export const SettingsTranslationsCard = ({+ objectNamePlural,+ fieldName,+ disabled = false,+}: SettingsTranslationsCardProps) => {+ const { t } = useLingui();+ const theme = useTheme();+ const icon = <IconLanguage size={theme.icon.size.md} />;++ if (disabled) {+ return (+ <SettingsCard+ Icon={icon}+ title={t`Edit translations`}+ description={t`Save your changes first`}+ disabled+ />+ );+ }++ return (+ <UndecoratedLink+ to={+ isDefined(fieldName)+ ? getSettingsPath(SettingsPath.ObjectFieldTranslations, {+ objectNamePlural,+ fieldName,+ })+ : getSettingsPath(SettingsPath.ObjectTranslations, {+ objectNamePlural,+ })+ }+ >+ <SettingsCard Icon={icon} title={t`Edit translations`} />+ </UndecoratedLink>+ );+};diff --git a/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx b/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsxdeleted file mode 100644index 57538e0a21f..00000000000--- a/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx+++ /dev/null@@ -1,159 +0,0 @@-import { MetadataTranslationValueCell } from '@/settings/translations/components/MetadataTranslationValueCell';-import {- type MetadataTranslationRow,- useMetadataTranslations,-} from '@/settings/translations/hooks/useMetadataTranslations';-import {- type SettingsTranslationsSidePanelTarget,- settingsTranslationsSidePanelTargetState,-} from '@/settings/translations/states/settingsTranslationsSidePanelTargetState';-import { Table } from '@/ui/layout/table/components/Table';-import { TableCell } from '@/ui/layout/table/components/TableCell';-import { TableRow } from '@/ui/layout/table/components/TableRow';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { LightIconButton, Section } from 'twenty-ui/components';-import { IconRestore } from 'twenty-ui/icon';-import { themeCssVariables } from 'twenty-ui/theme';-import { MetadataTranslationProvenance } from '~/generated-metadata/graphql';-import { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';--const TRANSLATIONS_ROW_GRID_TEMPLATE_COLUMNS = '112px 1fr 24px';--const StyledPageContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[6]};- padding: ${themeCssVariables.spacing[3]};-`;--const StyledHeader = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[1]};-`;--const StyledEntityLabel = styled.div`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.sm};- font-weight: ${themeCssVariables.font.weight.medium};-`;--const StyledExplanation = styled.div`- color: ${themeCssVariables.font.color.tertiary};- font-size: ${themeCssVariables.font.size.sm};-`;--const StyledPropertySection = styled.div`- display: flex;- flex-direction: column;-`;--const getMetadataTranslationsInput = (- target: SettingsTranslationsSidePanelTarget,-) =>- target.metadataName === 'objectMetadata'- ? { objectMetadataId: target.recordId }- : { fieldMetadataId: target.recordId };--export const SidePanelSettingsMetadataTranslationsPage = () => {- const { t } = useLingui();- // Registry property keys are unique across metadata names, except- // `description`, which reads the same on both.- const labelByProperty: Record<string, string> = {- labelSingular: t`Label (singular)`,- labelPlural: t`Label (plural)`,- label: t`Label`,- description: t`Description`,- };- const settingsTranslationsSidePanelTarget = useAtomStateValue(- settingsTranslationsSidePanelTargetState,- );- const { metadataTranslations, saveTranslationRow } = useMetadataTranslations(- isDefined(settingsTranslationsSidePanelTarget)- ? getMetadataTranslationsInput(settingsTranslationsSidePanelTarget)- : null,- );- const localeOptions = useLocaleOptions();-- if (!isDefined(settingsTranslationsSidePanelTarget)) {- return null;- }-- const rowsByProperty = new Map<string, Map<string, MetadataTranslationRow>>();-- for (const row of metadataTranslations) {- const localeRows = rowsByProperty.get(row.property) ?? new Map();-- localeRows.set(row.locale, row);- rowsByProperty.set(row.property, localeRows);- }-- return (- <StyledPageContainer>- <StyledHeader>- <StyledEntityLabel>- {settingsTranslationsSidePanelTarget.label}- </StyledEntityLabel>- <StyledExplanation>- {t`Languages without their own translation show the source text.`}- </StyledExplanation>- </StyledHeader>- {[...rowsByProperty.entries()].map(([property, localeRows]) => {- const canonicalValue = localeRows.values().next().value?.canonicalValue;-- return (- <StyledPropertySection key={property}>- <Section.Header- title={labelByProperty[property] ?? property}- description={t`Source: ${canonicalValue}`}- />- <Table>- {localeOptions.map(({ value: locale, label: localeLabel }) => {- const row = localeRows.get(locale);-- if (!isDefined(row)) {- return null;- }-- const isEdited =- row.provenance === MetadataTranslationProvenance.WORKSPACE;-- return (- <TableRow- key={`${property}:${locale}`}- gridAutoColumns={TRANSLATIONS_ROW_GRID_TEMPLATE_COLUMNS}- >- <TableCell color={themeCssVariables.font.color.primary}>- {localeLabel}- </TableCell>- <TableCell>- <MetadataTranslationValueCell- row={row}- onSave={(value) => saveTranslationRow(row, value)}- />- </TableCell>- <TableCell>- {isEdited && (- <LightIconButton- title={t`Reset to default`}- emphasis="subtle"- onClick={() => saveTranslationRow(row, null)}- aria-label={t`Reset to default`}- >- <IconRestore />- </LightIconButton>- )}- </TableCell>- </TableRow>- );- })}- </Table>- </StyledPropertySection>- );- })}- </StyledPageContainer>- );-};diff --git a/packages/twenty-front/src/modules/settings/translations/components/__stories__/SidePanelSettingsMetadataTranslationsPage.stories.tsx b/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsMetadataTranslationsSection.stories.tsxsimilarity index 57%rename from packages/twenty-front/src/modules/settings/translations/components/__stories__/SidePanelSettingsMetadataTranslationsPage.stories.tsxrename to packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsMetadataTranslationsSection.stories.tsxindex 2d08326e5de..52644839b1a 100644--- a/packages/twenty-front/src/modules/settings/translations/components/__stories__/SidePanelSettingsMetadataTranslationsPage.stories.tsx+++ b/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsMetadataTranslationsSection.stories.tsx@@ -1,27 +1,12 @@-import {- type Decorator,- type Meta,- type StoryObj,-} from '@storybook/react-vite';+import { type Meta, type StoryObj } from '@storybook/react-vite';import { HttpResponse, graphql } from 'msw';import { within } from 'storybook/test';-import { SidePanelSettingsMetadataTranslationsPage } from '@/settings/translations/components/SidePanelSettingsMetadataTranslationsPage';-import { settingsTranslationsSidePanelTargetState } from '@/settings/translations/states/settingsTranslationsSidePanelTargetState';-import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { SettingsMetadataTranslationsSection } from '@/settings/translations/components/SettingsMetadataTranslationsSection';import { ComponentDecorator } from 'twenty-ui/testing';import { RootDecorator } from '~/testing/decorators/RootDecorator';import { ToastDecorator } from '~/testing/decorators/ToastDecorator';-const TargetDecorator: Decorator = (Story) => {- jotaiStore.set(settingsTranslationsSidePanelTargetState.atom, {- metadataName: 'objectMetadata',- recordId: 'object-metadata-id',- label: 'Companies',- });- return <Story />;-};-const makeTranslationRow = ({locale,value,@@ -42,16 +27,13 @@ const makeTranslationRow = ({provenance,});-const meta: Meta<typeof SidePanelSettingsMetadataTranslationsPage> = {- title:- 'Modules/Settings/Translations/SidePanelSettingsMetadataTranslationsPage',- component: SidePanelSettingsMetadataTranslationsPage,- decorators: [- TargetDecorator,- RootDecorator,- ComponentDecorator,- ToastDecorator,- ],+const meta: Meta<typeof SettingsMetadataTranslationsSection> = {+ title: 'Modules/Settings/Translations/SettingsMetadataTranslationsSection',+ component: SettingsMetadataTranslationsSection,+ decorators: [RootDecorator, ComponentDecorator, ToastDecorator],+ args: {+ input: { objectMetadataId: 'object-metadata-id' },+ },parameters: {msw: {handlers: [@@ -84,15 +66,13 @@ const meta: Meta<typeof SidePanelSettingsMetadataTranslationsPage> = {};export default meta;-type Story = StoryObj<typeof SidePanelSettingsMetadataTranslationsPage>;+type Story = StoryObj<typeof SettingsMetadataTranslationsSection>;export const Default: Story = {play: async ({ canvasElement }) => {const canvas = within(canvasElement);- // The section header carries the source text; rows are translations- // only, and the workspace-edited row exposes its reset button.- await canvas.findByText('Source: Companies');+ await canvas.findByText('Languages');await canvas.findByText('Entreprises');await canvas.findByTitle('Reset to default');},diff --git a/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsTranslationsButton.stories.tsx b/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsTranslationsButton.stories.tsxdeleted file mode 100644index 8deee192cfa..00000000000--- a/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsTranslationsButton.stories.tsx+++ /dev/null@@ -1,29 +0,0 @@-import { type Meta, type StoryObj } from '@storybook/react-vite';-import { within } from 'storybook/test';--import { SettingsTranslationsButton } from '@/settings/translations/components/SettingsTranslationsButton';-import { ComponentDecorator } from 'twenty-ui/testing';--const meta: Meta<typeof SettingsTranslationsButton> = {- title: 'Modules/Settings/Translations/SettingsTranslationsButton',- component: SettingsTranslationsButton,- decorators: [ComponentDecorator],- args: {- target: {- metadataName: 'objectMetadata',- recordId: 'object-metadata-id',- label: 'Companies',- },- },-};--export default meta;-type Story = StoryObj<typeof SettingsTranslationsButton>;--export const Default: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement);-- await canvas.findByText('Edit translations');- },-};diff --git a/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsTranslationsCard.stories.tsx b/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsTranslationsCard.stories.tsxnew file mode 100644index 00000000000..9f2bc6567e3--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/components/__stories__/SettingsTranslationsCard.stories.tsx@@ -0,0 +1,25 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { within } from 'storybook/test';++import { SettingsTranslationsCard } from '@/settings/translations/components/SettingsTranslationsCard';+import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';++const meta: Meta<typeof SettingsTranslationsCard> = {+ title: 'Modules/Settings/Translations/SettingsTranslationsCard',+ component: SettingsTranslationsCard,+ decorators: [ComponentWithRouterDecorator],+ args: {+ objectNamePlural: 'companies',+ },+};++export default meta;+type Story = StoryObj<typeof SettingsTranslationsCard>;++export const Default: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ await canvas.findByText('Edit translations');+ },+};diff --git a/packages/twenty-front/src/modules/settings/translations/hooks/useMetadataTranslations.ts b/packages/twenty-front/src/modules/settings/translations/hooks/useMetadataTranslations.tsindex 32b9c7de739..ae52a3b0870 100644--- a/packages/twenty-front/src/modules/settings/translations/hooks/useMetadataTranslations.ts+++ b/packages/twenty-front/src/modules/settings/translations/hooks/useMetadataTranslations.ts@@ -1,6 +1,7 @@import { useQuery } from '@apollo/client/react';import { useUpdateOneFieldMetadataItem } from '@/object-metadata/hooks/useUpdateOneFieldMetadataItem';import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';+import { type MetadataTranslationRowValue } from '@/settings/translations/types/MetadataTranslationRowValue';import { isDefined } from 'twenty-shared/utils';import {type MetadataTranslationsInput,@@ -24,13 +25,21 @@ export const useMetadataTranslations = (// A null value removes the stored translation, reverting the locale to// shipped-or-canonical.- const saveTranslationRow = async (- row: MetadataTranslationRow,- value: string | null,+ const saveTranslationRows = async (+ rowValues: MetadataTranslationRowValue[],) => {- const translations = [- { locale: row.locale, property: row.property, value },- ];+ const [firstRowValue] = rowValues;++ if (!isDefined(firstRowValue)) {+ return;+ }++ const { row } = firstRowValue;+ const translations = rowValues.map(({ row, value }) => ({+ locale: row.locale,+ property: row.property,+ value,+ }));if (row.metadataName === 'objectMetadata') {await updateOneObjectMetadataItem({@@ -58,6 +67,6 @@ export const useMetadataTranslations = (metadataTranslations: data?.metadataTranslations ?? [],loading,refetch,- saveTranslationRow,+ saveTranslationRows,};};diff --git a/packages/twenty-front/src/modules/settings/translations/states/settingsTranslationsSidePanelTargetState.ts b/packages/twenty-front/src/modules/settings/translations/states/settingsTranslationsSidePanelTargetState.tsdeleted file mode 100644index 16a6409760d..00000000000--- a/packages/twenty-front/src/modules/settings/translations/states/settingsTranslationsSidePanelTargetState.ts+++ /dev/null@@ -1,14 +0,0 @@-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export type SettingsTranslationsSidePanelTarget = {- metadataName: 'objectMetadata' | 'fieldMetadata';- recordId: string;- objectMetadataId?: string;- label: string;-};--export const settingsTranslationsSidePanelTargetState =- createAtomState<SettingsTranslationsSidePanelTarget | null>({- key: 'settings/translations/settingsTranslationsSidePanelTargetState',- defaultValue: null,- });diff --git a/packages/twenty-front/src/modules/settings/translations/types/MetadataTranslationLanguageRow.ts b/packages/twenty-front/src/modules/settings/translations/types/MetadataTranslationLanguageRow.tsnew file mode 100644index 00000000000..76ec7470afe--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/types/MetadataTranslationLanguageRow.ts@@ -0,0 +1,7 @@+import { type MetadataTranslationRow } from '@/settings/translations/hooks/useMetadataTranslations';++export type MetadataTranslationLanguageRow = {+ locale: string;+ label: string;+ translations: (MetadataTranslationRow | undefined)[];+};diff --git a/packages/twenty-front/src/modules/settings/translations/types/MetadataTranslationRowValue.ts b/packages/twenty-front/src/modules/settings/translations/types/MetadataTranslationRowValue.tsnew file mode 100644index 00000000000..0b869d1044c--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/types/MetadataTranslationRowValue.ts@@ -0,0 +1,6 @@+import { type MetadataTranslationRow } from '@/settings/translations/hooks/useMetadataTranslations';++export type MetadataTranslationRowValue = {+ row: MetadataTranslationRow;+ value: string | null;+};diff --git a/packages/twenty-front/src/modules/settings/translations/utils/__tests__/buildMetadataTranslationsTable.test.ts b/packages/twenty-front/src/modules/settings/translations/utils/__tests__/buildMetadataTranslationsTable.test.tsnew file mode 100644index 00000000000..426ae360f28--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/utils/__tests__/buildMetadataTranslationsTable.test.ts@@ -0,0 +1,108 @@+import { type MetadataTranslationRow } from '@/settings/translations/hooks/useMetadataTranslations';+import { buildMetadataTranslationsTable } from '@/settings/translations/utils/buildMetadataTranslationsTable';+import { MetadataTranslationProvenance } from '~/generated-metadata/graphql';+import { type LocaleOption } from '~/localization/hooks/useLocaleOptions';++const buildTranslation = ({+ property,+ locale,+ value,+}: Pick<+ MetadataTranslationRow,+ 'property' | 'locale' | 'value'+>): MetadataTranslationRow => ({+ metadataName: 'objectMetadata',+ recordId: 'object-metadata-id',+ property,+ locale,+ sourceValue: value,+ canonicalValue: value,+ value,+ provenance: MetadataTranslationProvenance.SHIPPED,+});++const LOCALE_OPTIONS: LocaleOption[] = [+ { value: 'de-DE', label: 'German', searchKeywords: '' },+ { value: 'fr-FR', label: 'French', searchKeywords: '' },+ { value: 'it-IT', label: 'Italian', searchKeywords: '' },+];++const FRENCH_DESCRIPTION = buildTranslation({+ property: 'description',+ locale: 'fr-FR',+ value: 'Une entreprise',+});+const FRENCH_SINGULAR = buildTranslation({+ property: 'labelSingular',+ locale: 'fr-FR',+ value: 'Entreprise',+});+const FRENCH_PLURAL = buildTranslation({+ property: 'labelPlural',+ locale: 'fr-FR',+ value: 'Entreprises',+});+const GERMAN_SINGULAR = buildTranslation({+ property: 'labelSingular',+ locale: 'de-DE',+ value: 'Unternehmen',+});++describe('buildMetadataTranslationsTable', () => {+ it('should return no properties and no rows without translations', () => {+ expect(+ buildMetadataTranslationsTable({+ metadataTranslations: [],+ localeOptions: LOCALE_OPTIONS,+ }),+ ).toEqual({ properties: [], languageRows: [] });+ });++ it('should list each property once, with the description last', () => {+ const { properties } = buildMetadataTranslationsTable({+ metadataTranslations: [+ FRENCH_DESCRIPTION,+ FRENCH_SINGULAR,+ FRENCH_PLURAL,+ GERMAN_SINGULAR,+ ],+ localeOptions: LOCALE_OPTIONS,+ });++ expect(properties).toEqual(['labelSingular', 'labelPlural', 'description']);+ });++ it('should align each language row with the properties', () => {+ const { languageRows } = buildMetadataTranslationsTable({+ metadataTranslations: [+ FRENCH_DESCRIPTION,+ FRENCH_SINGULAR,+ FRENCH_PLURAL,+ GERMAN_SINGULAR,+ ],+ localeOptions: LOCALE_OPTIONS,+ });++ expect(languageRows).toEqual([+ {+ locale: 'de-DE',+ label: 'German',+ translations: [GERMAN_SINGULAR, undefined, undefined],+ },+ {+ locale: 'fr-FR',+ label: 'French',+ translations: [FRENCH_SINGULAR, FRENCH_PLURAL, FRENCH_DESCRIPTION],+ },+ ]);+ });++ it('should only keep the given languages, in their order', () => {+ const { languageRows } = buildMetadataTranslationsTable({+ metadataTranslations: [FRENCH_SINGULAR, GERMAN_SINGULAR],+ localeOptions: [LOCALE_OPTIONS[1]],+ });++ expect(languageRows.map(({ locale }) => locale)).toEqual(['fr-FR']);+ });+});diff --git a/packages/twenty-front/src/modules/settings/translations/utils/buildMetadataTranslationsTable.ts b/packages/twenty-front/src/modules/settings/translations/utils/buildMetadataTranslationsTable.tsnew file mode 100644index 00000000000..9e994c772d9--- /dev/null+++ b/packages/twenty-front/src/modules/settings/translations/utils/buildMetadataTranslationsTable.ts@@ -0,0 +1,41 @@+import { type MetadataTranslationRow } from '@/settings/translations/hooks/useMetadataTranslations';+import { type MetadataTranslationLanguageRow } from '@/settings/translations/types/MetadataTranslationLanguageRow';+import { isDefined } from 'twenty-shared/utils';+import { type LocaleOption } from '~/localization/hooks/useLocaleOptions';++const DESCRIPTION_PROPERTY = 'description';++export const buildMetadataTranslationsTable = ({+ metadataTranslations,+ localeOptions,+}: {+ metadataTranslations: MetadataTranslationRow[];+ localeOptions: LocaleOption[];+}): {+ properties: string[];+ languageRows: MetadataTranslationLanguageRow[];+} => {+ const uniqueProperties = [+ ...new Set(metadataTranslations.map(({ property }) => property)),+ ];++ const properties = [+ ...uniqueProperties.filter((property) => property !== DESCRIPTION_PROPERTY),+ ...uniqueProperties.filter((property) => property === DESCRIPTION_PROPERTY),+ ];++ const languageRows = localeOptions.flatMap(({ value: locale, label }) => {+ const translations = properties.map((property) =>+ metadataTranslations.find(+ (translation) =>+ translation.property === property && translation.locale === locale,+ ),+ );++ return translations.some(isDefined)+ ? [{ locale, label, translations }]+ : [];+ });++ return { properties, languageRows };+};diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsxindex a0972d97a60..b5d3fe54f35 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx@@ -3,7 +3,6 @@ import { SidePanelCommandMenuItemEditPage } from '@/command-menu-item/edit/compoimport { SidePanelCoreWorkflowFiltersPage } from '@/object-core/workflows/components/SidePanelCoreWorkflowFiltersPage';import { SidePanelCoreWorkflowVersionPage } from '@/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionPage';import { SidePanelCoreWorkflowVersionsPage } from '@/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionsPage';-import { SidePanelSettingsMetadataTranslationsPage } from '@/settings/translations/components/SidePanelSettingsMetadataTranslationsPage';import { SidePanelRoutedPage } from '@/side-panel/routing/components/SidePanelRoutedPage';import { SidePanelEmailBlockSettingsPage } from '@/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage';import { SidePanelAskAiPage } from '@/side-panel/pages/ask-ai/components/SidePanelAskAiPage';@@ -96,10 +95,6 @@ export const SIDE_PANEL_PAGES_CONFIG = new Map<[SidePanelPages.RecordCreationForm, <SidePanelRecordCreationFormPage />],[SidePanelPages.SendCampaignTest, <SidePanelSendCampaignTestPage />],[SidePanelPages.EmailBlockSettings, <SidePanelEmailBlockSettingsPage />],- [- SidePanelPages.SettingsMetadataTranslations,- <SidePanelSettingsMetadataTranslationsPage />,- ],[SidePanelPages.RoutedPage, <SidePanelRoutedPage />],[SidePanelPages.WorkflowCoreFilters, <SidePanelCoreWorkflowFiltersPage />],[SidePanelPages.WorkflowVersions, <SidePanelCoreWorkflowVersionsPage />],diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsxindex dc062d1d668..0fa1498ee9d 100644--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx@@ -20,7 +20,7 @@ import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fiimport { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema';import { type SettingsDataModelFieldEditFormValues } from '@/settings/data-model/types/SettingsDataModelFieldEditFormValues';import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';-import { SettingsTranslationsButton } from '@/settings/translations/components/SettingsTranslationsButton';+import { SettingsTranslationsCard } from '@/settings/translations/components/SettingsTranslationsCard';import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';@@ -34,7 +34,7 @@ import { useEffect, useState } from 'react';import { FormProvider, useForm } from 'react-hook-form';import { useLocation, useNavigate, useParams } from 'react-router-dom';import { AppPath, SettingsPath } from 'twenty-shared/types';-import { getSettingsPath, isDefined } from 'twenty-shared/utils';+import { getSettingsPath, isDefined, isEmptyObject } from 'twenty-shared/utils';import { Section, useToast } from 'twenty-ui/components';import { IconArchive, IconArchiveOff, IconTrash } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';@@ -157,7 +157,9 @@ export const SettingsObjectFieldEdit = () => {workspaceSurface.type,]);- const { isDirty, isValid, isSubmitting } = formConfig.formState;+ const { isValid, isSubmitting, dirtyFields } = formConfig.formState;++ const isDirty = !isEmptyObject(dirtyFields);const canSave = isDirty && isValid && !isSubmitting;@@ -407,13 +409,10 @@ export const SettingsObjectFieldEdit = () => {title={t`Translations`}description={t`What each language displays for this field's labels`}/>- <SettingsTranslationsButton- target={{- metadataName: 'fieldMetadata',- recordId: fieldMetadataItem.id,- objectMetadataId: objectMetadataItem.id,- label: fieldMetadataItem.label,- }}+ <SettingsTranslationsCard+ objectNamePlural={objectNamePlural}+ fieldName={fieldMetadataItem.name}+ disabled={isDirty}/></Section.Root>diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTranslations.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTranslations.tsxnew file mode 100644index 00000000000..5c8cde055d5--- /dev/null+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTranslations.tsx@@ -0,0 +1,72 @@+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';+import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';+import { SettingsMetadataTranslationsSection } from '@/settings/translations/components/SettingsMetadataTranslationsSection';+import { useLingui } from '@lingui/react/macro';+import { useParams } from 'react-router-dom';+import { SettingsPath } from 'twenty-shared/types';+import { getSettingsPath, isDefined } from 'twenty-shared/utils';++export const SettingsObjectTranslations = () => {+ const { t } = useLingui();+ const { objectNamePlural = '', fieldName } = useParams();++ const { findObjectMetadataItemByNamePlural } =+ useFilteredObjectMetadataItems();+ const objectMetadataItem =+ findObjectMetadataItemByNamePlural(objectNamePlural);+ const fieldMetadataItem = objectMetadataItem?.fields.find(+ (fieldMetadataItem) => fieldMetadataItem.name === fieldName,+ );++ if (+ !isDefined(objectMetadataItem) ||+ (isDefined(fieldName) && !isDefined(fieldMetadataItem))+ ) {+ return null;+ }++ return (+ <SettingsPageLayout+ title={t`Translations`}+ links={[+ {+ children: t`Workspace`,+ href: getSettingsPath(SettingsPath.General),+ },+ {+ children: t`Objects`,+ href: getSettingsPath(SettingsPath.Objects),+ },+ {+ children: objectMetadataItem.labelPlural,+ href: getSettingsPath(SettingsPath.ObjectDetail, {+ objectNamePlural,+ }),+ },+ ...(isDefined(fieldMetadataItem)+ ? [+ {+ children: fieldMetadataItem.label,+ href: getSettingsPath(SettingsPath.ObjectFieldEdit, {+ objectNamePlural,+ fieldName: fieldMetadataItem.name,+ }),+ },+ ]+ : []),+ { children: t`Translations` },+ ]}+ >+ <SettingsPageContainer>+ <SettingsMetadataTranslationsSection+ input={+ isDefined(fieldMetadataItem)+ ? { fieldMetadataId: fieldMetadataItem.id }+ : { objectMetadataId: objectMetadataItem.id }+ }+ />+ </SettingsPageContainer>+ </SettingsPageLayout>+ );+};diff --git a/packages/twenty-shared/src/types/SettingsPath.ts b/packages/twenty-shared/src/types/SettingsPath.tsindex ed62d655faf..b44671297f7 100644--- a/packages/twenty-shared/src/types/SettingsPath.ts+++ b/packages/twenty-shared/src/types/SettingsPath.ts@@ -24,6 +24,8 @@ export enum SettingsPath {ObjectNewFieldConfigure = 'objects/:objectNamePlural/new-field/configure',ObjectNewIndex = 'objects/:objectNamePlural/new-index',ObjectFieldEdit = 'objects/:objectNamePlural/:fieldName',+ ObjectTranslations = 'objects/:objectNamePlural/object-translations',+ ObjectFieldTranslations = 'objects/:objectNamePlural/:fieldName/translations',NewObject = 'objects/new',Layout = 'layout',WorkspaceMembersPage = 'members',