Persist update on board drag and drop (#328)

* chore: move dnd lib comment aligned with import

* feature: add onUpdate on board

* chore: remove multi entity pipelines

* feature: add pipelineProgressableType field

* feature: fetch progressableType in board

* feature: implement on update to persist progress change
This commit is contained in:
Sammy Teillet
2023-06-20 10:56:36 +02:00
committed by GitHub
parent 950a0b77fe
commit c120903a45
50 changed files with 308 additions and 40 deletions

View File

@ -975,6 +975,7 @@ export type Pipeline = {
icon: Scalars['String'];
id: Scalars['ID'];
name: Scalars['String'];
pipelineProgressableType: PipelineProgressableType;
pipelineProgresses?: Maybe<Array<PipelineProgress>>;
pipelineStages?: Maybe<Array<PipelineStage>>;
updatedAt: Scalars['DateTime'];
@ -990,6 +991,7 @@ export type PipelineOrderByWithRelationInput = {
icon?: InputMaybe<SortOrder>;
id?: InputMaybe<SortOrder>;
name?: InputMaybe<SortOrder>;
pipelineProgressableType?: InputMaybe<SortOrder>;
pipelineProgresses?: InputMaybe<PipelineProgressOrderByRelationAggregateInput>;
pipelineStages?: InputMaybe<PipelineStageOrderByRelationAggregateInput>;
updatedAt?: InputMaybe<SortOrder>;
@ -1102,6 +1104,7 @@ export enum PipelineScalarFieldEnum {
Icon = 'icon',
Id = 'id',
Name = 'name',
PipelineProgressableType = 'pipelineProgressableType',
UpdatedAt = 'updatedAt',
WorkspaceId = 'workspaceId'
}
@ -1201,6 +1204,7 @@ export type PipelineWhereInput = {
icon?: InputMaybe<StringFilter>;
id?: InputMaybe<StringFilter>;
name?: InputMaybe<StringFilter>;
pipelineProgressableType?: InputMaybe<EnumPipelineProgressableTypeFilter>;
pipelineProgresses?: InputMaybe<PipelineProgressListRelationFilter>;
pipelineStages?: InputMaybe<PipelineStageListRelationFilter>;
updatedAt?: InputMaybe<DateTimeFilter>;
@ -1625,7 +1629,15 @@ export type DeleteCompaniesMutation = { __typename?: 'Mutation', deleteManyCompa
export type GetPipelinesQueryVariables = Exact<{ [key: string]: never; }>;
export type GetPipelinesQuery = { __typename?: 'Query', findManyPipeline: Array<{ __typename?: 'Pipeline', id: string, name: string, pipelineStages?: Array<{ __typename?: 'PipelineStage', name: string, color: string, pipelineProgresses?: Array<{ __typename?: 'PipelineProgress', id: string, progressableType: PipelineProgressableType, progressableId: string }> | null }> | null }> };
export type GetPipelinesQuery = { __typename?: 'Query', findManyPipeline: Array<{ __typename?: 'Pipeline', id: string, name: string, pipelineProgressableType: PipelineProgressableType, pipelineStages?: Array<{ __typename?: 'PipelineStage', id: string, name: string, color: string, pipelineProgresses?: Array<{ __typename?: 'PipelineProgress', id: string, progressableType: PipelineProgressableType, progressableId: string }> | null }> | null }> };
export type UpdateOnePipelineProgressMutationVariables = Exact<{
id?: InputMaybe<Scalars['String']>;
pipelineStageId?: InputMaybe<Scalars['String']>;
}>;
export type UpdateOnePipelineProgressMutation = { __typename?: 'Mutation', updateOnePipelineProgress?: { __typename?: 'PipelineProgress', id: string } | null };
export type GetPeopleQueryVariables = Exact<{
orderBy?: InputMaybe<Array<PersonOrderByWithRelationInput> | PersonOrderByWithRelationInput>;
@ -2199,10 +2211,12 @@ export type DeleteCompaniesMutationResult = Apollo.MutationResult<DeleteCompanie
export type DeleteCompaniesMutationOptions = Apollo.BaseMutationOptions<DeleteCompaniesMutation, DeleteCompaniesMutationVariables>;
export const GetPipelinesDocument = gql`
query GetPipelines {
findManyPipeline(skip: 1) {
findManyPipeline {
id
name
pipelineProgressableType
pipelineStages {
id
name
color
pipelineProgresses {
@ -2241,6 +2255,43 @@ export function useGetPipelinesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptio
export type GetPipelinesQueryHookResult = ReturnType<typeof useGetPipelinesQuery>;
export type GetPipelinesLazyQueryHookResult = ReturnType<typeof useGetPipelinesLazyQuery>;
export type GetPipelinesQueryResult = Apollo.QueryResult<GetPipelinesQuery, GetPipelinesQueryVariables>;
export const UpdateOnePipelineProgressDocument = gql`
mutation UpdateOnePipelineProgress($id: String, $pipelineStageId: String) {
updateOnePipelineProgress(
where: {id: $id}
data: {pipelineStage: {connect: {id: $pipelineStageId}}}
) {
id
}
}
`;
export type UpdateOnePipelineProgressMutationFn = Apollo.MutationFunction<UpdateOnePipelineProgressMutation, UpdateOnePipelineProgressMutationVariables>;
/**
* __useUpdateOnePipelineProgressMutation__
*
* To run a mutation, you first call `useUpdateOnePipelineProgressMutation` within a React component and pass it any options that fit your needs.
* When your component renders, `useUpdateOnePipelineProgressMutation` returns a tuple that includes:
* - A mutate function that you can call at any time to execute the mutation
* - An object with fields that represent the current status of the mutation's execution
*
* @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
*
* @example
* const [updateOnePipelineProgressMutation, { data, loading, error }] = useUpdateOnePipelineProgressMutation({
* variables: {
* id: // value for 'id'
* pipelineStageId: // value for 'pipelineStageId'
* },
* });
*/
export function useUpdateOnePipelineProgressMutation(baseOptions?: Apollo.MutationHookOptions<UpdateOnePipelineProgressMutation, UpdateOnePipelineProgressMutationVariables>) {
const options = {...defaultOptions, ...baseOptions}
return Apollo.useMutation<UpdateOnePipelineProgressMutation, UpdateOnePipelineProgressMutationVariables>(UpdateOnePipelineProgressDocument, options);
}
export type UpdateOnePipelineProgressMutationHookResult = ReturnType<typeof useUpdateOnePipelineProgressMutation>;
export type UpdateOnePipelineProgressMutationResult = Apollo.MutationResult<UpdateOnePipelineProgressMutation>;
export type UpdateOnePipelineProgressMutationOptions = Apollo.BaseMutationOptions<UpdateOnePipelineProgressMutation, UpdateOnePipelineProgressMutationVariables>;
export const GetPeopleDocument = gql`
query GetPeople($orderBy: [PersonOrderByWithRelationInput!], $where: PersonWhereInput, $limit: Int) {
people: findManyPerson(orderBy: $orderBy, where: $where, take: $limit) {

View File

@ -4,9 +4,10 @@ import {
Draggable,
Droppable,
OnDragEndResponder,
} from '@hello-pangea/dnd';
} from '@hello-pangea/dnd'; // Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd https://github.com/atlassian/react-beautiful-dnd/issues/2350
import {
BoardItemKey,
Column,
getOptimisticlyUpdatedBoard,
Items,
@ -17,8 +18,6 @@ import {
StyledColumn,
StyledColumnTitle,
} from '../../ui/components/board/BoardColumn';
// Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd
// https://github.com/atlassian/react-beautiful-dnd/issues/2350
import { BoardItem } from '../../ui/components/board/BoardItem';
import { NewButton } from '../../ui/components/board/BoardNewButton';
@ -27,19 +26,29 @@ import { BoardCard } from './BoardCard';
type BoardProps = {
initialBoard: Column[];
items: Items;
onUpdate?: (itemKey: BoardItemKey, columnId: Column['id']) => Promise<void>;
};
export const Board = ({ initialBoard, items }: BoardProps) => {
export const Board = ({ initialBoard, items, onUpdate }: BoardProps) => {
const [board, setBoard] = useState<Column[]>(initialBoard);
const onDragEnd: OnDragEndResponder = useCallback(
(result) => {
async (result) => {
const newBoard = getOptimisticlyUpdatedBoard(board, result);
if (!newBoard) return;
setBoard(newBoard);
// TODO implement update board mutation
try {
const draggedEntityId = items[result.draggableId]?.id;
const destinationColumnId = result.destination?.droppableId;
draggedEntityId &&
destinationColumnId &&
onUpdate &&
(await onUpdate(draggedEntityId, destinationColumnId));
} catch (e) {
console.error(e);
}
},
[board],
[board, onUpdate, items],
);
return (

View File

@ -50,8 +50,9 @@ const StyledBoardCardBody = styled.div`
`;
export const BoardCard = ({ item }: { item: Person | Company }) => {
if (item.__typename === 'Person') return <PersonBoardCard person={item} />;
if (item.__typename === 'Company') return <CompanyBoardCard company={item} />;
if (item?.__typename === 'Person') return <PersonBoardCard person={item} />;
if (item?.__typename === 'Company')
return <CompanyBoardCard company={item} />;
// @todo return card skeleton
return null;
};

View File

@ -24,38 +24,49 @@ export const useBoard = () => {
const pipelineStages = pipelines.data?.findManyPipeline[0].pipelineStages;
const initialBoard: Column[] =
pipelineStages?.map((pipelineStage) => ({
id: pipelineStage.name,
id: pipelineStage.id,
title: pipelineStage.name,
colorCode: pipelineStage.color,
itemKeys:
pipelineStage.pipelineProgresses?.map(
(item) => `item-${item.progressableId}` as BoardItemKey,
(item) => item.progressableId as BoardItemKey,
) || [],
})) || [];
const pipelineEntityIds = pipelineStages?.reduce(
(acc, pipelineStage) => [
...acc,
...(pipelineStage.pipelineProgresses?.map(
(item) => item.progressableId,
) || []),
...(pipelineStage.pipelineProgresses?.map((item) => ({
entityId: item?.progressableId,
pipelineProgressId: item?.id,
})) || []),
],
[] as string[],
[] as { entityId: string; pipelineProgressId: string }[],
);
const pipelineEntityIdsMapper = (entityId: string) => {
const pipelineProgressId = pipelineEntityIds?.find(
(item) => item.entityId === entityId,
)?.pipelineProgressId;
return pipelineProgressId;
};
const pipelineEntityType: 'Person' | 'Company' | undefined =
pipelineStages?.[0].pipelineProgresses?.[0].progressableType;
pipelines.data?.findManyPipeline[0].pipelineProgressableType;
const query =
pipelineEntityType === 'Person' ? useGetPeopleQuery : useGetCompaniesQuery;
const entitiesQueryResult = query({
variables: { where: { id: { in: pipelineEntityIds } } },
variables: {
where: { id: { in: pipelineEntityIds?.map((item) => item.entityId) } },
},
});
const indexByIdReducer = (acc: Items, entity: { id: string }) => ({
...acc,
[`item-${entity.id}`]: entity,
[entity.id]: entity,
});
const items: Items | undefined = entitiesQueryResult.data
@ -71,5 +82,6 @@ export const useBoard = () => {
items,
loading: pipelines.loading || entitiesQueryResult.loading,
error: pipelines.error || entitiesQueryResult.error,
pipelineEntityIdsMapper,
};
};

View File

@ -2,10 +2,12 @@ import { gql } from '@apollo/client';
export const GET_PIPELINES = gql`
query GetPipelines {
findManyPipeline(skip: 1) {
findManyPipeline {
id
name
pipelineProgressableType
pipelineStages {
id
name
color
pipelineProgresses {
@ -17,3 +19,14 @@ export const GET_PIPELINES = gql`
}
}
`;
export const UPDATE_PIPELINE_STAGE = gql`
mutation UpdateOnePipelineProgress($id: String, $pipelineStageId: String) {
updateOnePipelineProgress(
where: { id: $id }
data: { pipelineStage: { connect: { id: $pipelineStageId } } }
) {
id
}
}
`;

View File

@ -1,5 +1,5 @@
import styled from '@emotion/styled';
import { DropResult } from '@hello-pangea/dnd';
import { DropResult } from '@hello-pangea/dnd'; // Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd https://github.com/atlassian/react-beautiful-dnd/issues/2350
export const StyledBoard = styled.div`
display: flex;
@ -7,7 +7,7 @@ export const StyledBoard = styled.div`
height: 100%;
`;
export type BoardItemKey = `item-${number | string}`;
export type BoardItemKey = string;
export type Item = any & { id: string };
export interface Items {
[key: string]: Item;

View File

@ -1,6 +1,6 @@
import React from 'react';
import styled from '@emotion/styled';
import { DroppableProvided } from '@hello-pangea/dnd';
import { DroppableProvided } from '@hello-pangea/dnd'; // Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd https://github.com/atlassian/react-beautiful-dnd/issues/2350
export const StyledColumn = styled.div`
background-color: ${({ theme }) => theme.primaryBackground};

View File

@ -1,5 +1,5 @@
import styled from '@emotion/styled';
import { DraggableProvided } from '@hello-pangea/dnd';
import { DraggableProvided } from '@hello-pangea/dnd'; // Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd https://github.com/atlassian/react-beautiful-dnd/issues/2350
const StyledCard = styled.div`
background-color: ${({ theme }) => theme.secondaryBackground};

View File

@ -1,11 +1,33 @@
import { useCallback } from 'react';
import { IconTargetArrow } from '@/ui/icons/index';
import { WithTopBarContainer } from '@/ui/layout/containers/WithTopBarContainer';
import {
PipelineProgress,
PipelineStage,
useUpdateOnePipelineProgressMutation,
} from '../../generated/graphql';
import { Board } from '../../modules/opportunities/components/Board';
import { useBoard } from '../../modules/opportunities/hooks/useBoard';
export function Opportunities() {
const { initialBoard, items, loading, error } = useBoard();
const { initialBoard, items, loading, error, pipelineEntityIdsMapper } =
useBoard();
const [updatePipelineProgress] = useUpdateOnePipelineProgressMutation();
const onUpdate = useCallback(
async (
entityId: NonNullable<PipelineProgress['progressableId']>,
pipelineStageId: NonNullable<PipelineStage['id']>,
) => {
const pipelineProgressId = pipelineEntityIdsMapper(entityId);
updatePipelineProgress({
variables: { id: pipelineProgressId, pipelineStageId },
});
},
[updatePipelineProgress, pipelineEntityIdsMapper],
);
if (loading) return <div>Loading...</div>;
if (error) return <div>Error...</div>;
@ -13,7 +35,7 @@ export function Opportunities() {
return <div>Initial board or items not found</div>;
return (
<WithTopBarContainer title="Opportunities" icon={<IconTargetArrow />}>
<Board initialBoard={initialBoard} items={items} />
<Board initialBoard={initialBoard} items={items} onUpdate={onUpdate} />
</WithTopBarContainer>
);
}

View File

@ -22,6 +22,9 @@ export class PipelineCountAggregateInput {
@Field(() => Boolean, { nullable: true })
icon?: true;
@Field(() => Boolean, { nullable: true })
pipelineProgressableType?: true;
@HideField()
workspaceId?: true;

View File

@ -23,6 +23,9 @@ export class PipelineCountAggregate {
@Field(() => Int, { nullable: false })
icon!: number;
@Field(() => Int, { nullable: false })
pipelineProgressableType!: number;
@HideField()
workspaceId!: number;

View File

@ -23,6 +23,9 @@ export class PipelineCountOrderByAggregateInput {
@Field(() => SortOrder, { nullable: true })
icon?: keyof typeof SortOrder;
@Field(() => SortOrder, { nullable: true })
pipelineProgressableType?: keyof typeof SortOrder;
@HideField()
workspaceId?: keyof typeof SortOrder;
}

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
@InputType()
export class PipelineCreateManyWorkspaceInput {
@ -20,4 +21,7 @@ export class PipelineCreateManyWorkspaceInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
}

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
@InputType()
@ -22,6 +23,9 @@ export class PipelineCreateManyInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@HideField()
workspaceId!: string;
}

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { PipelineStageCreateNestedManyWithoutPipelineInput } from '../pipeline-stage/pipeline-stage-create-nested-many-without-pipeline.input';
import { WorkspaceCreateNestedOneWithoutPipelinesInput } from '../workspace/workspace-create-nested-one-without-pipelines.input';
import { HideField } from '@nestjs/graphql';
@ -24,6 +25,9 @@ export class PipelineCreateWithoutPipelineProgressesInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@Field(() => PipelineStageCreateNestedManyWithoutPipelineInput, {
nullable: true,
})

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { PipelineProgressCreateNestedManyWithoutPipelineInput } from '../pipeline-progress/pipeline-progress-create-nested-many-without-pipeline.input';
import { WorkspaceCreateNestedOneWithoutPipelinesInput } from '../workspace/workspace-create-nested-one-without-pipelines.input';
import { HideField } from '@nestjs/graphql';
@ -24,6 +25,9 @@ export class PipelineCreateWithoutPipelineStagesInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@Field(() => PipelineProgressCreateNestedManyWithoutPipelineInput, {
nullable: true,
})

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { PipelineStageCreateNestedManyWithoutPipelineInput } from '../pipeline-stage/pipeline-stage-create-nested-many-without-pipeline.input';
import { PipelineProgressCreateNestedManyWithoutPipelineInput } from '../pipeline-progress/pipeline-progress-create-nested-many-without-pipeline.input';
@ -23,6 +24,9 @@ export class PipelineCreateWithoutWorkspaceInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@Field(() => PipelineStageCreateNestedManyWithoutPipelineInput, {
nullable: true,
})

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { PipelineStageCreateNestedManyWithoutPipelineInput } from '../pipeline-stage/pipeline-stage-create-nested-many-without-pipeline.input';
import { PipelineProgressCreateNestedManyWithoutPipelineInput } from '../pipeline-progress/pipeline-progress-create-nested-many-without-pipeline.input';
import { WorkspaceCreateNestedOneWithoutPipelinesInput } from '../workspace/workspace-create-nested-one-without-pipelines.input';
@ -25,6 +26,9 @@ export class PipelineCreateInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@Field(() => PipelineStageCreateNestedManyWithoutPipelineInput, {
nullable: true,
})

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { ObjectType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
import { PipelineCountAggregate } from './pipeline-count-aggregate.output';
import { PipelineMinAggregate } from './pipeline-min-aggregate.output';
@ -25,6 +26,9 @@ export class PipelineGroupBy {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: false })
pipelineProgressableType!: keyof typeof PipelineProgressableType;
@HideField()
workspaceId!: string;

View File

@ -22,6 +22,9 @@ export class PipelineMaxAggregateInput {
@Field(() => Boolean, { nullable: true })
icon?: true;
@Field(() => Boolean, { nullable: true })
pipelineProgressableType?: true;
@HideField()
workspaceId?: true;
}

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { ObjectType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
@ObjectType()
@ -22,6 +23,9 @@ export class PipelineMaxAggregate {
@Field(() => String, { nullable: true })
icon?: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@HideField()
workspaceId?: string;
}

View File

@ -23,6 +23,9 @@ export class PipelineMaxOrderByAggregateInput {
@Field(() => SortOrder, { nullable: true })
icon?: keyof typeof SortOrder;
@Field(() => SortOrder, { nullable: true })
pipelineProgressableType?: keyof typeof SortOrder;
@HideField()
workspaceId?: keyof typeof SortOrder;
}

View File

@ -22,6 +22,9 @@ export class PipelineMinAggregateInput {
@Field(() => Boolean, { nullable: true })
icon?: true;
@Field(() => Boolean, { nullable: true })
pipelineProgressableType?: true;
@HideField()
workspaceId?: true;
}

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { ObjectType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
@ObjectType()
@ -22,6 +23,9 @@ export class PipelineMinAggregate {
@Field(() => String, { nullable: true })
icon?: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@HideField()
workspaceId?: string;
}

View File

@ -23,6 +23,9 @@ export class PipelineMinOrderByAggregateInput {
@Field(() => SortOrder, { nullable: true })
icon?: keyof typeof SortOrder;
@Field(() => SortOrder, { nullable: true })
pipelineProgressableType?: keyof typeof SortOrder;
@HideField()
workspaceId?: keyof typeof SortOrder;
}

View File

@ -26,6 +26,9 @@ export class PipelineOrderByWithAggregationInput {
@Field(() => SortOrder, { nullable: true })
icon?: keyof typeof SortOrder;
@Field(() => SortOrder, { nullable: true })
pipelineProgressableType?: keyof typeof SortOrder;
@HideField()
workspaceId?: keyof typeof SortOrder;

View File

@ -26,6 +26,9 @@ export class PipelineOrderByWithRelationInput {
@Field(() => SortOrder, { nullable: true })
icon?: keyof typeof SortOrder;
@Field(() => SortOrder, { nullable: true })
pipelineProgressableType?: keyof typeof SortOrder;
@HideField()
workspaceId?: keyof typeof SortOrder;

View File

@ -7,6 +7,7 @@ export enum PipelineScalarFieldEnum {
deletedAt = 'deletedAt',
name = 'name',
icon = 'icon',
pipelineProgressableType = 'pipelineProgressableType',
workspaceId = 'workspaceId',
}

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringWithAggregatesFilter } from '../prisma/string-with-aggregates-filter.input';
import { DateTimeWithAggregatesFilter } from '../prisma/date-time-with-aggregates-filter.input';
import { DateTimeNullableWithAggregatesFilter } from '../prisma/date-time-nullable-with-aggregates-filter.input';
import { EnumPipelineProgressableTypeWithAggregatesFilter } from '../prisma/enum-pipeline-progressable-type-with-aggregates-filter.input';
import { HideField } from '@nestjs/graphql';
@InputType()
@ -34,6 +35,11 @@ export class PipelineScalarWhereWithAggregatesInput {
@Field(() => StringWithAggregatesFilter, { nullable: true })
icon?: StringWithAggregatesFilter;
@Field(() => EnumPipelineProgressableTypeWithAggregatesFilter, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeWithAggregatesFilter;
@HideField()
workspaceId?: StringWithAggregatesFilter;
}

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFilter } from '../prisma/string-filter.input';
import { DateTimeFilter } from '../prisma/date-time-filter.input';
import { DateTimeNullableFilter } from '../prisma/date-time-nullable-filter.input';
import { EnumPipelineProgressableTypeFilter } from '../prisma/enum-pipeline-progressable-type-filter.input';
import { HideField } from '@nestjs/graphql';
@InputType()
@ -34,6 +35,9 @@ export class PipelineScalarWhereInput {
@Field(() => StringFilter, { nullable: true })
icon?: StringFilter;
@Field(() => EnumPipelineProgressableTypeFilter, { nullable: true })
pipelineProgressableType?: EnumPipelineProgressableTypeFilter;
@HideField()
workspaceId?: StringFilter;
}

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
import { PipelineStageUncheckedCreateNestedManyWithoutPipelineInput } from '../pipeline-stage/pipeline-stage-unchecked-create-nested-many-without-pipeline.input';
@ -23,6 +24,9 @@ export class PipelineUncheckedCreateWithoutPipelineProgressesInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@HideField()
workspaceId!: string;

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
import { PipelineProgressUncheckedCreateNestedManyWithoutPipelineInput } from '../pipeline-progress/pipeline-progress-unchecked-create-nested-many-without-pipeline.input';
@ -23,6 +24,9 @@ export class PipelineUncheckedCreateWithoutPipelineStagesInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@HideField()
workspaceId!: string;

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { PipelineStageUncheckedCreateNestedManyWithoutPipelineInput } from '../pipeline-stage/pipeline-stage-unchecked-create-nested-many-without-pipeline.input';
import { PipelineProgressUncheckedCreateNestedManyWithoutPipelineInput } from '../pipeline-progress/pipeline-progress-unchecked-create-nested-many-without-pipeline.input';
@ -23,6 +24,9 @@ export class PipelineUncheckedCreateWithoutWorkspaceInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@Field(() => PipelineStageUncheckedCreateNestedManyWithoutPipelineInput, {
nullable: true,
})

View File

@ -1,5 +1,6 @@
import { Field } from '@nestjs/graphql';
import { InputType } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
import { PipelineStageUncheckedCreateNestedManyWithoutPipelineInput } from '../pipeline-stage/pipeline-stage-unchecked-create-nested-many-without-pipeline.input';
import { PipelineProgressUncheckedCreateNestedManyWithoutPipelineInput } from '../pipeline-progress/pipeline-progress-unchecked-create-nested-many-without-pipeline.input';
@ -24,6 +25,9 @@ export class PipelineUncheckedCreateInput {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, { nullable: true })
pipelineProgressableType?: keyof typeof PipelineProgressableType;
@HideField()
workspaceId!: string;

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
@InputType()
export class PipelineUncheckedUpdateManyWithoutPipelinesInput {
@ -23,4 +24,9 @@ export class PipelineUncheckedUpdateManyWithoutPipelinesInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
}

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { HideField } from '@nestjs/graphql';
@InputType()
@ -25,6 +26,11 @@ export class PipelineUncheckedUpdateManyInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@HideField()
workspaceId?: StringFieldUpdateOperationsInput;
}

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { HideField } from '@nestjs/graphql';
import { PipelineStageUncheckedUpdateManyWithoutPipelineNestedInput } from '../pipeline-stage/pipeline-stage-unchecked-update-many-without-pipeline-nested.input';
@ -26,6 +27,11 @@ export class PipelineUncheckedUpdateWithoutPipelineProgressesInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@HideField()
workspaceId?: StringFieldUpdateOperationsInput;

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { HideField } from '@nestjs/graphql';
import { PipelineProgressUncheckedUpdateManyWithoutPipelineNestedInput } from '../pipeline-progress/pipeline-progress-unchecked-update-many-without-pipeline-nested.input';
@ -26,6 +27,11 @@ export class PipelineUncheckedUpdateWithoutPipelineStagesInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@HideField()
workspaceId?: StringFieldUpdateOperationsInput;

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { PipelineStageUncheckedUpdateManyWithoutPipelineNestedInput } from '../pipeline-stage/pipeline-stage-unchecked-update-many-without-pipeline-nested.input';
import { PipelineProgressUncheckedUpdateManyWithoutPipelineNestedInput } from '../pipeline-progress/pipeline-progress-unchecked-update-many-without-pipeline-nested.input';
@ -26,6 +27,11 @@ export class PipelineUncheckedUpdateWithoutWorkspaceInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@Field(() => PipelineStageUncheckedUpdateManyWithoutPipelineNestedInput, {
nullable: true,
})

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { HideField } from '@nestjs/graphql';
import { PipelineStageUncheckedUpdateManyWithoutPipelineNestedInput } from '../pipeline-stage/pipeline-stage-unchecked-update-many-without-pipeline-nested.input';
import { PipelineProgressUncheckedUpdateManyWithoutPipelineNestedInput } from '../pipeline-progress/pipeline-progress-unchecked-update-many-without-pipeline-nested.input';
@ -27,6 +28,11 @@ export class PipelineUncheckedUpdateInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@HideField()
workspaceId?: StringFieldUpdateOperationsInput;

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
@InputType()
export class PipelineUpdateManyMutationInput {
@ -23,4 +24,9 @@ export class PipelineUpdateManyMutationInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
}

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { PipelineStageUpdateManyWithoutPipelineNestedInput } from '../pipeline-stage/pipeline-stage-update-many-without-pipeline-nested.input';
import { WorkspaceUpdateOneRequiredWithoutPipelinesNestedInput } from '../workspace/workspace-update-one-required-without-pipelines-nested.input';
import { HideField } from '@nestjs/graphql';
@ -27,6 +28,11 @@ export class PipelineUpdateWithoutPipelineProgressesInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@Field(() => PipelineStageUpdateManyWithoutPipelineNestedInput, {
nullable: true,
})

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { PipelineProgressUpdateManyWithoutPipelineNestedInput } from '../pipeline-progress/pipeline-progress-update-many-without-pipeline-nested.input';
import { WorkspaceUpdateOneRequiredWithoutPipelinesNestedInput } from '../workspace/workspace-update-one-required-without-pipelines-nested.input';
import { HideField } from '@nestjs/graphql';
@ -27,6 +28,11 @@ export class PipelineUpdateWithoutPipelineStagesInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@Field(() => PipelineProgressUpdateManyWithoutPipelineNestedInput, {
nullable: true,
})

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { PipelineStageUpdateManyWithoutPipelineNestedInput } from '../pipeline-stage/pipeline-stage-update-many-without-pipeline-nested.input';
import { PipelineProgressUpdateManyWithoutPipelineNestedInput } from '../pipeline-progress/pipeline-progress-update-many-without-pipeline-nested.input';
@ -26,6 +27,11 @@ export class PipelineUpdateWithoutWorkspaceInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@Field(() => PipelineStageUpdateManyWithoutPipelineNestedInput, {
nullable: true,
})

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
import { EnumPipelineProgressableTypeFieldUpdateOperationsInput } from '../prisma/enum-pipeline-progressable-type-field-update-operations.input';
import { PipelineStageUpdateManyWithoutPipelineNestedInput } from '../pipeline-stage/pipeline-stage-update-many-without-pipeline-nested.input';
import { PipelineProgressUpdateManyWithoutPipelineNestedInput } from '../pipeline-progress/pipeline-progress-update-many-without-pipeline-nested.input';
import { WorkspaceUpdateOneRequiredWithoutPipelinesNestedInput } from '../workspace/workspace-update-one-required-without-pipelines-nested.input';
@ -28,6 +29,11 @@ export class PipelineUpdateInput {
@Field(() => StringFieldUpdateOperationsInput, { nullable: true })
icon?: StringFieldUpdateOperationsInput;
@Field(() => EnumPipelineProgressableTypeFieldUpdateOperationsInput, {
nullable: true,
})
pipelineProgressableType?: EnumPipelineProgressableTypeFieldUpdateOperationsInput;
@Field(() => PipelineStageUpdateManyWithoutPipelineNestedInput, {
nullable: true,
})

View File

@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
import { StringFilter } from '../prisma/string-filter.input';
import { DateTimeFilter } from '../prisma/date-time-filter.input';
import { DateTimeNullableFilter } from '../prisma/date-time-nullable-filter.input';
import { EnumPipelineProgressableTypeFilter } from '../prisma/enum-pipeline-progressable-type-filter.input';
import { HideField } from '@nestjs/graphql';
import { PipelineStageListRelationFilter } from '../pipeline-stage/pipeline-stage-list-relation-filter.input';
import { PipelineProgressListRelationFilter } from '../pipeline-progress/pipeline-progress-list-relation-filter.input';
@ -37,6 +38,9 @@ export class PipelineWhereInput {
@Field(() => StringFilter, { nullable: true })
icon?: StringFilter;
@Field(() => EnumPipelineProgressableTypeFilter, { nullable: true })
pipelineProgressableType?: EnumPipelineProgressableTypeFilter;
@HideField()
workspaceId?: StringFilter;

View File

@ -1,6 +1,7 @@
import { Field } from '@nestjs/graphql';
import { ObjectType } from '@nestjs/graphql';
import { ID } from '@nestjs/graphql';
import { PipelineProgressableType } from '../prisma/pipeline-progressable-type.enum';
import { HideField } from '@nestjs/graphql';
import { PipelineStage } from '../pipeline-stage/pipeline-stage.model';
import { PipelineProgress } from '../pipeline-progress/pipeline-progress.model';
@ -27,6 +28,12 @@ export class Pipeline {
@Field(() => String, { nullable: false })
icon!: string;
@Field(() => PipelineProgressableType, {
nullable: false,
defaultValue: 'Company',
})
pipelineProgressableType!: keyof typeof PipelineProgressableType;
@HideField()
workspaceId!: string;

View File

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "pipelines" ADD COLUMN "pipelineProgressableType" "PipelineProgressableType" NOT NULL DEFAULT 'Company';

View File

@ -293,6 +293,7 @@ model Pipeline {
icon String
pipelineStages PipelineStage[]
pipelineProgresses PipelineProgress[]
pipelineProgressableType PipelineProgressableType @default(Company)
/// @TypeGraphQL.omit(input: true, output: true)
workspaceId String
/// @TypeGraphQL.omit(input: true, output: true)

View File

@ -8,6 +8,7 @@ export const seedPipelines = async (prisma: PrismaClient) => {
name: 'Sales pipeline',
icon: '💰',
workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
pipelineProgressableType: 'Person',
},
});
@ -97,6 +98,7 @@ export const seedPipelines = async (prisma: PrismaClient) => {
name: 'Customer support pipeline',
icon: '📔',
workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
pipelineProgressableType: 'Person',
},
});
@ -134,6 +136,7 @@ export const seedPipelines = async (prisma: PrismaClient) => {
name: 'Sales pipeline',
icon: '💰',
workspaceId: 'twenty-dev-7ed9d212-1c25-4d02-bf25-6aeccf7ea420',
pipelineProgressableType: 'Person',
},
});
@ -201,17 +204,4 @@ export const seedPipelines = async (prisma: PrismaClient) => {
workspaceId: 'twenty-dev-7ed9d212-1c25-4d02-bf25-6aeccf7ea420',
},
});
await prisma.pipelineProgress.upsert({
where: { id: 'twenty-dev-fe256b39-3ec3-4fe7-8998-b76aa0bfb600' },
update: {},
create: {
id: 'twenty-dev-fe256b39-3ec3-4fe7-8998-b76aa0bfb600',
pipelineId: 'twenty-dev-fe256b39-3ec3-4fe3-8997-b75aa0bfb400',
pipelineStageId: 'twenty-dev-fe256b39-3ec3-4fe3-8998-b76aa0bfb600',
progressableType: 'Company',
progressableId: 'twenty-dev-a674fa6c-1455-4c57-afaf-dd5dc086361e',
workspaceId: 'twenty-dev-7ed9d212-1c25-4d02-bf25-6aeccf7ea420',
},
});
};