diff --git a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js index 729c4b9..6a3fdf3 100644 --- a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js +++ b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js @@ -241,6 +241,8 @@ export default function GroupTasksViewModal({ isOpen }) { groupTaskSteps.sort((a, b) => a.Step - b.Step); + console.log("currentGroupTask", currentGroupTask.NumberOfSteps); + webSocketContext.CategoryGroups.forEach((categoryGroup) => { if (categoryGroup.category === currentGroupTask.Category) { categoryGroup.groups.forEach((group) => { @@ -251,10 +253,10 @@ export default function GroupTasksViewModal({ isOpen }) { } }); - let stepItems = []; + console.log("groupTasks", groupTasks, groupTaskSteps); - groupTasks.forEach((groupTask, index) => { - stepItems.push({ + const getStepItem = (groupTask, index) => { + return { key: index, title: groupTaskSteps[index] !== undefined && @@ -417,8 +419,37 @@ export default function GroupTasksViewModal({ isOpen }) { ) : ( "" ), - }); - }); + }; + }; + + let stepItems = []; + + groupTasks.forEach((groupTask, index) => + stepItems.push(getStepItem(groupTask, index)) + ); + + // occurs when tasks were taken from the group task config, but at a previous time the tasks existed + if (currentGroupTask.NumberOfSteps > groupTasks.length) { + for ( + let i = groupTasks.length - 1; + i < currentGroupTask.NumberOfSteps; + i++ + ) { + let stepParams = []; + + if (groupTaskSteps[i].Inputs !== "") { + let params = JSON.parse(groupTaskSteps[i].Inputs); + + for (let i2 = 0; i2 < params.length; i2++) { + params[i2].displayName = params[i2].parameterName; + } + + stepParams = params; + } + + stepItems.push(getStepItem({ name: "???", parameters: stepParams }, i)); + } + } return stepItems; };