mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Introduce main identifier to power RelationFieldDisplay (#2577)

Browse Source 
* Introduce main identifier to power RelationFieldDisplay, FilterDrodown, TableFirstColumn

* Apply to RelationPicker
This commit is contained in:
Charles Bochet
2023-11-20 10:33:36 +01:00
committed by GitHub
parent 18ee95179e
commit 25950ab82a
75 changed files with 412 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx
View File

@ -1,8 +1,7 @@
import { useQuery } from '@apollo/client';
import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
import { useFilteredSearchEntityQueryV2 } from '@/search/hooks/useFilteredSearchEntityQueryV2';
import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
import { ObjectFilterDropdownEntitySearchSelect } from '@/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect';
import { useFilter } from '@/ui/object/object-filter-dropdown/hooks/useFilter';
@ -19,7 +18,7 @@ export const FilterDropdownUserSearchSelect = () => {
const useFindManyWorkspaceMembers = (options: any) =>
useQuery(findManyQuery, options);
const workspaceMembers = useFilteredSearchEntityQueryV2({
const workspaceMembers = useFilteredSearchEntityQuery({
queryHook: useFindManyWorkspaceMembers,
filters: [
{
@ -29,13 +28,13 @@ export const FilterDropdownUserSearchSelect = () => {
],
orderByField: 'createdAt',
mappingFunction: (workspaceMember) => ({
entityType: Entity.WorkspaceMember,
entityType: 'WorkspaceMember',
id: workspaceMember.id,
name:
workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName,
avatarType: 'rounded',
avatarUrl: '',
originalEntity: workspaceMember,
record: workspaceMember,
}),
selectedIds: objectFilterDropdownSelectedEntityId
? [objectFilterDropdownSelectedEntityId]

6
front/src/modules/users/components/UserChip.tsx
View File

@ -3,14 +3,14 @@ import { EntityChip } from '@/ui/display/chip/components/EntityChip';
export type UserChipProps = {
id: string;
name: string;
pictureUrl?: string;
avatarUrl?: string;
};
export const UserChip = ({ id, name, pictureUrl }: UserChipProps) => (
export const UserChip = ({ id, name, avatarUrl }: UserChipProps) => (
<EntityChip
entityId={id}
name={name}
avatarType="rounded"
pictureUrl={pictureUrl}
avatarUrl={avatarUrl}
/>
);