Migrate activities (#2545)
* Start * Migrate activities to flexible schema
This commit is contained in:
@ -2,7 +2,6 @@ import { useParams } from 'react-router-dom';
|
||||
import { DateTime } from 'luxon';
|
||||
import { useRecoilState } from 'recoil';
|
||||
|
||||
import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
|
||||
import { useFavorites } from '@/favorites/hooks/useFavorites';
|
||||
import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
|
||||
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
|
||||
@ -50,7 +49,7 @@ export const RecordShowPage = () => {
|
||||
);
|
||||
|
||||
const { object } = useFindOneObjectRecord({
|
||||
objectMetadataId: objectMetadataId,
|
||||
objectRecordId: objectMetadataId,
|
||||
objectNameSingular,
|
||||
onCompleted: (data) => {
|
||||
setEntityFields(data);
|
||||
@ -133,7 +132,7 @@ export const RecordShowPage = () => {
|
||||
key="add"
|
||||
entity={{
|
||||
id: object.id,
|
||||
type: ActivityTargetableEntityType.Company,
|
||||
type: 'Company',
|
||||
}}
|
||||
/>
|
||||
</PageHeader>
|
||||
@ -185,7 +184,7 @@ export const RecordShowPage = () => {
|
||||
<ShowPageRightContainer
|
||||
entity={{
|
||||
id: object.id,
|
||||
type: ActivityTargetableEntityType.Company,
|
||||
type: 'Company',
|
||||
}}
|
||||
timeline
|
||||
tasks
|
||||
|
||||
@ -7,11 +7,13 @@ export const useFindOneObjectRecord = <
|
||||
ObjectType extends { id: string } & Record<string, any>,
|
||||
>({
|
||||
objectNameSingular,
|
||||
objectMetadataId,
|
||||
objectRecordId,
|
||||
onCompleted,
|
||||
skip,
|
||||
}: Pick<ObjectMetadataItemIdentifier, 'objectNameSingular'> & {
|
||||
objectMetadataId: string | undefined;
|
||||
objectRecordId: string | undefined;
|
||||
onCompleted?: (data: ObjectType) => void;
|
||||
skip?: boolean;
|
||||
}) => {
|
||||
const { foundObjectMetadataItem, objectNotFoundInMetadata, findOneQuery } =
|
||||
useFindOneObjectMetadataItem({
|
||||
@ -20,11 +22,11 @@ export const useFindOneObjectRecord = <
|
||||
|
||||
const { data, loading, error } = useQuery<
|
||||
{ [nameSingular: string]: ObjectType },
|
||||
{ objectMetadataId: string }
|
||||
{ objectRecordId: string }
|
||||
>(findOneQuery, {
|
||||
skip: !foundObjectMetadataItem || !objectMetadataId,
|
||||
skip: !foundObjectMetadataItem || !objectRecordId || skip,
|
||||
variables: {
|
||||
objectMetadataId: objectMetadataId ?? '',
|
||||
objectRecordId: objectRecordId ?? '',
|
||||
},
|
||||
onCompleted: (data) => {
|
||||
if (onCompleted && objectNameSingular) {
|
||||
|
||||
Reference in New Issue
Block a user