projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16212: Sets api token on login success, re-focus on login error.
[arvados-workbench2.git]
/
src
/
views
/
collection-content-address-panel
/
collection-content-address-panel.tsx
diff --git
a/src/views/collection-content-address-panel/collection-content-address-panel.tsx
b/src/views/collection-content-address-panel/collection-content-address-panel.tsx
index dfe1b5bf825375ed08321b130869bf2cc4328a86..b652b502886653bcf43695cf80eeaefd8d9e86bf 100644
(file)
--- a/
src/views/collection-content-address-panel/collection-content-address-panel.tsx
+++ b/
src/views/collection-content-address-panel/collection-content-address-panel.tsx
@@
-3,10
+3,7
@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Link } from 'react-router-dom';
-import {
- StyleRulesCallback, WithStyles, withStyles, Grid
-} from '@material-ui/core';
+import { StyleRulesCallback, WithStyles, withStyles, Grid, Button } from '@material-ui/core';
import { CollectionIcon } from '~/components/icon/icon';
import { ArvadosTheme } from '~/common/custom-theme';
import { BackIcon } from '~/components/icon/icon';
import { CollectionIcon } from '~/components/icon/icon';
import { ArvadosTheme } from '~/common/custom-theme';
import { BackIcon } from '~/components/icon/icon';
@@
-23,18
+20,18
@@
import { navigateTo } from '~/store/navigation/navigation-action';
import { DataColumns } from '~/components/data-table/data-table';
import { SortDirection } from '~/components/data-table/data-column';
import { createTree } from '~/models/tree';
import { DataColumns } from '~/components/data-table/data-table';
import { SortDirection } from '~/components/data-table/data-column';
import { createTree } from '~/models/tree';
-import { ResourceName, ResourceOwner, ResourceLastModifiedDate } from '~/views-components/data-explorer/renderers';
+import { ResourceName, ResourceOwner
Name
, ResourceLastModifiedDate } from '~/views-components/data-explorer/renderers';
type CssRules = 'backLink' | 'backIcon' | 'card' | 'title' | 'iconHeader' | 'link';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
backLink: {
type CssRules = 'backLink' | 'backIcon' | 'card' | 'title' | 'iconHeader' | 'link';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
backLink: {
- fontSize: '1
rem
',
+ fontSize: '1
4px
',
fontWeight: 600,
display: 'flex',
alignItems: 'center',
fontWeight: 600,
display: 'flex',
alignItems: 'center',
- textDecoration: 'none',
padding: theme.spacing.unit,
padding: theme.spacing.unit,
+ marginBottom: theme.spacing.unit,
color: theme.palette.grey["700"],
},
backIcon: {
color: theme.palette.grey["700"],
},
backIcon: {
@@
-80,7
+77,7
@@
export const collectionContentAddressPanelColumns: DataColumns<string> = [
selected: true,
configurable: true,
filters: createTree(),
selected: true,
configurable: true,
filters: createTree(),
- render: uuid => <ResourceOwner uuid={uuid} />
+ render: uuid => <ResourceOwner
Name
uuid={uuid} />
},
{
name: CollectionContentAddressPanelColumnNames.LAST_MODIFIED,
},
{
name: CollectionContentAddressPanelColumnNames.LAST_MODIFIED,
@@
-132,17
+129,19
@@
export const CollectionsContentAddressPanel = withStyles(styles)(
class extends React.Component<CollectionContentAddressPanelActionProps & CollectionContentAddressDataProps & WithStyles<CssRules>> {
render() {
return <Grid item xs={12}>
class extends React.Component<CollectionContentAddressPanelActionProps & CollectionContentAddressDataProps & WithStyles<CssRules>> {
render() {
return <Grid item xs={12}>
- {/* <Link to={`/collections/${collectionUuid}`} className={this.props.classes.backLink}>
+ <Button
+ onClick={() => history.back()}
+ className={this.props.classes.backLink}>
<BackIcon className={this.props.classes.backIcon} />
Back
<BackIcon className={this.props.classes.backIcon} />
Back
- </
Link> */}
+ </
Button>
<DataExplorer
id={COLLECTIONS_CONTENT_ADDRESS_PANEL_ID}
onRowClick={this.props.onItemClick}
onRowDoubleClick={this.props.onItemDoubleClick}
onContextMenu={this.props.onContextMenu}
contextMenuColumn={true}
<DataExplorer
id={COLLECTIONS_CONTENT_ADDRESS_PANEL_ID}
onRowClick={this.props.onItemClick}
onRowDoubleClick={this.props.onItemDoubleClick}
onContextMenu={this.props.onContextMenu}
contextMenuColumn={true}
- title={
this.props.match.params.id
}
+ title={
`Content address: ${this.props.match.params.id}`
}
dataTableDefaultView={
<DataTableDefaultView
icon={CollectionIcon}
dataTableDefaultView={
<DataTableDefaultView
icon={CollectionIcon}
@@
-152,4
+151,4
@@
export const CollectionsContentAddressPanel = withStyles(styles)(
}
}
)
}
}
)
-);
\ No newline at end of file
+);