projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract common utils for controlling property field error visibility
[arvados.git]
/
src
/
views-components
/
main-content-bar
/
main-content-bar.tsx
diff --git
a/src/views-components/main-content-bar/main-content-bar.tsx
b/src/views-components/main-content-bar/main-content-bar.tsx
index 16fa2a9c21257f72ae9c33ac95a6a5139e975a24..741a7e00f68481b07c24895cbcd5ecf05b8f8290 100644
(file)
--- a/
src/views-components/main-content-bar/main-content-bar.tsx
+++ b/
src/views-components/main-content-bar/main-content-bar.tsx
@@
-8,7
+8,7
@@
import { DetailsIcon } from "~/components/icon/icon";
import { Breadcrumbs } from "~/views-components/breadcrumbs/breadcrumbs";
import { connect } from 'react-redux';
import { RootState } from '~/store/store';
import { Breadcrumbs } from "~/views-components/breadcrumbs/breadcrumbs";
import { connect } from 'react-redux';
import { RootState } from '~/store/store';
-import { matchWorkflowRoute, matchSshKeysRoute } from '~/routes/routes';
+import { matchWorkflowRoute, matchSshKeysRoute
, matchRepositoriesRoute
} from '~/routes/routes';
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
interface MainContentBarProps {
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
interface MainContentBarProps {
@@
-22,6
+22,12
@@
const isWorkflowPath = ({ router }: RootState) => {
return !!match;
};
return !!match;
};
+const isRepositoriesPath = ({ router }: RootState) => {
+ const pathname = router.location ? router.location.pathname : '';
+ const match = matchRepositoriesRoute(pathname);
+ return !!match;
+};
+
const isSshKeysPath = ({ router }: RootState) => {
const pathname = router.location ? router.location.pathname : '';
const match = matchSshKeysRoute(pathname);
const isSshKeysPath = ({ router }: RootState) => {
const pathname = router.location ? router.location.pathname : '';
const match = matchSshKeysRoute(pathname);
@@
-29,7
+35,7
@@
const isSshKeysPath = ({ router }: RootState) => {
};
export const MainContentBar = connect((state: RootState) => ({
};
export const MainContentBar = connect((state: RootState) => ({
- buttonVisible: !isWorkflowPath(state) && !isSshKeysPath(state)
+ buttonVisible: !isWorkflowPath(state) && !isSshKeysPath(state)
&& !isRepositoriesPath(state)
}), {
onDetailsPanelToggle: toggleDetailsPanel
})((props: MainContentBarProps) =>
}), {
onDetailsPanelToggle: toggleDetailsPanel
})((props: MainContentBarProps) =>
@@
-39,11
+45,11
@@
export const MainContentBar = connect((state: RootState) => ({
<Breadcrumbs />
</Grid>
<Grid item>
<Breadcrumbs />
</Grid>
<Grid item>
- {props.buttonVisible
?
<Tooltip title="Additional Info">
+ {props.buttonVisible
&&
<Tooltip title="Additional Info">
<IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
<DetailsIcon />
</IconButton>
<IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
<DetailsIcon />
</IconButton>
- </Tooltip>
: null
}
+ </Tooltip>}
</Grid>
</Grid>
</Toolbar>);
</Grid>
</Grid>
</Toolbar>);