fix: clean up filters according to the new api

Author: ulemons

frontend/src/modules/member/components/bulk/bulk-edit-attribute-dropdown.vue

@@ -41,23 +41,6 @@
         </article>
       </template>
 
-      <!-- CUSTOM ATTRIBUTES -->
-      <template v-if="filteredCustomOptions.length > 0">
-        <div
-          class="el-dropdown-title !my-3 !-ml-1"
-        >
-          Custom Attributes
-        </div>
-        <article
-          v-for="attribute in filteredCustomOptions"
-          :key="attribute.name"
-          class="mb-1 p-3 rounded flex justify-between items-center transition whitespace-nowrap h-10 hover:bg-gray-50 text-xs !cursor-pointer"
-          data-qa="filter-list-item-custom"
-          @click="selectItem(attribute, 'custom')"
-        >
-          <span class="!text-gray-900">{{ attribute.label }}</span>
-        </article>
-      </template>
       <div
         v-if="filteredDefaultOptions.length === 0 && filteredCustomOptions.length === 0"
         class="el-dropdown-title !mt-2"

frontend/src/modules/member/config/filters/main.ts

@@ -1,35 +1,28 @@
+import unaffiliated from '@/modules/member/config/filters/unaffiliated/config';
 import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
 import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
-import unaffiliated from '@/modules/member/config/filters/unaffiliated/config';
-import noOfActivities from './noOfActivities/config';
-import noOfOSSContributions from './noOfOSSContributions/config';
-import activeOn from './activeOn/config';
 import activityType from './activityType/config';
-import avgSentiment from './avgSentiment/config';
-import engagementLevel from './engagementLevel/config';
 import identities from './identities/config';
-import joinedDate from './joinedDate/config';
-import lastActivityDate from './lastActivityDate/config';
-import reach from './reach/config';
-import projects from './projects/config';
-import memberName from './memberName/config';
 import jobTitle from './jobTitle/config';
+import memberName from './memberName/config';
+import noOfActivities from './noOfActivities/config';
 import organizations from './organizations/config';
+import projects from './projects/config';
 
 export const memberFilters: Record<string, FilterConfig> = {
   memberName,
   organizations,
   noOfActivities,
-  noOfOSSContributions,
+  // noOfOSSContributions,
   jobTitle,
-  activeOn,
+  // activeOn,
   activityType,
-  avgSentiment,
-  engagementLevel,
+  // avgSentiment,
+  // engagementLevel,
   identities,
-  joinedDate,
-  lastActivityDate,
-  reach,
+  // joinedDate,
+  // lastActivityDate,
+  // reach,
   projects,
   unaffiliated,
 };

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

@@ -1,16 +1,14 @@
-import { SavedView, SavedViewsConfig } from '@/shared/modules/saved-views/types/SavedViewsConfig';
 import { memberDefaultFilterRenderer } from '@/shared/modules/filters/config/defaultFilterRenderer/member.defaultFilter.renderer';
-import allMembers from './views/all-members';
-import unaffiliated from './views/unaffiliated';
-import toReview from './views/to-review';
+import { SavedView, SavedViewsConfig } from '@/shared/modules/saved-views/types/SavedViewsConfig';
 import bot from './settings/bot/config';
-import teamMember from './settings/teamMember/config';
 import organization from './settings/organization/config';
