Merge pull request #168 from DaleMcGrew/Dale_WCC_Apr19-2026

[WV-2471] Fixes to the Tasks filters.

Author: DaleMcGrew

.gitignore

@@ -39,6 +39,7 @@ build/Release
 
 # Dependency directory
 ###################
+git_commit_hash
 # https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
 node_modules
 

src/js/components/Task/EditTaskDefinitionForm.jsx

@@ -179,6 +179,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
               updateSaveButton();
             }}
             value={taskType}
+            variant="outlined"
           >
             <MenuItem value=""><em>None</em></MenuItem>
             {TASK_TYPE_LIST.filter((t) => t !== TASK_TYPES.ALL_TASKS).map((t) => (
@@ -472,7 +473,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
           Click on token to copy so you can paste into the instructions above.
         </CustomizationTokensDescription>
         {[...Array(Math.ceil(customizationTokensList.length / 2))].map((_, rowIndex) => (
-          <TokenRow key={rowIndex}>
+          <TokenRow key={`token-row-${rowIndex}`}>
             {customizationTokensList.slice(rowIndex * 2, rowIndex * 2 + 2).map((token, index) => (
               <NarrowTextField
                 InputProps={{
@@ -482,7 +483,7 @@ const EditTaskDefinitionForm = ({ classes }) => {
                     transition: 'background-color 0.3s',
                   },
                 }}
-                key={index}
+                key={`text-field-${index}`}
                 onClick={() => copyToClipboard(token)}
                 value={token}
                 variant="outlined"

src/js/components/Task/TaskListForPerson.jsx

@@ -5,9 +5,10 @@ import { renderLog } from '../../common/utils/logging';
 import TaskSummaryRow from './TaskSummaryRow';
 import { showTask } from '../../utils/showTask';
 import convertToInteger from '../../common/utils/convertToInteger';
+import { TASK_TYPES } from '../../constants/TaskTypeConstants';
 
 
-const TaskListForPerson = ({ searchText, showCompletedTasks, taskDefinitionList, taskListForPersonId }) => {
+const TaskListForPerson = ({ searchText, selectedTaskType, showCompletedTasks, taskDefinitionList, taskListForPersonId }) => {
   renderLog('TaskListForPerson');  // Set LOG_RENDER_EVENTS to log all renders
   // console.log('=== TaskListForPerson searchText:', searchText);
   // isSearchTextFoundInTask(searchText, task, taskDefinitionList)
@@ -16,7 +17,9 @@ const TaskListForPerson = ({ searchText, showCompletedTasks, taskDefinitionList,
     <TaskListWrapper>
       {taskListForPersonId.map((task) => {
         const taskDefinition = taskDefinitionList.find((taskDef) => taskDef.taskDefinitionId === task.taskDefinitionId) || {};
-        const showTaskTemp =  showTask(task, searchText, taskDefinitionList);
+        const taskTypeMatches = selectedTaskType === TASK_TYPES.ALL_TASKS || (taskDefinition && taskDefinition.taskType === selectedTaskType);
+        // console.log('selectedTaskType:', selectedTaskType, 'taskTypeMatches:', taskTypeMatches, ', showTaskDefinition:', showTaskDefinition(searchText, taskDefinition));
+        const showTaskTemp = taskTypeMatches && showTask(task, searchText, taskDefinitionList);
         // console.log('*** showTaskTemp:', showTaskTemp);
         return showTaskTemp ? (
           <TaskSummaryRow
@@ -33,6 +36,7 @@ const TaskListForPerson = ({ searchText, showCompletedTasks, taskDefinitionList,
 };
 TaskListForPerson.propTypes = {
   searchText: PropTypes.string,
+  selectedTaskType: PropTypes.string,
   showCompletedTasks: PropTypes.bool,
   taskDefinitionList: PropTypes.array,
   taskListForPersonId: PropTypes.array,

src/js/constants/TaskTypeConstants.js

@@ -2,12 +2,14 @@ export const TASK_TYPES = {
   ALL_TASKS: 'All Tasks',
   HR_ONBOARDING: 'HR Onboarding',
   HIRING_MANAGERS: 'Hiring Managers',
+  VOLUNTEER_TASKS: 'Volunteer Tasks',
 };
 
 export const TASK_TYPE_LIST = [
-  TASK_TYPES.ALL_TASKS,
   TASK_TYPES.HR_ONBOARDING,
   TASK_TYPES.HIRING_MANAGERS,
+  TASK_TYPES.VOLUNTEER_TASKS,
+  TASK_TYPES.ALL_TASKS,
 ];
 
 export default TASK_TYPES;

src/js/pages/Tasks.jsx

@@ -33,7 +33,7 @@ const Tasks = () => {
   const [personIdsList, setPersonIdsList] = useState([]);
   const [searchText, setSearchText] = useState('');
   const [selectedPersonList, setSelectedPersonList] = useState([]);
-  const [selectedTaskType, setSelectedTaskType] = useState(TASK_TYPES.ALL_TASKS);
+  const [selectedTaskType, setSelectedTaskType] = useState(TASK_TYPES.HR_ONBOARDING);
   const [hideAllTasks, setHideAllTasks] = useState(getAppContextValue('tasksActionBarHideAllTasks'));
   const [showCompletedTasks, setShowCompletedTasks] = useState(false);
   const [showTasksByTask, setShowTasksByTask] = useState(false);
@@ -124,10 +124,6 @@ const Tasks = () => {
     }
   }, [getAppContextValue]);
 
-  const filteredTaskDefinitionList = selectedTaskType === TASK_TYPES.ALL_TASKS
-    ? taskDefinitionList
-    : taskDefinitionList.filter((td) => td.taskType === selectedTaskType);
-
   const teamId = 0;  // hack 1/15/25
   // console.log('allTasksByDefinitionIdCache:', allTasksByDefinitionIdCache);
   return (
@@ -162,9 +158,10 @@ const Tasks = () => {
               {allTasksByDefinitionIdCache && Object.entries(allTasksByDefinitionIdCache).map(([taskDefinitionId, tasks]) => {
                 // console.log('=== taskDefinitionId:', taskDefinitionId);
                 // const showTaskDefinition = tasks.length > 0; // Also set to false if all tasks are marked as completed
-                const taskDefinition = filteredTaskDefinitionList.find((td) => String(td.taskDefinitionId) === String(taskDefinitionId)) || taskDefinitionList[taskDefinitionId];
+                const taskDefinition = taskDefinitionList[taskDefinitionId];
                 const taskName = taskDefinition ? taskDefinition.taskName ||  'taskName Missing' : 'Task Name Missing';
                 const taskTypeMatches = selectedTaskType === TASK_TYPES.ALL_TASKS || (taskDefinition && taskDefinition.taskType === selectedTaskType);
+                // console.log('selectedTaskType:', selectedTaskType, 'taskTypeMatches:', taskTypeMatches, ', showTaskDefinition:', showTaskDefinition(searchText, taskDefinition));
                 const showTaskTemp = taskTypeMatches && showTaskDefinition(searchText, taskDefinition);
                 // console.log('*** showTaskTemp:', showTaskTemp);
                 if (showTaskTemp) {
@@ -211,7 +208,7 @@ const Tasks = () => {
                 <PersonSummaryHeader />
               </PersonSummaryHeaderWrapper>
               {taskListByPersonId && selectedPersonList.map((person) => {
-                const showPersonResults = showPersonInTaskList(person, searchText, showCompletedTasks, filteredTaskDefinitionList, taskListByPersonId);
+                const showPersonResults = showPersonInTaskList(person, searchText, showCompletedTasks, taskDefinitionList, taskListByPersonId);
                 // console.log('=== person:', person, ', showPersonResults:', showPersonResults);
                 if ((showPersonResults.allSearchWordsWereFound || showPersonResults.tasksExistToShow) && !showPersonResults.hideBecauseInactive) {
                   return (
@@ -220,8 +217,9 @@ const Tasks = () => {
                       {!hideAllTasks && (
                         <TaskListForPerson
                           searchText={showPersonResults.searchTextMinusWordsFoundInPersonList}
+                          selectedTaskType={selectedTaskType}
                           showCompletedTasks={showCompletedTasks}
-                          taskDefinitionList={filteredTaskDefinitionList}
+                          taskDefinitionList={taskDefinitionList}
                           taskListForPersonId={taskListByPersonId[person.personId] || []}
                         />
                       )}