Merge pull request #2744 from objectcomputing/bugfix-2743/inactive-teams-guilds

Bugfix 2743/inactive teams guilds

Author: mkimberlin

web-ui/src/components/guild-results/EditGuildModal.spec.jsx

@@ -34,12 +34,14 @@ const testGuild = {
   guildMembers: [
     { id: 125, name: 'Guild Member' },
     { id: 126, name: 'Other Member' }
-  ]
+  ],
+  active: true,
 };
 
 const emptyGuild = {
   name: 'Test Guild',
-  description: 'A guild used for testing.'
+  description: 'A guild used for testing.',
+  active: true,
 };
 
 const currentUserProfile = {

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/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx

@@ -39,7 +39,8 @@ const testGuild = {
   name: 'Test Guild',
   description: 'A guild used for testing.',
   guildLeads: [{ id: 124, name: managerProfile.name }],
-  guildMembers: []
+  guildMembers: [],
+  active: true,
 };
 
 const initialState = {

web-ui/src/components/team-results/TeamSummaryCard.jsx

@@ -16,7 +16,8 @@ import {
   DialogContent,
   DialogContentText,
   DialogTitle,
-  Tooltip
+  Tooltip,
+  Typography,
 } from '@mui/material';
 import PropTypes from 'prop-types';
 import { updateTeam } from '../../api/team.js';
@@ -34,7 +35,8 @@ const StyledCard = styled(Card)({
     width: '340px',
     display: 'flex',
     flexDirection: 'column',
-    justifyContent: 'space-between'
+    justifyContent: 'space-between',
+    position: 'relative',
   },
   [`& .${classes.header}`]: {
     width: '100%'
@@ -46,6 +48,11 @@ const StyledCard = styled(Card)({
   }
 });
 
+const inactiveStyle = {
+  'color': 'var(--action-disabled)',
+  'font-size': '0.75em',
+};
+
 const propTypes = {
   team: PropTypes.shape({
     id: PropTypes.string,
@@ -101,7 +108,7 @@ const TeamSummaryCard = ({ team, index, onTeamSelect, selectedTeamId }) => {
           title: classes.title,
           subheader: classes.title
         }}
-        title={team.name + (team.active ? ' (Active)' : ' (Inactive)')}
+        title={team.name}
         subheader={
           <Tooltip
             open={tooltipIsOpen}
@@ -116,6 +123,14 @@ const TeamSummaryCard = ({ team, index, onTeamSelect, selectedTeamId }) => {
         }
       />
       <CardContent>
+        {!team.active && (
+          <Typography sx={{ position: 'absolute', top: 10, right: 10,
+                            ...inactiveStyle,
+                          }}
+          >
+            Inactive
+          </Typography>
+        )}
         {team.teamMembers == null ? (
           <React.Fragment key={`empty-team-${team.name}`}>
             <strong>Team Leads: </strong>None Assigned

web-ui/src/components/team-results/__snapshots__/TeamSummaryCard.test.jsx.snap

@@ -3,7 +3,7 @@
 exports[`renders correctly 1`] = `
 <div>
   <div
-    class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root TeamSummaryCard-card css-2bwzc-MuiPaper-root-MuiCard-root"
+    class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root TeamSummaryCard-card css-55zgp6-MuiPaper-root-MuiCard-root"
   >
     <div
       class="MuiCardHeader-root css-185gdzj-MuiCardHeader-root"
@@ -14,7 +14,7 @@ exports[`renders correctly 1`] = `
         <span
           class="MuiTypography-root MuiTypography-h5 MuiCardHeader-title TeamSummaryCard-title css-1qvr50w-MuiTypography-root"
         >
-          string (Inactive)
+          string
         </span>
         <span
           class="MuiTypography-root MuiTypography-body1 MuiCardHeader-subheader TeamSummaryCard-title css-nrdprl-MuiTypography-root"
@@ -32,6 +32,11 @@ exports[`renders correctly 1`] = `
     <div
       class="MuiCardContent-root css-46bh2p-MuiCardContent-root"
     >
+      <p
+        class="MuiTypography-root MuiTypography-body1 css-19pemnp-MuiTypography-root"
+      >
+        Inactive
+      </p>
       <strong>
         Team Leads: 
       </strong>
@@ -52,7 +57,7 @@ exports[`renders correctly 1`] = `
 exports[`renders correctly for ADMIN 1`] = `
 <div>
   <div
-    class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root TeamSummaryCard-card css-2bwzc-MuiPaper-root-MuiCard-root"
+    class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root TeamSummaryCard-card css-55zgp6-MuiPaper-root-MuiCard-root"
   >
     <div
       class="MuiCardHeader-root css-185gdzj-MuiCardHeader-root"
@@ -63,7 +68,7 @@ exports[`renders correctly for ADMIN 1`] = `
         <span
           class="MuiTypography-root MuiTypography-h5 MuiCardHeader-title TeamSummaryCard-title css-1qvr50w-MuiTypography-root"
         >
-          string (Inactive)
+          string
         </span>
         <span
           class="MuiTypography-root MuiTypography-body1 MuiCardHeader-subheader TeamSummaryCard-title css-nrdprl-MuiTypography-root"
@@ -81,6 +86,11 @@ exports[`renders correctly for ADMIN 1`] = `
     <div
       class="MuiCardContent-root css-46bh2p-MuiCardContent-root"
     >
+      <p
+        class="MuiTypography-root MuiTypography-body1 css-19pemnp-MuiTypography-root"
+      >
+        Inactive
+      </p>
       <strong>
         Team Leads: 
       </strong>
@@ -142,7 +152,7 @@ exports[`renders correctly for ADMIN 1`] = `
 exports[`renders correctly for team lead 1`] = `
 <div>
   <div
-    class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root TeamSummaryCard-card css-2bwzc-MuiPaper-root-MuiCard-root"
+    class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root TeamSummaryCard-card css-55zgp6-MuiPaper-root-MuiCard-root"
   >
     <div
       class="MuiCardHeader-root css-185gdzj-MuiCardHeader-root"
@@ -153,7 +163,7 @@ exports[`renders correctly for team lead 1`] = `
         <span
           class="MuiTypography-root MuiTypography-h5 MuiCardHeader-title TeamSummaryCard-title css-1qvr50w-MuiTypography-root"
         >
-          stuff (Inactive)
+          stuff
         </span>
         <span
           class="MuiTypography-root MuiTypography-body1 MuiCardHeader-subheader TeamSummaryCard-title css-nrdprl-MuiTypography-root"
@@ -169,6 +179,11 @@ exports[`renders correctly for team lead 1`] = `
     <div
       class="MuiCardContent-root css-46bh2p-MuiCardContent-root"
     >
+      <p
+        class="MuiTypography-root MuiTypography-body1 css-19pemnp-MuiTypography-root"
+      >
+        Inactive
+      </p>
       <strong>
         Team Leads: 
       </strong>

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)
     )
 );