Merge missing commits from lfx-main into main (#1038)

Co-authored-by: Joan Reyero <[email protected]>
Co-authored-by: Uroš Marolt <[email protected]>
Co-authored-by: garrrikkotua <[email protected]>

Author: 4 people

backend/src/database/repositories/segmentRepository.ts

@@ -467,7 +467,7 @@ class SegmentRepository extends RepositoryBase<
       {
         replacements: {
           tenantId: this.currentTenant.id,
-          name: `${criteria.filter?.name}%`,
+          name: `%${criteria.filter?.name}%`,
           status: criteria.filter?.status,
         },
         type: QueryTypes.SELECT,
@@ -642,8 +642,10 @@ class SegmentRepository extends RepositoryBase<
     activityTypes.default = lodash.cloneDeep(DEFAULT_ACTIVITY_TYPE_SETTINGS)
     activityTypes.custom = {}
 
-    if (Object.keys(record.customActivityTypes).length > 0) {
-      activityTypes.custom = record.customActivityTypes
+    const customActivityTypes = record.customActivityTypes || {}
+
+    if (Object.keys(customActivityTypes).length > 0) {
+      activityTypes.custom = customActivityTypes
     }
 
     return activityTypes

backend/src/database/repositories/settingsRepository.ts

@@ -2,6 +2,7 @@ import _get from 'lodash/get'
 import SequelizeRepository from './sequelizeRepository'
 import AuditLogRepository from './auditLogRepository'
 import { IRepositoryOptions } from './IRepositoryOptions'
+import SegmentService from '../../services/segmentService'
 
 export default class SettingsRepository {
   static async findOrCreateDefault(defaults, options: IRepositoryOptions) {
@@ -82,15 +83,11 @@ export default class SettingsRepository {
       return record
     }
 
-    let segment = null
-
-    if (options.currentSegments?.length > 0) {
-      segment = SequelizeRepository.getStrictlySingleActiveSegment(options)
-    }
+    const activityTypes = await SegmentService.getTenantActivityTypes(options.currentSegments)
 
     const settings = record.get({ plain: true })
 
-    settings.activityTypes = segment ? segment.activityTypes : null
+    settings.activityTypes = activityTypes
     settings.slackWebHook = !!settings.slackWebHook
 
     return settings

backend/src/serverless/dbOperations/operationsWorker.ts

@@ -88,7 +88,7 @@ async function bulkOperations(
   operation: string,
   records: Array<any>,
   options: IServiceOptions,
-  fireCrowdWebhooks: boolean = true,
+  fireCrowdWebhooks: boolean = false,
 ): Promise<any> {
   switch (operation) {
     case Operations.UPDATE_MEMBERS:

backend/src/serverless/integrations/services/integrations/githubIntegrationService.ts

@@ -1018,7 +1018,7 @@ export class GithubIntegrationService extends IntegrationServiceBase {
             prNumber,
           },
         }
-
+        // create a new stream
         await streamRepo.create(stream)
 
         if (!isExistingRun) {

backend/src/serverless/microservices/nodejs/workerFactory.ts

@@ -1,4 +1,5 @@
 /* eslint-disable no-case-declarations */
+import { Edition } from '@crowd/types'
 import { weeklyAnalyticsEmailsWorker } from './analytics/workers/weeklyAnalyticsEmailsWorker'
 import {
   AutomationMessage,
@@ -27,6 +28,7 @@ import { integrationDataCheckerWorker } from './integration-data-checker/integra
 import { refreshSampleDataWorker } from './integration-data-checker/refreshSampleDataWorker'
 import { mergeSuggestionsWorker } from './merge-suggestions/mergeSuggestionsWorker'
 import { BulkorganizationEnrichmentWorker } from './bulk-enrichment/bulkOrganizationEnrichmentWorker'
+import { API_CONFIG } from '../../../conf'
 
 /**
  * Worker factory for spawning different microservices
@@ -77,6 +79,9 @@ async function workerFactory(event: NodeMicroserviceMessage): Promise<any> {
     }
 
     case 'automation-process':
+      if (API_CONFIG.edition === Edition.LFX) {
+        return {}
+      }
       const automationProcessRequest = event as ProcessAutomationMessage
 
       switch (automationProcessRequest.automationType) {
@@ -103,6 +108,9 @@ async function workerFactory(event: NodeMicroserviceMessage): Promise<any> {
       }
 
     case 'automation':
+      if (API_CONFIG.edition === Edition.LFX) {
+        return {}
+      }
       const automationRequest = event as AutomationMessage
 
       switch (automationRequest.trigger) {

backend/src/services/segmentService.ts

@@ -384,19 +384,20 @@ export default class SegmentService extends LoggerBase {
   }
 
   static async getTenantActivityTypes(subprojects: any) {
-    return subprojects.reduce(
-      (acc: any, subproject) => ({
+    return subprojects.reduce((acc: any, subproject) => {
+      const activityTypes = SegmentRepository.buildActivityTypes(subproject)
+
+      return {
         custom: {
           ...acc.custom,
-          ...subproject.activityTypes.custom,
+          ...activityTypes.custom,
         },
         default: {
           ...acc.default,
-          ...subproject.activityTypes.default,
+          ...activityTypes.default,
         },
-      }),
-      {},
-    )
+      }
+    }, {})
   }
 
   static async getTenantActivityChannels(subprojects: any) {