Skip to content

Commit

Permalink
Fix missing avatar on People table (twentyhq#5601)
Browse files Browse the repository at this point in the history
As per title!
  • Loading branch information
charlesBochet committed May 27, 2024
1 parent 2c009af commit 56ef8fc
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,18 @@ export const useFindManyParams = (
};

export const useLoadRecordIndexTable = (objectNameSingular: string) => {
const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular,
});

const { setRecordTableData, setIsRecordTableInitialLoading } =
useRecordTable();
const { tableLastRowVisibleState } = useRecordTableStates();
const setLastRowVisible = useSetRecoilState(tableLastRowVisibleState);
const currentWorkspace = useRecoilValue(currentWorkspaceState);
const params = useFindManyParams(objectNameSingular);

const recordGqlFields = useRecordTableRecordGqlFields();
const recordGqlFields = useRecordTableRecordGqlFields({ objectMetadataItem });

const {
records,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
import { useRecoilValue } from 'recoil';

import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { getObjectMetadataIdentifierFields } from '@/object-metadata/utils/getObjectMetadataIdentifierFields';
import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
import { isDefined } from '~/utils/isDefined';

export const useRecordTableRecordGqlFields = () => {
export const useRecordTableRecordGqlFields = ({
objectMetadataItem,
}: {
objectMetadataItem: ObjectMetadataItem;
}) => {
const { visibleTableColumnsSelector } = useRecordTableStates();

const { imageIdentifierFieldMetadataItem, labelIdentifierFieldMetadataItem } =
getObjectMetadataIdentifierFields({ objectMetadataItem });

const visibleTableColumns = useRecoilValue(visibleTableColumnsSelector());

const identifierQueryFields: Record<string, boolean> = {};

if (isDefined(labelIdentifierFieldMetadataItem)) {
identifierQueryFields[labelIdentifierFieldMetadataItem.name] = true;
}

if (isDefined(imageIdentifierFieldMetadataItem)) {
identifierQueryFields[imageIdentifierFieldMetadataItem.name] = true;
}

const recordGqlFields: Record<string, any> = {
id: true,
...Object.fromEntries(
visibleTableColumns.map((column) => [column.metadata.fieldName, true]),
),
...identifierQueryFields,
position: true,
};

Expand Down

0 comments on commit 56ef8fc

Please sign in to comment.