From a7a8e05fd26147a8592bfcadfbbc59264954a349 Mon Sep 17 00:00:00 2001 From: Lykke Axlin Date: Wed, 15 Dec 2021 10:26:29 +0100 Subject: [PATCH] cleanup Signed-off-by: Lykke Axlin Co-authored-by: klaraab --- .../src/service/DatabaseHandler.test.ts | 1 + .../EntityBazaarInfoContent.tsx | 15 ++++++--------- .../HomePageBazaarInfoCard.tsx | 14 ++++++-------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts b/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts index aec043a4a4..3099e5bbb2 100644 --- a/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts +++ b/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts @@ -29,6 +29,7 @@ const bazaarProject: any = { size: 'small', responsible: 'r', }; + describe('DatabaseHandler', () => { const databases = TestDatabases.create({ ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'], diff --git a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx index e96fb9b4f1..f2c005abd1 100644 --- a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx +++ b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx @@ -69,15 +69,12 @@ export const EntityBazaarInfoContent = ({ }, [fetchMembers, fetchUserId]); useEffect(() => { - if (userId.value) { - if (members.value) { - const isBazaarMember = - members.value - ?.map((member: Member) => member.userId) - .indexOf(userId.value) >= 0; - - setIsMember(isBazaarMember); - } + if (members.value && userId.value) { + setIsMember( + members.value + ?.map((member: Member) => member.userId) + .indexOf(userId.value) >= 0, + ); } }, [bazaarProject, members, identity, userId.value]); diff --git a/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx b/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx index 06872467f5..daca0aec1d 100644 --- a/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx +++ b/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx @@ -115,14 +115,12 @@ export const HomePageBazaarInfoCard = ({ }, [fetchMembers, fetchBazaarProject, fetchCatalogEntities, fetchUserId]); useEffect(() => { - if (userId.value) { - if (members.value) { - const isBazaarMember = - members?.value - ?.map((member: Member) => member.userId) - .indexOf(userId.value) >= 0; - setIsMember(isBazaarMember); - } + if (members.value && userId.value) { + setIsMember( + members.value + ?.map((member: Member) => member.userId) + .indexOf(userId.value) >= 0, + ); } }, [bazaarProject.value, members, identity, userId.value]);