mirror of
https://github.com/twentyhq/twenty.git
synced 2024-09-19 20:18:19 +03:00
Fix Activity relation picker (#2684)
This commit is contained in:
parent
1e181c9d2a
commit
de5b86ee66
@ -18,7 +18,7 @@ export const ActivityTargetChips = ({ targets }: { targets?: any }) => {
|
||||
|
||||
return (
|
||||
<StyledContainer>
|
||||
{targets?.edges?.map(({ company, person }: any) => {
|
||||
{targets?.map(({ company, person }: any) => {
|
||||
if (company) {
|
||||
return (
|
||||
<CompanyChip
|
||||
|
@ -1,22 +1,13 @@
|
||||
import { v4 } from 'uuid';
|
||||
|
||||
import { ActivityTarget } from '@/activities/types/ActivityTarget';
|
||||
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
|
||||
import { useCreateOneObjectRecord } from '@/object-record/hooks/useCreateOneObjectRecord';
|
||||
import { useDeleteOneObjectRecord } from '@/object-record/hooks/useDeleteOneObjectRecord';
|
||||
|
||||
import { ActivityTargetableEntityForSelect } from '../types/ActivityTargetableEntityForSelect';
|
||||
|
||||
export const useHandleCheckableActivityTargetChange = ({
|
||||
activity,
|
||||
activityId,
|
||||
currentActivityTargets,
|
||||
}: {
|
||||
activity?: Pick<GraphQLActivity, 'id'> & {
|
||||
activityTargets?: {
|
||||
edges: Array<{
|
||||
node: Pick<ActivityTarget, 'id' | 'personId' | 'companyId'>;
|
||||
}> | null;
|
||||
};
|
||||
};
|
||||
activityId: string;
|
||||
currentActivityTargets: any[];
|
||||
}) => {
|
||||
const { createOneObject } = useCreateOneObjectRecord<ActivityTarget>({
|
||||
objectNameSingular: 'activityTarget',
|
||||
@ -27,49 +18,56 @@ export const useHandleCheckableActivityTargetChange = ({
|
||||
|
||||
return async (
|
||||
entityValues: Record<string, boolean>,
|
||||
entities: ActivityTargetableEntityForSelect[],
|
||||
entitiesToSelect: any,
|
||||
selectedEntities: any,
|
||||
) => {
|
||||
if (!activity) {
|
||||
if (!activityId) {
|
||||
return;
|
||||
}
|
||||
|
||||
const currentEntityIds = activity.activityTargets?.edges
|
||||
? activity.activityTargets.edges.map(
|
||||
({ node }) => node.personId ?? node.companyId,
|
||||
)
|
||||
: [];
|
||||
|
||||
const entitiesToAdd = entities.filter(
|
||||
({ id }) => entityValues[id] && !currentEntityIds.includes(id),
|
||||
const currentActivityTargetRecordIds = currentActivityTargets.map(
|
||||
({ companyId, personId }) => companyId ?? personId ?? '',
|
||||
);
|
||||
|
||||
if (entitiesToAdd.length) {
|
||||
entitiesToAdd.map((entity) => {
|
||||
const idsToAdd = Object.entries(entityValues)
|
||||
.filter(
|
||||
([recordId, value]) =>
|
||||
value && !currentActivityTargetRecordIds.includes(recordId),
|
||||
)
|
||||
.map(([id, _]) => id);
|
||||
|
||||
const idsToDelete = Object.entries(entityValues)
|
||||
.filter(([_, value]) => !value)
|
||||
.map(([id, _]) => id);
|
||||
|
||||
if (idsToAdd.length) {
|
||||
idsToAdd.map((id) => {
|
||||
const entityFromToSelect = entitiesToSelect.filter(
|
||||
(entity: any) => entity.id === id,
|
||||
).length
|
||||
? entitiesToSelect.filter((entity: any) => entity.id === id)[0]
|
||||
: null;
|
||||
|
||||
const entityFromSelected = selectedEntities.filter(
|
||||
(entity: any) => entity.id === id,
|
||||
).length
|
||||
? selectedEntities.filter((entity: any) => entity.id === id)[0]
|
||||
: null;
|
||||
|
||||
const entity = entityFromToSelect ?? entityFromSelected;
|
||||
createOneObject?.({
|
||||
activityId: activity.id,
|
||||
activityTargetInputs: {
|
||||
id: v4(),
|
||||
createdAt: new Date().toISOString(),
|
||||
companyId: entity.entityType === 'Company' ? entity.id : null,
|
||||
personId: entity.entityType === 'Person' ? entity.id : null,
|
||||
},
|
||||
activityId: activityId,
|
||||
companyId: entity.record.__typename === 'Company' ? entity.id : null,
|
||||
personId: entity.record.__typename === 'Person' ? entity.id : null,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
const activityTargetIdsToDelete = activity.activityTargets?.edges
|
||||
? activity.activityTargets.edges
|
||||
.filter(
|
||||
({ node }) =>
|
||||
(node.personId ?? node.companyId) &&
|
||||
!entityValues[node.personId ?? node.companyId ?? ''],
|
||||
)
|
||||
.map(({ node }) => node.id)
|
||||
: [];
|
||||
|
||||
if (activityTargetIdsToDelete.length) {
|
||||
activityTargetIdsToDelete.map((id) => {
|
||||
deleteOneObject?.(id);
|
||||
if (idsToDelete.length) {
|
||||
idsToDelete.map((id) => {
|
||||
const currentActivityTargetId = currentActivityTargets.filter(
|
||||
({ companyId, personId }) => companyId === id || personId === id,
|
||||
)[0].id;
|
||||
deleteOneObject?.(currentActivityTargetId);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
@ -1,20 +1,20 @@
|
||||
import { useCallback, useMemo, useState } from 'react';
|
||||
import { useQuery } from '@apollo/client';
|
||||
import styled from '@emotion/styled';
|
||||
|
||||
import { useHandleCheckableActivityTargetChange } from '@/activities/hooks/useHandleCheckableActivityTargetChange';
|
||||
import { ActivityTarget } from '@/activities/types/ActivityTarget';
|
||||
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
|
||||
import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '@/activities/utils/flatMapAndSortEntityForSelectArrayByName';
|
||||
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
|
||||
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
|
||||
import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
|
||||
import { MultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect';
|
||||
import { useInlineCell } from '@/ui/object/record-inline-cell/hooks/useInlineCell';
|
||||
import { assertNotNull } from '~/utils/assert';
|
||||
|
||||
type ActivityTargetInlineCellEditModeProps = {
|
||||
activity?: Pick<GraphQLActivity, 'id'> & {
|
||||
activityTargets?: {
|
||||
edges: Array<{
|
||||
node: Pick<ActivityTarget, 'id' | 'personId' | 'companyId'>;
|
||||
}> | null;
|
||||
};
|
||||
};
|
||||
activityId: string;
|
||||
activityTargets: Array<Pick<ActivityTarget, 'id' | 'personId' | 'companyId'>>;
|
||||
};
|
||||
|
||||
const StyledSelectContainer = styled.div`
|
||||
@ -24,26 +24,27 @@ const StyledSelectContainer = styled.div`
|
||||
`;
|
||||
|
||||
export const ActivityTargetInlineCellEditMode = ({
|
||||
activity,
|
||||
activityId,
|
||||
activityTargets,
|
||||
}: ActivityTargetInlineCellEditModeProps) => {
|
||||
const [searchFilter, setSearchFilter] = useState('');
|
||||
|
||||
const initialPeopleIds = useMemo(
|
||||
() =>
|
||||
activity?.activityTargets?.edges
|
||||
?.filter(({ node }) => node.personId !== null)
|
||||
.map(({ node }) => node.personId)
|
||||
activityTargets
|
||||
?.filter(({ personId }) => personId !== null)
|
||||
.map(({ personId }) => personId)
|
||||
.filter(assertNotNull) ?? [],
|
||||
[activity?.activityTargets],
|
||||
[activityTargets],
|
||||
);
|
||||
|
||||
const initialCompanyIds = useMemo(
|
||||
() =>
|
||||
activity?.activityTargets?.edges
|
||||
?.filter(({ node }) => node.companyId !== null)
|
||||
.map(({ node }) => node.companyId)
|
||||
activityTargets
|
||||
?.filter(({ companyId }) => companyId !== null)
|
||||
.map(({ companyId }) => companyId)
|
||||
.filter(assertNotNull) ?? [],
|
||||
[activity?.activityTargets],
|
||||
[activityTargets],
|
||||
);
|
||||
|
||||
const initialSelectedEntityIds = useMemo(
|
||||
@ -54,45 +55,92 @@ export const ActivityTargetInlineCellEditMode = ({
|
||||
[initialPeopleIds, initialCompanyIds],
|
||||
);
|
||||
|
||||
const { findManyQuery: findManyPeopleQuery } = useObjectMetadataItem({
|
||||
objectNameSingular: 'person',
|
||||
});
|
||||
|
||||
const { findManyQuery: findManyCompaniesQuery } = useObjectMetadataItem({
|
||||
objectNameSingular: 'company',
|
||||
});
|
||||
|
||||
const useFindManyPeopleQuery = (options: any) =>
|
||||
useQuery(findManyPeopleQuery, options);
|
||||
|
||||
const useFindManyCompaniesQuery = (options: any) =>
|
||||
useQuery(findManyCompaniesQuery, options);
|
||||
|
||||
const [selectedEntityIds, setSelectedEntityIds] = useState<
|
||||
Record<string, boolean>
|
||||
>(initialSelectedEntityIds);
|
||||
|
||||
// const personsForMultiSelect = useFilteredSearchPeopleQuery({
|
||||
// searchFilter,
|
||||
// selectedIds: initialPeopleIds,
|
||||
// });
|
||||
const { identifiersMapper, searchQuery } = useRelationPicker();
|
||||
|
||||
// const companiesForMultiSelect = useFilteredSearchCompanyQuery({
|
||||
// searchFilter,
|
||||
// selectedIds: initialCompanyIds,
|
||||
// });
|
||||
const people = useFilteredSearchEntityQuery({
|
||||
queryHook: useFindManyPeopleQuery,
|
||||
filters: [
|
||||
{
|
||||
fieldNames: searchQuery?.computeFilterFields?.('person') ?? [],
|
||||
filter: searchFilter,
|
||||
},
|
||||
],
|
||||
orderByField: 'createdAt',
|
||||
mappingFunction: (record: any) => identifiersMapper?.(record, 'person'),
|
||||
selectedIds: initialPeopleIds,
|
||||
objectNamePlural: 'people',
|
||||
limit: 3,
|
||||
});
|
||||
|
||||
// const selectedEntities = flatMapAndSortEntityForSelectArrayOfArrayByName([
|
||||
// personsForMultiSelect.selectedEntities,
|
||||
// companiesForMultiSelect.selectedEntities,
|
||||
// ]);
|
||||
const companies = useFilteredSearchEntityQuery({
|
||||
queryHook: useFindManyCompaniesQuery,
|
||||
filters: [
|
||||
{
|
||||
fieldNames: searchQuery?.computeFilterFields?.('company') ?? [],
|
||||
filter: searchFilter,
|
||||
},
|
||||
],
|
||||
orderByField: 'createdAt',
|
||||
mappingFunction: (record: any) => identifiersMapper?.(record, 'company'),
|
||||
selectedIds: initialCompanyIds,
|
||||
objectNamePlural: 'companies',
|
||||
limit: 3,
|
||||
});
|
||||
|
||||
// const filteredSelectedEntities =
|
||||
// flatMapAndSortEntityForSelectArrayOfArrayByName([
|
||||
// personsForMultiSelect.filteredSelectedEntities,
|
||||
// companiesForMultiSelect.filteredSelectedEntities,
|
||||
// ]);
|
||||
const selectedEntities = flatMapAndSortEntityForSelectArrayOfArrayByName([
|
||||
people.selectedEntities,
|
||||
companies.selectedEntities,
|
||||
]);
|
||||
|
||||
// const entitiesToSelect = flatMapAndSortEntityForSelectArrayOfArrayByName([
|
||||
// personsForMultiSelect.entitiesToSelect,
|
||||
// companiesForMultiSelect.entitiesToSelect,
|
||||
// ]);
|
||||
const filteredSelectedEntities =
|
||||
flatMapAndSortEntityForSelectArrayOfArrayByName([
|
||||
people.filteredSelectedEntities,
|
||||
companies.filteredSelectedEntities,
|
||||
]);
|
||||
|
||||
const entitiesToSelect = flatMapAndSortEntityForSelectArrayOfArrayByName([
|
||||
people.entitiesToSelect,
|
||||
companies.entitiesToSelect,
|
||||
]);
|
||||
|
||||
const handleCheckItemsChange = useHandleCheckableActivityTargetChange({
|
||||
activity,
|
||||
activityId,
|
||||
currentActivityTargets: activityTargets,
|
||||
});
|
||||
const { closeInlineCell: closeEditableField } = useInlineCell();
|
||||
|
||||
const handleSubmit = useCallback(() => {
|
||||
//handleCheckItemsChange(selectedEntityIds, entitiesToSelect);
|
||||
handleCheckItemsChange(
|
||||
selectedEntityIds,
|
||||
entitiesToSelect,
|
||||
selectedEntities,
|
||||
);
|
||||
closeEditableField();
|
||||
}, [closeEditableField]);
|
||||
}, [
|
||||
closeEditableField,
|
||||
entitiesToSelect,
|
||||
handleCheckItemsChange,
|
||||
selectedEntities,
|
||||
selectedEntityIds,
|
||||
]);
|
||||
|
||||
const handleCancel = () => {
|
||||
closeEditableField();
|
||||
@ -100,7 +148,7 @@ export const ActivityTargetInlineCellEditMode = ({
|
||||
|
||||
return (
|
||||
<StyledSelectContainer>
|
||||
{/* <MultipleEntitySelect
|
||||
<MultipleEntitySelect
|
||||
entities={{
|
||||
entitiesToSelect,
|
||||
filteredSelectedEntities,
|
||||
@ -113,7 +161,7 @@ export const ActivityTargetInlineCellEditMode = ({
|
||||
value={selectedEntityIds}
|
||||
onCancel={handleCancel}
|
||||
onSubmit={handleSubmit}
|
||||
/> */}
|
||||
/>
|
||||
</StyledSelectContainer>
|
||||
);
|
||||
};
|
||||
|
@ -2,8 +2,7 @@ import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips
|
||||
import { ActivityTargetInlineCellEditMode } from '@/activities/inline-cell/components/ActivityTargetInlineCellEditMode';
|
||||
import { ActivityTarget } from '@/activities/types/ActivityTarget';
|
||||
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
|
||||
import { Company } from '@/companies/types/Company';
|
||||
import { Person } from '@/people/types/Person';
|
||||
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
|
||||
import { IconArrowUpRight, IconPencil } from '@/ui/display/icon';
|
||||
import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
|
||||
import { RecordInlineCellContainer } from '@/ui/object/record-inline-cell/components/RecordInlineCellContainer';
|
||||
@ -14,10 +13,7 @@ type ActivityTargetsInlineCellProps = {
|
||||
activity?: Pick<GraphQLActivity, 'id'> & {
|
||||
activityTargets?: {
|
||||
edges: Array<{
|
||||
node: Pick<ActivityTarget, 'id' | 'personId' | 'companyId'> & {
|
||||
person?: Pick<Person, 'id' | 'name' | 'avatarUrl'> | null;
|
||||
company?: Pick<Company, 'id' | 'domainName' | 'name'> | null;
|
||||
};
|
||||
node: Pick<ActivityTarget, 'id'>;
|
||||
}> | null;
|
||||
};
|
||||
};
|
||||
@ -26,6 +22,18 @@ type ActivityTargetsInlineCellProps = {
|
||||
export const ActivityTargetsInlineCell = ({
|
||||
activity,
|
||||
}: ActivityTargetsInlineCellProps) => {
|
||||
const activityTargetIds =
|
||||
activity?.activityTargets?.edges?.map(
|
||||
(activityTarget) => activityTarget.node.id,
|
||||
) ?? [];
|
||||
|
||||
const { objects: activityTargets } = useFindManyObjectRecords<ActivityTarget>(
|
||||
{
|
||||
objectNamePlural: 'activityTargets',
|
||||
filter: { id: { in: activityTargetIds } },
|
||||
},
|
||||
);
|
||||
|
||||
return (
|
||||
<RecoilScope CustomRecoilScopeContext={FieldRecoilScopeContext}>
|
||||
<RecordInlineCellContainer
|
||||
@ -35,12 +43,13 @@ export const ActivityTargetsInlineCell = ({
|
||||
}}
|
||||
IconLabel={IconArrowUpRight}
|
||||
editModeContent={
|
||||
<ActivityTargetInlineCellEditMode activity={activity} />
|
||||
<ActivityTargetInlineCellEditMode
|
||||
activityId={activity?.id ?? ''}
|
||||
activityTargets={activityTargets as any}
|
||||
/>
|
||||
}
|
||||
label="Relations"
|
||||
displayModeContent={
|
||||
<ActivityTargetChips targets={activity?.activityTargets?.edges} />
|
||||
}
|
||||
displayModeContent={<ActivityTargetChips targets={activityTargets} />}
|
||||
isDisplayModeContentEmpty={
|
||||
activity?.activityTargets?.edges?.length === 0
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ import { ReactElement } from 'react';
|
||||
import styled from '@emotion/styled';
|
||||
|
||||
import { Activity } from '@/activities/types/Activity';
|
||||
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
|
||||
|
||||
import { TaskRow } from './TaskRow';
|
||||
|
||||
@ -60,7 +61,7 @@ export const TaskList = ({ title, tasks, button }: TaskListProps) => (
|
||||
</StyledTitleBar>
|
||||
<StyledTaskRows>
|
||||
{tasks.map((task) => (
|
||||
<TaskRow key={task.id} task={task} />
|
||||
<TaskRow key={task.id} task={task as unknown as GraphQLActivity} />
|
||||
))}
|
||||
</StyledTaskRows>
|
||||
</StyledContainer>
|
||||
|
@ -3,7 +3,9 @@ import styled from '@emotion/styled';
|
||||
|
||||
import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips';
|
||||
import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
|
||||
import { Activity } from '@/activities/types/Activity';
|
||||
import { ActivityTarget } from '@/activities/types/ActivityTarget';
|
||||
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
|
||||
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
|
||||
import { IconCalendar, IconComment } from '@/ui/display/icon';
|
||||
import { OverflowingTextWithTooltip } from '@/ui/display/tooltip/OverflowingTextWithTooltip';
|
||||
import { Checkbox, CheckboxShape } from '@/ui/input/components/Checkbox';
|
||||
@ -61,13 +63,29 @@ const StyledFieldsContainer = styled.div`
|
||||
display: flex;
|
||||
`;
|
||||
|
||||
export const TaskRow = ({ task }: { task: Omit<Activity, 'assigneeId'> }) => {
|
||||
export const TaskRow = ({
|
||||
task,
|
||||
}: {
|
||||
task: Omit<GraphQLActivity, 'assigneeId'>;
|
||||
}) => {
|
||||
const theme = useTheme();
|
||||
const openActivityRightDrawer = useOpenActivityRightDrawer();
|
||||
|
||||
const body = JSON.parse(task.body ?? '{}')[0]?.content[0]?.text;
|
||||
const { completeTask } = useCompleteTask(task);
|
||||
|
||||
const activityTargetIds =
|
||||
task?.activityTargets?.edges.map(
|
||||
(activityTarget) => activityTarget.node.id,
|
||||
) ?? [];
|
||||
|
||||
const { objects: activityTargets } = useFindManyObjectRecords<ActivityTarget>(
|
||||
{
|
||||
objectNamePlural: 'activityTargets',
|
||||
filter: { id: { in: activityTargetIds } },
|
||||
},
|
||||
);
|
||||
|
||||
return (
|
||||
<StyledContainer
|
||||
onClick={() => {
|
||||
@ -97,7 +115,7 @@ export const TaskRow = ({ task }: { task: Omit<Activity, 'assigneeId'> }) => {
|
||||
)}
|
||||
</StyledTaskBody>
|
||||
<StyledFieldsContainer>
|
||||
<ActivityTargetChips targets={task.activityTargets} />
|
||||
<ActivityTargetChips targets={activityTargets} />
|
||||
<StyledDueDate
|
||||
isPast={
|
||||
!!task.dueAt && hasDatePassed(task.dueAt) && !task.completedAt
|
||||
|
@ -47,8 +47,8 @@ export const CommandMenu = () => {
|
||||
objectNamePlural: 'people',
|
||||
filter: {
|
||||
or: [
|
||||
{ name: { firstName: { like: `%${search}%` } } },
|
||||
{ name: { firstName: { like: `%${search}%` } } },
|
||||
{ name: { firstName: { ilike: `%${search}%` } } },
|
||||
{ name: { firstName: { ilike: `%${search}%` } } },
|
||||
],
|
||||
},
|
||||
limit: 3,
|
||||
@ -58,7 +58,7 @@ export const CommandMenu = () => {
|
||||
skip: !isCommandMenuOpened,
|
||||
objectNamePlural: 'companies',
|
||||
filter: {
|
||||
name: { like: `%${search}%` },
|
||||
name: { ilike: `%${search}%` },
|
||||
},
|
||||
limit: 3,
|
||||
});
|
||||
|
@ -98,10 +98,8 @@ export const useFilteredSearchEntityQuery = ({
|
||||
and: searchFilter,
|
||||
},
|
||||
{
|
||||
not: {
|
||||
id: {
|
||||
in: selectedIds,
|
||||
},
|
||||
id: {
|
||||
in: selectedIds,
|
||||
},
|
||||
},
|
||||
],
|
||||
|
Loading…
Reference in New Issue
Block a user