fix: refactor to fix more console errors

This commit is contained in:
Markus
2026-08-07 15:28:15 +03:00
parent 5915594402
commit 4fa77b3e54
2 changed files with 29 additions and 27 deletions
@@ -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 <LoadingSpinner />
@@ -81,14 +83,14 @@ const AdminSprintsPage = (props) => {
<SprintsSelectForm
configurations={allConfigurations}
groups={allGroups}
selectedConfiguration={selectedConfiguration}
selectedGroup={selectedGroup}
handleConfigurationChange={setSelectedConfiguration}
handleGroupChange={setSelectedGroup}
selectedConfigurationId={selectedConfigurationId}
selectedGroupId={selectedGroupId}
handleConfigurationChange={setSelectedConfigurationId}
handleGroupChange={setSelectedGroupId}
/>
{selectedGroup && (
{selectedGroupId !== '' && selectedGroupObj && (
<div>
<Typography variant="h5">Sprints by {selectedGroup.name}</Typography>
<Typography variant="h5">Sprints by {selectedGroupObj.name}</Typography>
{allSprints.length > 0 && (
<div className="sprint-list-container">
<Table>
@@ -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 (
<Select
data-cy="configuration-selector"
value={selectedConfiguration}
value={selectedConfigurationId}
onChange={(e) => {
handleConfigurationChange(e.target.value)
handleGroupChange({})
handleGroupChange('')
}}
MenuProps={{ style: { zIndex: 1600 } }}
>
@@ -38,7 +38,7 @@ export const SprintsSelectForm = ({
<MenuItem
key={configuration.id}
className="configuration-menu-item"
value={configuration}
value={configuration.id}
>
{configuration.name}
</MenuItem>
@@ -47,24 +47,24 @@ export const SprintsSelectForm = ({
)
}
const GroupIsInConfiguration = (group, configuration) => {
return group.configurationId === configuration.id
const GroupIsInConfiguration = (group, configurationId) => {
return group.configurationId === configurationId
}
const GroupSelect = ({ groups, selectedGroup, handleGroupChange }) => {
const GroupSelect = ({ groups, selectedGroupId, handleGroupChange }) => {
return (
<Select
data-cy="group-selector"
value={selectedGroup}
value={selectedGroupId}
onChange={(e) => {
handleGroupChange(e.target.value)
}}
MenuProps={{ style: { zIndex: 1600 } }}
>
{groups
.filter((group) => GroupIsInConfiguration(group, selectedConfiguration))
.filter((group) => GroupIsInConfiguration(group, selectedConfigurationId))
.map((group) => (
<MenuItem key={group.id} className="group-menu-item" value={group}>
<MenuItem key={group.id} className="group-menu-item" value={group.id}>
{group.name}
</MenuItem>
))}
@@ -78,15 +78,15 @@ export const SprintsSelectForm = ({
<SelectorWrapper label="Select configuration">
<ConfigurationSelect
configurations={configurations}
selectedConfiguration={selectedConfiguration}
selectedConfigurationId={selectedConfigurationId}
handleConfigurationChange={handleConfigurationChange}
handleGroupChange={handleGroupChange}
/>
</SelectorWrapper>
{Object.keys(selectedConfiguration).length !== 0 && (
{selectedConfigurationId !== '' && (
<SelectorWrapper label="Select group">
<GroupSelect
selectedGroup={selectedGroup}
selectedGroupId={selectedGroupId}
handleGroupChange={handleGroupChange}
groups={groups}
/>