From 0c8240624194c20aa052be10898a61b07f5c18ed Mon Sep 17 00:00:00 2001 From: David Masselink Date: Mon, 25 Mar 2019 09:40:29 -0700 Subject: [PATCH] feature/#140-collapsable-detail-drawer (#147) * #140 - make collapsable drawer default to closed, but with a larger, more obvious, control mechanism; also fix bug #145 by including when necessary in graph URL --- app/src/components/app/App.js | 3 ++ app/src/components/errorPage/ErrorPage.css | 14 +++++++++ app/src/components/errorPage/ErrorPage.js | 28 ++++++++++++++++++ .../errorPage/katlas-logo-blue-300px.png | Bin 0 -> 16264 bytes app/src/components/graph/GraphContainer.js | 2 +- app/src/components/results/ResultList.js | 6 +++- app/src/components/results/Results.css | 6 ++++ app/src/components/results/Results.js | 4 ++- app/src/components/results/grabIcon.png | Bin 0 -> 743 bytes 9 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 app/src/components/errorPage/ErrorPage.css create mode 100644 app/src/components/errorPage/ErrorPage.js create mode 100644 app/src/components/errorPage/katlas-logo-blue-300px.png create mode 100644 app/src/components/results/Results.css create mode 100644 app/src/components/results/grabIcon.png diff --git a/app/src/components/app/App.js b/app/src/components/app/App.js index 6f12938..bc5c416 100644 --- a/app/src/components/app/App.js +++ b/app/src/components/app/App.js @@ -6,6 +6,7 @@ import Home from "../home/Home"; import Results from "../results/Results"; import GraphContainer from "../graph/GraphContainer"; import Notifier from '../notifier/Notifier'; +import ErrorPage from '../errorPage/ErrorPage'; export default class App extends Component { render() { @@ -17,6 +18,8 @@ export default class App extends Component { + {/* catch-all route in case of no earlier match */} + ); diff --git a/app/src/components/errorPage/ErrorPage.css b/app/src/components/errorPage/ErrorPage.css new file mode 100644 index 0000000..7872022 --- /dev/null +++ b/app/src/components/errorPage/ErrorPage.css @@ -0,0 +1,14 @@ +.Error { + min-height: 5vh; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: calc(10px + 1vmin); +} + +.Error-logo-full { + height: auto; + width: auto; + margin: 20px; +} \ No newline at end of file diff --git a/app/src/components/errorPage/ErrorPage.js b/app/src/components/errorPage/ErrorPage.js new file mode 100644 index 0000000..6371303 --- /dev/null +++ b/app/src/components/errorPage/ErrorPage.js @@ -0,0 +1,28 @@ +import React from 'react'; +import { withRouter } from 'react-router-dom'; +import { withStyles } from '@material-ui/core/styles'; + +import './ErrorPage.css'; +import logo from './katlas-logo-blue-300px.png'; + +const styles = () => ({ + title: { + textAlign: 'center' + } +}); + +class ErrorPage extends React.Component { + render() { + const { classes } = this.props; + return ( +
+
+

Something appears to have gone wrong. Please retry your operation.

+
+ logo +
+ ); + } +} + +export default withStyles(styles)(withRouter(ErrorPage)); diff --git a/app/src/components/errorPage/katlas-logo-blue-300px.png b/app/src/components/errorPage/katlas-logo-blue-300px.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ec7e5b71aa508ffb9d13532a735d3f57808dc4 GIT binary patch literal 16264 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 wes1Y}KU4iXE!+Q}rlATwbhF#L)kL0la|x6#xJL literal 0 HcmV?d00001 diff --git a/app/src/components/graph/GraphContainer.js b/app/src/components/graph/GraphContainer.js index d412b0a..752588d 100644 --- a/app/src/components/graph/GraphContainer.js +++ b/app/src/components/graph/GraphContainer.js @@ -107,7 +107,7 @@ class GraphContainer extends Component { ) : null } - + diff --git a/app/src/components/results/ResultList.js b/app/src/components/results/ResultList.js index 432bf95..9b0c3da 100644 --- a/app/src/components/results/ResultList.js +++ b/app/src/components/results/ResultList.js @@ -15,6 +15,7 @@ import Tooltip from '@material-ui/core/Tooltip'; import { ResultPaginationActionsWrapped } from './ResultPaginationActions'; import { getQueryLayout, rowCellsFromLayout } from './layoutComposer'; import { addResourceIdFilterQSL } from "../../utils/validate"; +import history from '../../history'; // Customized table cell theme export const CustomTableCell = withStyles(theme => ({ @@ -115,9 +116,12 @@ class ResultList extends Component { tableRows = query.results.map((item, idx) => { let cells = rowCellsFromLayout(item, layout); + //build url to use for QSL in graph action; include basename, if applicable + let rowUrl = (history.basename ? history.basename : '' ) + '/graph/' + + addResourceIdFilterQSL(query.current, item.resourceid); cells.unshift( - + {'\uf0e8'} diff --git a/app/src/components/results/Results.css b/app/src/components/results/Results.css new file mode 100644 index 0000000..204af98 --- /dev/null +++ b/app/src/components/results/Results.css @@ -0,0 +1,6 @@ +.splitter-layout > .layout-splitter { + width: 12px; + background-image: url("./grabIcon.png"); + background-position: center; + background-repeat: no-repeat; +} \ No newline at end of file diff --git a/app/src/components/results/Results.js b/app/src/components/results/Results.js index 520b476..94a5541 100644 --- a/app/src/components/results/Results.js +++ b/app/src/components/results/Results.js @@ -16,6 +16,8 @@ import EntityDetails from '../entityDetails/EntityDetails'; import * as queryActions from '../../actions/queryActions'; import { getQueryParam } from '../../utils/url'; +import './Results.css'; + const styles = theme => ({ progress: { margin: theme.spacing.unit * 2 @@ -144,7 +146,7 @@ class Results extends Component { ) : ( ;VkfoEM{Qf z76xHPhFNnYfC?frLn2Bde0{8v^KP? zWt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;z zSx}OhpQivaH!&%{w8U0P31kr*K-^i9nTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`Mz znW;dVLFU^T+JIG}h(YbK(Fa+MxY z&Uzho5SVvUWw*v`hyL0&nco~;><5=`40x?+{_%lk{=_+76*?*c{P#W+yyVR4sI>IR z8;i+hulYq~Zk(yPf2PJ-QtWv8b#85w)o{4d zQxZ8X;JT^$)HKn@yH$>F4Er^^*6u)%??;*1jU!%_R8t9+>v| zV84_9yHEf1pDg^h=iTm28vlMVHpWlsUov6(-pC(0$0k@Q*qOFB{jw