Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revived search on Add Team Member drawer #17

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Revived search on Add Team Member drawer #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 69 additions & 46 deletions src/js/components/Person/AddPersonDrawerMainContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useState } from 'react';
import { TextField } from '@mui/material';
import React, { useEffect, useRef, useState } from 'react';
import { useParams } from 'react-router';
import styled from 'styled-components';
import SearchBar2024 from '../../common/components/Search/SearchBar2024';
import arrayContains from '../../common/utils/arrayContains';
import { renderLog } from '../../common/utils/logging';
import { useConnectAppContext } from '../../contexts/ConnectAppContext';
import { useAddPersonToTeamMutation } from '../../react-query/mutations';
import makeRequestParams from '../../react-query/makeRequestParams';
import { useAddPersonToTeamMutation } from '../../react-query/mutations';
import { SpanWithLinkStyle } from '../Style/linkStyles';
import AddPersonForm from './AddPersonForm';

Expand All @@ -19,18 +19,19 @@ const AddPersonDrawerMainContent = () => {
const params = useParams();
console.log('AddPersonDrawerMainContent params: ', params);

const [allStaffList] = useState(getAppContextValue('allStaffList'));
const [allStaffLessAdds, setAllStaffLessAdds] = useState(getAppContextValue('allStaffList'));
const [staffToDisplayList, setStaffToDisplayList] = useState([]);
// eslint-disable-next-line no-unused-vars
const [searchText, setSearchText] = useState('');
const [allStaffList, setAllStaffList] = useState(getAppContextValue('allStaffList'));
const [staffListLabelAdd, setStaffListLabelAdd] = useState(true);
const [thisTeamsCurrentMembersList, setThisTeamsCurrentMembersList] = useState([]);
const [teamId, setTeamId] = useState(getAppContextValue('teamId'));
const [teamName, setTeamName] = useState('');
const [teamMemberPersonIdList] = useState([]);
const [searchResultsList] = useState([]);
const [matchingCountText, setMatchingCountText] = useState('');
const [addPersonDrawerOpen] = useState(getAppContextValue('addPersonDrawerOpen'));

// eslint-disable-next-line no-unused-vars
const [teamMemberPersonIdList, setTeamMemberPersonIdList] = useState([]);
// eslint-disable-next-line no-unused-vars
const [searchResultsList, setSearchResultsList] = useState([]);
const searchStringRef = useRef('');

let memberList = [];
const teamListFromContext = getAppContextValue('teamListNested');
Expand All @@ -47,34 +48,42 @@ const AddPersonDrawerMainContent = () => {
// console.log('no teamListFromContext yet!');
}

if (staffToDisplayList.length === 0 && allStaffList && allStaffList.length > 0) {
const staffToDisplay = [];
allStaffList.forEach((oneStaff) => {
const isOnTeam = memberList.some((obj) => obj.id === oneStaff.id);
if (!isOnTeam) {
staffToDisplay.push(oneStaff);
}
});
setStaffToDisplayList(staffToDisplay);
}
const setTheAllStaffToDisplayList = () => {
console.log('setTheAllStaffList in AddPersonDrawerMainContent');
// Start with the passed in allStaffList, create the staffToDisplayList, by removing any staff already on the team
if (allStaffList && allStaffList.length > 0) {
const staffToDisplay = [];
allStaffList.forEach((oneStaff) => {
const isOnTeam = thisTeamsCurrentMembersList.some((obj) => obj.id === oneStaff.id);
if (!isOnTeam) {
staffToDisplay.push(oneStaff);
}
});
setStaffToDisplayList(staffToDisplay);
}
};

// TODO: 1/6/25: revive search
// const searchFunction = (incomingSearchText) => {
// let searchingJustStarted = false;
// if (searchText.length === 0 && incomingSearchText.length > 0) {
// searchingJustStarted = true;
// }
// const isSearching = (incomingSearchText && incomingSearchText.length > 0);
// const teamIdTemp = getAppContextValue('addPersonDrawerTeamId');
// if (apiCalming(`addPersonToTeamSearch-${teamIdTemp}-${incomingSearchText}`, 60000)) { // Only once per 60 seconds
// PersonActions.personListRetrieve(incomingSearchText);
// }
// setSearchText(incomingSearchText);
// };

const clearFunction = () => {
setAllStaffList([]);
setSearchText('');
useEffect(() => {
setAllStaffLessAdds(allStaffList);
setTheAllStaffToDisplayList();
}, [addPersonDrawerOpen]);

const searchFunction = () => {
// TODO: This currently only searches for matches in the staff member's last name
const currentValue = searchStringRef.current.value;
if (currentValue.length === 0) {
setMatchingCountText('');
setTheAllStaffToDisplayList();
setStaffListLabelAdd(true);
} else {
const isMatch = (element) => element.lastName.toLowerCase().includes(currentValue.toLowerCase());
const matchingElements = staffToDisplayList ? staffToDisplayList.filter((element) => isMatch(element)) : {};
setStaffToDisplayList(matchingElements);
const matchingCount = matchingElements.length === 0 ? '' : `${matchingElements.length} matches out of ${allStaffList.length} staff members`;
setMatchingCountText(matchingCount);
setStaffListLabelAdd(false);
console.log(matchingElements);
}
};

const addClicked = (person) => {
Expand All @@ -86,21 +95,30 @@ const AddPersonDrawerMainContent = () => {
teamName,
};
mutate(makeRequestParams(plainParams, {}));
// This removes the recently "added" staff, from the list of staff who can be added, the staffToDisplayList
const updatedStaffToDisplayList = staffToDisplayList.filter((staff) => staff.id !== person.id);
setStaffToDisplayList(updatedStaffToDisplayList);
// Remove this staff from the All Staff less Adds list (since they were added to the team)
const updatedAllStaffLessAdds = allStaffLessAdds.filter((staff) => staff.id !== person.id);
setAllStaffLessAdds(updatedAllStaffLessAdds);
if (staffToDisplayList && staffToDisplayList.length > 0) {
// If we are currently showing filtered, remove this staff member from the filtered Staff To Display List
const updatedStaffToDisplayList = staffToDisplayList.filter((staff) => staff.id !== person.id);
setStaffToDisplayList(updatedStaffToDisplayList);
}
};

return (
<AddPersonDrawerMainContentWrapper>
<SearchBarWrapper>
<SearchBar2024
<TextField
id="search_input"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you get a moment, I would love to maintain the use of a component (perhaps SearchBar2025?) for the actual search bar input field (instead of an inline TextField), because we want features like an "x" to delete the search text, a search icon in the box, etc.

label="Search for team members"
inputRef={searchStringRef}
name="searchByName"
onChange={searchFunction}
placeholder="Search by name"
// searchFunction={searchFunction}
searchFunction={() => console.log('searchFunction')}
clearFunction={clearFunction}
searchUpdateDelayTime={750}
defaultValue=""
sx={{ minWidth: '250px' }}
/>
<MatchingPerson>{matchingCountText}</MatchingPerson>
</SearchBarWrapper>
{(searchResultsList && searchResultsList.length > 0) && (
<PersonSearchResultsWrapper>
Expand All @@ -123,7 +141,7 @@ const AddPersonDrawerMainContent = () => {
</PersonSearchResultsWrapper>
)}
<PersonDirectoryWrapper>
<PersonListTitle>All Staff:</PersonListTitle>
<PersonListTitle>{staffListLabelAdd ? 'Can be added to team' : 'Filtered list of people to add to team'}</PersonListTitle>
<PersonList>
{staffToDisplayList.map((person) => (
<PersonItem key={`personResult-${person.id}`}>
Expand Down Expand Up @@ -153,6 +171,10 @@ const AddPersonDrawerMainContentWrapper = styled('div')`
const AddPersonWrapper = styled('div')`
margin-top: 32px;
`;
const MatchingPerson = styled('div')`
margin: 10px 0 0 10px;
font-style: italic;
`;

const PersonDirectoryWrapper = styled('div')`
margin-top: 16px;
Expand All @@ -165,6 +187,7 @@ const PersonList = styled('div')`
`;

const PersonListTitle = styled('div')`
font-weight: 250;
`;

const PersonSearchResultsWrapper = styled('div')`
Expand Down
Loading