mirror of
https://github.com/twentyhq/twenty
synced 2026-04-21 21:47:38 +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>
75 lines
2.5 KiB
TypeScript
75 lines
2.5 KiB
TypeScript
import { loginTokenState } from '@/auth/states/loginTokenState';
|
|
import { qrCodeState } from '@/auth/states/qrCode';
|
|
import { useOrigin } from '@/domain-manager/hooks/useOrigin';
|
|
import { useCurrentUserWorkspaceTwoFactorAuthentication } from '@/settings/two-factor-authentication/hooks/useCurrentUserWorkspaceTwoFactorAuthentication';
|
|
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
|
|
import { useLingui } from '@lingui/react/macro';
|
|
import { useEffect } from 'react';
|
|
import { useRecoilValue, useSetRecoilState } from 'recoil';
|
|
import { AppPath } from 'twenty-shared/types';
|
|
import { isDefined } from 'twenty-shared/utils';
|
|
import { useNavigateApp } from '~/hooks/useNavigateApp';
|
|
|
|
export const TwoFactorAuthenticationSetupEffect = () => {
|
|
const { initiateCurrentUserWorkspaceOtpProvisioning } =
|
|
useCurrentUserWorkspaceTwoFactorAuthentication();
|
|
const { enqueueErrorSnackBar } = useSnackBar();
|
|
|
|
const navigate = useNavigateApp();
|
|
const { origin } = useOrigin();
|
|
const loginToken = useRecoilValue(loginTokenState);
|
|
const qrCode = useRecoilValue(qrCodeState);
|
|
const setQrCodeState = useSetRecoilState(qrCodeState);
|
|
|
|
const { t } = useLingui();
|
|
|
|
useEffect(() => {
|
|
if (isDefined(qrCode)) {
|
|
return;
|
|
}
|
|
|
|
const handleTwoFactorAuthenticationProvisioningInitiation = async () => {
|
|
try {
|
|
if (!loginToken) {
|
|
enqueueErrorSnackBar({
|
|
message: t`Login token missing. Two Factor Authentication setup can not be initiated.`,
|
|
options: {
|
|
dedupeKey: 'invalid-session-dedupe-key',
|
|
},
|
|
});
|
|
return navigate(AppPath.SignInUp);
|
|
}
|
|
|
|
const initiateOTPProvisioningResult =
|
|
await initiateCurrentUserWorkspaceOtpProvisioning({
|
|
variables: {
|
|
loginToken: loginToken,
|
|
origin,
|
|
},
|
|
});
|
|
|
|
if (!initiateOTPProvisioningResult.data?.initiateOTPProvisioning.uri)
|
|
return;
|
|
|
|
setQrCodeState(
|
|
initiateOTPProvisioningResult.data?.initiateOTPProvisioning.uri,
|
|
);
|
|
} catch {
|
|
enqueueErrorSnackBar({
|
|
message: t`Two factor authentication provisioning failed.`,
|
|
options: {
|
|
dedupeKey:
|
|
'two-factor-authentication-provisioning-initiation-failed',
|
|
},
|
|
});
|
|
}
|
|
};
|
|
|
|
handleTwoFactorAuthenticationProvisioningInitiation();
|
|
|
|
// Two factor authentication provisioning only needs to run once at mount
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, []);
|
|
|
|
return <></>;
|
|
};
|