From 772711154d55e3e893158fe80f96f1c61535c040 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Tue, 19 Sep 2023 14:59:08 -0700 Subject: [PATCH] Fix bug company update (#1664) --- front/.storybook/main.js | 1 - front/nyc.config.js | 15 ++++++++- .../table/components/CompanyTable.tsx | 33 ++++++++----------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/front/.storybook/main.js b/front/.storybook/main.js index d6f32838c..08739d6ea 100644 --- a/front/.storybook/main.js +++ b/front/.storybook/main.js @@ -10,7 +10,6 @@ computeStoriesGlob = () => { } return ['../src/**/*.stories.@(js|jsx|ts|tsx)'] - }; module.exports = { diff --git a/front/nyc.config.js b/front/nyc.config.js index 7bc9d5d25..3b050162c 100644 --- a/front/nyc.config.js +++ b/front/nyc.config.js @@ -1,3 +1,12 @@ +const globalCoverage = { + "statements": 60, + "lines": 60, + "functions": 60, + "exclude": [ + "src/generated/**/*", + ] +}; + const modulesCoverage = { "statements": 50, "lines": 50, @@ -17,4 +26,8 @@ const pagesCoverage = { ] }; -module.exports = process.env.STORYBOOK_STORIES_FOLDER === 'modules' ? modulesCoverage : pagesCoverage; \ No newline at end of file +const storybookStoriesFolders = process.env.STORYBOOK_STORIES_FOLDER; + +module.exports = storybookStoriesFolders === 'pages' ? + pagesCoverage : storybookStoriesFolders === 'modules' ? modulesCoverage + : globalCoverage; \ No newline at end of file diff --git a/front/src/modules/companies/table/components/CompanyTable.tsx b/front/src/modules/companies/table/components/CompanyTable.tsx index 623922bdb..92c7db041 100644 --- a/front/src/modules/companies/table/components/CompanyTable.tsx +++ b/front/src/modules/companies/table/components/CompanyTable.tsx @@ -49,30 +49,23 @@ export const CompanyTable = () => { const updateCompany = async ( variables: UpdateOneCompanyMutationVariables, ) => { - const workspaceMemberAccountOwner = variables.data.accountOwner - ? ( - await getWorkspaceMember({ - variables: { - where: { - userId: { equals: variables.data.accountOwner.connect?.id }, - }, + if (variables.data.accountOwner?.connect?.id) { + const workspaceMemberAccountOwner = ( + await getWorkspaceMember({ + variables: { + where: { + userId: { equals: variables.data.accountOwner.connect?.id }, }, - }) - ).data?.workspaceMembers?.[0] - : undefined; - - const data = { - ...variables.data, - workspaceMemberAccountOwner: { + }, + }) + ).data?.workspaceMembers?.[0]; + variables.data.workspaceMemberAccountOwner = { connect: { id: workspaceMemberAccountOwner?.id }, - }, - }; + }; + } updateEntityMutation({ - variables: { - ...variables, - data, - }, + variables: variables, onCompleted: (data) => { if (!data.updateOneCompany) { return;