Revert bots filters (#2663)

Author: joanagmaia

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

@@ -3,14 +3,15 @@ import { memberDefaultFilterRenderer } from '@/shared/modules/filters/config/def
 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/settings/bot/MemberBotSetting.vue

@@ -0,0 +1,56 @@
+<template>
+  <article>
+    <p class="text-xs font-semibold leading-5 mb-3">
+      Bots visibility
+    </p>
+    <el-radio-group v-model="value" :disabled="props.settings?.teamMember === 'filter'">
+      <el-radio :label="IncludeEnum.EXCLUDE" class="!h-5">
+        <span class="text-xs">Exclude bots</span>
+      </el-radio>
+      <el-radio :label="IncludeEnum.INCLUDE" class="!h-5">
+        <span class="text-xs">Include bots</span>
+      </el-radio>
+    </el-radio-group>
+  </article>
+</template>
+
+<script setup lang="ts">
+import { IncludeEnum } from '@/modules/member/config/saved-views/settings/common/types/IncludeEnum';
+import { computed, ref, watch } from 'vue';
+
+const props = defineProps<{
+    modelValue: IncludeEnum | '',
+    settings: Record<string, string>,
+  }>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: IncludeEnum | ''): any }>();
+
+const value = computed<IncludeEnum | ''>({
+  get() {
+    return props.modelValue;
+  },
+  set(val: IncludeEnum | '') {
+    emit('update:modelValue', val);
+  },
+});
+
+const previousSettings = ref<Record<string, string> | null>(null);
+
+watch(() => props.settings, (current) => {
+  if (current?.teamMember === 'filter') {
+    if (!previousSettings.value || previousSettings.value.teamMember !== 'filter') {
+      value.value = '';
+    }
+  }
+  if (previousSettings.value?.teamMember === 'filter' && current?.teamMember !== 'filter') {
+    value.value = IncludeEnum.EXCLUDE;
+  }
+  previousSettings.value = { ...current };
+}, { deep: true, immediate: true });
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfMemberTeamMemberSetting',
+};
+</script>

frontend/src/modules/member/config/saved-views/settings/bot/config.ts

@@ -0,0 +1,18 @@
+import { SavedViewsSetting } from '@/shared/modules/saved-views/types/SavedViewsConfig';
+import { IncludeEnum } from '@/modules/member/config/saved-views/settings/common/types/IncludeEnum';
+import { includeFilterRenderer } from '@/modules/member/config/saved-views/settings/common/includeFilterRenderer';
+import MemberBotSetting from './MemberBotSetting.vue';
+
+const bot: SavedViewsSetting<IncludeEnum> = {
+  inSettings: true,
+  settingsComponent: MemberBotSetting,
+  defaultValue: IncludeEnum.EXCLUDE,
+  queryUrlParser(value: string): IncludeEnum {
+    return value as IncludeEnum;
+  },
+  apiFilterRenderer(value: IncludeEnum): any[] {
+    return includeFilterRenderer('isBot', value);
+  },
+};
+
+export default bot;

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

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

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

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

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

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

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

@@ -1,17 +1,22 @@
 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 }: DefaultFiltersSettings) => {
-  if (teamMember === IncludeEnum.EXCLUDE) {
-    return 'Excl. team members';
+export const memberDefaultFilterRenderer = ({ teamMember, bot }: DefaultFiltersSettings) => {
+  if (teamMember === IncludeEnum.EXCLUDE && bot === IncludeEnum.EXCLUDE) {
+    return 'Excl. team members and bots';
   }
 
-  if (teamMember === IncludeEnum.INCLUDE) {
-    return 'Incl. 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.FILTER) {
     return 'Team members only';
   }
-  return '';
+
+  return 'Incl. team members and bots';
 };