admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix export view missing column and viewGroups not persisted bug (#10584)

Browse Source 
Fixes https://github.com/twentyhq/twenty/issues/10535
Also fixes missing columns in export view
This commit is contained in:
Charles Bochet
2025-02-28 15:59:13 +01:00
committed by GitHub
parent 122a6a7801
commit 00b650a121
20 changed files with 70 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/twenty-front/src/testing/jest/JestContextStoreSetter.tsx
View File

@ -1,6 +1,7 @@
import { PropsWithChildren, useEffect, useState } from 'react';
import { contextStoreCurrentObjectMetadataItemComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemComponentState';
import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState';
import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
import {
@ -16,11 +17,13 @@ export type JestContextStoreSetterMocks = {
contextStoreNumberOfSelectedRecords?: number;
contextStoreFilters?: RecordFilter[];
contextStoreCurrentObjectMetadataNameSingular?: string;
contextStoreCurrentViewId?: string;
};
type JestContextStoreSetterProps =
PropsWithChildren<JestContextStoreSetterMocks>;
export const JestContextStoreSetter = ({
contextStoreCurrentViewId,
contextStoreTargetedRecordsRule = {
mode: 'selection',
selectedRecordIds: [],
@ -46,6 +49,10 @@ export const JestContextStoreSetter = ({
contextStoreFiltersComponentState,
);
const setContextStoreCurrentViewId = useSetRecoilComponentStateV2(
contextStoreCurrentViewIdComponentState,
);
const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular: contextStoreCurrentObjectMetadataNameSingular,
});
@ -54,6 +61,7 @@ export const JestContextStoreSetter = ({
const [isLoaded, setIsLoaded] = useState(false);
useEffect(() => {
setContextStoreCurrentViewId(contextStoreCurrentViewId);
setContextStoreTargetedRecordsRule(contextStoreTargetedRecordsRule);
setContextStoreCurrentObjectMetadataItem(objectMetadataItem);
setContextStoreNumberOfSelectedRecords(contextStoreNumberOfSelectedRecords);
@ -70,6 +78,8 @@ export const JestContextStoreSetter = ({
setcontextStoreFiltersComponentState,
contextStoreFilters,
objectMetadataItem,
setContextStoreCurrentViewId,
contextStoreCurrentViewId,
]);
return isLoaded ? <>{children}</> : null;

2
packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper.tsx
View File

@ -27,6 +27,7 @@ export const getJestMetadataAndApolloMocksAndActionMenuWrapper = ({
apolloMocks,
onInitializeRecoilSnapshot,
contextStoreTargetedRecordsRule,
contextStoreCurrentViewId,
contextStoreNumberOfSelectedRecords,
contextStoreCurrentObjectMetadataNameSingular,
contextStoreFilters,
@ -81,6 +82,7 @@ export const getJestMetadataAndApolloMocksAndActionMenuWrapper = ({
}}
>
<JestContextStoreSetter
contextStoreCurrentViewId={contextStoreCurrentViewId}
contextStoreFilters={contextStoreFilters}
contextStoreTargetedRecordsRule={
contextStoreTargetedRecordsRule