fix: fe issue people list (CM-908)

backend/src/api/member/memberFind.ts

@@ -20,6 +20,9 @@ export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.memberRead)
 
   const segmentId = req.query.segments?.length > 0 ? req.query.segments[0] : null
+  const includeAllAttributes =
+    req.query.includeAllAttributes === 'true' || req.query.includeAllAttributes === true
+
   if (!segmentId) {
     await req.responseHandler.error(req, res, {
       code: 400,
@@ -28,7 +31,12 @@ export default async (req, res) => {
     return
   }
 
-  const payload = await new MemberService(req).findById(req.params.id, segmentId, req.query.include)
+  const payload = await new MemberService(req).findById(
+    req.params.id,
+    segmentId,
+    req.query.include,
+    includeAllAttributes,
+  )
 
   await req.responseHandler.success(req, res, payload)
 }

backend/src/api/member/memberUpdate.ts

@@ -20,9 +20,12 @@ import PermissionChecker from '../../services/user/permissionChecker'
 export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.memberEdit)
 
-  const payload = await new MemberService(req).update(req.params.id, req.body, {
+  const { invalidateCache, ...data } = req.body
+
+  const payload = await new MemberService(req).update(req.params.id, data, {
     syncToOpensearch: true,
     manualChange: true,
+    invalidateCache: invalidateCache ?? false,
   })
 
   await req.responseHandler.success(req, res, payload)

backend/src/database/repositories/memberRepository.ts

@@ -1190,6 +1190,7 @@ class MemberRepository {
       segmentId?: string
     } = {},
     include: Record<string, boolean> = {},
+    includeAllAttributes = false,
   ) {
     let memberResponse = null
 
@@ -1201,6 +1202,7 @@ class MemberRepository {
       limit: 1,
       offset: 0,
       segmentId,
+      includeAllAttributes,
       include: {
         memberOrganizations: false,
         lfxMemberships: true,
@@ -1219,6 +1221,7 @@ class MemberRepository {
         filter: { id: { eq: id } },
         limit: 1,
         offset: 0,
+        includeAllAttributes,
         include: {
           lfxMemberships: true,
           segments: true,

backend/src/services/memberService.ts

@@ -749,7 +749,7 @@ export default class MemberService extends LoggerBase {
           await SequelizeRepository.commitTransaction(tx)
 
           // Invalidate member query cache after unmerge
-          await this.invalidateMemberQueryCache([memberId, secondaryMember.id])
+          await this.invalidateMemberQueryCache([memberId, secondaryMember.id], true)
 
           return { member, secondaryMember }
         }),
@@ -1237,9 +1237,11 @@ export default class MemberService extends LoggerBase {
     {
       syncToOpensearch = true,
       manualChange = false,
+      invalidateCache = false,
     }: {
       syncToOpensearch?: boolean
       manualChange?: boolean
+      invalidateCache?: boolean
     } = {},
   ) {
     let transaction
@@ -1260,7 +1262,8 @@ export default class MemberService extends LoggerBase {
       await SequelizeRepository.commitTransaction(transaction)
 
       // Invalidate member query cache after update
-      await this.invalidateMemberQueryCache([id])
+      // Pass invalidateCache from options to control whether to clear list caches
+      await this.invalidateMemberQueryCache([id], invalidateCache)
 
       const commonMemberService = new CommonMemberService(
         optionsQx(this.options),
@@ -1315,7 +1318,8 @@ export default class MemberService extends LoggerBase {
       await SequelizeRepository.commitTransaction(transaction)
 
       // Invalidate member query cache after bulk delete
-      await this.invalidateMemberQueryCache(ids)
+      // Pass invalidateAll=true to also clear list caches since deletion affects list views
+      await this.invalidateMemberQueryCache(ids, true)
     } catch (error) {
       await SequelizeRepository.rollbackTransaction(transaction)
       throw error
@@ -1343,6 +1347,10 @@ export default class MemberService extends LoggerBase {
       }
 
       await SequelizeRepository.commitTransaction(transaction)
+
+      // Invalidate member query cache after deletion
+      // Pass invalidateAll=true to also clear list caches since deletion affects list views
+      await this.invalidateMemberQueryCache(ids, true)
     } catch (error) {
       await SequelizeRepository.rollbackTransaction(transaction)
       throw error
@@ -1353,14 +1361,20 @@ export default class MemberService extends LoggerBase {
     }
   }
 
-  async findById(id, segmentId?: string, include: Record<string, boolean> = {}) {
+  async findById(
+    id,
+    segmentId?: string,
+    include: Record<string, boolean> = {},
+    includeAllAttributes = false,
+  ) {
     return MemberRepository.findById(
       id,
       this.options,
       {
         segmentId,
       },
       include,
+      includeAllAttributes,
     )
   }
 
@@ -1465,16 +1479,23 @@ export default class MemberService extends LoggerBase {
     return fetchMemberBotSuggestionsBySegment(qx, segmentId, args.limit ?? 10, args.offset ?? 0)
   }
 
-  async invalidateMemberQueryCache(memberIds?: string[]): Promise<void> {
+  async invalidateMemberQueryCache(memberIds?: string[], invalidateAll = false): Promise<void> {
     try {
       const cache = new MemberQueryCache(this.options.redis)
 
       if (memberIds && memberIds.length > 0) {
-        // Invalidate specific member cache entries
+        // Invalidate specific member cache entries (queries with filter.id.eq)
         for (const memberId of memberIds) {
           await cache.invalidateByPattern(`members_advanced:${memberId}:*`)
         }
         this.log.debug(`Invalidated member query cache for ${memberIds.length} specific members`)
+
+        // Only invalidate all caches if explicitly requested
+        // This is useful for operations like update/delete that affect list views
+        if (invalidateAll) {
+          await cache.invalidateAll()
+          this.log.debug('Invalidated all member query cache entries')
+        }
       } else {
         // Invalidate all cache entries
         await cache.invalidateAll()

frontend/src/modules/member/components/list/member-list-toolbar.vue

@@ -34,6 +34,16 @@
           <lf-icon :name="markAsTeamMemberOptions.icon" :size="20" class="mr-1" />
           {{ markAsTeamMemberOptions.copy }}
         </el-dropdown-item>
+        <el-dropdown-item
+          v-if="hasPermission(LfPermission.memberEdit)"
+          :command="{
+            action: 'markAsBot',
+            value: markAsBotOptions.value,
+          }"
+        >
+          <lf-icon :name="markAsBotOptions.icon" :size="20" class="mr-1" />
+          {{ markAsBotOptions.copy }}
+        </el-dropdown-item>
         <el-dropdown-item
           v-if="hasPermission(LfPermission.memberEdit)"
           :command="{ action: 'editAttribute' }"
@@ -60,7 +70,6 @@
 
   <app-bulk-edit-attribute-popover
     v-model="bulkAttributesUpdateVisible"
-    @reload="fetchMembers({ reload: true })"
   />
 </template>
 
@@ -70,6 +79,7 @@ import { useRoute } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import pluralize from 'pluralize';
 import { useMemberStore } from '@/modules/member/store/pinia';
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import { MemberService } from '@/modules/member/member-service';
 import ConfirmDialog from '@/shared/dialog/confirm-dialog';
 
@@ -85,22 +95,46 @@ import { EventType, FeatureEventKey } from '@/shared/modules/monitoring/types/ev
 import LfIcon from '@/ui-kit/icon/Icon.vue';
 import LfButton from '@/ui-kit/button/Button.vue';
 import LfTableBulkActions from '@/ui-kit/table/table-bulk-actions.vue';
+import { useQueryClient } from '@tanstack/vue-query';
+import { TanstackKey } from '@/shared/types/tanstack';
 
 const { trackEvent } = useProductTracking();
 
 const route = useRoute();
+const queryClient = useQueryClient();
 
 const authStore = useAuthStore();
 const { getUser } = authStore;
 
 const memberStore = useMemberStore();
 const { selectedMembers, filters } = storeToRefs(memberStore);
-const { fetchMembers } = memberStore;
 
 const { hasPermission } = usePermissions();
 
 const bulkAttributesUpdateVisible = ref(false);
 
+// Refresh member data by invalidating TanStack Query cache
+// Note: Backend cache is invalidated by passing invalidateCache parameter to update/delete operations
+const refreshMemberData = async () => {
+  await queryClient.invalidateQueries({
+    queryKey: [TanstackKey.MEMBERS_LIST],
+  });
+};
+
+// Helper function to fetch member with all attributes before bulk update
+const fetchMemberWithAllAttributes = async (memberId) => {
+  const lsSegmentsStore = useLfSegmentsStore();
+  const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
+
+  const response = await MemberService.find(
+    memberId,
+    selectedProjectGroup.value?.id,
+    true,
+  );
+
+  return response;
+};
+
 const markAsTeamMemberOptions = computed(() => {
   const isTeamView = filters.value.settings.teamMember === 'filter';
   const membersCopy = pluralize(
@@ -124,6 +158,31 @@ const markAsTeamMemberOptions = computed(() => {
   };
 });
 
+const markAsBotOptions = computed(() => {
+  const membersCopy = pluralize(
+    'person',
+    selectedMembers.value.length,
+    false,
+  );
+
+  // Check if any of the selected members is already marked as bot
+  const hasBot = selectedMembers.value.some((member) => member.attributes?.isBot?.default);
+
+  if (hasBot) {
+    return {
+      icon: 'robot',
+      copy: 'Unmark as bot',
+      value: false,
+    };
+  }
+
+  return {
+    icon: 'robot',
+    copy: 'Mark as bot',
+    value: true,
+  };
+});
+
 const handleMergeMembers = async () => {
   const [firstMember, secondMember] = selectedMembers.value;
 
@@ -168,7 +227,13 @@ const doDestroyAllWithConfirm = () => ConfirmDialog({
     const ids = selectedMembers.value.map((m) => m.id);
     return MemberService.destroyAll(ids);
   })
-  .then(() => fetchMembers({ reload: true }));
+  .then(async () => {
+    // Clear selection immediately to prevent UI issues
+    selectedMembers.value = [];
+
+    // Refresh data to ensure UI is up to date
+    await refreshMemberData();
+  });
 
 const handleDoExport = async () => {
   const ids = selectedMembers.value.map((i) => i.id);
@@ -226,20 +291,77 @@ const handleEditAttribute = async () => {
 const doMarkAsTeamMember = async (value) => {
   ToastStore.info('People are being updated');
 
-  return Promise.all(selectedMembers.value.map((member) => MemberService.update(member.id, {
-    attributes: {
-      ...member.attributes,
+  const updatePromises = selectedMembers.value.map(async (member) => {
+    // Fetch member with all attributes to prevent data loss
+    const memberWithAllAttributes = await fetchMemberWithAllAttributes(member.id);
+    const currentAttributes = memberWithAllAttributes.attributes;
+
+    const updatedAttributes = {
+      ...currentAttributes,
       isTeamMember: {
         default: value,
+        custom: value,
       },
-    },
-  }, member.segmentIds)))
-    .then(() => {
+    };
+
+    return MemberService.update(member.id, {
+      attributes: updatedAttributes,
+      invalidateCache: true,
+    });
+  });
+
+  return Promise.all(updatePromises)
+    .then(async () => {
+      ToastStore.closeAll();
+      ToastStore.success(`${
+        pluralize('Person', selectedMembers.value.length, true)} updated successfully`);
+
+      // Clear selection immediately to prevent UI issues
+      selectedMembers.value = [];
+
+      // Refresh data to ensure UI is up to date
+      await refreshMemberData();
+    })
+    .catch(() => {
+      ToastStore.closeAll();
+      ToastStore.error('Error updating people');
+    });
+};
+
+const doMarkAsBot = async (value) => {
+  ToastStore.info('People are being updated');
+
+  const updatePromises = selectedMembers.value.map(async (member) => {
+    // Fetch member with all attributes to prevent data loss
+    const memberWithAllAttributes = await fetchMemberWithAllAttributes(member.id);
+    const currentAttributes = memberWithAllAttributes.attributes;
+
+    const updatedAttributes = {
+      ...currentAttributes,
+      isBot: {
+        ...currentAttributes.isBot,
+        default: value,
+        custom: value,
+      },
+    };
+
+    return MemberService.update(member.id, {
+      attributes: updatedAttributes,
+      invalidateCache: true,
+    });
+  });
+
+  return Promise.all(updatePromises)
+    .then(async () => {
       ToastStore.closeAll();
       ToastStore.success(`${
         pluralize('Person', selectedMembers.value.length, true)} updated successfully`);
 
-      fetchMembers({ reload: true });
+      // Clear selection immediately to prevent UI issues
+      selectedMembers.value = [];
+
+      // Refresh data to ensure UI is up to date
+      await refreshMemberData();
     })
     .catch(() => {
       ToastStore.closeAll();
@@ -259,6 +381,17 @@ const handleCommand = async (command) => {
     });
 
     await doMarkAsTeamMember(command.value);
+  } else if (command.action === 'markAsBot') {
+    trackEvent({
+      key: FeatureEventKey.MARK_AS_BOT,
+      type: EventType.FEATURE,
+      properties: {
+        path: route.path,
+        bulk: true,
+      },
+    });
+
+    await doMarkAsBot(command.value);
   } else if (command.action === 'export') {
     await handleDoExport();
   } else if (command.action === 'mergeMembers') {