Skip to content

Remove the adaptation display map option #7

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

Draft
gkalomalos wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Remove the adaptation display map option #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
643e746
fix: Remove adaptation tab display map option
gkalomalos Aug 21, 2025
e0539ae
chore: Update the package-lock.json
gkalomalos Aug 21, 2025
02a0838
chore: Add comments
gkalomalos Aug 21, 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
28 changes: 22 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions src/components/controls/MainViewControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,26 @@ import BarChartIcon from "@mui/icons-material/BarChart";

import useStore from "../../store";

const controls = [
const allControls = [
{ id: "display_map", icon: <MapIcon /> },
{ id: "display_chart", icon: <BarChartIcon /> },
];

const MainViewControls = () => {
const { activeViewControl, setActiveViewControl } = useStore();
const { activeViewControl, setActiveViewControl, selectedSubTab } = useStore();
const { t } = useTranslation();

const controls =
selectedSubTab === 1 ? allControls.filter((c) => c.id !== "display_map") : allControls;

const handleSelect = (control) => {
setActiveViewControl(control);
};

return (
<Card
sx={{
// maxWidth: controls.length === 1 ? "50%" : "100%",
maxWidth: "100%",
margin: "auto",
bgcolor: "#FFCCCC",
Expand Down
13 changes: 12 additions & 1 deletion src/components/main/MainSubTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import useStore from "../../store";
import { useMapTools } from "../../utils/mapTools";

const MainSubTabs = () => {
const { activeViewControl, selectedSubTab, selectedTab, setSelectedSubTab } = useStore();
const {
activeViewControl,
selectedSubTab,
selectedTab,
setSelectedSubTab,
setActiveViewControl,
} = useStore();
const { handleSaveImage, handleSaveMap, handleAddToOutput } = useMapTools();
const { t } = useTranslation();

Expand All @@ -27,6 +33,11 @@ const MainSubTabs = () => {

const handleSubTabChange = (event, newValue) => {
setSelectedSubTab(newValue);
// Set the active vew to display_chart if Economic & Non-Economic tab is selected.
// The display_map is not currently available for this tab.
if (newValue === 1) {
setActiveViewControl("display_chart");
}
};

const handleButtonClick = (index) => {
Expand Down