## 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>
This commit is contained in:
+3
-1
@@ -6,6 +6,8 @@ import crypto from 'crypto';
|
||||
import { t } from '@lingui/core/macro';
|
||||
import { render } from '@react-email/render';
|
||||
import { SendApprovedAccessDomainValidation } from 'twenty-emails';
|
||||
import { SettingsPath } from 'twenty-shared/types';
|
||||
import { getSettingsPath } from 'twenty-shared/utils';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
import { ApprovedAccessDomain as ApprovedAccessDomainEntity } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.entity';
|
||||
@@ -59,7 +61,7 @@ export class ApprovedAccessDomainService {
|
||||
|
||||
const link = this.domainManagerService.buildWorkspaceURL({
|
||||
workspace,
|
||||
pathname: `settings/security`,
|
||||
pathname: getSettingsPath(SettingsPath.Domains),
|
||||
searchParams: {
|
||||
wtdId: approvedAccessDomain.id,
|
||||
validationToken: this.generateUniqueHash(approvedAccessDomain),
|
||||
|
||||
+3
-1
@@ -1,6 +1,8 @@
|
||||
import { Test, type TestingModule } from '@nestjs/testing';
|
||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||
|
||||
import { SettingsPath } from 'twenty-shared/types';
|
||||
import { getSettingsPath } from 'twenty-shared/utils';
|
||||
import { type DeleteResult, type Repository } from 'typeorm';
|
||||
|
||||
import { ApprovedAccessDomain } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.entity';
|
||||
@@ -282,7 +284,7 @@ describe('ApprovedAccessDomainService', () => {
|
||||
|
||||
expect(domainManagerService.buildWorkspaceURL).toHaveBeenCalledWith({
|
||||
workspace: workspace,
|
||||
pathname: 'settings/security',
|
||||
pathname: getSettingsPath(SettingsPath.Domains),
|
||||
searchParams: { validationToken: expect.any(String) },
|
||||
});
|
||||
|
||||
|
||||
+5
-2
@@ -9,6 +9,8 @@ import {
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
|
||||
import { Response } from 'express';
|
||||
import { SettingsPath } from 'twenty-shared/types';
|
||||
import { getSettingsPath } from 'twenty-shared/utils';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
import {
|
||||
@@ -115,7 +117,8 @@ export class GoogleAPIsAuthController {
|
||||
this.domainManagerService
|
||||
.buildWorkspaceURL({
|
||||
workspace,
|
||||
pathname: redirectLocation || '/settings/accounts',
|
||||
pathname:
|
||||
redirectLocation || getSettingsPath(SettingsPath.Accounts),
|
||||
})
|
||||
.toString(),
|
||||
);
|
||||
@@ -127,7 +130,7 @@ export class GoogleAPIsAuthController {
|
||||
subdomain: this.twentyConfigService.get('DEFAULT_SUBDOMAIN'),
|
||||
customDomain: null,
|
||||
},
|
||||
pathname: '/settings/accounts',
|
||||
pathname: getSettingsPath(SettingsPath.Accounts),
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
+5
-2
@@ -9,6 +9,8 @@ import {
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
|
||||
import { Response } from 'express';
|
||||
import { AppPath, SettingsPath } from 'twenty-shared/types';
|
||||
import { getSettingsPath } from 'twenty-shared/utils';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
import {
|
||||
@@ -122,7 +124,8 @@ export class MicrosoftAPIsAuthController {
|
||||
this.domainManagerService
|
||||
.buildWorkspaceURL({
|
||||
workspace,
|
||||
pathname: redirectLocation || '/settings/accounts',
|
||||
pathname:
|
||||
redirectLocation || getSettingsPath(SettingsPath.Accounts),
|
||||
})
|
||||
.toString(),
|
||||
);
|
||||
@@ -134,7 +137,7 @@ export class MicrosoftAPIsAuthController {
|
||||
subdomain: this.twentyConfigService.get('DEFAULT_SUBDOMAIN'),
|
||||
customDomain: null,
|
||||
},
|
||||
pathname: '/verify',
|
||||
pathname: AppPath.Verify,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
+2
-1
@@ -13,6 +13,7 @@ import { InjectRepository } from '@nestjs/typeorm';
|
||||
|
||||
import { generateServiceProviderMetadata } from '@node-saml/node-saml';
|
||||
import { Response } from 'express';
|
||||
import { AppPath } from 'twenty-shared/types';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
import {
|
||||
@@ -162,7 +163,7 @@ export class SSOAuthController {
|
||||
this.domainManagerService.getSubdomainAndCustomDomainFromWorkspaceFallbackOnDefaultSubdomain(
|
||||
workspaceIdentityProvider?.workspace,
|
||||
),
|
||||
pathname: '/verify',
|
||||
pathname: AppPath.Verify,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import { render } from '@react-email/render';
|
||||
import { addMilliseconds } from 'date-fns';
|
||||
import ms from 'ms';
|
||||
import { PasswordUpdateNotifyEmail } from 'twenty-emails';
|
||||
import { AppPath } from 'twenty-shared/types';
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
@@ -527,7 +528,7 @@ export class AuthService {
|
||||
}) {
|
||||
const url = this.domainManagerService.buildWorkspaceURL({
|
||||
workspace,
|
||||
pathname: '/verify',
|
||||
pathname: AppPath.Verify,
|
||||
searchParams: {
|
||||
loginToken,
|
||||
...(billingCheckoutSessionState ? { billingCheckoutSessionState } : {}),
|
||||
@@ -739,7 +740,7 @@ export class AuthService {
|
||||
));
|
||||
|
||||
const url = this.domainManagerService.buildBaseUrl({
|
||||
pathname: '/welcome',
|
||||
pathname: AppPath.SignInUp,
|
||||
searchParams: {
|
||||
tokenPair: JSON.stringify({
|
||||
accessOrWorkspaceAgnosticToken:
|
||||
@@ -827,7 +828,7 @@ export class AuthService {
|
||||
this.domainManagerService.getSubdomainAndCustomDomainFromWorkspaceFallbackOnDefaultSubdomain(
|
||||
currentWorkspace,
|
||||
),
|
||||
pathname: '/verify',
|
||||
pathname: AppPath.Verify,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
+5
-1
@@ -10,6 +10,8 @@ import { addMilliseconds, differenceInMilliseconds } from 'date-fns';
|
||||
import ms from 'ms';
|
||||
import { PasswordResetLinkEmail } from 'twenty-emails';
|
||||
import { type APP_LOCALES } from 'twenty-shared/translations';
|
||||
import { AppPath } from 'twenty-shared/types';
|
||||
import { getAppPath } from 'twenty-shared/utils';
|
||||
import { IsNull, MoreThan, Repository } from 'typeorm';
|
||||
|
||||
import {
|
||||
@@ -139,7 +141,9 @@ export class ResetPasswordService {
|
||||
|
||||
const link = this.domainManagerService.buildWorkspaceURL({
|
||||
workspace,
|
||||
pathname: `/reset-password/${resetToken.passwordResetToken}`,
|
||||
pathname: getAppPath(AppPath.ResetPassword, {
|
||||
passwordResetToken: resetToken.passwordResetToken,
|
||||
}),
|
||||
});
|
||||
|
||||
const emailData = {
|
||||
|
||||
+2
-1
@@ -8,6 +8,7 @@ import { addMilliseconds, differenceInMilliseconds } from 'date-fns';
|
||||
import ms from 'ms';
|
||||
import { SendEmailVerificationLinkEmail } from 'twenty-emails';
|
||||
import { type APP_LOCALES } from 'twenty-shared/translations';
|
||||
import { AppPath } from 'twenty-shared/types';
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
@@ -55,7 +56,7 @@ export class EmailVerificationService {
|
||||
await this.emailVerificationTokenService.generateToken(userId, email);
|
||||
|
||||
const linkPathnameAndSearchParams = {
|
||||
pathname: 'verify-email',
|
||||
pathname: AppPath.VerifyEmail,
|
||||
searchParams: {
|
||||
emailVerificationToken,
|
||||
email,
|
||||
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
import { type ExecutionContext, Injectable } from '@nestjs/common';
|
||||
|
||||
import { type Request } from 'express';
|
||||
import { AppPath } from 'twenty-shared/types';
|
||||
|
||||
import {
|
||||
AuthException,
|
||||
@@ -28,7 +29,7 @@ export class GuardRedirectService {
|
||||
customDomain: string | null;
|
||||
isCustomDomainEnabled?: boolean;
|
||||
},
|
||||
pathname = '/verify',
|
||||
pathname = AppPath.Verify,
|
||||
) {
|
||||
if ('contextType' in context && context.contextType === 'graphql') {
|
||||
throw error;
|
||||
|
||||
+5
-1
@@ -9,6 +9,8 @@ import { render } from '@react-email/render';
|
||||
import { addMilliseconds } from 'date-fns';
|
||||
import ms from 'ms';
|
||||
import { SendInviteLinkEmail } from 'twenty-emails';
|
||||
import { AppPath } from 'twenty-shared/types';
|
||||
import { getAppPath } from 'twenty-shared/utils';
|
||||
import { IsNull, Repository } from 'typeorm';
|
||||
|
||||
import {
|
||||
@@ -278,7 +280,9 @@ export class WorkspaceInvitationService {
|
||||
if (invitation.status === 'fulfilled') {
|
||||
const link = this.domainManagerService.buildWorkspaceURL({
|
||||
workspace,
|
||||
pathname: `invite/${workspace?.inviteHash}`,
|
||||
pathname: getAppPath(AppPath.Invite, {
|
||||
workspaceInviteHash: workspace?.inviteHash,
|
||||
}),
|
||||
searchParams: invitation.value.isPersonalInvitation
|
||||
? {
|
||||
inviteToken: invitation.value.appToken.value,
|
||||
|
||||
Reference in New Issue
Block a user