Skip to content

Commit

Permalink
Merge branch 'develop' into fix-rewriting-TestManagementConfigMenu-page
Browse files Browse the repository at this point in the history
  • Loading branch information
@adityadeshlahre
adityadeshlahre authored Jan 17, 2025
2 parents a635f03 + ae2166c commit 4e842d8
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 86 deletions.
101 changes: 54 additions & 47 deletions frontend/src/components/cytology/CytologyDashBoard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,10 @@ function CytologyDashboard() {
const [filters, setFilters] = useState({
searchTerm: "",
myCases: false,
statuses: [
{
id: "PREPARING_SLIDES",
value: "Preparing slides",
},
],
statuses: [{}],
});
const [inProgressStatuses, setInProgressStatuses] = useState([]);

const [counts, setCounts] = useState({
inProgress: 0,
awaitingReview: 0,
Expand All @@ -59,10 +56,31 @@ function CytologyDashboard() {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(100);
const intl = useIntl();

const [inProgressStatusObjects, setInProgressStatusObjects] = useState(
inProgressStatuses.map((statusId) => ({ id: statusId })),
);
const setStatusList = (statusList) => {
if (componentMounted.current) {
// Set all statuses
setStatuses(statusList);

// Filter out COMPLETED statuses and update the in-progress statuses state
const filteredStatuses = statusList
.filter((status) => status.id !== "COMPLETED")
.map((status) => status.id);

setInProgressStatuses(filteredStatuses);

// Update the inProgressStatusObjects state
setInProgressStatusObjects(
filteredStatuses.map((statusId) => ({ id: statusId })),
);

// Set filters using the updated state
setFilters((prev) => ({
...prev,
statuses: filteredStatuses.map((statusId) => ({ id: statusId })),
}));
}
};

Expand Down Expand Up @@ -149,13 +167,29 @@ function CytologyDashboard() {
};

const setStatusFilter = (event) => {
if (event.target.value === "All") {
const { value } = event.target;

if (value === "All") {
setFilters({ ...filters, statuses: statuses });
} else if (value === "IN_PROGRESS") {
setFilters({ ...filters, statuses: inProgressStatusObjects });
} else {
setFilters({ ...filters, statuses: [{ id: event.target.value }] });
setFilters({ ...filters, statuses: [{ id: value }] });
}
};

const getSelectedValue = () => {
const selectedValue =
filters.statuses.length === inProgressStatuses.length &&
filters.statuses.every((status) => inProgressStatuses.includes(status.id))
? "IN_PROGRESS"
: filters.statuses.length > 1
? "All"
: filters.statuses[0].id;

return selectedValue;
};

const filtersToParameters = () => {
return (
"statuses=" +
Expand Down Expand Up @@ -242,23 +276,6 @@ function CytologyDashboard() {
},
];

useEffect(() => {
componentMounted.current = true;
setFilters({
...filters,
statuses: [
{
id: "PREPARING_SLIDES",
value: "Preparing slides",
},
],
});

return () => {
componentMounted.current = false;
};
}, [statuses]);

useEffect(() => {
componentMounted.current = true;
refreshItems();
Expand Down Expand Up @@ -329,30 +346,20 @@ function CytologyDashboard() {
id="statusFilter"
name="statusFilter"
labelText={intl.formatMessage({ id: "label.filters.status" })}
value={
filters.statuses.length > 1 ? "All" : filters.statuses[0].id
}
value={getSelectedValue()}
onChange={setStatusFilter}
noLabel
>
<SelectItem
disabled
value="placeholder"
text={intl.formatMessage({ id: "label.filters.status" })}
/>
<SelectItem
text={intl.formatMessage({ id: "all.label" })}
value="All"
/>
{statuses.map((status, index) => {
return (
<SelectItem
key={index}
text={status.value}
value={status.id}
/>
);
})}
<SelectItem disabled value="placeholder" text="Status" />
<SelectItem text="All" value="All" />
<SelectItem text="In Progress" value="IN_PROGRESS" />
{statuses.map((status, index) => (
<SelectItem
key={index}
text={status.value}
value={status.id}
/>
))}
</Select>
</div>
</Column>
Expand Down
92 changes: 53 additions & 39 deletions frontend/src/components/pathology/PathologyDashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,43 @@ function PathologyDashboard() {
const [filters, setFilters] = useState({
searchTerm: "",
myCases: false,
statuses: [
{
id: "GROSSING",
value: "Grossing",
},
],
statuses: [{}],
});

const [inProgressStatuses, setInProgressStatuses] = useState([]);

const [counts, setCounts] = useState({
inProgress: 0,
awaitingReview: 0,
additionalRequests: 0,
complete: 0,
});
const [loading, setLoading] = useState(true);

const [inProgressStatusObjects, setInProgressStatusObjects] = useState(
inProgressStatuses.map((statusId) => ({ id: statusId })),
);
const setStatusList = (statusList) => {
if (componentMounted.current) {
// Set all statuses
setStatuses(statusList);

// Filter out COMPLETED statuses and update the in-progress statuses state
const filteredStatuses = statusList
.filter((status) => status.id !== "COMPLETED")
.map((status) => status.id);

setInProgressStatuses(filteredStatuses);

// Update the inProgressStatusObjects state
setInProgressStatusObjects(
filteredStatuses.map((statusId) => ({ id: statusId })),
);

// Set filters using the updated state
setFilters((prev) => ({
...prev,
statuses: filteredStatuses.map((statusId) => ({ id: statusId })),
}));
}
};

Expand Down Expand Up @@ -153,13 +172,29 @@ function PathologyDashboard() {
};

const setStatusFilter = (event) => {
if (event.target.value === "All") {
const { value } = event.target;

if (value === "All") {
setFilters({ ...filters, statuses: statuses });
} else if (value === "IN_PROGRESS") {
setFilters({ ...filters, statuses: inProgressStatusObjects });
} else {
setFilters({ ...filters, statuses: [{ id: event.target.value }] });
setFilters({ ...filters, statuses: [{ id: value }] });
}
};

const getSelectedValue = () => {
const selectedValue =
filters.statuses.length === inProgressStatuses.length &&
filters.statuses.every((status) => inProgressStatuses.includes(status.id))
? "IN_PROGRESS"
: filters.statuses.length > 1
? "All"
: filters.statuses[0].id;

return selectedValue;
};

const filtersToParameters = () => {
return (
"statuses=" +
Expand Down Expand Up @@ -250,23 +285,6 @@ function PathologyDashboard() {
},
];

useEffect(() => {
componentMounted.current = true;
setFilters({
...filters,
statuses: [
{
id: "GROSSING",
value: "Grossing",
},
],
});

return () => {
componentMounted.current = false;
};
}, [statuses]);

useEffect(() => {
componentMounted.current = true;
refreshItems();
Expand Down Expand Up @@ -334,24 +352,20 @@ function PathologyDashboard() {
id="statusFilter"
name="statusFilter"
labelText={intl.formatMessage({ id: "label.filters.status" })}
defaultValue="placeholder"
value={
filters.statuses.length > 1 ? "All" : filters.statuses[0].id
}
value={getSelectedValue()}
onChange={setStatusFilter}
noLabel
>
<SelectItem disabled value="placeholder" text="Status" />
<SelectItem text="All" value="All" />
{statuses.map((status, index) => {
return (
<SelectItem
key={index}
text={status.value}
value={status.id}
/>
);
})}
<SelectItem text="In Progress" value="IN_PROGRESS" />
{statuses.map((status, index) => (
<SelectItem
key={index}
text={status.value}
value={status.id}
/>
))}
</Select>
</div>
</Column>
Expand Down

0 comments on commit 4e842d8

Please sign in to comment.