Show only active teams and guilds when creating the member selector dialog or kudos dialog.

Author: ocielliottc

web-ui/src/components/kudos_dialog/KudosDialog.jsx

@@ -29,7 +29,7 @@ import { AppContext } from '../../context/AppContext';
 import {
   selectCsrfToken,
   selectCurrentUser,
-  selectNormalizedTeams,
+  selectActiveTeams,
   selectOrderedCurrentMemberProfiles,
   selectProfile
 } from '../../context/selectors';
@@ -65,7 +65,7 @@ const KudosDialog = ({ open, recipient, teamId, onClose }) => {
   );
 
   const currentUser = selectCurrentUser(state);
-  const teams = selectNormalizedTeams(state, '');
+  const teams = selectActiveTeams(state);
   const memberProfiles = selectOrderedCurrentMemberProfiles(state);
 
   const handleSubmit = useCallback(() => {

web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.jsx

@@ -37,14 +37,14 @@ import { AppContext } from '../../../context/AppContext';
 import {
   selectCsrfToken,
   selectCurrentMembers,
-  selectGuilds,
+  selectActiveGuilds,
   selectMappedUserRoles,
   selectRoles,
   selectSkills,
   selectSubordinates,
   selectSupervisors,
   selectTeamMembersBySupervisorId,
-  selectTeams
+  selectActiveTeams,
 } from '../../../context/selectors';
 import { UPDATE_TOAST } from '../../../context/actions';
 import { getMembersByTeam } from '../../../api/team';
@@ -172,14 +172,14 @@ const MemberSelectorDialog = ({
     const getFilterOptions = () => {
       switch (filterType) {
         case FilterType.TEAM:
-          const teams = selectTeams(state);
+          const teams = selectActiveTeams(state);
           return {
             options: teams,
             label: team => team.name,
             equals: (team1, team2) => team1.id === team2.id
           };
         case FilterType.GUILD:
-          const guilds = selectGuilds(state);
+          const guilds = selectActiveGuilds(state);
           return {
             options: guilds,
             label: guild => guild.name,

web-ui/src/context/selectors.js

@@ -686,11 +686,21 @@ export const selectNormalizedTeams = createSelector(
     })
 );
 
+export const selectActiveTeams = createSelector(
+  selectTeams,
+  (teams, searchText) => teams?.filter(team => team.active)
+);
+
+export const selectActiveGuilds = createSelector(
+  selectGuilds,
+  (guilds, searchText) => guilds?.filter(guild => guild.active)
+);
+
 export const selectMyGuilds = createSelector(
   selectCurrentUserId,
   selectGuilds,
   (id, guilds) =>
-    guilds?.filter(guild =>
+    guilds?.filter(guild => guild.active &&
       guild.guildMembers?.some(member => member.memberId === id)
     )
 );
@@ -699,7 +709,7 @@ export const selectMyTeams = createSelector(
   selectCurrentUserId,
   selectTeams,
   (id, teams) =>
-    teams?.filter(team =>
+    teams?.filter(team => team.active &&
       team.teamMembers?.some(member => member.memberId === id)
     )
 );