Félix Malfait
f7cde28dd6
## 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>
58 lines
3.4 KiB
TypeScript
58 lines
3.4 KiB
TypeScript
/*
|
|
* _____ _
|
|
*|_ _|_ _____ _ __ | |_ _ _
|
|
* | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
|
|
* | | \ V V / __/ | | | |_| |_| | Any edits to this will be overridden
|
|
* |_| \_/\_/ \___|_| |_|\__|\__, |
|
|
* |___/
|
|
*/
|
|
|
|
export { filterOutByProperty } from './array/filterOutByProperty';
|
|
export { findById } from './array/findById';
|
|
export { findByProperty } from './array/findByProperty';
|
|
export { sumByProperty } from './array/sumByProperty';
|
|
export { assertUnreachable } from './assertUnreachable';
|
|
export { deepMerge } from './deepMerge';
|
|
export { extractAndSanitizeObjectStringFields } from './extractAndSanitizeObjectStringFields';
|
|
export { isFieldMetadataDateKind } from './fieldMetadata/isFieldMetadataDateKind';
|
|
export { fromArrayToUniqueKeyRecord } from './from-array-to-unique-key-record.util';
|
|
export { fromArrayToValuesByKeyRecord } from './fromArrayToValuesByKeyRecord.util';
|
|
export { getURLSafely } from './getURLSafely';
|
|
export { getImageAbsoluteURI } from './image/getImageAbsoluteURI';
|
|
export {
|
|
sanitizeURL,
|
|
getLogoUrlFromDomainName,
|
|
} from './image/getLogoUrlFromDomainName';
|
|
export { getUniqueConstraintsFields } from './indexMetadata/getUniqueConstraintsFields';
|
|
export { getAppPath } from './navigation/getAppPath';
|
|
export { getSettingsPath } from './navigation/getSettingsPath';
|
|
export { parseJson } from './parseJson';
|
|
export { removePropertiesFromRecord } from './removePropertiesFromRecord';
|
|
export { removeUndefinedFields } from './removeUndefinedFields';
|
|
export { safeParseRelativeDateFilterValue } from './safeParseRelativeDateFilterValue';
|
|
export { getGenericOperationName } from './sentry/getGenericOperationName';
|
|
export { getHumanReadableNameFromCode } from './sentry/getHumanReadableNameFromCode';
|
|
export { capitalize } from './strings/capitalize';
|
|
export type { StringPropertyKeys } from './trim-and-remove-duplicated-whitespaces-from-object-string-properties';
|
|
export { trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties } from './trim-and-remove-duplicated-whitespaces-from-object-string-properties';
|
|
export { trimAndRemoveDuplicatedWhitespacesFromString } from './trim-and-remove-duplicated-whitespaces-from-string';
|
|
export { throwIfNotDefined } from './typeguard/throwIfNotDefined';
|
|
export { absoluteUrlSchema } from './url/absoluteUrlSchema';
|
|
export { buildSignedPath } from './url/buildSignedPath';
|
|
export { getAbsoluteUrl } from './url/getAbsoluteUrl';
|
|
export { getAbsoluteUrlOrThrow } from './url/getAbsoluteUrlOrThrow';
|
|
export { getUrlHostnameOrThrow } from './url/getUrlHostnameOrThrow';
|
|
export { isValidHostname } from './url/isValidHostname';
|
|
export { isValidUrl } from './url/isValidUrl';
|
|
export { lowercaseUrlOriginAndRemoveTrailingSlash } from './url/lowercaseUrlOriginAndRemoveTrailingSlash';
|
|
export { uuidToBase36 } from './uuidToBase36';
|
|
export { isDefined } from './validation/isDefined';
|
|
export { isLabelIdentifierFieldMetadataTypes } from './validation/isLabelIdentifierFieldMetadataTypes';
|
|
export { isValidLocale } from './validation/isValidLocale';
|
|
export { isValidUuid } from './validation/isValidUuid';
|
|
export { isValidVariable } from './validation/isValidVariable';
|
|
export { normalizeLocale } from './validation/normalizeLocale';
|
|
export { getCountryCodesForCallingCode } from './validation/phones-value/getCountryCodesForCallingCode';
|
|
export { isValidCountryCode } from './validation/phones-value/isValidCountryCode';
|
|
export { resolveInput } from './variable-resolver';
|