+import allMembers from './views/all-members';
+import toReview from './views/to-review';
+import unaffiliated from './views/unaffiliated';
 
 export const memberSavedViews: SavedViewsConfig = {
   defaultView: allMembers,
   settings: {
-    teamMember,
     bot,
     organization,
   },

frontend/src/shared/modules/filters/components/FilterDropdown.vue

@@ -33,25 +33,6 @@
         <lf-icon :class="isSelected(key) ? 'opacity-100' : 'opacity-0'" name="check" :size="16" class="!text-gray-400 !mr-0 ml-1" />
       </article>
 
-      <!-- CUSTOM ATTRIBUTES -->
-      <template v-if="props.customConfig && Object.keys(props.customConfig).length > 0 && filteredCustomOptions.length > 0">
-        <div
-          class="el-dropdown-title !my-3"
-        >
-          Custom Attributes
-        </div>
-        <article
-          v-for="{ key, label } in filteredCustomOptions"
-          :key="key"
-          class="mb-1 p-3 rounded flex justify-between items-center transition whitespace-nowrap h-10 hover:bg-gray-50 text-xs"
-          :class="isSelected(key) ? 'bg-gray-50 text-gray-400' : 'text-gray-900 cursor-pointer'"
-          data-qa="filter-list-item-custom"
-          @click="add(key)"
-        >
-          <span class="first-letter:uppercase lowercase">{{ label }}</span>
-          <lf-icon :class="isSelected(key) ? 'opacity-100' : 'opacity-0'" name="check" :size="16" class="!text-gray-400 !mr-0 ml-1" />
-        </article>
-      </template>
       <div
         v-if="filteredOptions.length === 0 && filteredCustomOptions.length === 0"
         class="el-dropdown-title !mt-2"

frontend/src/shared/modules/saved-views/components/forms/SavedViewForm.vue

@@ -139,20 +139,6 @@
                     >
                       {{ filterConfig.label }}
                     </el-dropdown-item>
-                    <div
-                      v-if="filteredCustomFilters.length > 0"
-                      class="el-dropdown-title !my-3"
-                    >
-                      Custom Attributes
-                    </div>
-                    <el-dropdown-item
-                      v-for="[key, filterConfig] of filteredCustomFilters"
-                      :key="key"
-                      :disabled="filterList.includes(key)"
-                      @click="addFilter(key)"
-                    >
-                      {{ filterConfig.label }}
-                    </el-dropdown-item>
                   </div>
                 </div>
               </template>
@@ -332,9 +318,6 @@ const dropdownSearch = ref<string>('');
 const filteredFilters = computed(() => Object.entries(props.filters)
   .filter(([_, config]: [string, FilterConfig]) => config.label.toLowerCase().includes(dropdownSearch.value.toLowerCase())));
 
-const filteredCustomFilters = computed(() => (props.customFilters ? Object.entries(props.customFilters)
-  .filter(([_, config]: [string, FilterConfig]) => config.label.toLowerCase().includes(dropdownSearch.value.toLowerCase())) : []));
-
 const allFilters = computed(() => ({
   ...props.filters,
   ...(props.customFilters || {}),

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

@@ -106,18 +106,19 @@ export const MEMBER_INSERT_COLUMNS = [
 ]
 
 const QUERY_FILTER_COLUMN_MAP: Map<string, { name: string; queryable?: boolean }> = new Map([
-  ['id', { name: 'm.id' }],
-  ['segmentId', { name: 'msa."segmentId"' }],
+  ['activityCount', { name: 'coalesce(msa."activityCount", 0)::integer' }],
+  ['attributes', { name: 'm.attributes' }],
   ['displayName', { name: 'm."displayName"' }],
-  ['jobTitle', { name: `m.attributes -> 'jobTitle' ->> 'default'` }],
+  ['id', { name: 'm.id' }],
+  ['identityPlatforms', { name: 'coalesce(msa."activeOn", \'{}\'::text[])' }],
   ['isBot', { name: `COALESCE((m.attributes -> 'isBot' ->> 'default')::BOOLEAN, FALSE)` }],
   [
     'isOrganization',
     { name: `COALESCE((m.attributes -> 'isOrganization' ->> 'default')::BOOLEAN, FALSE)` },
   ],
-  ['activityCount', { name: 'coalesce(msa."activityCount", 0)::integer' }],
+  ['jobTitle', { name: `m.attributes -> 'jobTitle' ->> 'default'` }],
   ['organizations', { name: 'mo."organizationId"', queryable: false }],
-  ['attributes', { name: 'm.attributes' }],
+  ['segmentId', { name: 'msa."segmentId"' }],
 ])
 
 const QUERY_FILTER_ATTRIBUTE_MAP = ['avatarUrl', 'isBot', 'isTeamMember', 'jobTitle']