Skip to content

Xinyi - fix: dropdown and issue data fetching #4385

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

Open
RitzzzZ2021 wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Xinyi - fix: dropdown and issue data fetching #4385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1befd8
fix: conflicts
RitzzzZ2021 Dec 9, 2025
3be28b4
fix: redirect to projects page
RitzzzZ2021 Dec 9, 2025
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
2 changes: 1 addition & 1 deletion src/components/BMDashboard/Issues/IssueDashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import IssueHeader from './IssueHeader';

export default function IssueDashboard() {
const dispatch = useDispatch();
const issues = useSelector(state => state.bmIssues?.issues || []);
const issues = useSelector(state => state.bmIssues || []);
const darkMode = useSelector(state => state.theme.darkMode);

const [currentPage, setCurrentPage] = useState(1);
Expand Down
2 changes: 1 addition & 1 deletion src/components/BMDashboard/Issues/IssueHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function IssueHeader(props) {
<button className="more-button" type="button" label="More Button">
<MoreHorizontal size={20} />
</button>
<Link to="/bmdashboard/projects" style={{ textDecoration: 'none' }}>
<Link to="/projects" style={{ textDecoration: 'none' }}>
<button className="back-button" type="button">
Back to Projects
</button>
Expand Down
8 changes: 7 additions & 1 deletion src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
import { useParams } from 'react-router-dom';
import { useSelector } from 'react-redux';
import { useSelector, useDispatch } from 'react-redux';
import { useEffect } from 'react';
import { Container, Row, Col } from 'reactstrap';
import LogBar from './LogBar';
import RentedToolsDisplay from './RentedTools/RentedToolsDisplay';
import MaterialsDisplay from './Materials/MaterialsDisplay';
import ProjectLog from './ProjectLog';
import styles from './ProjectDetails.module.css';
import { fetchBMProjects } from '../../../../actions/bmdashboard/projectActions';

function ProjectDetails() {
const dispatch = useDispatch();
useEffect(() => {
dispatch(fetchBMProjects());
}, []);
const { projectId } = useParams();
const darkMode = useSelector(state => state.theme.darkMode);
const projects = useSelector(state => state.bmProjects) || [];
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ export function Header(props) {
<DropdownItem tag={Link} to="/bmdashboard/equipment" className={fontColor} disabled={headerDisabled}>
Equipment/Tool List
</DropdownItem>
<DropdownItem tag={Link} to="/bmdashboard/Issue" className={fontColor} disabled={headerDisabled}>
<DropdownItem tag={Link} to="/bmdashboard/issues" className={fontColor} disabled={headerDisabled}>
Issue
</DropdownItem>
<DropdownItem tag={Link} to="/bmdashboard/lessonform/" className={fontColor} disabled={headerDisabled}>
Expand Down
Loading