From 3d926623a8e6be9368bed813fd16898eba758f77 Mon Sep 17 00:00:00 2001
From: anilb <epipav@gmail.com>
Date: Tue, 1 Oct 2024 15:11:51 +0200
Subject: [PATCH 1/2] Disable activity aggregates on unmerge preview (#2631)

---
 backend/src/services/memberService.ts | 49 +++++++++++++++------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/backend/src/services/memberService.ts b/backend/src/services/memberService.ts
index 7756b1b1b..dbe380828 100644
--- a/backend/src/services/memberService.ts
+++ b/backend/src/services/memberService.ts
@@ -53,7 +53,7 @@ import {
   removeMemberTasks,
 } from '@crowd/data-access-layer/src/members'
 import { findMemberAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
-import { getActivityCountOfMemberIdentities } from '@crowd/data-access-layer'
+// import { getActivityCountOfMemberIdentities } from '@crowd/data-access-layer'
 import { fetchManySegments } from '@crowd/data-access-layer/src/segments'
 import { QueryExecutor, optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
 import { TEMPORAL_CONFIG } from '@/conf'
@@ -1161,17 +1161,19 @@ export default class MemberService extends LoggerBase {
           )
           member.memberOrganizations = unmergedRoles as IMemberRoleWithOrganization[]
 
+          const secondaryActivityCount = 0
+          const primaryActivityCount = 0
           // activity count
-          const secondaryActivityCount = await getActivityCountOfMemberIdentities(
-            this.options.qdb,
-            member.id,
-            secondaryBackup.identities,
-          )
-          const primaryActivityCount = await getActivityCountOfMemberIdentities(
-            this.options.qdb,
-            member.id,
-            member.identities,
-          )
+          // const secondaryActivityCount = await getActivityCountOfMemberIdentities(
+          //   this.options.qdb,
+          //   member.id,
+          //   secondaryBackup.identities,
+          // )
+          // const primaryActivityCount = await getActivityCountOfMemberIdentities(
+          //   this.options.qdb,
+          //   member.id,
+          //   member.identities,
+          // )
 
           return {
             primary: {
@@ -1210,17 +1212,20 @@ export default class MemberService extends LoggerBase {
         throw new Error(`Original member only has one identity, cannot extract it!`)
       }
 
-      const secondaryActivityCount = await getActivityCountOfMemberIdentities(
-        this.options.qdb,
-        member.id,
-        secondaryIdentities,
-      )
-
-      const primaryActivityCount = await getActivityCountOfMemberIdentities(
-        this.options.qdb,
-        member.id,
-        primaryIdentities,
-      )
+      const secondaryActivityCount = 0
+      const primaryActivityCount = 0
+
+      // const secondaryActivityCount = await getActivityCountOfMemberIdentities(
+      //   this.options.qdb,
+      //   member.id,
+      //   secondaryIdentities,
+      // )
+      //
+      // const primaryActivityCount = await getActivityCountOfMemberIdentities(
+      //   this.options.qdb,
+      //   member.id,
+      //   primaryIdentities,
+      // )
 
       const primaryMemberRoles = await MemberOrganizationRepository.findMemberRoles(
         member.id,

From 5da42e0076cf0b67b493225b6ddafa0875cb1e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Grom?= <gasper.grom@gmail.com>
Date: Wed, 2 Oct 2024 11:54:30 +0200
Subject: [PATCH 2/2] Remove tooltip for enrichment

---
 .../components/shared/contributor-last-enrichment.vue      | 7 -------
 .../components/shared/organization-last-enrichment.vue     | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/frontend/src/modules/contributor/components/shared/contributor-last-enrichment.vue b/frontend/src/modules/contributor/components/shared/contributor-last-enrichment.vue
index 1c51860cb..c7ec4b089 100644
--- a/frontend/src/modules/contributor/components/shared/contributor-last-enrichment.vue
+++ b/frontend/src/modules/contributor/components/shared/contributor-last-enrichment.vue
@@ -3,18 +3,11 @@
     <p class="text-tiny text-gray-500 mr-2 text-right">
       Last enrichment on {{ moment(props.contributor.lastEnriched).format('MMM DD, YYYY') }}
     </p>
-    <lf-tooltip
-      content="Profile is enriched via GitHub identity or email. Enrichment is processed every 3 months."
-    >
-      <lf-icon name="question-line" :size="16" class="text-gray-400" />
-    </lf-tooltip>
   </div>
 </template>
 
 <script setup lang="ts">
-import LfIcon from '@/ui-kit/icon/Icon.vue';
 import moment from 'moment';
-import LfTooltip from '@/ui-kit/tooltip/Tooltip.vue';
 import { Contributor } from '@/modules/contributor/types/Contributor';
 
 const props = defineProps<{
diff --git a/frontend/src/modules/organization/components/shared/organization-last-enrichment.vue b/frontend/src/modules/organization/components/shared/organization-last-enrichment.vue
index fb7254dfb..e557f6c40 100644
--- a/frontend/src/modules/organization/components/shared/organization-last-enrichment.vue
+++ b/frontend/src/modules/organization/components/shared/organization-last-enrichment.vue
@@ -3,18 +3,11 @@
     <p class="text-tiny text-gray-500 mr-2 text-right">
       Last enrichment on {{ moment(props.organization.lastEnrichedAt).format('MMM DD, YYYY') }}
     </p>
-    <lf-tooltip
-      content="Organization data is enriched via GitHub identity. Enrichment is processed every 3 months."
-    >
-      <lf-icon name="question-line" :size="16" class="text-gray-400" />
-    </lf-tooltip>
   </div>
 </template>
 
 <script setup lang="ts">
-import LfIcon from '@/ui-kit/icon/Icon.vue';
 import moment from 'moment';
-import LfTooltip from '@/ui-kit/tooltip/Tooltip.vue';
 import { Organization } from '@/modules/organization/types/Organization';
 
 const props = defineProps<{