Hide bot activity (#465)

Co-authored-by: anilb <epipav@gmail.com>

Author: mariobalca

backend/src/database/attributes/member/default.ts

@@ -38,4 +38,11 @@ export const DefaultMemberAttributes: Attribute[] = [
     canDelete: false,
     show: false,
   },
+  {
+    name: MemberAttributes[MemberAttributeName.IS_BOT].name,
+    label: MemberAttributes[MemberAttributeName.IS_BOT].label,
+    type: AttributeType.BOOLEAN,
+    canDelete: false,
+    show: false,
+  },
 ]

backend/src/database/attributes/member/enums.ts

@@ -13,6 +13,7 @@ export enum MemberAttributeName {
   JOB_TITLE = 'jobTitle',
   IS_TEAM_MEMBER = 'isTeamMember',
   IS_ORGANIZATION = 'isOrganization',
+  IS_BOT = 'isBot',
   TIMEZONE = 'timezone',
   KARMA = 'karma',
 }
@@ -74,6 +75,10 @@ export const MemberAttributes = {
     name: MemberAttributeName.IS_ORGANIZATION,
     label: 'is Organization',
   },
+  [MemberAttributeName.IS_BOT]: {
+    name: MemberAttributeName.IS_BOT,
+    label: 'is Bot',
+  },
   [MemberAttributeName.KARMA]: {
     name: MemberAttributeName.KARMA,
     label: 'Karma',

backend/src/database/initializers/entities/2023-01-23-add-isBot-to-member-attributes.ts

@@ -0,0 +1,26 @@
+import TenantService from '../../../services/tenantService'
+import getUserContext from '../../utils/getUserContext'
+import MemberAttributeSettingsService from '../../../services/memberAttributeSettingsService'
+import { DefaultMemberAttributes } from '../../attributes/member/default'
+
+const addIsBotToMemberAttributes = async () => {
+  const tenants = await TenantService._findAndCountAllForEveryUser({})
+  const isBotAttributes = DefaultMemberAttributes.find((a) => a.name === 'isBot')
+
+  // for each tenant
+  for (const tenant of tenants.rows) {
+    const userContext = await getUserContext(tenant.id)
+    const memberAttributeSettingsService = new MemberAttributeSettingsService(userContext)
+
+    console.log(`Creating isBot member attribute for tenant ${tenant.id}`)
+    await memberAttributeSettingsService.create({
+      name: isBotAttributes.name,
+      label: isBotAttributes.label,
+      type: isBotAttributes.type,
+      canDelete: isBotAttributes.canDelete,
+      show: isBotAttributes.show,
+    })
+  }
+}
+
+addIsBotToMemberAttributes()

backend/src/services/__tests__/tenantService.test.ts

@@ -188,6 +188,7 @@ describe('TenantService tests', () => {
 
       expect(defaultAttributes.rows.map((i) => i.name).sort()).toEqual([
         MemberAttributeName.BIO,
+        MemberAttributeName.IS_BOT,
         MemberAttributeName.IS_TEAM_MEMBER,
         MemberAttributeName.JOB_TITLE,
         MemberAttributeName.LOCATION,

frontend/src/assets/scss/badge.scss

@@ -33,6 +33,10 @@
     @apply bg-gray-400 text-white;
   }
 
+  &--gray-dark {
+    @apply bg-gray-600 text-white;
+  }
+
   &--red {
     @apply bg-red-100 text-red-900;
   }

frontend/src/modules/activity/activity-service.js

@@ -91,7 +91,10 @@ export class ActivityService {
       : filter
     builtFilter = {
       ...builtFilter,
-      member: { isTeamMember: { not: true } }
+      member: {
+        isTeamMember: { not: true },
+        isBot: { not: true }
+      }
     }
 
     const body = {

frontend/src/modules/member/components/member-badge.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="isNew || isTeam"
+    v-if="isNew || isTeam || isBot"
     class="member-badge flex items-center ml-1"
   >
     <el-tooltip
@@ -19,6 +19,13 @@
     >
       <div :class="computedBadgeClass('team')">Team</div>
     </el-tooltip>
+    <el-tooltip
+      v-if="isBot"
+      placement="top"
+      :content="computedTooltipContent('bot')"
+    >
+      <div :class="computedBadgeClass('bot')">Bot</div>
+    </el-tooltip>
   </div>
 </template>
 
@@ -43,6 +50,10 @@ const isTeam = computed(() => {
   return props.member.attributes.isTeamMember
 })
 
+const isBot = computed(() => {
+  return props.member.attributes.isBot
+})
+
 const isNew = computed(() => {
   return (
     moment().diff(moment(props.member.joinedAt), 'days') <=
@@ -60,18 +71,24 @@ const computedBadgeClass = function (badge) {
       classes += ' mr-1'
     }
   } else if (badge === 'team') {
+    classes += ' badge--gray-dark'
+  } else if (badge === 'bot') {
     classes += ' badge--gray'
   }
 
   return classes
 }
 
 const computedTooltipContent = function (tooltip) {
-  return tooltip === 'new'
-    ? `Member since ${moment(props.member.joinedAt).format(
-        'MMM DD, YYYY'
-      )}`
-    : `Team member`
+  if (tooltip === 'new') {
+    return `Member since ${moment(
+      props.member.joinedAt
+    ).format('MMM DD, YYYY')}`
+  } else if (tooltip === 'team') {
+    return 'Team member'
+  } else {
+    return 'Bot'
+  }
 }
 </script>
 

frontend/src/modules/member/components/member-dropdown.vue

@@ -68,7 +68,7 @@
           ></el-dropdown-item
         >
         <el-dropdown-item
-          v-if="!member.team"
+          v-if="!member.attributes.isTeamMember?.default"
           class="h-10"
           :command="{
             action: 'memberMarkAsTeamMember',
@@ -80,6 +80,18 @@
             >Mark as team member</span
           ></el-dropdown-item
         >
+        <el-dropdown-item
+          v-if="!member.attributes.isBot?.default"
+          class="h-10"
+          :command="{
+            action: 'memberMarkAsBot',
+            member: member
+          }"
+          ><i class="ri-robot-line text-base mr-2" /><span
+            class="text-xs text-gray-900"
+            >Mark as bot</span
+          ></el-dropdown-item
+        >
         <el-divider class="border-gray-200" />
         <el-dropdown-item
           class="h-10"
@@ -251,7 +263,28 @@ export default {
           attributes: {
             ...command.member.attributes,
             isTeamMember: {
-              crowd: true,
+              default: true
+            }
+          }
+        })
+        await this.doFetch({
+          filter: {},
+          keepPagination: false
+        })
+        Message.success('Member updated successfully')
+        if (this.$route.name === 'member') {
+          this.doFetch({
+            filter: {},
+            keepPagination: true
+          })
+        } else {
+          this.doFind(command.member.id)
+        }
+      } else if (command.action === 'memberMarkAsBot') {
+        await MemberService.update(command.member.id, {
+          attributes: {
+            ...command.member.attributes,
+            isBot: {
               default: true
             }
           }