Skip to content

Make sidebar toggle button consistently clickable #745

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
suvanbanerjee wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make sidebar toggle button consistently clickable #745

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dab1b6
Merge pull request #741 from openclimatefix/staging
suvanbanerjee May 11, 2026
1a59b24
fix(sidebar): clean up button structure and format file
suvanbanerjee May 14, 2026
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
40 changes: 19 additions & 21 deletions apps/quartz-app/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const Sidebar: React.FC<SidebarProps> = ({
for (const value of windForecastData?.values) {
const timestamp = convertDatestampToEpoch(value.Time);
const existingData = formattedSidebarData?.find(
(data) => data.timestamp === timestamp
(data) => data.timestamp === timestamp,
);
if (existingData) {
existingData.wind_forecast = value.PowerKW / 1000;
Expand All @@ -122,7 +122,7 @@ const Sidebar: React.FC<SidebarProps> = ({
const time = value.Time;
const timestamp = convertDatestampToEpoch(value.Time);
const existingData = formattedSidebarData?.find(
(data) => data.timestamp === timestamp
(data) => data.timestamp === timestamp,
);
if (existingData) {
existingData.solar_forecast = value.PowerKW / 1000;
Expand All @@ -140,7 +140,7 @@ const Sidebar: React.FC<SidebarProps> = ({
for (const value of solarGenerationData?.values) {
const timestamp = convertDatestampToEpoch(value.Time);
const existingData = formattedSidebarData?.find(
(data) => data.timestamp === timestamp
(data) => data.timestamp === timestamp,
);
if (
existingData &&
Expand All @@ -155,7 +155,7 @@ const Sidebar: React.FC<SidebarProps> = ({
for (const value of windGenerationData?.values) {
const timestamp = convertDatestampToEpoch(value.Time);
const existingData = formattedSidebarData?.find(
(data) => data.timestamp === timestamp
(data) => data.timestamp === timestamp,
);
if (
existingData &&
Expand All @@ -167,45 +167,45 @@ const Sidebar: React.FC<SidebarProps> = ({
}

const formattedSideBarData = formattedSidebarData.sort(
(a, b) => a.timestamp - b.timestamp
(a, b) => a.timestamp - b.timestamp,
);

let solarForecastNow = formattedSideBarData.find(
(data) => data.timestamp === getEpochNowInTimezone()
(data) => data.timestamp === getEpochNowInTimezone(),
)?.solar_forecast;
solarForecastNow = Number(solarForecastNow) || 0;

let windForecastNow =
formattedSideBarData.find(
(data) => data.timestamp === getEpochNowInTimezone()
(data) => data.timestamp === getEpochNowInTimezone(),
)?.wind_forecast || 0;
windForecastNow = Number(windForecastNow) || 0;

// get the next 15 min slot solar forecast

let solarForecastNext =
formattedSideBarData.find(
(data) => data.timestamp === getEpochNowInTimezonePlus15()
(data) => data.timestamp === getEpochNowInTimezonePlus15(),
)?.solar_forecast || 0;
solarForecastNext = Number(solarForecastNext) || 0;

let windForecastNext =
formattedSideBarData.find(
(data) => data.timestamp === getEpochNowInTimezonePlus15()
(data) => data.timestamp === getEpochNowInTimezonePlus15(),
)?.wind_forecast || 0;
windForecastNext = Number(windForecastNext) || 0;

const powerForecastNow = Number(windForecastNow + solarForecastNow) || 0;
const powerForecastNext = Number(windForecastNext + solarForecastNext) || 0;

let actualWindGeneration = formattedSideBarData.find(
(data) => data.timestamp === getEpochNowInTimezone()
(data) => data.timestamp === getEpochNowInTimezone(),
)?.wind_generation;
actualWindGeneration = Number(actualWindGeneration) || 0;

let actualSolarGeneration =
formattedSideBarData.find(
(data) => data.timestamp === getEpochNowInTimezone()
(data) => data.timestamp === getEpochNowInTimezone(),
)?.solar_generation || 0;
actualSolarGeneration = Number(actualSolarGeneration) || 0;

Expand Down Expand Up @@ -378,18 +378,16 @@ const Sidebar: React.FC<SidebarProps> = ({
<div className="w-14 h-full px-2 py-4 bg-neutral-700 flex-col justify-start items-center gap-5 inline-flex">
<div className="justify-start items-start gap-[110px] inline-flex ">
{/* // on hover, set showChevronRight to true show the chevron, otherwise show the hamburger menu*/}
{showChevronRight ? (
<button
className="p-2 -mt-1 -ml-1 flex justify-center items-center rounded-lg hover:bg-ocf-grey-400 hover:duration-300"
onClick={handleClick}
>
<button
className="p-2 -mt-1 -ml-1 flex justify-center items-center rounded-lg hover:bg-ocf-grey-400 hover:duration-300"
onClick={handleClick}
>
{showChevronRight ? (
<ChevronRight />
</button>
) : (
<div className="p-2 -mt-1 -ml-1 flex justify-center items-center rounded-lg">
) : (
<HamburgerMenu className="text-white" />
</div>
)}
)}
</button>
</div>
<div className="self-stretch flex-col justify-start items-start flex">
<MiniCard
Expand Down
Loading