From 1b8b78d61581d5295579d5d4b3e7c7f5dcc27ce1 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Thu, 22 Jun 2023 14:57:08 -0700
Subject: [PATCH] Various fixes (#362)

---
 front/src/generated/graphql.tsx                      |  7 ++++---
 .../modules/opportunities/components/NewButton.tsx   |  1 +
 front/src/modules/opportunities/queries/index.ts     |  2 ++
 .../modules/pipelines/components/PipelineChip.tsx    |  2 +-
 .../pipelines/interfaces/pipeline.interface.ts       | 12 ------------
 server/src/ability/ability.factory.ts                |  6 ++++++
 .../src/ability/handlers/company.ability-handler.ts  |  1 +
 server/src/core/company/company.resolver.ts          |  4 ++--
 8 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 front/src/modules/pipelines/interfaces/pipeline.interface.ts

diff --git a/front/src/generated/graphql.tsx b/front/src/generated/graphql.tsx
index 74bd17043..11f9373ea 100644
--- a/front/src/generated/graphql.tsx
+++ b/front/src/generated/graphql.tsx
@@ -1517,7 +1517,6 @@ export type WorkspaceMember = {
   user: User;
   userId: Scalars['String'];
   workspace: Workspace;
-  workspaceId: Scalars['String'];
 };
 
 export type CreateCommentMutationVariables = Exact<{
@@ -1633,6 +1632,7 @@ export type UpdateOnePipelineProgressMutationVariables = Exact<{
 export type UpdateOnePipelineProgressMutation = { __typename?: 'Mutation', updateOnePipelineProgress?: { __typename?: 'PipelineProgress', id: string } | null };
 
 export type CreateOnePipelineProgressMutationVariables = Exact<{
+  uuid: Scalars['String'];
   entityType: PipelineProgressableType;
   entityId: Scalars['String'];
   pipelineId: Scalars['String'];
@@ -2298,9 +2298,9 @@ export type UpdateOnePipelineProgressMutationHookResult = ReturnType<typeof useU
 export type UpdateOnePipelineProgressMutationResult = Apollo.MutationResult<UpdateOnePipelineProgressMutation>;
 export type UpdateOnePipelineProgressMutationOptions = Apollo.BaseMutationOptions<UpdateOnePipelineProgressMutation, UpdateOnePipelineProgressMutationVariables>;
 export const CreateOnePipelineProgressDocument = gql`
-    mutation CreateOnePipelineProgress($entityType: PipelineProgressableType!, $entityId: String!, $pipelineId: String!, $pipelineStageId: String!) {
+    mutation CreateOnePipelineProgress($uuid: String!, $entityType: PipelineProgressableType!, $entityId: String!, $pipelineId: String!, $pipelineStageId: String!) {
   createOnePipelineProgress(
-    data: {progressableType: $entityType, progressableId: $entityId, pipeline: {connect: {id: $pipelineId}}, pipelineStage: {connect: {id: $pipelineStageId}}}
+    data: {id: $uuid, progressableType: $entityType, progressableId: $entityId, pipeline: {connect: {id: $pipelineId}}, pipelineStage: {connect: {id: $pipelineStageId}}}
   ) {
     id
   }
@@ -2321,6 +2321,7 @@ export type CreateOnePipelineProgressMutationFn = Apollo.MutationFunction<Create
  * @example
  * const [createOnePipelineProgressMutation, { data, loading, error }] = useCreateOnePipelineProgressMutation({
  *   variables: {
+ *      uuid: // value for 'uuid'
  *      entityType: // value for 'entityType'
  *      entityId: // value for 'entityId'
  *      pipelineId: // value for 'pipelineId'
diff --git a/front/src/modules/opportunities/components/NewButton.tsx b/front/src/modules/opportunities/components/NewButton.tsx
index 8f6da0acc..77e6ed8a4 100644
--- a/front/src/modules/opportunities/components/NewButton.tsx
+++ b/front/src/modules/opportunities/components/NewButton.tsx
@@ -48,6 +48,7 @@ export function NewButton({ pipelineId, columnId }: OwnProps) {
       setBoard(newBoard);
       await createOnePipelineProgress({
         variables: {
+          uuid: newUuid,
           pipelineStageId: columnId,
           pipelineId,
           entityId: company.id,
diff --git a/front/src/modules/opportunities/queries/index.ts b/front/src/modules/opportunities/queries/index.ts
index 5753c37e2..b19ccb830 100644
--- a/front/src/modules/opportunities/queries/index.ts
+++ b/front/src/modules/opportunities/queries/index.ts
@@ -33,6 +33,7 @@ export const UPDATE_PIPELINE_STAGE = gql`
 
 export const ADD_ENTITY_TO_PIPELINE = gql`
   mutation CreateOnePipelineProgress(
+    $uuid: String!
     $entityType: PipelineProgressableType!
     $entityId: String!
     $pipelineId: String!
@@ -40,6 +41,7 @@ export const ADD_ENTITY_TO_PIPELINE = gql`
   ) {
     createOnePipelineProgress(
       data: {
+        id: $uuid
         progressableType: $entityType
         progressableId: $entityId
         pipeline: { connect: { id: $pipelineId } }
diff --git a/front/src/modules/pipelines/components/PipelineChip.tsx b/front/src/modules/pipelines/components/PipelineChip.tsx
index 9de2c298e..47bfdd777 100644
--- a/front/src/modules/pipelines/components/PipelineChip.tsx
+++ b/front/src/modules/pipelines/components/PipelineChip.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import styled from '@emotion/styled';
 
-import { Pipeline } from '../interfaces/pipeline.interface';
+import { Pipeline } from '~/generated/graphql';
 
 type OwnProps = {
   opportunity: Pipeline;
diff --git a/front/src/modules/pipelines/interfaces/pipeline.interface.ts b/front/src/modules/pipelines/interfaces/pipeline.interface.ts
deleted file mode 100644
index 5fc0283fa..000000000
--- a/front/src/modules/pipelines/interfaces/pipeline.interface.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface Pipeline {
-  id: string;
-  name?: string;
-  icon?: string | null;
-}
-
-export interface GraphqlQueryPipeline {
-  id: string;
-  name?: string;
-  icon?: string | null;
-  __typename?: string;
-}
diff --git a/server/src/ability/ability.factory.ts b/server/src/ability/ability.factory.ts
index 1f92dc4a6..26bdd97a0 100644
--- a/server/src/ability/ability.factory.ts
+++ b/server/src/ability/ability.factory.ts
@@ -61,18 +61,24 @@ export class AbilityFactory {
 
     // Company
     can(AbilityAction.Read, 'Company', { workspaceId: workspace.id });
+    can(AbilityAction.Create, 'Company');
+    can(AbilityAction.Update, 'Company', { workspaceId: workspace.id });
 
     // Person
     can(AbilityAction.Read, 'Person', { workspaceId: workspace.id });
+    can(AbilityAction.Create, 'Person');
+    can(AbilityAction.Update, 'Person', { workspaceId: workspace.id });
 
     // RefreshToken
     cannot(AbilityAction.Manage, 'RefreshToken');
 
     // CommentThread
     can(AbilityAction.Read, 'CommentThread', { workspaceId: workspace.id });
+    can(AbilityAction.Create, 'CommentThread');
 
     // Comment
     can(AbilityAction.Read, 'Comment', { workspaceId: workspace.id });
+    can(AbilityAction.Create, 'Comment');
     can(AbilityAction.Update, 'Comment', {
       workspaceId: workspace.id,
       authorId: user.id,
diff --git a/server/src/ability/handlers/company.ability-handler.ts b/server/src/ability/handlers/company.ability-handler.ts
index eecdff821..8ae6f063e 100644
--- a/server/src/ability/handlers/company.ability-handler.ts
+++ b/server/src/ability/handlers/company.ability-handler.ts
@@ -47,6 +47,7 @@ export class UpdateCompanyAbilityHandler implements IAbilityHandler {
     const company = await this.prismaService.company.findFirst({
       where: args.where,
     });
+
     assert(company, '', NotFoundException);
 
     return ability.can(AbilityAction.Update, subject('Company', company));
diff --git a/server/src/core/company/company.resolver.ts b/server/src/core/company/company.resolver.ts
index 155db7997..e41aa17dd 100644
--- a/server/src/core/company/company.resolver.ts
+++ b/server/src/core/company/company.resolver.ts
@@ -24,11 +24,11 @@ import {
   CreateCompanyAbilityHandler,
   DeleteCompanyAbilityHandler,
   ReadCompanyAbilityHandler,
+  UpdateCompanyAbilityHandler,
 } from 'src/ability/handlers/company.ability-handler';
 import { UserAbility } from 'src/decorators/user-ability.decorator';
 import { AppAbility } from 'src/ability/ability.factory';
 import { accessibleBy } from '@casl/prisma';
-import { UpdateCommentAbilityHandler } from 'src/ability/handlers/comment.ability-handler';
 
 @UseGuards(JwtAuthGuard)
 @Resolver(() => Company)
@@ -59,7 +59,7 @@ export class CompanyResolver {
     nullable: true,
   })
   @UseGuards(AbilityGuard)
-  @CheckAbilities(UpdateCommentAbilityHandler)
+  @CheckAbilities(UpdateCompanyAbilityHandler)
   async updateOneCompany(
     @Args() args: UpdateOneCompanyArgs,
     @PrismaSelector({ modelName: 'Company' })