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

fix: add viewFieldGroupId to ViewField fragment and connect page layout selectors to live metadata store (#18676)

Browse Source
This commit is contained in:
nitin
2026-03-16 18:54:41 +05:30
committed by GitHub
parent ddedecbb36
commit e552704201
5 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-front/src/generated-metadata/graphql.ts
+42 -42
View File
File diff suppressed because one or more lines are too long
packages/twenty-front/src/modules/page-layout/states/recordPageLayoutsState.ts
-7
View File
@@ -1,7 +0,0 @@
import { type PageLayout } from '@/page-layout/types/PageLayout';
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
export const recordPageLayoutsState = createAtomState<PageLayout[]>({
key: 'recordPageLayoutsState',
defaultValue: [],
});
packages/twenty-front/src/modules/page-layout/states/selectors/recordPageLayoutByObjectMetadataIdFamilySelector.ts
+7 -4
View File
@@ -1,6 +1,7 @@
import { recordPageLayoutsState } from '@/page-layout/states/recordPageLayoutsState';
import { pageLayoutsWithRelationsSelector } from '@/page-layout/states/pageLayoutsWithRelationsSelector';
import { type PageLayout } from '@/page-layout/types/PageLayout';
import { createAtomFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomFamilySelector';
import { PageLayoutType } from '~/generated-metadata/graphql';
export const recordPageLayoutByObjectMetadataIdFamilySelector =
createAtomFamilySelector<
@@ -11,10 +12,12 @@ export const recordPageLayoutByObjectMetadataIdFamilySelector =
get:
({ objectMetadataId }) =>
({ get }) => {
const recordPageLayouts = get(recordPageLayoutsState);
const pageLayouts = get(pageLayoutsWithRelationsSelector);
return recordPageLayouts.find(
(pageLayout) => pageLayout.objectMetadataId === objectMetadataId,
return pageLayouts.find(
(pageLayout) =>
pageLayout.type === PageLayoutType.RECORD_PAGE &&
pageLayout.objectMetadataId === objectMetadataId,
);
},
});
packages/twenty-front/src/modules/page-layout/states/selectors/recordPageLayoutFromIdFamilySelector.ts
+7 -4
View File
@@ -1,6 +1,7 @@
import { recordPageLayoutsState } from '@/page-layout/states/recordPageLayoutsState';
import { pageLayoutsWithRelationsSelector } from '@/page-layout/states/pageLayoutsWithRelationsSelector';
import { type PageLayout } from '@/page-layout/types/PageLayout';
import { createAtomFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomFamilySelector';
import { PageLayoutType } from '~/generated-metadata/graphql';
export const recordPageLayoutFromIdFamilySelector = createAtomFamilySelector<
PageLayout | undefined,
@@ -10,10 +11,12 @@ export const recordPageLayoutFromIdFamilySelector = createAtomFamilySelector<
get:
({ pageLayoutId }) =>
({ get }) => {
const recordPageLayouts = get(recordPageLayoutsState);
const pageLayouts = get(pageLayoutsWithRelationsSelector);
return recordPageLayouts.find(
(pageLayout) => pageLayout.id === pageLayoutId,
return pageLayouts.find(
(pageLayout) =>
pageLayout.type === PageLayoutType.RECORD_PAGE &&
pageLayout.id === pageLayoutId,
);
},
});
packages/twenty-front/src/modules/views/graphql/fragments/viewFieldFragment.ts
+1
View File
@@ -9,6 +9,7 @@ export const VIEW_FIELD_FRAGMENT = gql`
position
size
aggregateOperation
viewFieldGroupId
isOverridden
createdAt
updatedAt