mirror of
https://github.com/twentyhq/twenty
synced 2026-04-21 13:37:22 +00:00
## Problem **CRITICAL:** Two PRs were accidentally reverted when PR #14347 "Prevent csv export injections" was merged: 1. **PR #14348** "[Page Layout] - Review Refactor" - ✅ **RESTORED** 2. **PR #14352** "Fix wrong path used by backend" - ✅ **RESTORED** ## Root Cause Analysis During the merge of PR #14347, there was a complex merge conflict with PR #14352 "Fix wrong path used by backend". The merge commit `324d7204bb` in the PR #14347 branch brought in changes from PR #14352, but during the conflict resolution, **BOTH PR #14348 and PR #14352's changes were accidentally overwritten**. ## What This PR Restores This PR restores **BOTH** PRs by cherry-picking their commits: ### ✅ PR #14348 Changes Restored: - `GraphWidgetRenderer.tsx` - was deleted, now restored - `WidgetRenderer.tsx` - was missing, now restored - `SettingsPageLayoutTabsInstanceId.ts` - was deleted, now restored - `useUpdatePageLayoutWidget.ts` - was renamed back, now restored with correct name - Multiple test files that were deleted - Several hook files that were renamed/reverted - File renames: `usePageLayoutWidgetUpdate.ts` → `useUpdatePageLayoutWidget.ts` - Hook refactoring and test file organization - Page layout component improvements ### ✅ PR #14352 Changes Restored: - **Types moved to twenty-shared:** - `packages/twenty-shared/src/types/AppBasePath.ts` ✅ RESTORED - `packages/twenty-shared/src/types/AppPath.ts` ✅ RESTORED - `packages/twenty-shared/src/types/SettingsPath.ts` ✅ RESTORED - **Navigation utilities moved to twenty-shared:** - `packages/twenty-shared/src/utils/navigation/getAppPath.ts` ✅ RESTORED - `packages/twenty-shared/src/utils/navigation/getSettingsPath.ts` ✅ RESTORED - **200+ import statements updated** across the codebase to use twenty-shared - **Old type files deleted** from twenty-front/src/modules/types/ ## Evidence of Complete Restoration **Before (reverted state):** - ❌ Types were in `packages/twenty-front/src/modules/types/` - ❌ Page layout files missing - ❌ Hook files incorrectly named **After (this PR):** - ✅ Types correctly in `packages/twenty-shared/src/types/` - ✅ All page layout files restored - ✅ Hook files correctly named - ✅ All import statements updated ## Verification **Total changes:** - PR #14348: 36 files changed, 863 insertions(+), 442 deletions(-) - PR #14352: 243 files changed, 492 insertions(+), 461 deletions(-) - **Combined: 279 files changed, 1355 insertions(+), 903 deletions(-)** ## Impact This completely restores both PRs that were accidentally lost, ensuring: 1. Page layout refactoring work is back 2. Type organization and path utilities are correctly in twenty-shared 3. Backend email paths work correctly again 4. No functionality is lost Fixes the reversion caused by the merge conflict in PR #14347. --------- Co-authored-by: nitin <142569587+ehconitin@users.noreply.github.com>
128 lines
4.4 KiB
TypeScript
128 lines
4.4 KiB
TypeScript
import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
|
|
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
|
import { useDestroyOneRecord } from '@/object-record/hooks/useDestroyOneRecord';
|
|
import { useTriggerProviderReconnect } from '@/settings/accounts/hooks/useTriggerProviderReconnect';
|
|
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
|
|
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
|
|
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
|
|
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
|
|
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
|
|
import { useModal } from '@/ui/layout/modal/hooks/useModal';
|
|
import { Trans, useLingui } from '@lingui/react/macro';
|
|
import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
|
|
import {
|
|
IconAt,
|
|
IconCalendarEvent,
|
|
IconDotsVertical,
|
|
IconMail,
|
|
IconRefresh,
|
|
IconTrash,
|
|
} from 'twenty-ui/display';
|
|
import { LightIconButton } from 'twenty-ui/input';
|
|
import { MenuItem } from 'twenty-ui/navigation';
|
|
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
|
|
|
|
type SettingsAccountsRowDropdownMenuProps = {
|
|
account: ConnectedAccount;
|
|
};
|
|
|
|
export const SettingsAccountsRowDropdownMenu = ({
|
|
account,
|
|
}: SettingsAccountsRowDropdownMenuProps) => {
|
|
const dropdownId = `settings-account-row-${account.id}`;
|
|
const deleteAccountModalId = `delete-account-modal-${account.id}`;
|
|
const accountHandle = account.handle;
|
|
|
|
const { t } = useLingui();
|
|
const { openModal } = useModal();
|
|
|
|
const navigate = useNavigateSettings();
|
|
const { closeDropdown } = useCloseDropdown();
|
|
|
|
const { destroyOneRecord } = useDestroyOneRecord({
|
|
objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
|
|
});
|
|
const { triggerProviderReconnect } = useTriggerProviderReconnect();
|
|
|
|
const deleteAccount = async () => {
|
|
await destroyOneRecord(account.id);
|
|
};
|
|
|
|
return (
|
|
<>
|
|
<Dropdown
|
|
dropdownId={dropdownId}
|
|
dropdownPlacement="right-start"
|
|
clickableComponent={
|
|
<LightIconButton Icon={IconDotsVertical} accent="tertiary" />
|
|
}
|
|
dropdownComponents={
|
|
<DropdownContent>
|
|
<DropdownMenuItemsContainer>
|
|
{account.provider ===
|
|
ConnectedAccountProvider.IMAP_SMTP_CALDAV && (
|
|
<MenuItem
|
|
text={t`Connection settings`}
|
|
LeftIcon={IconAt}
|
|
onClick={() => {
|
|
navigate(SettingsPath.EditImapSmtpCaldavConnection, {
|
|
connectedAccountId: account.id,
|
|
});
|
|
closeDropdown(dropdownId);
|
|
}}
|
|
/>
|
|
)}
|
|
<MenuItem
|
|
LeftIcon={IconMail}
|
|
text={t`Emails settings`}
|
|
onClick={() => {
|
|
navigate(SettingsPath.AccountsEmails);
|
|
closeDropdown(dropdownId);
|
|
}}
|
|
/>
|
|
<MenuItem
|
|
LeftIcon={IconCalendarEvent}
|
|
text={t`Calendar settings`}
|
|
onClick={() => {
|
|
navigate(SettingsPath.AccountsCalendars);
|
|
closeDropdown(dropdownId);
|
|
}}
|
|
/>
|
|
{account.authFailedAt && (
|
|
<MenuItem
|
|
LeftIcon={IconRefresh}
|
|
text={t`Reconnect`}
|
|
onClick={() => {
|
|
triggerProviderReconnect(account.provider, account.id);
|
|
closeDropdown(dropdownId);
|
|
}}
|
|
/>
|
|
)}
|
|
<MenuItem
|
|
accent="danger"
|
|
LeftIcon={IconTrash}
|
|
text={t`Remove account`}
|
|
onClick={() => {
|
|
closeDropdown(dropdownId);
|
|
openModal(deleteAccountModalId);
|
|
}}
|
|
/>
|
|
</DropdownMenuItemsContainer>
|
|
</DropdownContent>
|
|
}
|
|
/>
|
|
<ConfirmationModal
|
|
modalId={deleteAccountModalId}
|
|
title={t`Data deletion`}
|
|
subtitle={
|
|
<Trans>
|
|
All emails and events linked to this account ({accountHandle}) will
|
|
be deleted
|
|
</Trans>
|
|
}
|
|
onConfirmClick={deleteAccount}
|
|
confirmButtonText={t`Delete account`}
|
|
/>
|
|
</>
|
|
);
|
|
};
|