diff --git a/frontend/src/components/AdminSprintsPage/AdminSprintsPage.jsx b/frontend/src/components/AdminSprintsPage/AdminSprintsPage.jsx
index 82a0a06..204e193 100644
--- a/frontend/src/components/AdminSprintsPage/AdminSprintsPage.jsx
+++ b/frontend/src/components/AdminSprintsPage/AdminSprintsPage.jsx
@@ -21,8 +21,10 @@ const AdminSprintsPage = (props) => {
const [allConfigurations, setAllConfigurations] = useState([])
const [allGroups, setAllGroups] = useState([])
const [allSprints, setAllSprints] = useState([])
- const [selectedConfiguration, setSelectedConfiguration] = useState({})
- const [selectedGroup, setSelectedGroup] = useState({})
+ const [selectedConfigurationId, setSelectedConfigurationId] = useState('')
+ const [selectedGroupId, setSelectedGroupId] = useState('')
+
+ const selectedGroupObj = allGroups.find((g) => g.id === selectedGroupId)
const [isLoading, setIsLoading] = useState(true)
@@ -66,13 +68,13 @@ const AdminSprintsPage = (props) => {
notificationActions.setError(error.response.data.error)
}
}
- const fetchData = async (selectedGroupId) => {
+ const fetchData = async (id) => {
setIsLoading(true)
- await fetchSprints(selectedGroupId)
+ await fetchSprints(id)
setIsLoading(false)
}
- if (selectedGroup?.id) fetchData(selectedGroup.id)
- }, [selectedGroup, selectedConfiguration])
+ if (selectedGroupId) fetchData(selectedGroupId)
+ }, [selectedGroupId, selectedConfigurationId])
if (isLoading) return
@@ -81,14 +83,14 @@ const AdminSprintsPage = (props) => {
- {selectedGroup && (
+ {selectedGroupId !== '' && selectedGroupObj && (
-
Sprints by {selectedGroup.name}
+
Sprints by {selectedGroupObj.name}
{allSprints.length > 0 && (
diff --git a/frontend/src/components/AdminSprintsPage/SprintsSelectForm.jsx b/frontend/src/components/AdminSprintsPage/SprintsSelectForm.jsx
index 29eb013..c6d094b 100644
--- a/frontend/src/components/AdminSprintsPage/SprintsSelectForm.jsx
+++ b/frontend/src/components/AdminSprintsPage/SprintsSelectForm.jsx
@@ -5,10 +5,10 @@ import Select from '@mui/material/Select'
export const SprintsSelectForm = ({
configurations,
- selectedConfiguration,
+ selectedConfigurationId,
handleConfigurationChange,
groups,
- selectedGroup,
+ selectedGroupId,
handleGroupChange,
}) => {
const SelectorWrapper = ({ label, children }) => (
@@ -20,17 +20,17 @@ export const SprintsSelectForm = ({
const ConfigurationSelect = ({
configurations,
- selectedConfiguration,
+ selectedConfigurationId,
handleConfigurationChange,
handleGroupChange,
}) => {
return (