diff --git a/src/Components/ControlsGroup.jsx b/src/Components/ControlsGroup.jsx index 5da7e5c65..0ad4b2806 100644 --- a/src/Components/ControlsGroup.jsx +++ b/src/Components/ControlsGroup.jsx @@ -3,7 +3,7 @@ import ButtonGroup from '@mui/material/ButtonGroup' import OpenModelControl from './OpenModelControl' import useStore from '../store/useStore' import {TooltipIconButton} from './Buttons' -// import HistoryIcon from '@mui/icons-material/History' +import HistoryIcon from '@mui/icons-material/History' import SearchIcon from '@mui/icons-material/Search' import TreeIcon from '../assets/icons/Tree.svg' @@ -16,10 +16,13 @@ import TreeIcon from '../assets/icons/Tree.svg' * @return {React.Component} */ export default function OperationsGroup({fileOpen}) { - const toggleIsNavigationVisible = useStore((state) => state.toggleIsNavigationVisible) const isNavigationVisible = useStore((state) => state.isNavigationVisible) - const toggleIsSearchVisible = useStore((state) => state.toggleIsSearchVisible) + const toggleIsNavigationVisible = useStore((state) => state.toggleIsNavigationVisible) const isSearchVisible = useStore((state) => state.isSearchVisible) + const toggleIsSearchVisible = useStore((state) => state.toggleIsSearchVisible) + const isVersionHistoryVisible = useStore((state) => state.isVersionHistoryVisible) + const toggleIsVersionHistoryVisible = useStore((state) => state.toggleIsVersionHistoryVisible) + return ( - {/* } placement='bottom' - selected={false} - onClick={toggleIsNavigationVisible} - /> */} + selected={isVersionHistoryVisible} + onClick={toggleIsVersionHistoryVisible} + /> ) } diff --git a/src/Components/NavPanel.jsx b/src/Components/NavPanel.jsx index 6c8706f9d..f5120afac 100644 --- a/src/Components/NavPanel.jsx +++ b/src/Components/NavPanel.jsx @@ -1,7 +1,10 @@ import React from 'react' import AccountTreeIcon from '@mui/icons-material/AccountTree' +import Box from '@mui/material/Box' +import IconButton from '@mui/material/IconButton' import ListIcon from '@mui/icons-material/List' import Paper from '@mui/material/Paper' +import Stack from '@mui/material/Stack' import ToggleButton from '@mui/material/ToggleButton' import ToggleButtonGroup from '@mui/material/ToggleButtonGroup' import Tooltip from '@mui/material/Tooltip' @@ -15,7 +18,7 @@ import {assertDefined} from '../utils/assert' import {useExistInFeature} from '../hooks/useExistInFeature' import NodeClosedIcon from '../assets/icons/NodeClosed.svg' import NodeOpenIcon from '../assets/icons/NodeOpened.svg' -import {Typography} from '@mui/material' +import CloseIcon from '@mui/icons-material/Close' /** @@ -49,6 +52,7 @@ export default function NavPanel({ // nodes besides hardcoding. const elementTypesMap = useStore((state) => state.elementTypesMap) + const toggleIsNavigationVisible = useStore((state) => state.toggleIsVersionHistoryVisible) const existNavTypesInFeature = useExistInFeature('navtypes') @@ -106,12 +110,6 @@ export default function NavPanel({ }} >
- - Project Navigation - {existNavTypesInFeature && } - Spatial Navigation + + Spatial Navigation + + + + + + } diff --git a/src/Components/Timeline.jsx b/src/Components/Timeline.jsx index 5fefe1cb7..febac4ac1 100644 --- a/src/Components/Timeline.jsx +++ b/src/Components/Timeline.jsx @@ -29,6 +29,7 @@ export default function VersionsTimeline({versionHistory, branch}) { const [commitData, setCommitData] = useState([]) const accessToken = useStore((state) => state.accessToken) const repository = useStore((state) => state.repository) + const toggleIsVersionHistoryVisible = useStore((state) => state.toggleIsVersionHistoryVisible) useEffect(() => { const fetchCommits = async () => { @@ -49,10 +50,12 @@ export default function VersionsTimeline({versionHistory, branch}) { // console.log('commitData', commitData) return ( - Version History - - + Version History + + diff --git a/src/Containers/CadView.jsx b/src/Containers/CadView.jsx index 72277e2ae..876fa076c 100644 --- a/src/Containers/CadView.jsx +++ b/src/Containers/CadView.jsx @@ -123,6 +123,7 @@ export default function CadView({ const isNavigationPanelVisible = useStore((state) => state.isNavigationPanelVisible) const isSearchVisible = useStore((state) => state.isSearchVisible) const isNavigationVisible = useStore((state) => state.isNavigationVisible) + const isVersionHistoryVisible = useStore((state) => state.isVersionHistoryVisible) // Place Mark @@ -674,13 +675,6 @@ export default function CadView({ loadLocalFile(navigate, appPrefix, handleBeforeUnload)}/> } - { - modelPath.repo !== undefined && - <> - - - - } {isNavPanelOpen && isNavigationPanelVisible && isNavigationVisible && @@ -701,6 +695,13 @@ export default function CadView({ } /> } + { + modelPath.repo !== undefined && isVersionHistoryVisible && + <> + + + + } )} navToDefault(navigate, appPrefix)}/> diff --git a/src/store/UISlice.js b/src/store/UISlice.js index 8f7defe0d..26810cc83 100644 --- a/src/store/UISlice.js +++ b/src/store/UISlice.js @@ -16,6 +16,7 @@ export default function createUISlice(set, get) { isNavPanelOpen: true, isNavigationVisible: false, isSearchVisible: false, + isVersionHistoryVisible: false, isOpenControlHighlighted: true, isPropertiesOn: false, snackMessage: null, @@ -62,6 +63,7 @@ export default function createUISlice(set, get) { setSidebarHeight: (newSidebarHeight) => set(() => ({sidebarHeight: newSidebarHeight})), setDrawer: (newDrawer) => set(() => ({drawer: newDrawer})), toggleAppStoreDrawer: () => set((state) => ({isAppStoreOpen: !state.isAppStoreOpen})), + toggleIsVersionHistoryVisible: () => set((state) => ({isVersionHistoryVisible: !state.isVersionHistoryVisible})), toggleIsNavigationVisible: () => set((state) => ({isNavigationVisible: !state.isNavigationVisible})), toggleIsSearchVisible: () => set((state) => ({isSearchVisible: !state.isSearchVisible})), setAppStoreSidebarWidth: (newSidebarWidth) => set(() => ({appStoreSidebarWidth: newSidebarWidth})),