Org and member view updates (LFX-1664)

backend/src/database/repositories/organizationRepository.ts

@@ -104,12 +104,12 @@ class OrganizationRepository {
     ['revenueRangeMax', `(o."revenueRange"->>'max')::integer`],
 
     // aggregated fields
-    ['activityCount', 'osa."activityCount"'],
-    ['memberCount', 'osa."memberCount"'],
-    ['activeOn', 'osa."activeOn"'],
+    ['activityCount', 'coalesce(osa."activityCount", 0)::integer'],
+    ['memberCount', 'coalesce(osa."memberCount", 0)::integer'],
+    ['activeOn', 'coalesce(osa."activeOn", \'{}\'::text[])'],
     ['joinedAt', 'osa."joinedAt"'],
     ['lastActive', 'osa."lastActive"'],
-    ['avgContributorEngagement', 'osa."avgContributorEngagement"'],
+    ['avgContributorEngagement', 'coalesce(osa."avgContributorEngagement", 0)::integer'],
 
     // org fields for display
     ['logo', 'o."logo"'],
@@ -1682,7 +1682,7 @@ class OrganizationRepository {
       FROM organizations o
       ${
         withAggregates
-          ? ` JOIN "organizationSegmentsAgg" osa ON osa."organizationId" = o.id AND ${
+          ? ` LEFT JOIN "organizationSegmentsAgg" osa ON osa."organizationId" = o.id AND ${
               segmentId ? `osa."segmentId" = $(segmentId)` : `osa."segmentId" IS NULL`
             }`
           : ''
@@ -1693,9 +1693,7 @@ class OrganizationRepository {
         AND (${filterString})
     `
 
-    const results = await Promise.all([
-      qx.select(
-        `
+    const query = `
           ${createQuery(
             (function prepareFields(fields) {
               return fields
@@ -1704,26 +1702,25 @@ class OrganizationRepository {
                   if (!mappedField) {
                     throw new Error400(options.language, `Invalid field: ${f}`)
                   }
-
-                  return mappedField
+                  return `${mappedField} as "${f}"`
                 })
                 .filter((f) => {
                   if (withAggregates) {
                     return true
                   }
-                  return !f.startsWith('osa.')
+                  return !f.includes('osa.')
                 })
                 .join(',\n')
             })(fields),
           )}
-          ORDER BY ${order}
+          ORDER BY ${order} NULLS LAST
           LIMIT $(limit)
           OFFSET $(offset)
-        `,
-        params,
-      ),
-      qx.selectOne(createQuery('COUNT(*)'), params),
-    ])
+        `
+
+    const countQuery = createQuery('COUNT(*)')
+
+    const results = await Promise.all([qx.select(query, params), qx.selectOne(countQuery, params)])
 
     const rows = results[0]
     const count = parseInt(results[1].count, 10)

frontend/src/modules/member/config/saved-views/main.ts

@@ -4,15 +4,13 @@ import allMembers from './views/all-members';
 import unaffiliated from './views/unaffiliated';
 import toReview from './views/to-review';
 
-import bot from './settings/bot/config';
 import teamMember from './settings/teamMember/config';
 import organization from './settings/organization/config';
 
 export const memberSavedViews: SavedViewsConfig = {
   defaultView: allMembers,
   settings: {
     teamMember,
-    bot,
     organization,
   },
   defaultFilters: {

frontend/src/modules/member/config/saved-views/views/all-members.ts

@@ -13,8 +13,7 @@ const allMembers: SavedView = {
       order: 'descending',
     },
     settings: {
-      bot: 'exclude',
-      teamMember: 'exclude',
+      teamMember: 'include',
       organization: 'exclude',
     },
   },

frontend/src/modules/member/config/saved-views/views/to-review.ts

@@ -13,8 +13,7 @@ const toReview: SavedView = {
       order: 'descending',
     },
     settings: {
-      bot: 'exclude',
-      teamMember: 'exclude',
+      teamMember: 'include',
       organization: 'exclude',
     },
     reviewed: {

frontend/src/modules/member/config/saved-views/views/unaffiliated.ts

@@ -13,8 +13,7 @@ const unaffiliated: SavedView = {
       order: 'descending',
     },
     settings: {
-      bot: 'exclude',
-      teamMember: 'exclude',
+      teamMember: 'include',
       organization: 'exclude',
     },
     unaffiliated: {

frontend/src/modules/organization/config/saved-views/main.ts

@@ -3,13 +3,11 @@ import { organizationDefaultFilterRenderer } from '@/shared/modules/filters/conf
 import allOrganizations from './views/all-organizations';
 
 import teamOrganization from './settings/teamOrganization/config';
-import hasActivities from './settings/hasActivities/config';
 
 export const organizationSavedViews: SavedViewsConfig = {
   defaultView: allOrganizations,
   settings: {
     teamOrganization,
-    hasActivities,
   },
   defaultFilters: {
     render: organizationDefaultFilterRenderer,
@@ -42,7 +40,6 @@ export const commonOrganizationSavedViews: SavedViewsConfig = {
     },
   },
   settings: {
-    hasActivities,
   },
   defaultFilters: {
     render: organizationDefaultFilterRenderer,

frontend/src/modules/organization/config/saved-views/views/all-organizations.ts

@@ -13,8 +13,7 @@ const allOrganizations: SavedView = {
       order: 'descending',
     },
     settings: {
-      teamOrganization: 'exclude',
-      hasActivities: 'true',
+      teamOrganization: 'include',
     },
   },
 };

frontend/src/shared/modules/filters/config/defaultFilterRenderer/member.defaultFilter.renderer.ts

@@ -1,22 +1,17 @@
 import { IncludeEnum } from '@/modules/member/config/saved-views/settings/common/types/IncludeEnum';
 import { DefaultFiltersSettings } from '@/shared/modules/saved-views/types/SavedViewsConfig';
 
-export const memberDefaultFilterRenderer = ({ teamMember, bot }: DefaultFiltersSettings) => {
-  if (teamMember === IncludeEnum.EXCLUDE && bot === IncludeEnum.EXCLUDE) {
-    return 'Excl. team members and bots';
+export const memberDefaultFilterRenderer = ({ teamMember }: DefaultFiltersSettings) => {
+  if (teamMember === IncludeEnum.EXCLUDE) {
+    return 'Excl. team members';
   }
 
-  if (teamMember === IncludeEnum.EXCLUDE && bot === IncludeEnum.INCLUDE) {
-    return 'Incl. bots and excl. team members';
-  }
-
-  if (teamMember === IncludeEnum.INCLUDE && bot === IncludeEnum.EXCLUDE) {
-    return 'Incl. team members and excl. bots';
+  if (teamMember === IncludeEnum.INCLUDE) {
+    return 'Incl. team members';
   }
 
   if (teamMember === IncludeEnum.FILTER) {
     return 'Team members only';
   }
-
-  return 'Incl. team members and bots';
+  return '';
 };

services/libs/data-access-layer/src/members/base.ts

@@ -82,13 +82,13 @@ const QUERY_FILTER_COLUMN_MAP: Map<string, { name: string; queryable?: boolean }
 
   // member agg fields
   ['lastActive', { name: 'msa."lastActive"' }],
-  ['identityPlatforms', { name: 'msa."activeOn"' }],
+  ['identityPlatforms', { name: 'coalesce(msa."activeOn", \'{}\'::text[])' }],
   ['lastEnriched', { name: 'm."lastEnriched"' }],
   ['score', { name: 'm.score' }],
-  ['averageSentiment', { name: 'msa."averageSentiment"' }],
-  ['activityTypes', { name: 'msa."activityTypes"' }],
-  ['activeOn', { name: 'msa."activeOn"' }],
-  ['activityCount', { name: 'msa."activityCount"' }],
+  ['averageSentiment', { name: 'coalesce(msa."averageSentiment", 0)::decimal' }],
+  ['activityTypes', { name: 'coalesce(msa."activityTypes", \'{}\'::text[])' }],
+  ['activeOn', { name: 'coalesce(msa."activeOn", \'{}\'::text[])' }],
+  ['activityCount', { name: 'coalesce(msa."activityCount", 0)::integer' }],
 
   // others
   ['organizations', { name: 'mo."organizationId"', queryable: false }],
@@ -235,7 +235,7 @@ export async function queryMembersAdvanced(
       FROM members m
       ${
         withAggregates
-          ? ` JOIN "memberSegmentsAgg" msa ON msa."memberId" = m.id AND msa."segmentId" = $(segmentId)`
+          ? ` LEFT JOIN "memberSegmentsAgg" msa ON msa."memberId" = m.id AND msa."segmentId" = $(segmentId)`
           : ''
       }
       LEFT JOIN member_orgs mo ON mo."memberId" = m.id

services/libs/opensearch/src/service/member.sync.service.ts

@@ -483,7 +483,14 @@ export class MemberSyncService {
       'syncMembersToOpensearchForMergeSuggestions',
     )
 
-    return syncResults
+    if (syncResults) {
+      return syncResults
+    }
+
+    return {
+      membersSynced: 0,
+      documentsIndexed: 0,
+    }
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any